diff options
| author | gumi <git@gumi.ca> | 2018-01-28 00:05:53 -0500 |
|---|---|---|
| committer | gumi <git@gumi.ca> | 2018-01-28 00:05:53 -0500 |
| commit | c066e21cf7bba2309800b7ab913da77ad6fddd0e (patch) | |
| tree | ff4398eb4bff685ce1c6e827f13d8d8488f2c449 | |
| parent | 9024b4e950f151727c6c5e4a7b594911029d487b (diff) | |
| download | tmwa-c066e21cf7bba2309800b7ab913da77ad6fddd0e.tar.gz tmwa-c066e21cf7bba2309800b7ab913da77ad6fddd0e.tar.bz2 tmwa-c066e21cf7bba2309800b7ab913da77ad6fddd0e.tar.xz tmwa-c066e21cf7bba2309800b7ab913da77ad6fddd0e.zip | |
allow to specify charges for magic override
| -rw-r--r-- | src/map/script-fun.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp index ff50400..cf0b985 100644 --- a/src/map/script-fun.cpp +++ b/src/map/script-fun.cpp @@ -2257,7 +2257,7 @@ void builtin_overrideattack(ScriptState *st) extract(event_, &event); sd->attack_spell_override = st->oid; - sd->attack_spell_charges = 1; + sd->attack_spell_charges = HARG(5) ? conv_num(st, &AARG(5)) : 1; sd->magic_attack = event; pc_set_weapon_icon(sd, 1, icon, look); pc_set_attack_info(sd, attack_delay, attack_range); @@ -4767,7 +4767,7 @@ BuiltinFunction builtin_functions[] = BUILTIN(skill, "ii?"_s, '\0'), BUILTIN(setskill, "ii"_s, '\0'), BUILTIN(getskilllv, "i"_s, 'i'), - BUILTIN(overrideattack, "?????"_s, '\0'), + BUILTIN(overrideattack, "??????"_s, '\0'), BUILTIN(getgmlevel, ""_s, 'i'), BUILTIN(end, ""_s, '\0'), BUILTIN(getopt2, ""_s, 'i'), |