summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDracoRPG <DracoRPG@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-26 21:12:08 +0000
committerDracoRPG <DracoRPG@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-26 21:12:08 +0000
commit3299e0cf10d83dfa8827a6f538ef1bcf1382ae45 (patch)
tree366bef5a78533782ba52dce6a001c6c6236d95f3
parent0693a231629beed6faa2ee4c3ce8b23bdf001262 (diff)
downloadhercules-3299e0cf10d83dfa8827a6f538ef1bcf1382ae45.tar.gz
hercules-3299e0cf10d83dfa8827a6f538ef1bcf1382ae45.tar.bz2
hercules-3299e0cf10d83dfa8827a6f538ef1bcf1382ae45.tar.xz
hercules-3299e0cf10d83dfa8827a6f538ef1bcf1382ae45.zip
Added missing parenthesis preventing SinX etc to get +4/lv from Improve Dodge
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1301 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-SVN.txt13
-rw-r--r--doc/item_bonus.txt18
-rw-r--r--src/map/status.c4
3 files changed, 18 insertions, 17 deletions
diff --git a/Changelog-SVN.txt b/Changelog-SVN.txt
index 4dadf4540..2219d2176 100644
--- a/Changelog-SVN.txt
+++ b/Changelog-SVN.txt
@@ -1,8 +1,13 @@
Date Added
03/27
+ * Added missing parenthesis in my Improve Dodge code, not giving +4/lv to proper jobs [DracoRPG]
* Added all released cards into monsters drops and Old Card Album [Lupus]
03/25
+ * Fixed a typo in my fix for Stalk / Tunnel Drive increasing instead of decreasing speed, sorry [DracoRPG]
+ * Rewrote a little bit Improve Dodge [DracoRPG]
+ - The speed bonus does not effect when Cloaked
+ - Assassins & Rogues get +4 Flee/lv, but all other jobs can get +3/lv if they have the skill (not only Thiefs & Super Novices)
* Some minor changes to Sacrifice in battle.c [celest]
* Set the Emperium to be immune to Sacrifice [celest]
* Set the Emperium to be have max status effects immunity [celest]
@@ -10,12 +15,10 @@ Date Added
set to 'no' [celest]
* Fixed @monsterbig/@monstersmall not working [celest]
* Fixed @killmonster2 not working [celest]
- * Fixed a typo in my fix for Stalk / Tunnel Drive increasing instead of decreasing speed, sorry [DracoRPG]
- * Rewrote a little bit Improve Dodge [DracoRPG]
- - The speed bonus does not effect when Cloaked
- - Assassins & Rogues get +4 Flee/lv, but all other jobs can get +3/lv if they have the skill (not only Thiefs & Super Novices)
03/24
+ * Updated obj_del to delete all GNUMakeFile and .o files + compiled exes [DracoRPG]
+ * Fixed a typo in Stalk / Tunnel Drive speed calculation [DracoRPG]
* Added some mapflags for new towns [Lupus]
* Added timer.c optimization / timers sort fix. 'no freezing mobs anymore' Thanx 2 Yor/Freya [Lupus]
* Added 'map_charid2id' [celest]
@@ -33,8 +36,6 @@ Date Added
is set to 'yes' -- they're only not allowed to cast near players [celest]
* Print number of online users in online.txt/.html even if there's only 1 user
online [celest]
- * Updated obj_del to delete all GNUMakeFile and .o files + compiled exes [DracoRPG]
- * Fixed a typo in Stalk / Tunnel Drive speed calculation [DracoRPG]
03/23
* Adjusted my trade fix [1280: MouseJstr]
diff --git a/doc/item_bonus.txt b/doc/item_bonus.txt
index fbc613893..13dac4169 100644
--- a/doc/item_bonus.txt
+++ b/doc/item_bonus.txt
@@ -1,4 +1,4 @@
-//eAthena Items Scripting Manual
+//eAthena Items Scripting Manual
skill n,x; skill n of level x
@@ -45,11 +45,11 @@ bonus bDoubleRate,n; attack probability n% (with weapon disregard just high one
bonus bDoubleAddRate,n; Double attack probability + n% (weapon disregard)
bonus bPerfectHitRate,n; On-target impact attack probability n% (just high ones application)
bonus bPerfectHitAddRate,n; On-target impact attack probability +n%
-bonus bGetZenyNum,n; When pushing down the monster with physical attack, rand () ゼニ of %n+1 is obtained, (as for n just high ones application)
-bonus bAddGetZenyNum,n; When pushing down the monster with physical attack, rand () ゼニ of %n+1 is obtained, (n is done +)
-bonus bCriticalDef,n; Critical 喰 and others the trap it is, probability + n%
-bonus bNearAtkDef,n; The damage of short-range attack n% reduction (magic and the trap, the 鷹 is excluded)
-bonus bLongAtkDef,n; damage of stand off attack n% reduction (magic and the trap, the 鷹 is excluded)
+bonus bGetZenyNum,n; When pushing down the monster with physical attack, rand () ?? of %n+1 is obtained, (as for n just high ones application)
+bonus bAddGetZenyNum,n; When pushing down the monster with physical attack, rand () ?? of %n+1 is obtained, (n is done +)
+bonus bCriticalDef,n; Critical ? and others the trap it is, probability + n%
+bonus bNearAtkDef,n; The damage of short-range attack n% reduction (magic and the trap, the ? is excluded)
+bonus bLongAtkDef,n; damage of stand off attack n% reduction (magic and the trap, the ? is excluded)
bonus bMagicAtkDef the damage of magical attack n% reduction
bonus bMiscAtkDef MISC attack (the trap and ?) the damage n% reduction
@@ -121,7 +121,7 @@ bonus2 bMagicSubRace,n,x; Magical damage x% reduction from n race
0,Intangibility 1,Immortality 2,Animal 3,Plant 4,Insect 5,Fish and shellfish 6,Demon 7,Human 8,Angel 9,Dragon family 10:Boss monster 11:Other than boss monster (normal monster)
bonus2 bAddEle,n,x; In n attribute the damage addition of x%
0,Nothing 1,Water 2,Earth 3,Fire 4,Wind 5,Poison 6,Saint 7,Darkness 8,Sense 9,Immortality
-bonus2 bMagicAddEle,n,x; In n attribute the damage addition of x% (only magical attack)
+bonus2 bMagicAddEle,n,x
0,Nothing 1,Water 2,Earth 3,Fire 4,Wind 5,Poison 6,Saint 7,Darkness 8,Sense 9,Immortality
bonus2 bSubEle,n,x; Damage x% reduction from n attribute
0,Nothing 1,Water 2,Earth 3,Fire 4,Wind 5,Poison 6,Saint 7,Darkness 8,Sense 9,Immortality
@@ -176,7 +176,7 @@ bonus3 bAutoSpellWhenHit,x,y,n; n% chance to cast skill x of level y when
bonus3 bSPDrainRate,n,x,y; When attacking there is a n% chance to either
gain SP equivalent to x% of damage dealt, OR
drain the amount of sp from the enemy.
- y:0=gain sp 1:drain enemy sp
+
bonus3 bSPDrainValue,n,x,y; When attacking there is a n% chance to either
gain x SP, OR drain the amount of sp from the
enemy. y:0=gain sp 1:drain enemy sp
@@ -195,7 +195,7 @@ bonus2 bAddItemHealRate,n,x; Increases HP recovered by n type items by x%
//---- 3/15 new card effects ----
-bonus bLoseSPWhenUnequip.n; Lose n SP when the item is unequipped
+bonus bLoseSPWhenUnequip,n; Lose n SP when the item is unequipped
bonus2 bExpAddRace,n,x; Increase exp gained by n% vs. enemies of type x
bonus2 bSPGainRace,n,x; When killing a monster of type x by physical
diff --git a/src/map/status.c b/src/map/status.c
index 30887e201..bc059e442 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1034,7 +1034,7 @@ int status_calc_pc(struct map_session_data* sd,int first)
//Flee㏸
if( (skill=pc_checkskill(sd,TF_MISS))>0 ){ // ?
- sd->flee += skill*(sd->status.class_==12 || sd->status.class_==17 || sd->status.class_==4013 || sd->status.class_==4018 ? 4 : 3);
+ sd->flee += skill*((sd->status.class_==12 || sd->status.class_==17 || sd->status.class_==4013 || sd->status.class_==4018) ? 4 : 3);
if((sd->status.class_==12 || sd->status.class_==4013) && (sd->sc_count && sd->sc_data[SC_CLOAKING].timer==-1))
sd->speed -= (short)(skill*1.5/100 * DEFAULT_WALK_SPEED);
}
@@ -1539,7 +1539,7 @@ int status_calc_speed (struct map_session_data *sd)
}
if(sd->status.option&2 && (skill = pc_checkskill(sd,RG_TUNNELDRIVE))>0 )
- sd->speed += (1.2*DEFAULT_WALK_SPEED - skill*9);
+ sd->speed += (100-16*skill)*DEFAULT_WALK_SPEED/100;
if (pc_iscarton(sd) && (skill=pc_checkskill(sd,MC_PUSHCART))>0)
sd->speed += (10-skill) * (DEFAULT_WALK_SPEED * 0.1);
else if (pc_isriding(sd)) {