summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-01 14:52:22 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-08-01 14:52:22 +0000
commitd9ef2dcf2cbc5fe59f8c22641760bada628f0810 (patch)
tree115b3a1b8aba7516773d3a3e989eab37edfd78f8
parent945e9d383420969d704031eb8703648243affebe (diff)
downloadhercules-d9ef2dcf2cbc5fe59f8c22641760bada628f0810.tar.gz
hercules-d9ef2dcf2cbc5fe59f8c22641760bada628f0810.tar.bz2
hercules-d9ef2dcf2cbc5fe59f8c22641760bada628f0810.tar.xz
hercules-d9ef2dcf2cbc5fe59f8c22641760bada628f0810.zip
- Added the missing lines to enable script command "kickwaitingroomall"
- Magic Rod's can-act delay will no longer be applied when you absorb a spell. - Fixed Don't Forget Me increase speed instead of decreasing it. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8031 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt5
-rw-r--r--src/map/script.c2
-rw-r--r--src/map/skill.c9
3 files changed, 13 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index a25e5cdd8..ed2eae186 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,11 @@ 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/01
+ * Added the missing lines to enable script command "kickwaitingroomall"
+ [Skotlex]
+ * Magic Rod's can-act delay will no longer be applied when you absorb a
+ spell. [Skotlex]
+ * Fixed Don't Forget Me increasing speed instead of decreasing it. [Skotlex]
* Modified setlabel so that the script engine barks when you are trying to
use the same label name as a constant or variable name. [Skotlex]
2006/07/31
diff --git a/src/map/script.c b/src/map/script.c
index 3272eb005..b26cbf749 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -3384,6 +3384,7 @@ int buildin_changebase(struct script_state *st);
int buildin_changesex(struct script_state *st);
int buildin_waitingroom(struct script_state *st);
int buildin_delwaitingroom(struct script_state *st);
+int buildin_waitingroomkickall(struct script_state *st);
int buildin_enablewaitingroomevent(struct script_state *st);
int buildin_disablewaitingroomevent(struct script_state *st);
int buildin_getwaitingroomstate(struct script_state *st);
@@ -3710,6 +3711,7 @@ struct script_function buildin_func[] = {
{buildin_waitingroom,"waitingroom","si*"},
{buildin_warpwaitingpc,"warpwaitingpc","sii"},
{buildin_delwaitingroom,"delwaitingroom","*"},
+ {buildin_waitingroomkickall,"kickwaitingroomall","*"},
{buildin_enablewaitingroomevent,"enablewaitingroomevent","*"},
{buildin_disablewaitingroomevent,"disablewaitingroomevent","*"},
{buildin_getwaitingroomstate,"getwaitingroomstate","i*"},
diff --git a/src/map/skill.c b/src/map/skill.c
index ed0c4358d..5e22f2624 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1841,7 +1841,7 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
}
if(sc && sc->data[SC_MAGICROD].timer != -1 && src == dsrc) {
- struct unit_data *ud;
+ //struct unit_data *ud;
int sp = skill_get_sp(skillid,skilllv);
dmg.damage = dmg.damage2 = 0;
dmg.dmg_lv = ATK_FLEE; //This will prevent skill additional effect from taking effect. [Skotlex]
@@ -1850,9 +1850,11 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
sp = sp/((skilllv|1)*(skilllv|1)); //Estimate SP cost of a single water-ball
status_heal(bl, 0, sp, 2);
clif_skill_nodamage(bl,bl,SA_MAGICROD,sc->data[SC_MAGICROD].val1,1);
+ /* It was reported you don't get an act delay once it triggers.
ud = unit_bl2ud(bl);
if (ud) ud->canact_tick = tick
+ skill_delayfix(bl, SA_MAGICROD, sc->data[SC_MAGICROD].val1);
+ */
}
}
@@ -6625,11 +6627,12 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, int skillid,
break;
case DC_DONTFORGETME:
val1 = 30*skilllv+status->dex; // ASPD decrease
- val2 = 100+2*skilllv+status->agi/10; // Movement speed adjustment.
+ val2 = 100 -2*skilllv -status->agi/10; // Movement speed adjustment.
if(sd){
val1 += pc_checkskill(sd,DC_DANCINGLESSON);
- val2 += pc_checkskill(sd,DC_DANCINGLESSON);
+ val2 -= pc_checkskill(sd,DC_DANCINGLESSON);
}
+ if (val2 < 1) val2 = 1;
break;
case BA_APPLEIDUN:
val1 = 5+2*skilllv+status->vit/10; // MaxHP percent increase