summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/battle.c8
2 files changed, 8 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 5de86d1e9..0073ebd81 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,6 +5,8 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV
GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
2006/03/16
+ * Changed NJ_ZENYNAGE according to this weeks patch to deal a random [MasterOfMuppets]
+ ammount of damage depending on the skill lvl.
* @kill_monster/@kill_monster2 won't touch Guardians/Emperium now. [Skotlex]
* Small change in the random item reading function, may fix @itemdbreload
messing up random item searches. [Skotlex]
diff --git a/src/map/battle.c b/src/map/battle.c
index 94ce76a6b..6de02dc23 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3019,10 +3019,14 @@ struct Damage battle_calc_misc_attack(
aflag = (aflag&~BF_RANGEMASK)|BF_LONG;
break;
case NJ_ZENYNAGE:
- damage=1000*skill_lv;
- if(skill_lv == 10) damage -= 1;
+ {
+ int dmgnage = (500*skill_lv)+rand()%(500*skill_lv);
+ damage=dmgnage;
+ sd->status.zeny -= dmgnage;
+ clif_updatestatus(sd,SP_ZENY);
if(map_flag_vs(bl->m) || is_boss(bl))
damage=damage/2; //temp value
+ }
break;
}