diff options
author | Ben Longbons <b.r.longbons@gmail.com> | 2013-11-24 14:44:15 -0800 |
---|---|---|
committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-11-24 14:44:15 -0800 |
commit | 14b0731f8a74aad602e004fa726c53584bb72029 (patch) | |
tree | e86b6f2762680809c560047234e77543a650e4df /world/map/npc/items/launcher_ammo.txt | |
parent | 5b7768879adf803278e425bc20961c2dc4bc4147 (diff) | |
download | serverdata-14b0731f8a74aad602e004fa726c53584bb72029.tar.gz serverdata-14b0731f8a74aad602e004fa726c53584bb72029.tar.bz2 serverdata-14b0731f8a74aad602e004fa726c53584bb72029.tar.xz serverdata-14b0731f8a74aad602e004fa726c53584bb72029.zip |
Fix style and logic of UnequipCB
Diffstat (limited to 'world/map/npc/items/launcher_ammo.txt')
-rw-r--r-- | world/map/npc/items/launcher_ammo.txt | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/world/map/npc/items/launcher_ammo.txt b/world/map/npc/items/launcher_ammo.txt index 3b0b21f8..79cf057b 100644 --- a/world/map/npc/items/launcher_ammo.txt +++ b/world/map/npc/items/launcher_ammo.txt @@ -2,9 +2,10 @@ // Ammo Needs to know Launcher and vice versa. // // Behavior: -// Ammo is always unequipped +// - If only one is equipped, do nothing +// - If incompatible launcher and ammo are equipped, unequip the ammo // -// Variables passed to this script: +// Variables passed to these scripts: // // @LauncherType, @AmmoType // @@ -12,14 +13,8 @@ function|script|CheckLauncher|, { - set @AmmoEquip, (getequipid(equip_arrow) + 1); - if (@AmmoEquip) - goto L_Return; - -L_NoAmmoEquip: - set @LauncherType, 0; - -L_Return: + if (getequipid(equip_arrow) == -1) + set @LauncherType, 0; return; } @@ -28,9 +23,10 @@ function|script|CheckAmmo|, if ((@LauncherType == @AmmoType) || (!@LauncherType)) goto L_Return; -L_Unequip: callfunc "UnequipLater"; L_Return: + set @LauncherType, 0; + set @AmmoType, 0; return; } |