diff options
author | Jessica Tölke <jtoelke@mail.upb.de> | 2011-09-08 20:36:29 +0200 |
---|---|---|
committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-09-08 20:36:29 +0200 |
commit | 5ea6c568c86d9c0f76983705258951e2db9974fa (patch) | |
tree | 94a402b645140a7bb9fbfa467a73cfb30d880a56 /world/map/npc/013-3 | |
parent | 2629fa14c6f7e6a5a7a71f5c784424cf80189f17 (diff) | |
parent | cba4de9a5f7b9de412b9f458c80904cee9764a85 (diff) | |
download | serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.gz serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.bz2 serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.xz serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.zip |
Merge remote-tracking branch 'testing/master'v2011.09.08
Diffstat (limited to 'world/map/npc/013-3')
-rw-r--r-- | world/map/npc/013-3/_import.txt | 2 | ||||
-rw-r--r-- | world/map/npc/013-3/_mobs.txt | 2 | ||||
-rw-r--r-- | world/map/npc/013-3/_warps.txt | 2 | ||||
-rw-r--r-- | world/map/npc/013-3/barrier.txt | 23 | ||||
-rw-r--r-- | world/map/npc/013-3/mask_chest.txt | 290 | ||||
-rw-r--r-- | world/map/npc/013-3/misc.txt | 6 | ||||
-rw-r--r-- | world/map/npc/013-3/sword_chest.txt | 55 |
7 files changed, 207 insertions, 173 deletions
diff --git a/world/map/npc/013-3/_import.txt b/world/map/npc/013-3/_import.txt index 8be025b3..d55983bf 100644 --- a/world/map/npc/013-3/_import.txt +++ b/world/map/npc/013-3/_import.txt @@ -1,4 +1,4 @@ -// Map 013-3: Cave +// Map 013-3: Woodland Hills Caves // This file is generated automatically. All manually changes will be removed when running the Converter. map: 013-3.gat npc: npc/013-3/_mobs.txt diff --git a/world/map/npc/013-3/_mobs.txt b/world/map/npc/013-3/_mobs.txt index 6a1da2bf..8d15cfef 100644 --- a/world/map/npc/013-3/_mobs.txt +++ b/world/map/npc/013-3/_mobs.txt @@ -1,5 +1,5 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. -// Cave mobs +// Woodland Hills Caves mobs 013-3.gat,28,89,16,52|monster|Cave Snake|1021,10,120000,60000,Mob013-3::On1021 013-3.gat,61,22,2,2|monster|Fire Skull|1023,1,120000,60000,Mob013-3::On1023 diff --git a/world/map/npc/013-3/_warps.txt b/world/map/npc/013-3/_warps.txt index 871ab8dc..51dee2f4 100644 --- a/world/map/npc/013-3/_warps.txt +++ b/world/map/npc/013-3/_warps.txt @@ -1,5 +1,5 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. -// Cave warps +// Woodland Hills Caves warps 013-3.gat,28,20|warp|hiddenExit|-1,-1,013-1.gat,0,0 013-3.gat,34,63|warp|toOutside|-1,-1,013-1.gat,125,102 diff --git a/world/map/npc/013-3/barrier.txt b/world/map/npc/013-3/barrier.txt index 0ec3f86a..2d3cb5fe 100644 --- a/world/map/npc/013-3/barrier.txt +++ b/world/map/npc/013-3/barrier.txt @@ -1,19 +1,18 @@ // -//013-3.gat,71,21,0 script #DemonMineBarrier1#_M 0,1,1,{ -013-3.gat,71,21,0 script #DemonMineBarrier1#_M 127,1,1,{ - if (QUEST_demon_mines >= 2) close; +//013-3.gat,71,21,0|script|#DemonMineBarrier1#_M|0,1,1,{ +013-3.gat,71,21,0|script|#DemonMineBarrier1#_M|127,1,1,{ + if (QUEST_demon_mines >= 2) close; + if (QUEST_demon_mines == 1 && countitem(1198) >= 1) goto L_Has_Jack_O_Soul; - if (QUEST_demon_mines == 1 && countitem(1198) >= 1) goto L_Has_Jack_O_Soul; + mes "A barrier around the opening pushes you back as you approach."; - mes "A barrier around the opening pushes you back as you approach."; - - warp "013-3.gat", 71, 25; - close; + warp "013-3.gat", 71, 25; + close; L_Has_Jack_O_Soul: - mes "The barrier around the opening allows you passage."; - set QUEST_demon_mines, 2; - delitem "JackOSoul", 1; - close; + mes "The barrier around the opening allows you passage."; + set QUEST_demon_mines, 2; + delitem "JackOSoul", 1; + close; } diff --git a/world/map/npc/013-3/mask_chest.txt b/world/map/npc/013-3/mask_chest.txt index fb72f54c..59aa0819 100644 --- a/world/map/npc/013-3/mask_chest.txt +++ b/world/map/npc/013-3/mask_chest.txt @@ -1,176 +1,208 @@ // -013-3.gat,28,27,0 script Chest#DemonMask 111,{ - if (QUEST_demon_mines < 2) goto L_This_shouldn_t_happen; - if (QUEST_demon_mines == 3) goto L_Finished; - - if (countitem("MaggotSlime") == 0) goto L_No_maggot_slime; - if (countitem("SmallMushroom") == 0) goto L_No_mushroom; - if (countitem("PinkPetal") == 0) goto L_No_pink_petal; - - if (countitem("Pearl") == 0) goto L_No_pearl; - if (countitem("HardSpike") == 0) goto L_No_hard_spike; - if (countitem("RawLog") == 0) goto L_No_raw_log; - - if (countitem("PinkAntenna") == 0) goto L_No_pink_antenna; - if (countitem("SnakeTongue") == 0 || countitem("MountainSnakeTongue") == 0 || countitem("GrassSnakeTongue") == 0 || countitem("CaveSnakeTongue") == 0) goto L_No_tongues; - if (countitem("TreasureKey") == 0) goto L_No_treasure_key; - - if (countitem("PileOfAsh") == 0) goto L_No_ash; - if (countitem("MauveHerb") == 0 || countitem("CobaltHerb") == 0 || countitem("GambogeHerb") == 0 || countitem("AlizarinHerb") == 0) goto L_No_herbs; - if (countitem("BugLeg") == 0) goto L_No_bug_leg; - - if (countitem("CaveSnakeLamp") == 0) goto L_No_lamp; - if (countitem("IronOre") == 0) goto L_No_iron_ore; - if (countitem("ScorpionStinger") == 0 || countitem("RedScorpionStinger") == 0 || countitem("BlackScorpionStinger") == 0) goto L_No_stingers; - - if (countitem("SilkCocoon") == 0) goto L_No_silk; - if (countitem("WhiteFur") == 0) goto L_No_fur; - if (countitem("DarkCrystal") == 0) goto L_No_dark_crystal; - - if (countitem("BottleOfWater") == 0) goto L_No_water; - - getinventorylist; - if (@inventorylist_count == 100 && countitem("MaggotSlime") > 1 && countitem("BugLeg") > 1 && countitem("SilkCocoon") > 1 - && countitem("SmallMushroom") > 1 && countitem("PinkPetal") > 1 && countitem("Pearl") > 1 - && countitem("HardSpike") > 1 && countitem("RawLog") > 1 && countitem("PinkAntenna") > 1 - && countitem("DarkCrystal") > 1 && countitem("IronOre") > 1 && countitem("ScorpionStinger") > 1 - && countitem("RedScorpionStinger") > 1 && countitem("BlackScorpionStinger") > 1 && countitem("SnakeTongue") > 1 - && countitem("MountainSnakeTongue") > 1 && countitem("GrassSnakeTongue") > 1 && countitem("CaveSnakeTongue") > 1 - && countitem("MauveHerb") > 1 && countitem("CobaltHerb") > 1 && countitem("GambogeHerb") > 1 - && countitem("AlizarinHerb") > 1 && countitem("TreasureKey") > 1 && countitem("CaveSnakeLamp") > 1 - && countitem("PileOfAsh") > 1 && countitem("WhiteFur") > 1 && countitem("BottleOfWater") > 1) goto L_TooMany; - - delitem "MaggotSlime", 1; - delitem "BugLeg", 1; - delitem "SilkCocoon", 1; - - delitem "SmallMushroom", 1; - delitem "PinkPetal", 1; - delitem "Pearl", 1; - - delitem "HardSpike", 1; - delitem "RawLog", 1; - delitem "PinkAntenna", 1; - - delitem "DarkCrystal", 1; - delitem "IronOre", 1; - delitem "ScorpionStinger", 1; - - delitem "RedScorpionStinger", 1; - delitem "BlackScorpionStinger", 1; - delitem "SnakeTongue", 1; - - delitem "MountainSnakeTongue", 1; - delitem "GrassSnakeTongue", 1; - delitem "CaveSnakeTongue", 1; - - delitem "MauveHerb", 1; - delitem "CobaltHerb", 1; - delitem "GambogeHerb", 1; - - delitem "AlizarinHerb", 1; - delitem "TreasureKey", 1; - delitem "CaveSnakeLamp", 1; - - delitem "WhiteFur", 1; - delitem "PileOfAsh", 1; - delitem "BottleOfWater", 1; - - mes "You managed to perform the ritual and open the chest."; - getitem "DemonMask", 1; - mes "You found a demon mask inside."; - set QUEST_demon_mines, 3; - close; +013-3.gat,28,27,0|script|Chest#DemonMask|111,{ + if (QUEST_demon_mines < 2) goto L_This_shouldn_t_happen; + if (QUEST_demon_mines == 3) goto L_Finished; + + if (countitem("MaggotSlime") == 0) + goto L_No_maggot_slime; + if (countitem("SmallMushroom") == 0) + goto L_No_mushroom; + if (countitem("PinkPetal") == 0) + goto L_No_pink_petal; + if (countitem("Pearl") == 0) + goto L_No_pearl; + if (countitem("HardSpike") == 0) + goto L_No_hard_spike; + if (countitem("RawLog") == 0) + goto L_No_raw_log; + if (countitem("PinkAntenna") == 0) + goto L_No_pink_antenna; + if (countitem("SnakeTongue") == 0 + || countitem("MountainSnakeTongue") == 0 + || countitem("GrassSnakeTongue") == 0 + || countitem("CaveSnakeTongue") == 0) + goto L_No_tongues; + if (countitem("TreasureKey") == 0) + goto L_No_treasure_key; + if (countitem("PileOfAsh") == 0) + goto L_No_ash; + if (countitem("MauveHerb") == 0 + || countitem("CobaltHerb") == 0 + || countitem("GambogeHerb") == 0 + || countitem("AlizarinHerb") == 0) + goto L_No_herbs; + if (countitem("BugLeg") == 0) + goto L_No_bug_leg; + if (countitem("CaveSnakeLamp") == 0) + goto L_No_lamp; + if (countitem("IronOre") == 0) + goto L_No_iron_ore; + if (countitem("ScorpionStinger") == 0 + || countitem("RedScorpionStinger") == 0 + || countitem("BlackScorpionStinger") == 0) + goto L_No_stingers; + if (countitem("SilkCocoon") == 0) + goto L_No_silk; + if (countitem("WhiteFur") == 0) + goto L_No_fur; + if (countitem("DarkCrystal") == 0) + goto L_No_dark_crystal; + if (countitem("BottleOfWater") == 0) + goto L_No_water; + getinventorylist; + if (@inventorylist_count == 100 + && countitem("MaggotSlime") > 1 + && countitem("BugLeg") > 1 + && countitem("SilkCocoon") > 1 + && countitem("SmallMushroom") > 1 + && countitem("PinkPetal") > 1 + && countitem("Pearl") > 1 + && countitem("HardSpike") > 1 + && countitem("RawLog") > 1 + && countitem("PinkAntenna") > 1 + && countitem("DarkCrystal") > 1 + && countitem("IronOre") > 1 + && countitem("ScorpionStinger") > 1 + && countitem("RedScorpionStinger") > 1 + && countitem("BlackScorpionStinger") > 1 + && countitem("SnakeTongue") > 1 + && countitem("MountainSnakeTongue") > 1 + && countitem("GrassSnakeTongue") > 1 + && countitem("CaveSnakeTongue") > 1 + && countitem("MauveHerb") > 1 + && countitem("CobaltHerb") > 1 + && countitem("GambogeHerb") > 1 + && countitem("AlizarinHerb") > 1 + && countitem("TreasureKey") > 1 + && countitem("CaveSnakeLamp") > 1 + && countitem("PileOfAsh") > 1 + && countitem("WhiteFur") > 1 + && countitem("BottleOfWater") > 1) + goto L_TooMany; + + delitem "MaggotSlime", 1; + delitem "BugLeg", 1; + delitem "SilkCocoon", 1; + delitem "SmallMushroom", 1; + delitem "PinkPetal", 1; + delitem "Pearl", 1; + delitem "HardSpike", 1; + delitem "RawLog", 1; + delitem "PinkAntenna", 1; + delitem "DarkCrystal", 1; + delitem "IronOre", 1; + delitem "ScorpionStinger", 1; + delitem "RedScorpionStinger", 1; + delitem "BlackScorpionStinger", 1; + delitem "SnakeTongue", 1; + delitem "MountainSnakeTongue", 1; + delitem "GrassSnakeTongue", 1; + delitem "CaveSnakeTongue", 1; + delitem "MauveHerb", 1; + delitem "CobaltHerb", 1; + delitem "GambogeHerb", 1; + delitem "AlizarinHerb", 1; + delitem "TreasureKey", 1; + delitem "CaveSnakeLamp", 1; + delitem "WhiteFur", 1; + delitem "PileOfAsh", 1; + delitem "BottleOfWater", 1; + + mes "You managed to perform the ritual and open the chest."; + getitem "DemonMask", 1; + mes "You found a demon mask inside."; + set QUEST_demon_mines, 3; + close; L_No_maggot_slime: - mes "You do not have any maggot slime."; - close; + mes "You do not have any maggot slime."; + close; L_No_mushroom: - mes "You do not have a mushroom, neither big, nor small."; - close; + mes "You do not have a mushroom, neither big, nor small."; + close; L_No_pink_petal: - mes "You can't seem to find that pink petal you had."; - close; + mes "You can't seem to find that pink petal you had."; + close; L_No_pearl: - mes "You do not have a pearl, let alone one from the sea."; - close; + mes "You do not have a pearl, let alone one from the sea."; + close; L_No_hard_spike: - mes "You weren't able to find a hard spike in the stuff you brought."; - close; + mes "You weren't able to find a hard spike in the stuff you brought."; + close; L_No_raw_log: - mes "You don't have any wood."; - close; + mes "You don't have any wood."; + close; L_No_pink_antenna: - mes "You aren't carrying any antenna."; - close; + mes "You aren't carrying any antenna."; + close; L_No_tongues: - mes "You don't have four different snake tongues."; - close; + mes "You don't have four different snake tongues."; + close; L_No_treasure_key: - mes "No treasure chest key, no opening ritual."; - close; + mes "No treasure chest key, no opening ritual."; + close; L_No_ash: - mes "You still need a pile of ash."; - close; + mes "You still need a pile of ash."; + close; L_No_herbs: - mes "Four different herbs are needed to get this thing open."; - close; + mes "Four different herbs are needed to get this thing open."; + close; L_No_bug_leg: - mes "You do not have part of a bug on you. That is rather odd considering what you went through to get here."; - close; + mes "You do not have part of a bug on you. That is rather odd considering what you went through to get here."; + close; L_No_lamp: - mes "You do not have a lamp. Yet, somehow, you were able to get this far into this dark cave."; - close; + mes "You do not have a lamp. Yet, somehow, you were able to get this far into this dark cave."; + close; L_No_iron_ore: - mes "\"Rock and metal, as one.\" You don't seem to have anything that fits the bill."; - close; + mes "\"Rock and metal, as one.\" You don't seem to have anything that fits the bill."; + close; L_No_stingers: - mes "Three scorpion deaths are still missing."; - close; + mes "Three scorpion deaths are still missing."; + close; L_No_silk: - mes "You could not find the womb for a butterfly among your stuff."; - close; + mes "You could not find the womb for a butterfly among your stuff."; + close; L_No_fur: - mes "You wonder how you can carry the \"gentle caress of a creature without blemish.\" But you need it to get this thing open."; - close; + mes "You wonder how you can carry the \"gentle caress of a creature without blemish.\" But you need it to get this thing open."; + close; L_No_dark_crystal: - mes "A piece of darkness is missing."; - close; + mes "A piece of darkness is missing."; + close; L_No_water: - mes "Just one bottle of water and you can start the ritual."; - close; + mes "Just one bottle of water and you can start the ritual."; + close; L_This_shouldn_t_happen: - warp "013-3.gat", 71, 25; - // You need to go through the barrier to get to the chest, so this shouldn't happen. So just warp them like the barrier does. - close; + warp "013-3.gat", 71, 25; + // You need to go through the barrier to get to the chest, so this shouldn't happen. So just warp them like the barrier does. + close; L_Finished: - mes "[Chest]"; - mes "You already opened this chest."; - close; + mes "[Chest]"; + mes "You already opened this chest."; + close; L_TooMany: - mes "[Chest]"; - mes "You don't have room for what ever is inside. Maybe you should try again later."; - close; + mes "[Chest]"; + mes "You don't have room for what ever is inside. Maybe you should try again later."; + close; } diff --git a/world/map/npc/013-3/misc.txt b/world/map/npc/013-3/misc.txt index 8f7da034..116adef5 100644 --- a/world/map/npc/013-3/misc.txt +++ b/world/map/npc/013-3/misc.txt @@ -1,6 +1,6 @@ // -013-3.gat,127,68,0 script Chest 111,{ - mes "You can't see any way to open this chest."; - close; +013-3.gat,127,68,0|script|Chest|111,{ + mes "You can't see any way to open this chest."; + close; } diff --git a/world/map/npc/013-3/sword_chest.txt b/world/map/npc/013-3/sword_chest.txt index 5d2c97b7..bb89e3f3 100644 --- a/world/map/npc/013-3/sword_chest.txt +++ b/world/map/npc/013-3/sword_chest.txt @@ -1,38 +1,41 @@ // -013-3.gat,177,22,0 script Chest 111,{ - if( ChestQuest & 2) goto L_Finished; +013-3.gat,177,22,0|script|Chest|111,{ + if( ChestQuest & 2) goto L_Finished; - mes "[Chest]"; - mes "Would you try to open it?"; - next; - menu - "Yes", L_Yes, - "No", -; - close; + mes "[Chest]"; + mes "Would you try to open it?"; + next; + menu + "Yes", L_Yes, + "No", -; + close; L_Yes: - if(countitem("TreasureKey") < 10) goto L_Not_Enough; - getinventorylist; - if (@inventorylist_count == 100 && countitem("TreasureKey") > 10) goto L_TooMany; - delitem "TreasureKey", 10; - getitem "ShortSword", 1; - mes "[Chest]"; - mes "You opened it and found a short sword!"; - set ChestQuest, ChestQuest | 2; - close; + if(countitem("TreasureKey") < 10) + goto L_Not_Enough; + getinventorylist; + if (@inventorylist_count == 100 + && countitem("TreasureKey") > 10) + goto L_TooMany; + delitem "TreasureKey", 10; + getitem "ShortSword", 1; + mes "[Chest]"; + mes "You opened it and found a short sword!"; + set ChestQuest, ChestQuest | 2; + close; L_Not_Enough: - mes "It seems that this is not the right key..."; - close; + mes "It seems that this is not the right key..."; + close; L_Finished: - mes "[Chest]"; - mes "You already opened this chest."; - close; + mes "[Chest]"; + mes "You already opened this chest."; + close; L_TooMany: - mes "[Chest]"; - mes "You don't have room for what ever is inside. Maybe you should try again later."; - close; + mes "[Chest]"; + mes "You don't have room for what ever is inside. Maybe you should try again later."; + close; } |