From 9877fd4ad81120af8e63e96d5d429092014dc017 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Wed, 7 Jul 2021 20:34:27 -0300 Subject: Remove all Legacy files --- world/map/npc/015-3/_import.txt | 10 -- world/map/npc/015-3/_mobs.txt | 7 -- world/map/npc/015-3/_nodes.txt | 4 - world/map/npc/015-3/_warps.txt | 4 - world/map/npc/015-3/barrier.txt | 41 -------- world/map/npc/015-3/katze.txt | 203 --------------------------------------- world/map/npc/015-3/mapflags.txt | 2 - world/map/npc/015-3/pot.txt | 124 ------------------------ 8 files changed, 395 deletions(-) delete mode 100644 world/map/npc/015-3/_import.txt delete mode 100644 world/map/npc/015-3/_mobs.txt delete mode 100644 world/map/npc/015-3/_nodes.txt delete mode 100644 world/map/npc/015-3/_warps.txt delete mode 100644 world/map/npc/015-3/barrier.txt delete mode 100644 world/map/npc/015-3/katze.txt delete mode 100644 world/map/npc/015-3/mapflags.txt delete mode 100644 world/map/npc/015-3/pot.txt (limited to 'world/map/npc/015-3') diff --git a/world/map/npc/015-3/_import.txt b/world/map/npc/015-3/_import.txt deleted file mode 100644 index d1b95191..00000000 --- a/world/map/npc/015-3/_import.txt +++ /dev/null @@ -1,10 +0,0 @@ -// Map 015-3: Cat's Cave -// This file is generated automatically. All manually added changes will be removed when running the Converter. -map: 015-3 -npc: npc/015-3/_mobs.txt -npc: npc/015-3/_nodes.txt -npc: npc/015-3/_warps.txt -npc: npc/015-3/barrier.txt -npc: npc/015-3/katze.txt -npc: npc/015-3/mapflags.txt -npc: npc/015-3/pot.txt diff --git a/world/map/npc/015-3/_mobs.txt b/world/map/npc/015-3/_mobs.txt deleted file mode 100644 index faab0b97..00000000 --- a/world/map/npc/015-3/_mobs.txt +++ /dev/null @@ -1,7 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Cat's Cave mobs - -015-3,22,25,2,4|monster|Bat|1017,2,100000ms,30000ms -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 diff --git a/world/map/npc/015-3/_nodes.txt b/world/map/npc/015-3/_nodes.txt deleted file mode 100644 index e37c6a3c..00000000 --- a/world/map/npc/015-3/_nodes.txt +++ /dev/null @@ -1,4 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Cat's Cave nodes - -// (no nodes) diff --git a/world/map/npc/015-3/_warps.txt b/world/map/npc/015-3/_warps.txt deleted file mode 100644 index 2fd9fe85..00000000 --- a/world/map/npc/015-3/_warps.txt +++ /dev/null @@ -1,4 +0,0 @@ -// This file is generated automatically. All manually added changes will be removed when running the Converter. -// Cat's Cave warps - -015-3,31,43|warp|-1,-1,015-1,59,32 diff --git a/world/map/npc/015-3/barrier.txt b/world/map/npc/015-3/barrier.txt deleted file mode 100644 index f65b6c85..00000000 --- a/world/map/npc/015-3/barrier.txt +++ /dev/null @@ -1,41 +0,0 @@ -// You can only enter the cat cave naked, otherwise the cat's reaction scares -// you away. You can also get in while wearing the cat ears. - -015-3,31,42,0|script|#CatCaveBarrier|45,1,1 -{ - set @Hiss, ((Katze & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT); - if (getequipid(equip_head) != 1217 - && (getequipid(equip_head) > 0 - || getequipid(equip_shield) > 0 - || getequipid(equip_hand1) > 0 - || getequipid(equip_hand2) > 0 - || getequipid(equip_gloves) > 0 - || getequipid(equip_shoes) > 0 - || getequipid(equip_misc1) > 0 - || getequipid(equip_misc2) > 0 - || getequipid(equip_torso) > 0 - || getequipid(equip_legs) > 0)) - goto L_Not_Naked; - - if (@Hiss != 2) - mes "\"Hissss...\""; - set @Hiss, 2; - callsub S_Update_Hiss; - goto L_Close; - -L_Not_Naked: - warp "015-1", 60, 32; - set @Hiss, 1; - callsub S_Update_Hiss; - mes "\"GRAAUWL! Hissss...\""; - mes "Scared of what you hear, you flee back outside."; - goto L_Close; - -L_Close: - set @Hiss, 0; - close; - -S_Update_Hiss: - set Katze, (Katze & ~(NIBBLE_1_MASK)) | (@Hiss << NIBBLE_1_SHIFT); - return; -} diff --git a/world/map/npc/015-3/katze.txt b/world/map/npc/015-3/katze.txt deleted file mode 100644 index 15dea917..00000000 --- a/world/map/npc/015-3/katze.txt +++ /dev/null @@ -1,203 +0,0 @@ -// Katze doesn't like the player at first, needs following: -// -// 1. Some milk -// 2. Some steak or chicken leg -// 3. Some fur -// -// Now the cat starts to speak, still needs: -// -// 4. Some wood for scratching -// 5. Some stuff for making somethings nice for the player: -// -// * 2 Snake skins -// * 2 Snake tongues -// * 2 Maggot slimes -// * 2 White furs -// * 2 Hard spikes -// * 2 Tiny potions - -015-3,32,25,0|script|Katze|172 -{ - set @cat, ((Katze & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT); - - if (@cat == 1 && @catNeedsAlone == 0) goto L_NeedsFood; - if (@cat == 1) goto L_NeedsFood; - if (@cat == 2 && @catNeedsAlone == 0) goto L_NeedsFur; - if (@cat == 2) goto L_NeedsFur; - if (@cat == 3) goto L_NeedsWood; - if (@cat == 4 && @catNeedsAlone == 0) goto L_NeedsStuff; - if (@cat == 4) goto L_PreNeedsStuff; - if (@cat == 5) goto L_NeedsStuff2; - if (@cat == 6 && @catNeedsAlone == 0) goto L_GainEars; - if (@cat == 6) goto L_PreGainEars; - if (@cat == 7) goto L_Finished; - goto L_NeedsMilk; - -L_NeedsMilk: - mes "[Katze]"; - mes "\"Meow.\""; - next; - menu "Throw a stone at the cat.", L_ThrowStone, - "Leave the cat alone.", L_Close; - -L_ThrowStone: - set @cat, 0; - callsub S_Update_Katze; - heal ((MaxHp/100) * -30), 0; - warp "015-1", 60, 32; - mes "\"GRAAUWL! Hissss...\""; - mes "Yikes, the cat attacked you! Your whole body is scratched. Maybe throwing a stone wasn't such a great idea..."; - goto L_Close; - -L_NeedsFood: - mes "[Katze]"; - mes "\"Meow, prrrr...\""; - next; - menu - "Throw a stone at the cat.", L_ThrowStone, - "Leave the cat alone.", L_Close; - -L_NeedsFur: - mes "[Katze]"; - mes "\"Prrr. Meow, prrr...\""; - next; - if (countitem("WhiteFur") > 0) - menu - "Make funny movements with the fur near the ground.", L_MoveFur, - "Throw a stone at the cat.", L_ThrowStone, - "Leave the cat alone.", L_Close; - if (countitem("WhiteFur") == 0) - menu - "Throw a stone at the cat.", L_ThrowStone, - "Leave the cat alone.", L_Close; - goto L_Close; - -L_MoveFur: - delitem "WhiteFur", 1; - set @cat, 3; - callsub S_Update_Katze; - mes "The cat jumps at the fur! You quickly let go of it. The cat happily returns to its spot, carrying the fur in its mouth."; - next; - mes "The cat drops the fur and looks at you with half opened eyes. Suddenly she starts talking, and says: \"That was very kind of you.\" She seems to be smiling."; - goto L_Close; - -L_NeedsWood: - mes "[Katze]"; - mes "\"Prrrr, now I'd like something to sharpen my claws on.\""; - next; - - if (countitem("RawLog") > 0) - menu - "Want this piece of wood?", L_GiveWood, - "Ok, see you later.", L_Close; - goto L_Close; - -L_GiveWood: - mes "[Katze]"; - mes "\"Sure! Please put it next to the pot.\""; - goto L_Close; - -L_PreNeedsStuff: - mes "The cat is still eyeing the piece of wood. She probably needs to be left alone for a bit again."; - goto L_Close; - -L_NeedsStuff: - set @cat, 5; - callsub S_Update_Katze; - mes "[Katze]"; - 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 White Furs,"; - mes "2 Hard Spikes and"; - mes "2 Tiny Healing Potions.\""; - goto L_Close; - -L_NeedsStuff2: - mes "[Katze]"; - mes "\"Did you bring what I asked you for?\""; - next; - menu - "Look here.", L_CatChecksStuff, - "What do you need again?", L_WhatsNeeded, - "No, I haven't got everything yet.", L_Close; - -L_WhatsNeeded: - mes "[Katze]"; - mes "\"Actually, you should have remembered yourself.\""; - next; - menu - "Please tell me.", L_Please, - "Never mind.", L_Close; - -L_Please: - mes "[Katze]"; - mes "\"Alright... [the cat glares at you] it was"; - mes "2 Snake Skins,"; - mes "2 Snake Tongues,"; - mes "2 Maggot Slimes,"; - mes "2 White Furs,"; - mes "2 Hard Spikes and"; - mes "2 Tiny Healing Potions.\""; - goto L_Close; - -L_CatChecksStuff: - if (countitem("SnakeSkin") > 1 - && countitem("SnakeTongue") > 1 - && countitem("MaggotSlime") > 1 - && countitem("WhiteFur") > 1 - && countitem("HardSpike") > 1 - && countitem("TinyHealingPotion") > 1) - goto L_GiveStuff; - mes "[Katze]"; - mes "\"You don't seem to have everything yet. Come back later when you do.\""; - goto L_Close; - -L_GiveStuff: - delitem "SnakeSkin", 2; - delitem "SnakeTongue", 2; - delitem "MaggotSlime", 2; - delitem "WhiteFur", 2; - delitem "HardSpike", 2; - delitem "TinyHealingPotion", 2; - set @cat, 6; - callsub S_Update_Katze; - set @catNeedsAlone, 1; - mes "[Katze]"; - mes "\"Nicely done! Now leave me alone for a while, I need some time to prepare your present.\""; - goto L_Close; - -L_PreGainEars: - mes "[Katze]"; - mes "\"Please leave me alone for a while, so I can prepare your present.\""; - goto L_Close; - -L_GainEars: - getitem "CatEars", 1; - set @xpval, 5000; - getexp @xpval, 0; - set @cat, 7; - callsub S_Update_Katze; - mes "[Katze]"; - mes "\"Look what I made for you! It makes you look a bit like me! Maybe it will give you a feeling of what it is like to be a cat.\""; - mes "The cat winks at you."; - mes "[You gain " + @xpval + " experience points]"; - goto L_Close; - -L_Finished: - mes "[Katze]"; - if (getequipid(equip_head) == 1217) // Cat ears - mes "\"Meow, fellow cat.\""; - if (getequipid(equip_head) != 1217) - mes "\"Meow. Lost your ears?\""; - goto L_Close; - -L_Close: - set @cat, 0; - close; - -S_Update_Katze: - set Katze, (Katze & ~(NIBBLE_0_MASK)) | (@cat << NIBBLE_0_SHIFT); - return; -} diff --git a/world/map/npc/015-3/mapflags.txt b/world/map/npc/015-3/mapflags.txt deleted file mode 100644 index 04397e31..00000000 --- a/world/map/npc/015-3/mapflags.txt +++ /dev/null @@ -1,2 +0,0 @@ -015-3|mapflag|nosave|015-1,59,32 -015-3|mapflag|resave|010-1,27,97 diff --git a/world/map/npc/015-3/pot.txt b/world/map/npc/015-3/pot.txt deleted file mode 100644 index 523be319..00000000 --- a/world/map/npc/015-3/pot.txt +++ /dev/null @@ -1,124 +0,0 @@ -// The pot where the player can deposit stuff for the cat. - -015-3,37,29,0|script|Pot|400 -{ - set @cat, ((Katze & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT); - - if (@cat > 0) - mes "It's that old pot again."; - if (@cat == 0) - mes "It's a pot."; - next; - - if (@cat == 1 && @catNeedsAlone == 0) - goto L_NeedsFood; - if (@cat == 1) - goto L_HasMilk; - if (@cat == 2 && @catNeedsAlone == 0) - goto L_NeedsFur; - if (@cat == 2) - goto L_HasFood; - if (@cat == 3) - goto L_NeedsWood; - if (@cat == 4 && @catNeedsAlone == 1) - goto L_HasWood; - if (@cat >= 4) - goto L_Close; - goto L_NeedsMilk; - -L_NeedsMilk: - if (countitem("Milk") > 0) - menu - "Pour in some milk.", L_GiveMilk, - "Leave it alone.", L_Close; - goto L_Close; - -L_GiveMilk: - delitem "Milk", 1; - set @cat, 1; - callsub S_Update_Katze; - set @catNeedsAlone, 1; - goto L_Close; - -L_HasMilk: - mes "There is milk in it."; - goto L_Close; - -L_NeedsFood: - mes "The milk is gone!"; - next; - - if (countitem("ChickenLeg") > 0 && countitem("Steak") > 0) - menu - "Put in a chicken leg.", L_GiveChicken, - "Put in a steak.", L_GiveSteak, - "Leave it alone.", L_Close; - if (countitem("ChickenLeg") > 0 && countitem("Steak") == 0) - menu - "Put in a chicken leg.", L_GiveChicken, - "Leave it alone.", L_Close; - if (countitem("ChickenLeg") == 0 && countitem("Steak") > 0) - menu - "Put in a steak.", L_GiveSteak, - "Leave it alone.", L_Close; - goto L_Close; - -L_GiveChicken: - delitem "ChickenLeg", 1; - set @cat, 2; - callsub S_Update_Katze; - set @catNeedsAlone, 1; - goto L_Close; - -L_GiveSteak: - delitem "Steak", 1; - set @cat, 2; - callsub S_Update_Katze; - set @catNeedsAlone, 1; - goto L_Close; - -L_HasFood: - mes "There is some food in it."; - goto L_Close; - -L_NeedsFur: - mes "And it's empty!"; - next; - - if (countitem("WhiteFur") > 0) - menu - "Put a white fur next to the pot.", L_GiveFur, - "Leave it alone.", L_Close; - goto L_Close; - -L_GiveFur: - mes "You put down the fur, but the cat doesn't seem to take any notice. Maybe there's something else you could do. You pick the fur up again."; - goto L_Close; - -L_NeedsWood: - if (countitem("RawLog") > 0) - menu - "Put a wooden log next to the pot.", L_GiveWood, - "Leave it alone.", L_Close; - goto L_Close; - -L_GiveWood: - delitem "RawLog", 1; - set @cat, 4; - callsub S_Update_Katze; - set @catNeedsAlone, 1; - mes "You put the wooden log next to the pot. The cat eyes it suspiciously, but remains on her spot."; - goto L_Close; - -L_HasWood: - mes "A wooden log is patiently lying next to it."; - goto L_Close; - -L_Close: - set @cat, 0; - close; - -S_Update_Katze: - set Katze, (Katze & ~(NIBBLE_0_MASK)) | (@cat << NIBBLE_0_SHIFT); - return; -} -- cgit v1.2.3-70-g09d2