From fc3b3af416688490595b01a43a7e9fbb6d96a3ae Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Sat, 22 Nov 2008 22:52:52 +0000 Subject: Commit an update --- npc/002-4_Desert_mines/chest.txt | 4 +- npc/003-1_Beach/_warps.txt | 2 +- npc/010-1_Woodland/_warps.txt | 2 +- npc/013-1_Woodland_hills/_warps.txt | 2 +- npc/013-3_Cave/_import.txt | 1 + npc/013-3_Cave/_mobs.txt | 79 --------------------- npc/013-3_Cave/barrier.txt | 6 +- npc/013-3_Cave/mask_chest.txt | 4 +- npc/013-3_Cave/misc.txt | 6 ++ npc/013-3_Cave/sword_chest.txt | 31 +++++++++ npc/018-1_Woodland_mining_camp/_mobs.txt | 1 - npc/018-1_Woodland_mining_camp/miners.txt | 4 +- npc/018-3_Cave/_mobs.txt | 111 ------------------------------ npc/_import.txt | 2 +- 14 files changed, 51 insertions(+), 204 deletions(-) diff --git a/npc/002-4_Desert_mines/chest.txt b/npc/002-4_Desert_mines/chest.txt index bd76dd08..49014976 100644 --- a/npc/002-4_Desert_mines/chest.txt +++ b/npc/002-4_Desert_mines/chest.txt @@ -1,7 +1,7 @@ // 002-4.gat,93,37,0 script Treasure 111,{ - if( ChestQuest == 1) goto L_Finished; + if( ChestQuest && 1) goto L_Finished; mes "[Chest]"; mes "Would you try to open it?"; @@ -17,7 +17,7 @@ L_Yes: getitem 536, 1; mes "[Chest]"; mes "You opened it and found a short sword!"; - set ChestQuest, 1; + set ChestQuest, ChestQuest || 1; close; L_Not_Enough: diff --git a/npc/003-1_Beach/_warps.txt b/npc/003-1_Beach/_warps.txt index e66a28e4..2358947b 100644 --- a/npc/003-1_Beach/_warps.txt +++ b/npc/003-1_Beach/_warps.txt @@ -1,4 +1,4 @@ // 003-1 Beach warps -003-1.gat,172,77 warp ToSandstorm -1,3,002-1.gat,15,66 +003-1.gat,172,77 warp ToSandstorm -1,3,002-1.gat,37,109 003-1.gat,20,23 warp ToWoodland 1,-1,007-1.gat,120,112 diff --git a/npc/010-1_Woodland/_warps.txt b/npc/010-1_Woodland/_warps.txt index 1e27f550..b02dc45c 100644 --- a/npc/010-1_Woodland/_warps.txt +++ b/npc/010-1_Woodland/_warps.txt @@ -3,5 +3,5 @@ 010-1.gat,49,23 warp ToWoodland 0,-1,011-1.gat,46,99 010-1.gat,14,55 warp ToWoodland -1,0,015-1.gat,92,54 010-1.gat,36,94 warp ToDimondsCove -1,-1,010-2.gat,32,44 -010-1.gat,56,104 warp ToWoodland 1,-1,016-1.gat,56,21 +010-1.gat,56,104 warp ToWoodland 1,-1,015-1.gat,56,21 010-1.gat,131,54 warp ToWoodland -1,0,007-1.gat,25,53 diff --git a/npc/013-1_Woodland_hills/_warps.txt b/npc/013-1_Woodland_hills/_warps.txt index b27c118c..6daa4447 100644 --- a/npc/013-1_Woodland_hills/_warps.txt +++ b/npc/013-1_Woodland_hills/_warps.txt @@ -1,6 +1,6 @@ // 013-1 Woodland hills warps 013-1.gat,125,103 warp toCave -1,-1,013-3.gat,34,64 -013-1.gat,20,76 warp ToWoodlandHills -1,2,012-1.gat,148,60 +013-1.gat,20,76 warp ToWoodlandHills -1,2,012-1.gat,149,78 013-1.gat,45,21 warp ToWoodland 1,-1,017-1.gat,46,104 013-1.gat,42,90 warp toHouse -1,-1,013-2.gat,63,41 diff --git a/npc/013-3_Cave/_import.txt b/npc/013-3_Cave/_import.txt index e4208f4f..40597409 100644 --- a/npc/013-3_Cave/_import.txt +++ b/npc/013-3_Cave/_import.txt @@ -5,3 +5,4 @@ npc: npc/013-3_Cave/_warps.txt npc: npc/013-3_Cave/_mobs.txt npc: npc/013-3_Cave/mask_chest.txt npc: npc/013-3_Cave/sword_chest.txt +npc: npc/013-3_Cave/bookcase.txt diff --git a/npc/013-3_Cave/_mobs.txt b/npc/013-3_Cave/_mobs.txt index b89dc170..4c3e8330 100644 --- a/npc/013-3_Cave/_mobs.txt +++ b/npc/013-3_Cave/_mobs.txt @@ -1,86 +1,7 @@ // 013-3 Cave mobs -013-3.gat,28,89,16,52 monster Cave Snake 1021,10,0,0,Mob013-3::On1021 -013-3.gat,61,22,2,2 monster Fire Skull 1023,3,0,0,Mob013-3::On1023 -013-3.gat,81,22,2,2 monster Poison Skull 1024,3,0,0,Mob013-3::On1024 -013-3.gat,109,31,6,22 monster Black Scorpion 1009,20,0,0,Mob013-3::On1009 -013-3.gat,119,84,27,38 monster Spider 1012,20,0,0,Mob013-3::On1012 -013-3.gat,176,23,5,6 monster Spider 1012,10,0,0,Mob013-3::On1012 -013-3.gat,82,75,2,2 monster Fire skull 1023,1,0,0,Mob013-3::On1023 -013-3.gat,142,37,2,2 monster Poison skull 1024,1,0,0,Mob013-3::On1024 -013-3.gat,79,134,21,16 monster Scorpion 1003,5,0,0,Mob013-3::On1003 -013-3.gat,71,169,38,17 monster Red scorpion 1004,5,0,0,Mob013-3::On1004 -013-3.gat,64,85,9,21 monster Black scorpion 1009,10,0,0,Mob013-3::On1009 -013-3.gat,81,92,3,20 monster Black scorpion 1009,10,0,0,Mob013-3::On1009 -013-3.gat,162,84,33,37 monster Snake 1010,30,0,0,Mob013-3::On1010 -013-3.gat,162,85,33,37 monster Spider 1012,30,0,0,Mob013-3::On1012 -013-3.gat,172,77,18,25 monster Black scorpion 1009,15,0,0,Mob013-3::On1009 -013-3.gat,145,36,20,15 monster Red slime 1008,25,0,0,Mob013-3::On1008 -013-3.gat,167,37,23,11 monster Snake 1010,20,0,0,Mob013-3::On1010 -013-3.gat,165,25,16,11 monster Black scorpion 1009,15,0,0,Mob013-3::On1009 -013-3.gat,71,39,2,3 monster Cave snake 1021,2,0,0,Mob013-3::On1021 -013-3.gat,159,102,3,5 monster Yellow slime 1007,2,0,0,Mob013-3::On1007 -013-3.gat,67,22,2,2 monster Maggot 1002,2,0,0,Mob013-3::On1002 -013-3.gat,75,22,2,2 monster Maggot 1002,2,0,0,Mob013-3::On1002 -013-3.gat,76,39,7,4 monster Black scorpion 1009,8,0,0,Mob013-3::On1009 -013-3.gat,65,39,7,4 monster Red slime 1008,8,0,0,Mob013-3::On1008 013-3.gat,0,0,0 script Mob013-3 -1,{ -On1002: - set @mobID, 1002; - callfunc "MobPoints"; - break; - -On1003: - set @mobID, 1003; - callfunc "MobPoints"; - break; - -On1004: - set @mobID, 1004; - callfunc "MobPoints"; - break; - -On1007: - set @mobID, 1007; - callfunc "MobPoints"; - break; - -On1008: - set @mobID, 1008; - callfunc "MobPoints"; - break; - -On1009: - set @mobID, 1009; - callfunc "MobPoints"; - break; - -On1010: - set @mobID, 1010; - callfunc "MobPoints"; - break; - -On1012: - set @mobID, 1012; - callfunc "MobPoints"; - break; - -On1021: - set @mobID, 1021; - callfunc "MobPoints"; - break; - -On1023: - set @mobID, 1023; - callfunc "MobPoints"; - break; - -On1024: - set @mobID, 1024; - callfunc "MobPoints"; - break; - end; } diff --git a/npc/013-3_Cave/barrier.txt b/npc/013-3_Cave/barrier.txt index 07f7a12b..635ab234 100644 --- a/npc/013-3_Cave/barrier.txt +++ b/npc/013-3_Cave/barrier.txt @@ -1,14 +1,14 @@ // -013-3.gat,71,21 script #DemonMineBarrier1 127,1,1,{ - if (QUEST_demon_mines >= 2) quit; +013-3.gat,71,21,0 script #DemonMineBarrier1 127,1,1,{ + if (QUEST_demon_mines >= 2) close; if (QUEST_demon_mines == 1 && countitem(1198) >= 1) goto L_Has_Jack_O_Soul; mes "The barrier around the opening pushes you bach as you approach."; warp "013-3.gat", 71, 38; - quit; + close; L_Has_Jack_O_Soul: mes "The barrier around the opening allows you passage."; diff --git a/npc/013-3_Cave/mask_chest.txt b/npc/013-3_Cave/mask_chest.txt index 1fdb6559..5d474107 100644 --- a/npc/013-3_Cave/mask_chest.txt +++ b/npc/013-3_Cave/mask_chest.txt @@ -1,5 +1,5 @@ // -013-3.gat,28,27 script Chest#DemonMask ,{ - +013-3.gat,28,27,0 script Chest#DemonMask 111,{ + mes "WIP"; } diff --git a/npc/013-3_Cave/misc.txt b/npc/013-3_Cave/misc.txt index e69de29b..8f7da034 100644 --- a/npc/013-3_Cave/misc.txt +++ b/npc/013-3_Cave/misc.txt @@ -0,0 +1,6 @@ +// + +013-3.gat,127,68,0 script Chest 111,{ + mes "You can't see any way to open this chest."; + close; +} diff --git a/npc/013-3_Cave/sword_chest.txt b/npc/013-3_Cave/sword_chest.txt index e69de29b..aad6dde8 100644 --- a/npc/013-3_Cave/sword_chest.txt +++ b/npc/013-3_Cave/sword_chest.txt @@ -0,0 +1,31 @@ +// + +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; + +L_Yes: + if(countitem(537) < 10) goto L_Not_Enough; + delitem 537, 3; + getitem 536, 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; + +L_Finished: + mes "[Chest]"; + mes "You already opened this chest."; + close; +} diff --git a/npc/018-1_Woodland_mining_camp/_mobs.txt b/npc/018-1_Woodland_mining_camp/_mobs.txt index 1f6d4706..df2cf445 100644 --- a/npc/018-1_Woodland_mining_camp/_mobs.txt +++ b/npc/018-1_Woodland_mining_camp/_mobs.txt @@ -22,7 +22,6 @@ 018-1.gat,78,55,37,6 monster Fire Goblin 1011,7,0,0,Mob018-1::On1011 018-1.gat,145,24,10,9 monster Green Slime 1005,3,0,0,Mob018-1::On1005 018-1.gat,68,89,14,17 monster Scorpion 1003,3,0,0,Mob018-1::On1003 -018-1.gat,160,31,11,18 monster Scorpion 1003,5,0,0,Mob018-1::On1003 018-1.gat,0,0,0 script Mob018-1 -1,{ diff --git a/npc/018-1_Woodland_mining_camp/miners.txt b/npc/018-1_Woodland_mining_camp/miners.txt index 17873549..cfa990dd 100644 --- a/npc/018-1_Woodland_mining_camp/miners.txt +++ b/npc/018-1_Woodland_mining_camp/miners.txt @@ -1,6 +1,6 @@ // -018-1.gat,78,59,0 script Miner 109,1,1,{ +018-1.gat,80,61,0 script Miner 109,{ mes "[Miner]"; - mes "\"I'm sorry, but this area is closed off.\""; + mes "\"Be careful in there.\""; } diff --git a/npc/018-3_Cave/_mobs.txt b/npc/018-3_Cave/_mobs.txt index 668d5902..f18b58ab 100644 --- a/npc/018-3_Cave/_mobs.txt +++ b/npc/018-3_Cave/_mobs.txt @@ -1,118 +1,7 @@ // 018-3 Cave mobs -018-3.gat,48,28,57,16 monster Silk Worm 1035,8,0,0,Mob018-3::On1035 -018-3.gat,48,28,56,17 monster Bat 1017,10,0,0,Mob018-3::On1017 -018-3.gat,35,62,31,15 monster Evil Mushroom 1013,10,0,0,Mob018-3::On1013 -018-3.gat,35,65,28,22 monster Spiky Mushroom 1019,15,0,0,Mob018-3::On1019 -018-3.gat,28,157,3,2 monster Flower 1014,1,0,0,Mob018-3::On1014 -018-3.gat,99,110,17,39 monster Yellow slime 1007,10,0,0,Mob018-3::On1007 -018-3.gat,137,140,2,1 monster Spider 1012,1,300000,120000,Mob018-3::On1012 -018-3.gat,102,172,131,13 monster Black scorpions 1009,20,0,0,Mob018-3::On1009 -018-3.gat,174,37,10,31 monster Yellow slime 1007,5,0,0,Mob018-3::On1007 -018-3.gat,135,148,10,6 monster Giant maggot 1006,2,0,0,Mob018-3::On1006 -018-3.gat,134,140,12,8 monster Maggot 1002,3,0,0,Mob018-3::On1002 -018-3.gat,34,142,30,48 monster Fire goblin 1011,4,0,0,Mob018-3::On1011 -018-3.gat,87,153,78,22 monster Snake 1010,10,0,0,Mob018-3::On1010 -018-3.gat,148,148,13,24 monster Bat 1017,3,0,0,Mob018-3::On1017 -018-3.gat,153,97,18,22 monster Yellow slime 1007,6,0,0,Mob018-3::On1007 -018-3.gat,81,77,27,21 monster Red slime 1008,15,0,0,Mob018-3::On1008 -018-3.gat,111,80,5,6 monster Black scorpions 1009,10,0,0,Mob018-3::On1009 -018-3.gat,175,122,5,40 monster Snake 1010,15,0,0,Mob018-3::On1010 -018-3.gat,98,75,1,2 monster Fire skull 1023,1,0,0,Mob018-3::On1023 -018-3.gat,100,75,1,2 monster Poison skull 2024,1,0,0,Mob018-3::On2024 -018-3.gat,171,95,15,19 monster Red scorpion 1004,5,0,0,Mob018-3::On1004 -018-3.gat,134,87,17,7 monster Red slime 1008,10,0,0,Mob018-3::On1008 -018-3.gat,59,95,11,8 monster Spider 1012,15,0,0,Mob018-3::On1012 -018-3.gat,77,92,23,7 monster Black scorpion 1009,15,0,0,Mob018-3::On1009 -018-3.gat,133,39,12,17 monster Spider 1012,10,0,0,Mob018-3::On1012 -018-3.gat,111,33,30,16 monster Mountain snake 1026,15,0,0,Mob018-3::On1026 018-3.gat,0,0,0 script Mob018-3 -1,{ -On1002: - set @mobID, 1002; - callfunc "MobPoints"; - break; - -On1004: - set @mobID, 1004; - callfunc "MobPoints"; - break; - -On1006: - set @mobID, 1006; - callfunc "MobPoints"; - break; - -On1007: - set @mobID, 1007; - callfunc "MobPoints"; - break; - -On1008: - set @mobID, 1008; - callfunc "MobPoints"; - break; - -On1009: - set @mobID, 1009; - callfunc "MobPoints"; - break; - -On1010: - set @mobID, 1010; - callfunc "MobPoints"; - break; - -On1011: - set @mobID, 1011; - callfunc "MobPoints"; - break; - -On1012: - set @mobID, 1012; - callfunc "MobPoints"; - break; - -On1013: - set @mobID, 1013; - callfunc "MobPoints"; - break; - -On1014: - set @mobID, 1014; - callfunc "MobPoints"; - break; - -On1017: - set @mobID, 1017; - callfunc "MobPoints"; - break; - -On1019: - set @mobID, 1019; - callfunc "MobPoints"; - break; - -On1023: - set @mobID, 1023; - callfunc "MobPoints"; - break; - -On1026: - set @mobID, 1026; - callfunc "MobPoints"; - break; - -On1035: - set @mobID, 1035; - callfunc "MobPoints"; - break; - -On2024: - set @mobID, 2024; - callfunc "MobPoints"; - break; - end; } diff --git a/npc/_import.txt b/npc/_import.txt index 1812076a..83d1389e 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -1,8 +1,8 @@ +import: npc/test/_import.txt import: npc/001-1_Tulimshar/_import.txt import: npc/001-2_Tulimshar/_import.txt import: npc/001-3_Tulimshar_arena/_import.txt import: npc/002-1_Sandstorm/_import.txt -import: npc/002-2/_import.txt import: npc/002-3_Desert_mines/_import.txt import: npc/002-4_Desert_mines/_import.txt import: npc/003-1_Beach/_import.txt -- cgit v1.2.3-60-g2f50