Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fixed Martyr's Reckoning having a cap damage of 32k.

Browse Source 
- Changed Scream and Hammerfall's stun duration to 5 seconds.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8064 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-08-02 17:49:01 +00:00
parent 144eaf0a1a
commit 0fbdc22df4
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -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. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/08/02 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] * 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] * Fixed Defender Raising Walk speed instead of diminishing it. [Skotlex]
* Added a check on status-change load to prevent loading speed-affecting * Added a check on status-change load to prevent loading speed-affecting

1
db/Changelog.txt
View File

@ -20,6 +20,7 @@
========================= =========================
08/02 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] * Converted NJ_HYOUSYOURAKU from jAthena since our version was lacking a time2 [Playtester]
* Reverted LOD card changes as well [Playtester] * Reverted LOD card changes as well [Playtester]
* Reverted some changes. [MasterOfMuppets] * Reverted some changes. [MasterOfMuppets]

4
db/skill_cast_db.txt
View File

@ -200,7 +200,7 @@
//-- BS_REPAIRWEAPON //-- BS_REPAIRWEAPON
108,7500,0,0,0,0 108,7500,0,0,0,0
//-- BS_HAMMERFALL //-- BS_HAMMERFALL
110,0,0,0,0,3000 110,0,0,0,0,5000
//-- BS_ADRENALINE //-- BS_ADRENALINE
111,0,0,0,30000:60000:90000:120000:150000,0 111,0,0,0,30000:60000:90000:120000:150000,0
//-- BS_WEAPONPEFECT //-- BS_WEAPONPEFECT
@ -508,7 +508,7 @@
//-- DC_UGLYDANCE //-- DC_UGLYDANCE
325,0,0,0,30000,3000 325,0,0,0,30000,3000
//-- DC_SCREAM //-- DC_SCREAM
326,0,3000,0,0,3000 326,0,3000,0,0,5000
//-- DC_HUMMING //-- DC_HUMMING
327,0,0,0,60000,20000 327,0,0,0,60000,20000
//-- DC_DONTFORGETME //-- DC_DONTFORGETME

8
src/map/battle.c
View File

@ -1130,11 +1130,9 @@ static struct Damage battle_calc_weapon_attack(
status_set_hp(src, 1, 0); status_set_hp(src, 1, 0);
break; break;
case PA_SACRIFICE: case PA_SACRIFICE:
skill = sstatus->max_hp* 9/100; wd.damage = sstatus->max_hp* 9/100;
status_zap(src, skill, 0);//Damage to self is always 9% status_zap(src, wd.damage, 0);//Damage to self is always 9%
clif_damage(src,src, gettick(), 0, 0, skill, 0 , 0, 0); clif_damage(src,src, gettick(), 0, 0, wd.damage, 0 , 0, 0);
wd.damage = skill;
wd.damage2 = 0; wd.damage2 = 0;
if (sc && sc->data[SC_SACRIFICE].timer != -1) if (sc && sc->data[SC_SACRIFICE].timer != -1)