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

* Rev. 13251 Removed 'casttime' adjustment from offensive ressurection. Follow up to r13225.

Browse Source 
* Kaahi will now override override higher existing levels previously casted. (bugreport:2296)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13251 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
L0ne_W0lf 2008-10-01 11:21:49 +00:00
parent 139fc00c19
commit 850cf0d038
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog-Trunk.txt
View File

@ -3,6 +3,9 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
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.
2008/10/01
* Rev. 13251 Removed 'casttime' adjustment from offensive ressurection. Follow up to r13225. [L0ne_W0lf]
* Kaahi will now override override higher existing levels previously casted. (bugreport:2296)
2008/09/27 2008/09/27
* Fixed clif_changelook betraying the presence of gm-hidden players (bugreport:2283) [ultramage] * Fixed clif_changelook betraying the presence of gm-hidden players (bugreport:2283) [ultramage]
2008/09/11 2008/09/11

3
src/map/status.c
View File

@ -5134,8 +5134,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
return 1; return 1;
break; break;
case SC_KAAHI: case SC_KAAHI:
if(sce->val1 > val1) //Kaahi overwrites previous level regardless of existing level.
return 1;
//Delete timer if it exists. //Delete timer if it exists.
if (sce->val4 != -1) { if (sce->val4 != -1) {
delete_timer(sce->val4,kaahi_heal_timer); delete_timer(sce->val4,kaahi_heal_timer);

1
src/map/unit.c
View File

@ -987,7 +987,6 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh
case ALL_RESURRECTION: case ALL_RESURRECTION:
if(battle_check_undead(tstatus->race,tstatus->def_ele)) { if(battle_check_undead(tstatus->race,tstatus->def_ele)) {
temp = 1; temp = 1;
casttime = skill_castfix(src, ALL_RESURRECTION, skill_lv);
} else if (!status_isdead(target)) } else if (!status_isdead(target))
return 0; //Can't cast on non-dead characters. return 0; //Can't cast on non-dead characters.
break; break;