Required Stats, Restricted Items, Unreleased Items, and Multiple Ammo types properly Unequip on condition failure

world/map/db/const.txt

@@ -672,3 +672,8 @@ OPT_BANK_CLOSE 2
 // Currently used by the fluffy hunt (033-1).
 // starts counting with 0
 MAX_HIGH_SCORES 4
+
+// Launcher/Ammo Types
+AMMO_NONE  0
+AMMO_BOW   1
+AMMO_SLING 2

world/map/npc/021-1/north_shops.txt

@@ -3,7 +3,7 @@
 // More high-end stuff to satisfy the richer people in Royal Tulimshar
 
 // Some clothing
-021-1.gat,135,38,0|shop|Inar|108,CottonShirt :-1,CottonShorts :-1,CottonBoots :-1,DesertShirt :-1,SilkRobe :-5,DesertHat :-4
+021-1.gat,135,38,0|shop|Inar|108,SlingShot :-1,SlingBullet :-1,CottonShirt :-1,CottonShorts :-1,CottonBoots :-1,DesertShirt :-1,SilkRobe :-5,DesertHat :-4
 
 021-1.gat,129,40,0|script|Well|400,
 {

world/map/npc/042-2/sorfina.txt

@@ -231,6 +231,8 @@ L_SkipTut:
     mes "\"Alright, if you say so. But take at least this.";
     callfunc "TutorialCompleted";
     getitem "Knife", 1;
+    getitem "SlingShot", 1;
+    getitem "SlingBullet", 100;
     getitem "CottonShirt", 1;
     getitem "RaggedShorts", 1;
     set Zeny, Zeny + 50;

world/map/npc/042-2/tanisha.txt

@@ -50,7 +50,7 @@ L_Maggots:
 
 L_Fight_Again:
     mes "\"Ok, listen what to do.";
-    mes "Equip the knife and kill the maggots.\"";
+    mes "Equip a weapon and kill the maggots.\"";
     next;
     mes "\"Press A to focus on a monster. With X you can focus and start attacking the same time.";
     mes "But it also works to click on the monster with your mouse.\"";
@@ -64,7 +64,15 @@ L_Fight_Again:
     // The getitem must be in the same place as set tanisha, 2;
     // since it was moved to after L_Fight_Again, add it conditionally
     if (tanisha == 1)
-        getitem "Knife", 1;
+        goto L_GetFightItems;
+    goto L_ContinueFight;
+
+L_GetFightItems:
+    getitem "Knife", 1;
+    getitem "SlingShot", 1;
+    getitem "SlingBullet", 100;
+
+L_ContinueFight:
     set tanisha, 2;
     set @Maggot_Kills, 0;
     set @time, 0;

world/map/npc/items/launcher_ammo.txt

@@ -0,0 +1,55 @@
+// ------------------------------------------------------------
+// Ammo Needs to know Launcher and vice versa.
+//
+// Behavior:
+// Ammo is always unequipped
+//
+// Variables passed to this script:
+//
+// @LauncherType, @AmmoType
+//
+// ------------------------------------------------------------
+
+function|script|CheckLauncher|,
+{
+    // Need to check if this is still equipped later.
+    set @LauncherTypeId, @itemId;
+    // If no Ammo equipped Hide LauncherType Until it's Needed.
+    if (!(@LauncherNoAmmoType) || (@LauncherType != @LauncherNoAmmoType))
+        set @LauncherNoAmmoType, @LauncherType;
+    set @LauncherType, 0;
+    return;
+}
+
+function|script|CheckAmmo|,
+{
+    // Iterates over all slots to check for equipment
+    // Allows Armor to effect Ammo and equip slots to move
+    set @EquipSlotCheck, 0;
+
+L_EquipCheck:
+    if (@EquipSlotCheck == 11)
+        goto L_CheckAmmo;
+    if (@LauncherTypeId == getequipid(@EquipSlotCheck))
+       goto L_LauncherEquipped;
+
+L_EquipInc:
+    set @EquipSlotCheck, @EquipSlotCheck + 1;
+    goto L_EquipCheck;
+
+L_LauncherEquipped:
+    set @LauncherType, @LauncherNoAmmoType;
+
+L_CheckAmmo:
+    // Check If Launcher Matches Ammo or is No Longer equipped.
+    if ((@LauncherType == @AmmoType) || (@LauncherType == 0))
+        goto L_Return;
+
+L_Unequip:
+    callfunc "UnequipLater";
+
+L_Return:
+    set @LauncherType, 0;
+    set @AmmoType, 0;
+    return;
+}

world/map/npc/items/require_stat.txt

@@ -11,9 +11,15 @@
 function|script|RequireStat|,
 {
     set @bStatVal, readparam(@bStat);
-    // If the requirement isn't met, then we end the script.
-    // Hence, subsequent item modifiers won't be applied.
+    // If the requirement isn't met, we set an unequip trigger.
+    // The item is now removed.
     if (@bStatVal < @minbStatVal)
-        end;
+        goto L_Unequip;
+    goto L_Return;
+
+L_Unequip:
+    callfunc "UnequipLater";
+
+L_Return:
     return;
 }

world/map/npc/items/restricted_item.txt

@@ -11,11 +11,10 @@ function|script|RestrictedItem|,
     if (!@minLvl) set @minLvl, 60;
     if (debug || getgmlevel() >= @minLvl) goto L_Return; // If the active character is staff, do nothing.
     message strcharinfo(0), "This item repells you with extreme force. It does not seem to be meant for you.";
-    unequipbyid @slotId;
+    callfunc "UnequipLater";
     if (getgmlevel()) goto L_Return;
     gmcommand "@wgm Restricted item '" + @itemId + "' used by character '" + strcharinfo(0) + "'.";
     gmcommand "@l Restricted item '" + @itemId + "' used by character '" + strcharinfo(0) + "'.";
-    end;
 
 L_Return:
     return;

world/map/npc/items/unequipcb.txt

@@ -0,0 +1,27 @@
+// For now this has to use a real map name, but the effect happens
+// on any map because of the -1s at the end.
+// Note: the client (I think) has a display bug if this is called
+// during the intial connection's equip hook
+botcheck.gat,0,0,0|script|UnequipCB|-1,-1,-1
+{
+
+OnUnequip:
+    unequipbyid (@unequip_slot -1);
+    set @unequip_slot, 0;
+    end;
+}
+
+// Paired with unequipcb
+function|script|UnequipLater|,
+{
+    if(@unequip_slot)
+        goto L_Return;
+    goto L_ReturnTimer;
+
+L_ReturnTimer:
+    set @unequip_slot, (@slotId + 1);
+    addtimer 0, "UnequipCB::OnUnequip";
+
+L_Return:
+    return;
+}

world/map/npc/items/unreleased_item.txt

@@ -5,8 +5,12 @@
 
 function|script|UnreleasedItem|,
 {
-    if (debug || getgmlevel()) end; // If the server allows equipping unreleased items or if the active character is staff, do nothing.
+    // If the server allows equipping unreleased items or if the active character is staff, do nothing.
+    if (debug || getgmlevel())
+        goto L_Return;
     message strcharinfo(0), "You have difficulties equipping this item, as if it is not yet fully in this world.";
-    unequipbyid @slotId;
-    end;
+    callfunc "UnequipLater";
+
+L_Return:
+    return;
 }

world/map/npc/scripts.conf

@@ -29,6 +29,8 @@ npc: npc/items/unreleased_item.txt
 npc: npc/items/require_stat.txt
 npc: npc/items/restricted_item.txt
 npc: npc/items/warpTowels.txt
+npc: npc/items/unequipcb.txt
+npc: npc/items/launcher_ammo.txt
 
 import: npc/_import.txt