Merge pull request #45 from wushin/equip-arrow-fix

Unequip & Multiple Ammo Types and Launcher Fix

1 files changed, 10 insertions, 2 deletions

diff --git a/world/map/npc/042-2/tanisha.txt b/world/map/npc/042-2/tanisha.txt
index 437099dd..de93b8d5 100644
--- a/world/map/npc/042-2/tanisha.txt
+++ b/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;