summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--db/Changelog.txt1
-rw-r--r--db/skill_cast_db.txt4
-rw-r--r--src/map/battle.c8
4 files changed, 7 insertions, 7 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 00f851878..81243d025 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ 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/08/02
+ * Fixed Martyr's Reckoning having a cap damage of 32k. [Skotlex]
* Now you can teleport in Thanatos Boss room, but you can't respawn there [Playtester]
* Fixed Defender Raising Walk speed instead of diminishing it. [Skotlex]
* Added a check on status-change load to prevent loading speed-affecting
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 8a848fe37..e1f685814 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -20,6 +20,7 @@
=========================
08/02
+ * Changed Scream and Hammerfall's stun duration to 5 seconds. [Skotlex]
* Converted NJ_HYOUSYOURAKU from jAthena since our version was lacking a time2 [Playtester]
* Reverted LOD card changes as well [Playtester]
* Reverted some changes. [MasterOfMuppets]
diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt
index 69606d4f8..707babeda 100644
--- a/db/skill_cast_db.txt
+++ b/db/skill_cast_db.txt
@@ -200,7 +200,7 @@
//-- BS_REPAIRWEAPON
108,7500,0,0,0,0
//-- BS_HAMMERFALL
-110,0,0,0,0,3000
+110,0,0,0,0,5000
//-- BS_ADRENALINE
111,0,0,0,30000:60000:90000:120000:150000,0
//-- BS_WEAPONPEFECT
@@ -508,7 +508,7 @@
//-- DC_UGLYDANCE
325,0,0,0,30000,3000
//-- DC_SCREAM
-326,0,3000,0,0,3000
+326,0,3000,0,0,5000
//-- DC_HUMMING
327,0,0,0,60000,20000
//-- DC_DONTFORGETME
diff --git a/src/map/battle.c b/src/map/battle.c
index 6c0f57651..4e4126831 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -1130,11 +1130,9 @@ static struct Damage battle_calc_weapon_attack(
status_set_hp(src, 1, 0);
break;
case PA_SACRIFICE:
- skill = sstatus->max_hp* 9/100;
- status_zap(src, skill, 0);//Damage to self is always 9%
- clif_damage(src,src, gettick(), 0, 0, skill, 0 , 0, 0);
-
- wd.damage = skill;
+ wd.damage = sstatus->max_hp* 9/100;
+ status_zap(src, wd.damage, 0);//Damage to self is always 9%
+ clif_damage(src,src, gettick(), 0, 0, wd.damage, 0 , 0, 0);
wd.damage2 = 0;
if (sc && sc->data[SC_SACRIFICE].timer != -1)