summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-09 23:04:56 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-05-09 23:04:56 +0000
commit03a0930bca1ecd78e36d7fe26d57b98bb3619dff (patch)
treed1406f62cd5becac36019d287b9777e49e2f771b
parentd4af767c7bc60c330cdc9b470e770bc382b3121e (diff)
downloadhercules-03a0930bca1ecd78e36d7fe26d57b98bb3619dff.tar.gz
hercules-03a0930bca1ecd78e36d7fe26d57b98bb3619dff.tar.bz2
hercules-03a0930bca1ecd78e36d7fe26d57b98bb3619dff.tar.xz
hercules-03a0930bca1ecd78e36d7fe26d57b98bb3619dff.zip
- Updated SKA to return a random value between 0 and 99 each time status_get_def is invoked.
- Updated Making Arrow to not include unidentified items in the list. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6540 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt4
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/status.c4
3 files changed, 7 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index c1c0e713f..68c9f82a0 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,10 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/05/09
+ * Updated SKA to return a random value between 0 and 99 each time
+ status_get_def is invoked. [Skotlex]
+ * Updated Making Arrow to not include unidentified items in the list.
+ [Skotlex]
* Reduced drop slots from 15 to 10. [Skotlex]
* Updated mob_db.sql with the current data. [Skotlex]
* Updated setoption script command to receive a second (optional) argument
diff --git a/src/map/clif.c b/src/map/clif.c
index 36f53d271..b020d3f9f 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -2968,7 +2968,7 @@ int clif_arrow_create_list(struct map_session_data *sd)
for (i = 0, c = 0; i < MAX_SKILL_ARROW_DB; i++) {
if (skill_arrow_db[i].nameid > 0 &&
(j = pc_search_inventory(sd, skill_arrow_db[i].nameid)) >= 0 &&
- !sd->status.inventory[j].equip)
+ !sd->status.inventory[j].equip && sd->status.inventory[j].identify)
{
if ((j = itemdb_viewid(skill_arrow_db[i].nameid)) > 0)
WFIFOW(fd,c*2+4) = j;
diff --git a/src/map/status.c b/src/map/status.c
index 5140cf4e5..b9d2b904e 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -2046,10 +2046,10 @@ int status_calc_def(struct block_list *bl, int def)
return 0;
if(sc->data[SC_KEEPING].timer!=-1)
return 100;
+ if(sc->data[SC_SKA].timer != -1)
+ return rand()%100; //Reports indicate SKA actually randomizes defense.
if(sc->data[SC_STEELBODY].timer!=-1)
return 90;
- if(sc->data[SC_SKA].timer != -1) // [marquis007]
- return 90;
if(sc->data[SC_DRUMBATTLE].timer!=-1)
def += sc->data[SC_DRUMBATTLE].val3;
if(sc->data[SC_INCDEFRATE].timer!=-1)