From f4aad0b8a088ffbd648bb1fcace56d2f8dc96909 Mon Sep 17 00:00:00 2001 From: wushin Date: Fri, 21 Jun 2013 11:28:26 -0500 Subject: New server content to support new caves Added mobs:Angry Fire Goblin, Angry Sea Slime, Angry Green Slime. Moved NPCs in sandstorm around. Malvox got a house and lives in it now on 002-2 The mines go a layer deeper so the merchant was moved into the camp along with nathan. Naem and Sema moved down with respective maps. Sandstorm_mine_barrier is not mining_camp_barrier --- world/map/npc/002-3/merchant.txt | 3 + world/map/npc/002-3/mine_triggerone.txt | 67 --------- world/map/npc/002-3/mine_triggerthree.txt | 67 --------- world/map/npc/002-3/mine_triggertwo.txt | 70 ---------- world/map/npc/002-3/mining_camp_barrier.txt | 22 +++ world/map/npc/002-3/naem.txt | 152 --------------------- world/map/npc/002-3/nathan.txt | 2 +- world/map/npc/002-3/underground_palace_barrier.txt | 22 --- 8 files changed, 26 insertions(+), 379 deletions(-) create mode 100644 world/map/npc/002-3/merchant.txt delete mode 100644 world/map/npc/002-3/mine_triggerone.txt delete mode 100644 world/map/npc/002-3/mine_triggerthree.txt delete mode 100644 world/map/npc/002-3/mine_triggertwo.txt create mode 100644 world/map/npc/002-3/mining_camp_barrier.txt delete mode 100644 world/map/npc/002-3/naem.txt delete mode 100644 world/map/npc/002-3/underground_palace_barrier.txt (limited to 'world/map/npc/002-3') diff --git a/world/map/npc/002-3/merchant.txt b/world/map/npc/002-3/merchant.txt new file mode 100644 index 00000000..3eb2f426 --- /dev/null +++ b/world/map/npc/002-3/merchant.txt @@ -0,0 +1,3 @@ +// + +002-3.gat,60,47,0|shop|Ishyah|109,MinersHat :-1,MinerGloves :-1,ShortBow :-1,Arrow :-1,LeatherShield :-1 diff --git a/world/map/npc/002-3/mine_triggerone.txt b/world/map/npc/002-3/mine_triggerone.txt deleted file mode 100644 index 05aa1c01..00000000 --- a/world/map/npc/002-3/mine_triggerone.txt +++ /dev/null @@ -1,67 +0,0 @@ -//Sandstorm mine trigger 1 Trigger 002-3 35,43 (127) -// Variables used: nibble 4 and 5 of QUEST_SouthTulimshar - -002-3.gat,30,47,0|script|Button|400,0,0,{ - - // This NPC previously used the variable TMW_Quest - callfunc "ClearVarTMW_Quest"; - - set @state, ((QUEST_SouthTulimshar & BYTE_2_MASK) >> BYTE_2_SHIFT); - - if (@state == 24) goto L_Trigger_Wrong_1; - if (@state == 23) goto L_Trigger_Wrong_1; - if (@state == 22) goto L_Trigger_1; - - mes "There is a large button on the ground. A key hole appears on the button."; - goto L_Close; - -L_Trigger_Wrong_1: - mes "There is a large button on the ground. A key hole appears on the button."; - menu - "Put the key in, turn right.", L_Right_Wrong_1, - "Put the key in, turn left.", L_Left_Wrong_1, - "Do nothing.", L_Nothing_1; - -L_Right_Wrong_1: - set @state, 22; - callsub S_Update_Var; - mes "You turn the key right."; - goto L_Close; - -L_Left_Wrong_1: - set @state, 22; - callsub S_Update_Var; - mes "You turn the key left."; - goto L_Close; - -L_Trigger_1: - mes "There is a large button on the ground. A key hole appears on the button."; - menu - "Put the key in, turn right.", L_Right_1, - "Put the key in, turn left.", L_Left_1, - "Do nothing.", L_Nothing_1; - -L_Right_1: - set @state, 23; - callsub S_Update_Var; - mes "You turn the key right. A clicking sound echoes throughout the mine."; - goto L_Close; - -L_Left_1: - set @state, 22; - callsub S_Update_Var; - mes "You turn the key left."; - goto L_Close; - -L_Nothing_1: - mes "You leave the button alone."; - goto L_Close; - -L_Close: - set @state, 0; - close; - -S_Update_Var: - set QUEST_SouthTulimshar, (QUEST_SouthTulimshar & ~(BYTE_2_MASK) | (@state << BYTE_2_SHIFT)); - return; -} diff --git a/world/map/npc/002-3/mine_triggerthree.txt b/world/map/npc/002-3/mine_triggerthree.txt deleted file mode 100644 index 0bfecd22..00000000 --- a/world/map/npc/002-3/mine_triggerthree.txt +++ /dev/null @@ -1,67 +0,0 @@ -//Sandstorm mine trigger 3 Trigger 002-3 98,42 (127) -// Variables used: nibble 4 and 5 of QUEST_SouthTulimshar - -002-3.gat,91,99,0|script|Button|400,0,0,{ - - // This NPC previously used the variable TMW_Quest - callfunc "ClearVarTMW_Quest"; - - set @state, ((QUEST_SouthTulimshar & BYTE_2_MASK) >> BYTE_2_SHIFT); - - if (@state == 24) goto L_Trigger_Wrong_3; - if (@state == 23) goto L_Trigger_3; - if (@state == 22) goto L_Trigger_Wrong_3; - - mes "There is a large button on the ground. A key hole appears on the button."; - goto L_Close; - -L_Trigger_Wrong_3: - mes "There is a large button on the ground. A key hole appears on the button."; - menu - "Put the key in, turn right.", L_Right_Wrong_3, - "Put the key in, turn left.", L_Left_Wrong_3, - "Do nothing.", L_Nothing_3; - -L_Right_Wrong_3: - set @state, 22; - callsub S_Update_Var; - mes "You turn the key right."; - goto L_Close; - -L_Left_Wrong_3: - set @state, 22; - callsub S_Update_Var; - mes "You turn the key left."; - goto L_Close; - -L_Trigger_3: - mes "There is a large button on the ground. A key hole appears on the button."; - menu - "Put the key in, turn right.", L_Right_3, - "Put the key in, turn left.", L_Left_3, - "Do nothing.", L_Nothing_3; - -L_Right_3: - set @state, 22; - callsub S_Update_Var; - mes "You turn the key right."; - goto L_Close; - -L_Left_3: - set @state, 24; - callsub S_Update_Var; - mes "You turn the key left. A clicking sound echoes throughout the mine."; - goto L_Close; - -L_Nothing_3: - mes "You leave the button alone."; - goto L_Close; - -L_Close: - set @state, 0; - close; - -S_Update_Var: - set QUEST_SouthTulimshar, (QUEST_SouthTulimshar & ~(BYTE_2_MASK) | (@state << BYTE_2_SHIFT)); - return; -} diff --git a/world/map/npc/002-3/mine_triggertwo.txt b/world/map/npc/002-3/mine_triggertwo.txt deleted file mode 100644 index d18712ee..00000000 --- a/world/map/npc/002-3/mine_triggertwo.txt +++ /dev/null @@ -1,70 +0,0 @@ -//Sandstorm mine trigger -// Variables used: -// - nibble 4 and 5 of QUEST_SouthTulimshar -// - in FLAGS, FLAG_OPENED_UNDERGROUND - -002-3.gat,100,37,0|script|Button|400,0,0,{ - - // This NPC previously used the variable TMW_Quest - callfunc "ClearVarTMW_Quest"; - - set @state, ((QUEST_SouthTulimshar & BYTE_2_MASK) >> BYTE_2_SHIFT); - - if (@state == 24) goto L_Trigger_2; - if (@state == 23) goto L_Trigger_Wrong_2; - if (@state == 22) goto L_Trigger_Wrong_2; - - mes "There is a large button on the ground. A key hole appears on the button."; - goto L_Close; - -L_Trigger_Wrong_2: - mes "There is a large button on the ground. A key hole appears on the button."; - menu - "Put the key in, turn right.", L_Right_Wrong_2, - "Put the key in, turn left.", L_Left_Wrong_2, - "Do nothing.", L_Nothing_2; - -L_Right_Wrong_2: - set @state, 22; - callsub S_Update_Var; - mes "You turn the key right."; - goto L_Close; - -L_Left_Wrong_2: - set @state, 22; - callsub S_Update_Var; - mes "You turn the key left."; - goto L_Close; - -L_Trigger_2: - mes "There is a large button on the ground. A key hole appears on the button."; - menu - "Put the key in, turn right.", L_Right_2, - "Put the key in, turn left.", L_Left_2, - "Do nothing.", L_Nothing_2; - -L_Right_2: - set @state, 22; - callsub S_Update_Var; - mes "You turn the key right."; - goto L_Close; - -L_Left_2: - set @state, 25; - callsub S_Update_Var; - set FLAGS, FLAGS | FLAG_OPENED_UNDERGROUND; - mes "You turn the key left. A clicking sound echoes throughout the mine, followed by a loud thump."; - goto L_Close; - -L_Nothing_2: - mes "You leave the button alone."; - goto L_Close; - -L_Close: - set @state, 0; - close; - -S_Update_Var: - set QUEST_SouthTulimshar, (QUEST_SouthTulimshar & ~(BYTE_2_MASK) | (@state << BYTE_2_SHIFT)); - return; -} diff --git a/world/map/npc/002-3/mining_camp_barrier.txt b/world/map/npc/002-3/mining_camp_barrier.txt new file mode 100644 index 00000000..84a239e8 --- /dev/null +++ b/world/map/npc/002-3/mining_camp_barrier.txt @@ -0,0 +1,22 @@ +//Sandstorm mine barrier + +002-3.gat,82,32,0|script|#Sandstorm_Mine_Barrier|45,0,0,{ + + // This NPC previously used the variable TMW_Quest + callfunc "ClearVarTMW_Quest"; + + set @state, ((QUEST_SouthTulimshar & BYTE_2_MASK) >> BYTE_2_SHIFT); + + if (@state >= 8) goto L_Sandstorm_Barrier_Open; + + message strcharinfo(0), "Some force seems to block your entrance."; + goto L_End; + +L_Sandstorm_Barrier_Open: + warp "002-4.gat",37,31; + goto L_End; + +L_End: + set @state, 0; + end; +} diff --git a/world/map/npc/002-3/naem.txt b/world/map/npc/002-3/naem.txt deleted file mode 100644 index bfcde613..00000000 --- a/world/map/npc/002-3/naem.txt +++ /dev/null @@ -1,152 +0,0 @@ -// Variables used: -// - nibble 4 and 5 of QUEST_SouthTulimshar -// - in FLAGS, bits FLAG_GOT_NAEM_GLOVES and FLAG_OPENED_UNDERGROUND - -002-3.gat,85,97,6|script|Naem|109,{ - - // This NPC previously used the variable TMW_Quest - callfunc "ClearVarTMW_Quest"; - - set @state, ((QUEST_SouthTulimshar & BYTE_2_MASK) >> BYTE_2_SHIFT); - - if (FLAGS & FLAG_GOT_NAEM_GLOVES) goto L_Naem_Complete; - if (FLAGS & FLAG_OPENED_UNDERGROUND) goto L_Naem_Gloves; - if (@state == 22) goto L_Naem_Code; - if (@state == 21) goto L_Naem_Lt; - if (@state == 20) goto L_Naem_Memory; - if ((@state > 17) && (@state < 19)) - goto L_Naem_Great; - if (@state == 17) goto L_Naem_Waits_3; - if (@state == 16) goto L_Naem_Help_3; - if (@state == 15) goto L_Naem_Waits_2; - if (@state == 14) goto L_Naem_Help_2; - if (@state == 13) goto L_Naem_Waits_1; - if (@state == 12) goto L_Naem_Help_1; - if (@state == 10) goto L_Naem_Cool; - if (@state == 9) goto L_Naem_Okay; - - mes "[Naem]"; - mes "\"I'm just mining away here. Lots of work to do.\""; - goto L_Close; - -L_Naem_Okay: - set @state, 10; - callsub S_Update_Var; - mes "[Naem]"; - mes "\"Oh, hello there. Nickos wanted you to check on me? Yeah, you can tell him I'm okay.\""; - goto L_Close; - -L_Naem_Cool: - mes "[Naem]"; - mes "\"Yeah, I'm cool. Just mining away here.\""; - goto L_Close; - -L_Naem_Help_1: - set @state, 13; - callsub S_Update_Var; - mes "[Naem]"; - mes "\"Oh, you are here to help move my bags? Cool, I've got a few ready to go. Go ahead and take this one!\""; - next; - mes "Naem hands you a bag of ore."; - next; - mes "[Naem]"; - mes "\"After you deliver that one to Nathan, come on back, I've got a couple more ready to go.\""; - goto L_Close; - -L_Naem_Waits_1: - mes "[Naem]"; - mes "\"After you deliver that bag of ore to Nathan, come on back, I've got a couple more ready to go.\""; - goto L_Close; - -L_Naem_Help_2: - set @state, 15; - callsub S_Update_Var; - mes "Naem gives you a bag of ore."; - next; - mes "[Naem]"; - mes "\"Just one more after this one and we'll be all caught up!\""; - goto L_Close; - -L_Naem_Waits_2: - mes "[Naem]"; - mes "\"Just one more bag of ore after the one you got and we'll be all caught up!\""; - goto L_Close; - -L_Naem_Help_3: - set @state, 17; - callsub S_Update_Var; - mes "[Naem]"; - mes "Hands a bag of ore to you."; - next; - mes "\"Last one!\""; - goto L_Close; - -L_Naem_Waits_3: - mes "[Naem]"; - mes "\"You got my last sack already. Just give it to Nathan and we'll have caught up.\""; - goto L_Close; - -L_Naem_Great: - mes "[Naem]"; - mes "\"Hi ho! It's off to work I go! I work every day for meager pay, a miner's life for me...\""; - goto L_Close; - -L_Naem_Memory: - mes "You see Naem grimacing in pain as you approach."; - next; - mes "[Naem]"; - mes "\"Oh, my head! Some rocks fell on me and bonked me pretty good. I'm still a little sore.\""; - menu - "Don't you have a key so I can go to the underground palace?", L_Naem_Palace_No, - "You should be more careful.", L_Naem_Duh; - -L_Naem_Duh: - mes "[Naem]"; - mes "\"I guess I should...\""; - goto L_Close; - -L_Naem_Palace_No: - set @state, 21; - callsub S_Update_Var; - mes "[Naem]"; - mes "\"Oh no! I lost the key! Don't worry though, talk to Lieutenant Dausen about getting the spare key.\""; - goto L_Close; - -L_Naem_Lt: - mes "[Naem]"; - mes "\"I hurt my head pretty bad. I also lost my key. If you want to get into the underground palace, you'll have to talk to Lieutenant Dausen about getting the spare.\""; - goto L_Close; - -L_Naem_Code: - mes "[Naem]"; - mes "\"Oh, you got the key. That is good! But my head still hurts... All I remember about the code is you have to put the key into the key hole buttons around the mine in a certain order and turn them in a certain order and it will unlock the underground palace. Sorry, that's all I have for you. Good luck!\""; - goto L_Close; - -L_Naem_Gloves: - getinventorylist; - if (@inventorylist_count == 100) - goto L_Nathan_TooMany; - set FLAGS, FLAGS | FLAG_GOT_NAEM_GLOVES; - getitem "MinerGloves", 1; - mes "[Naem]"; - mes "\"Hey, good job on getting that together! Take these gloves, they might prove useful in the underground palace.\""; - goto L_Close; - -L_Naem_TooMany: - mes "[Naem]"; - mes "\"You have too many items for me to give you a reward.\""; - goto L_Close; - -L_Naem_Complete: - mes "[Naem]"; - mes "\"Yo-ho-ho, a miner's life for me!\""; - goto L_Close; - -L_Close: - set @state, 0; - close; - -S_Update_Var: - set QUEST_SouthTulimshar, (QUEST_SouthTulimshar & ~(BYTE_2_MASK) | (@state << BYTE_2_SHIFT)); - return; -} diff --git a/world/map/npc/002-3/nathan.txt b/world/map/npc/002-3/nathan.txt index b668f7b7..675f01ea 100644 --- a/world/map/npc/002-3/nathan.txt +++ b/world/map/npc/002-3/nathan.txt @@ -1,6 +1,6 @@ // Variables used: nibble 4 and 5 of QUEST_SouthTulimshar -002-3.gat,35,35,6|script|Nathan|109,{ +002-3.gat,42,45,6|script|Nathan|109,{ // This NPC previously used the variable TMW_Quest callfunc "ClearVarTMW_Quest"; diff --git a/world/map/npc/002-3/underground_palace_barrier.txt b/world/map/npc/002-3/underground_palace_barrier.txt deleted file mode 100644 index a56fe801..00000000 --- a/world/map/npc/002-3/underground_palace_barrier.txt +++ /dev/null @@ -1,22 +0,0 @@ -//underground palace barrier - -002-3.gat,68,98,0|script|#UGP_Barrier|45,0,0,{ - - // This NPC previously used the variable TMW_Quest - callfunc "ClearVarTMW_Quest"; - - set @state, ((QUEST_SouthTulimshar & BYTE_2_MASK) >> BYTE_2_SHIFT); - - if (@state >= 25) goto L_Underground_Palace_Barrier_Open; - - message strcharinfo(0), "Some force seems to block your entrance."; - goto L_End; - -L_Underground_Palace_Barrier_Open: - warp "002-4.gat",34,98; - goto L_End; - -L_End: - set @state, 0; - end; -} -- cgit v1.2.3-60-g2f50