merge

3 files changed, 14 insertions, 14 deletions

diff --git a/world/map/npc/015-3/_mobs.txt b/world/map/npc/015-3/_mobs.txt
index 340ae5e3..33da56e1 100644
--- a/world/map/npc/015-3/_mobs.txt
+++ b/world/map/npc/015-3/_mobs.txt
@@ -5,4 +5,4 @@
 015-3,29,31,2,2|monster|Maggot|1002,2,100000ms,30000ms
 015-3,23,19,1,1|monster|Maggot|1002,1,100000ms,30000ms
 015-3,40,19,1,1|monster|Spider|1012,1,100000ms,30000ms
-015-3,31,38,4,6|monster|ShadowPlant|1189,3,60000ms,30000ms
+015-3,31,38,4,6|monster|ShadowPlant|1189,3,240000ms,120000ms
diff --git a/world/map/npc/015-3/katze.txt b/world/map/npc/015-3/katze.txt
index 15dea917..1aec54db 100644
--- a/world/map/npc/015-3/katze.txt
+++ b/world/map/npc/015-3/katze.txt
@@ -1,7 +1,7 @@
 // Katze doesn't like the player at first, needs following:
 //
 // 1. Some milk
-// 2. Some steak or chicken leg
+// 2. Some steak or bird leg
 // 3. Some fur
 //
 // Now the cat starts to speak, still needs:
@@ -11,7 +11,7 @@
 //
 //    * 2 Snake skins
 //    * 2 Snake tongues
-//    * 2 Maggot slimes
+//    * 2 Insect slimes
 //    * 2 White furs
 //    * 2 Hard spikes
 //    * 2 Tiny potions
@@ -108,7 +108,7 @@ L_NeedsStuff:
     mes "\"You've been really kind to me. I can make you something nice, but I will need";
     mes "2 Snake Skins,";
     mes "2 Snake Tongues,";
-    mes "2 Maggot Slimes,";
+    mes "2 Insect Slimes,";
     mes "2 White Furs,";
     mes "2 Hard Spikes and";
     mes "2 Tiny Healing Potions.\"";
@@ -136,7 +136,7 @@ L_Please:
     mes "\"Alright... [the cat glares at you] it was";
     mes "2 Snake Skins,";
     mes "2 Snake Tongues,";
-    mes "2 Maggot Slimes,";
+    mes "2 Insect Slimes,";
     mes "2 White Furs,";
     mes "2 Hard Spikes and";
     mes "2 Tiny Healing Potions.\"";
@@ -145,7 +145,7 @@ L_Please:
 L_CatChecksStuff:
     if (countitem("SnakeSkin") > 1
         && countitem("SnakeTongue") > 1
-        && countitem("MaggotSlime") > 1
+        && countitem("InsectSlime") > 1
         && countitem("WhiteFur") > 1
         && countitem("HardSpike") > 1
         && countitem("TinyHealingPotion") > 1)
@@ -157,7 +157,7 @@ L_CatChecksStuff:
 L_GiveStuff:
     delitem "SnakeSkin", 2;
     delitem "SnakeTongue", 2;
-    delitem "MaggotSlime", 2;
+    delitem "InsectSlime", 2;
     delitem "WhiteFur", 2;
     delitem "HardSpike", 2;
     delitem "TinyHealingPotion", 2;
diff --git a/world/map/npc/015-3/pot.txt b/world/map/npc/015-3/pot.txt
index 523be319..d13b819f 100644
--- a/world/map/npc/015-3/pot.txt
+++ b/world/map/npc/015-3/pot.txt
@@ -48,23 +48,23 @@ L_NeedsFood:
     mes "The milk is gone!";
     next;
 
-    if (countitem("ChickenLeg") > 0 && countitem("Steak") > 0)
+    if (countitem("BirdLeg") > 0 && countitem("Steak") > 0)
         menu
-            "Put in a chicken leg.", L_GiveChicken,
+            "Put in a bird leg.", L_GiveBird,
             "Put in a steak.", L_GiveSteak,
             "Leave it alone.", L_Close;
-    if (countitem("ChickenLeg") > 0 && countitem("Steak") == 0)
+    if (countitem("BirdLeg") > 0 && countitem("Steak") == 0)
         menu
-            "Put in a chicken leg.", L_GiveChicken,
+            "Put in a bird leg.", L_GiveBird,
             "Leave it alone.", L_Close;
-    if (countitem("ChickenLeg") == 0 && countitem("Steak") > 0)
+    if (countitem("BirdLeg") == 0 && countitem("Steak") > 0)
         menu
             "Put in a steak.", L_GiveSteak,
             "Leave it alone.", L_Close;
     goto L_Close;
 
-L_GiveChicken:
-    delitem "ChickenLeg", 1;
+L_GiveBird:
+    delitem "BirdLeg", 1;
     set @cat, 2;
     callsub S_Update_Katze;
     set @catNeedsAlone, 1;