diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-06-05 00:22:12 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-06-05 00:22:12 +0000 |
| commit | 2b4f29931162cd748c07588fcae9220b02f672ed (patch) | |
| tree | 1aac3b94d3e39aa9e52f5887e179b354699c0926 /src/map/script.c | |
| parent | 2f526028369f0fb0148ced3d9d6d6b970307421d (diff) | |
| download | hercules-2b4f29931162cd748c07588fcae9220b02f672ed.tar.gz hercules-2b4f29931162cd748c07588fcae9220b02f672ed.tar.bz2 hercules-2b4f29931162cd748c07588fcae9220b02f672ed.tar.xz hercules-2b4f29931162cd748c07588fcae9220b02f672ed.zip | |
* Fixed turning off a skill needed to meet the requirements. (bugreport:3175)
* Skills used through items not having aftercast delay or cast time now don't overwrite the former canact_tick. (topic:220921)
* Multiple autoscripts now can trigger at once.
* Applied a temp fix for autoscripts crashing server.(bugreport:3154)
* Implemented SC_JEXPBOOST (thanks to GMJobbie for the diff). (bugreport:3177)
* Implemented SC_IGNOREDEF. (topic:217330)
* SC_DEFRATIOATK won't affect boss monsters. (topic:217330)
* Fixed skip_teleport_lv1_menu made lv2 skip menu as well. (bugreport:3183)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13844 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
| -rw-r--r-- | src/map/script.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/script.c b/src/map/script.c index a414de4ca..b5e00fe55 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -6594,7 +6594,7 @@ BUILDIN_FUNC(bonusautoscript) script = parse_script(str, "autoscript bonus", 0, 0); if( !script ) return 1; - if( !pc_autoscript_add(sd->autoscript, ARRAYLENGTH(sd->autoscript), rate, flag, target, script, false) ) + if( sd->state.autocast || !pc_autoscript_add(sd->autoscript, ARRAYLENGTH(sd->autoscript), rate, flag, target, script, false) ) { script_free_code(script); return 1; @@ -6622,7 +6622,7 @@ BUILDIN_FUNC(bonusautoscript2) script = parse_script(str, "autoscript2 bonus", 0, 0); if (!script) return 1; - if (!pc_autoscript_add(sd->autoscript2, ARRAYLENGTH(sd->autoscript2), rate, flag, target, script, false)) + if( sd->state.autocast || !pc_autoscript_add(sd->autoscript2, ARRAYLENGTH(sd->autoscript2), rate, flag, target, script, false) ) { script_free_code(script); return 1; @@ -6649,7 +6649,7 @@ BUILDIN_FUNC(bonusautoscript3) script = parse_script(str, "autoscript3 bonus", 0, 0); if( !script ) return 1; - if( !pc_autoscript_add(sd->autoscript3, ARRAYLENGTH(sd->autoscript3), rate, skill, target, script, true) ) + if( sd->state.autocast || !pc_autoscript_add(sd->autoscript3, ARRAYLENGTH(sd->autoscript3), rate, skill, target, script, true) ) { script_free_code(script); return 1; |