diff options
30 files changed, 239 insertions, 229 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf index dd3010068..2b3b2ec0b 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -5,6 +5,7 @@ map_list: ( "000-0", "000-1", "001-1", + "001-10", "001-2", "001-3-1", "001-3", diff --git a/db/map_index.txt b/db/map_index.txt index 9986c3bfb..8fac24771 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -2,119 +2,120 @@ 000-0 2 000-1 3 001-1 4 -001-2 5 -001-3-1 6 -001-3 7 -001-4 8 -001-5 9 -001-6 10 -001-7 11 -001-8 12 -001-9 13 -002-1 14 -002-2 15 -002-3 16 -002-4 17 -002-5 18 -003-0-1 19 -003-0 20 -003-1-1 21 -003-1-2 22 -003-1-3 23 -003-1 24 -003-10 25 -003-13 26 -003-2 27 -003-3 28 -003-4-1 29 -003-4 30 -003-5 31 -003-6 32 -003-7 33 -003-8 34 -004-1 35 -004-2-1 36 -004-2 37 -005-1 38 -005-2-1 39 -005-2 40 -005-3 41 -005-4 42 -005-5 43 -005-6 44 -005-7 45 -006-1 46 -007-1 47 -008-0 48 -008-1 49 -008-2 50 -009-1 51 -009-2 52 -009-3 53 -009-4 54 -009-5 55 -010-1-1 56 -010-1 57 -010-2 58 -011-1 59 -011-2 60 -012-1 61 -012-2 62 -012-3 63 -012-4 64 -012-5 65 -012-6 66 -012-7 67 -014-1 68 -014-2-1 69 -014-2 70 -014-3 71 -014-4 72 -014-5 73 -015-1 74 -015-2 75 -015-3 76 -015-4 77 -015-5 78 -015-6 79 -015-7 80 -016-1 81 -016-6 82 -016-7 83 -017-1 84 -017-2-1 85 -017-2 86 -017-3 87 -017-4 88 -017-5 89 -017-6 90 -018-1-1 91 -018-1 92 -018-2-1 93 -018-2 94 -018-3-1 95 -018-3 96 -018-4-1 97 -018-4-2 98 -018-4 99 -018-5 100 -019-1-1 101 -019-1 102 -019-2 103 -019-3 104 -020-1 105 -021-1 106 -021-2 107 -021-3 108 -021-4 109 -022-1 110 -023-1 111 -023-2 112 -024-1 113 -boss 114 -botcheck 115 -sec_pri 116 -soren-2 117 -soren 118 -test 119 -testbg 120 +001-10 5 +001-2 6 +001-3-1 7 +001-3 8 +001-4 9 +001-5 10 +001-6 11 +001-7 12 +001-8 13 +001-9 14 +002-1 15 +002-2 16 +002-3 17 +002-4 18 +002-5 19 +003-0-1 20 +003-0 21 +003-1-1 22 +003-1-2 23 +003-1-3 24 +003-1 25 +003-10 26 +003-13 27 +003-2 28 +003-3 29 +003-4-1 30 +003-4 31 +003-5 32 +003-6 33 +003-7 34 +003-8 35 +004-1 36 +004-2-1 37 +004-2 38 +005-1 39 +005-2-1 40 +005-2 41 +005-3 42 +005-4 43 +005-5 44 +005-6 45 +005-7 46 +006-1 47 +007-1 48 +008-0 49 +008-1 50 +008-2 51 +009-1 52 +009-2 53 +009-3 54 +009-4 55 +009-5 56 +010-1-1 57 +010-1 58 +010-2 59 +011-1 60 +011-2 61 +012-1 62 +012-2 63 +012-3 64 +012-4 65 +012-5 66 +012-6 67 +012-7 68 +014-1 69 +014-2-1 70 +014-2 71 +014-3 72 +014-4 73 +014-5 74 +015-1 75 +015-2 76 +015-3 77 +015-4 78 +015-5 79 +015-6 80 +015-7 81 +016-1 82 +016-6 83 +016-7 84 +017-1 85 +017-2-1 86 +017-2 87 +017-3 88 +017-4 89 +017-5 90 +017-6 91 +018-1-1 92 +018-1 93 +018-2-1 94 +018-2 95 +018-3-1 96 +018-3 97 +018-4-1 98 +018-4-2 99 +018-4 100 +018-5 101 +019-1-1 102 +019-1 103 +019-2 104 +019-3 105 +020-1 106 +021-1 107 +021-2 108 +021-3 109 +021-4 110 +022-1 111 +023-1 112 +023-2 113 +024-1 114 +boss 115 +botcheck 116 +sec_pri 117 +soren-2 118 +soren 119 +test 120 +testbg 121 diff --git a/maps/re/001-10.mcache b/maps/re/001-10.mcache Binary files differnew file mode 100644 index 000000000..4f6dde8fa --- /dev/null +++ b/maps/re/001-10.mcache diff --git a/maps/re/003-1.mcache b/maps/re/003-1.mcache Binary files differindex 4189abde3..e5c7df264 100644 --- a/maps/re/003-1.mcache +++ b/maps/re/003-1.mcache diff --git a/maps/re/005-1.mcache b/maps/re/005-1.mcache Binary files differindex 0137cc271..0bb2524bc 100644 --- a/maps/re/005-1.mcache +++ b/maps/re/005-1.mcache diff --git a/maps/re/010-1.mcache b/maps/re/010-1.mcache Binary files differindex 8ca4b70bf..269a637a0 100644 --- a/maps/re/010-1.mcache +++ b/maps/re/010-1.mcache diff --git a/npc/001-10/_import.txt b/npc/001-10/_import.txt new file mode 100644 index 000000000..9cfc26a67 --- /dev/null +++ b/npc/001-10/_import.txt @@ -0,0 +1,2 @@ +// Map 001-10: Call Of Dusty +// This file is generated automatically. All manually added changes will be removed when running the Converter. diff --git a/npc/005-1/_mobs.txt b/npc/005-1/_mobs.txt index e517b5244..62858bdea 100644 --- a/npc/005-1/_mobs.txt +++ b/npc/005-1/_mobs.txt @@ -1,10 +1,10 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 005-1: Candor Island mobs -005-1,36,40,2,1 monster Clover Field 1028,1,35000,300000 -005-1,23,56,1,0 monster Diamond Bif 1108,1,35000,250000,Rosen::OnKillMBif -005-1,63,84,7,6 monster Maggot 1030,9,35000,300000,Trainer::OnKillMaggot -005-1,82,87,8,9 monster Candor Scorpion 1073,7,35000,300000,Trainer::OnKillCandorScorpion -005-1,36,105,6,3 monster Piou 1002,1,35000,300000 -005-1,80,33,16,15 monster Candor Scorpion 1073,12,35000,300000,Trainer::OnKillCandorScorpion -005-1,71,39,28,10 monster Mana Bug 1075,5,35000,300000,Trainer::OnKillManaBug -005-1,30,39,12,14 monster Scorpion 1071,2,35000,300000,Trainer::OnKillScorpion +005-1,43,50,2,1 monster Clover Field 1028,1,35000,300000 +005-1,30,66,1,0 monster Diamond Bif 1108,1,35000,250000,Rosen::OnKillMBif +005-1,70,94,7,6 monster Maggot 1030,9,35000,300000,Trainer::OnKillMaggot +005-1,89,97,8,9 monster Candor Scorpion 1073,7,35000,300000,Trainer::OnKillCandorScorpion +005-1,43,115,6,3 monster Piou 1002,1,35000,300000 +005-1,87,43,16,15 monster Candor Scorpion 1073,12,35000,300000,Trainer::OnKillCandorScorpion +005-1,78,49,28,10 monster Mana Bug 1075,5,35000,300000,Trainer::OnKillManaBug +005-1,37,49,12,14 monster Scorpion 1071,2,35000,300000,Trainer::OnKillScorpion diff --git a/npc/005-1/_warps.txt b/npc/005-1/_warps.txt index 48e3eb000..70bb147a1 100644 --- a/npc/005-1/_warps.txt +++ b/npc/005-1/_warps.txt @@ -1,8 +1,8 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 005-1: Candor Island warps -005-1,31,79,0 warp #005-1_31_79 0,0,005-2,33,42 -005-1,34,74,0 warp #005-1_34_74 0,0,005-3,25,42 -005-1,48,70,0 warp #005-1_48_70 0,0,005-4,25,42 -005-1,39,68,0 warp #005-1_39_68 0,0,005-5,25,41 -005-1,22,90,0 warp #005-1_22_90 0,0,005-7,45,37 -005-1,43,75,0 warp #005-1_43_75 0,0,005-6,33,42 +005-1,38,89,0 warp #005-1_38_89 0,0,005-2,33,42 +005-1,41,84,0 warp #005-1_41_84 0,0,005-3,25,42 +005-1,55,80,0 warp #005-1_55_80 0,0,005-4,25,42 +005-1,46,78,0 warp #005-1_46_78 0,0,005-5,25,41 +005-1,29,100,0 warp #005-1_29_100 0,0,005-7,45,37 +005-1,50,85,0 warp #005-1_50_85 0,0,005-6,33,42 diff --git a/npc/005-1/ayasha.txt b/npc/005-1/ayasha.txt index a0dcc76c7..a55d3bee7 100644 --- a/npc/005-1/ayasha.txt +++ b/npc/005-1/ayasha.txt @@ -13,7 +13,7 @@ // 3: Found all kids // 4: Reward given -005-1,52,81,0 script Ayasha NPC_HUMAN_FEMALE_NOOB,{ +005-1,59,91,0 script Ayasha NPC_HUMAN_FEMALE_NOOB,{ showavatar NPC_HUMAN_FEMALE_NOOB; // this is handled by avatars.xml if (strcharinfo(2) == "Monster King" && is_admin()) goto L_MKControl; @@ -135,15 +135,15 @@ L_MKSmall: disablenpc("Mana Stone"); pvpon("005-1"); announce(l("##1WARNING! WARNING! Siege starting at Candor!!"), bc_all); - areamonster("005-1", 0, 0, 105, 105, l("Black Scorpion"), BlackScorpion, 1, "Ayasha::OnBlackScorpionDeath"); - areamonster("005-1", 0, 0, 105, 105, ("House Maggot"), HouseMaggot, 3, "Ayasha::OnHouseMaggotDeath"); + areamonster("005-1", 0, 0, 125, 125, l("Black Scorpion"), BlackScorpion, 1, "Ayasha::OnBlackScorpionDeath"); + areamonster("005-1", 0, 0, 125, 125, ("House Maggot"), HouseMaggot, 3, "Ayasha::OnHouseMaggotDeath"); initnpctimer; close; OnBlackScorpionDeath: dispbottom "BSD"; - areamonster("005-1", 0, 0, 105, 105, l("Black Scorpion"), BlackScorpion, 1, "Ayasha::OnBlackScorpionDeath"); + areamonster("005-1", 0, 0, 125, 125, l("Black Scorpion"), BlackScorpion, 1, "Ayasha::OnBlackScorpionDeath"); if (rand(10000) <= 900) getitem StrangeCoin, 1; debugmes "BSD OK"; @@ -151,7 +151,7 @@ OnBlackScorpionDeath: OnManaGhostDeath: dispbottom "MGD"; - areamonster("005-1", 0, 0, 105, 105, l("Mana Ghost"), ManaGhost, 1, "Ayasha::OnManaGhostDeath"); + areamonster("005-1", 0, 0, 125, 125, l("Mana Ghost"), ManaGhost, 1, "Ayasha::OnManaGhostDeath"); if (rand(10000) <= 500) getitem StrangeCoin, 1; debugmes "MGD OK"; @@ -159,7 +159,7 @@ OnManaGhostDeath: OnHouseMaggotDeath: dispbottom "HMD"; - areamonster("005-1", 0, 0, 105, 105, l("House Maggot"), ManaGhost, 1, "Ayasha::OnHouseMaggotDeath"); + areamonster("005-1", 0, 0, 125, 125, l("House Maggot"), ManaGhost, 1, "Ayasha::OnHouseMaggotDeath"); if (rand(10000) <= 400) getitem StrangeCoin, 1; debugmes "HMD OK"; @@ -167,8 +167,8 @@ OnHouseMaggotDeath: OnTimer5000: - areamonster("005-1", 0, 0, 105, 105, "Black Scorpion", BlackScorpion, 1, "Ayasha::OnBlackScorpionDeath"); - areamonster("005-1", 0, 0, 105, 105, ("House Maggot"), HouseMaggot, 10, "Ayasha::OnHouseMaggotDeath"); + areamonster("005-1", 0, 0, 125, 125, "Black Scorpion", BlackScorpion, 1, "Ayasha::OnBlackScorpionDeath"); + areamonster("005-1", 0, 0, 125, 125, ("House Maggot"), HouseMaggot, 10, "Ayasha::OnHouseMaggotDeath"); mapannounce("003-1", "##2Message to all Candor NPCs: Take shelter!", bc_map); disablenpc "Ayasha"; disablenpc "Charda"; @@ -193,9 +193,9 @@ OnTimer5000: end; OnTimer60000: - areamonster("005-1", 0, 0, 105, 105, "Black Scorpion", BlackScorpion, 1, "Ayasha::OnBlackScorpionDeath"); - areamonster("005-1", 0, 0, 105, 105, ("Mana Ghost"), ManaGhost, 3, "Ayasha::OnManaGhostDeath"); - areamonster("005-1", 0, 0, 105, 105, ("House Maggot"), HouseMaggot, 5, "Ayasha::OnHouseMaggotDeath"); + areamonster("005-1", 0, 0, 125, 125, "Black Scorpion", BlackScorpion, 1, "Ayasha::OnBlackScorpionDeath"); + areamonster("005-1", 0, 0, 125, 125, ("Mana Ghost"), ManaGhost, 3, "Ayasha::OnManaGhostDeath"); + areamonster("005-1", 0, 0, 125, 125, ("House Maggot"), HouseMaggot, 5, "Ayasha::OnHouseMaggotDeath"); end; OnTimer120000: @@ -205,16 +205,16 @@ OnTimer300000: OnTimer360000: OnTimer420000: OnTimer480000: - areamonster("005-1", 0, 0, 105, 105, ("Slime Blast"), 1090, 1); - areamonster("005-1", 0, 0, 105, 105, ("Mana Ghost"), ManaGhost, 1, "Ayasha::OnManaGhostDeath"); - areamonster("005-1", 0, 0, 105, 105, ("House Maggot"), HouseMaggot, 1, "Ayasha::OnHouseMaggotDeath"); + areamonster("005-1", 0, 0, 125, 125, ("Slime Blast"), 1090, 1); + areamonster("005-1", 0, 0, 125, 125, ("Mana Ghost"), ManaGhost, 1, "Ayasha::OnManaGhostDeath"); + areamonster("005-1", 0, 0, 125, 125, ("House Maggot"), HouseMaggot, 1, "Ayasha::OnHouseMaggotDeath"); end; OnTimer540000: mapannounce("005-1", "##1The Monster Army is getting tired of resistance!", bc_map); - areamonster("005-1", 0, 0, 105, 105, ("Slime Blast"), 1090, 5); - areamonster("005-1", 0, 0, 105, 105, ("Mana Ghost"), ManaGhost, 1, "Ayasha::OnManaGhostDeath"); - areamonster("005-1", 0, 0, 105, 105, ("House Maggot"), HouseMaggot, 1, "Ayasha::OnHouseMaggotDeath"); + areamonster("005-1", 0, 0, 125, 125, ("Slime Blast"), 1090, 5); + areamonster("005-1", 0, 0, 125, 125, ("Mana Ghost"), ManaGhost, 1, "Ayasha::OnManaGhostDeath"); + areamonster("005-1", 0, 0, 125, 125, ("House Maggot"), HouseMaggot, 1, "Ayasha::OnHouseMaggotDeath"); end; OnTimer600000: @@ -300,7 +300,7 @@ L_Already: return; } -005-1,69,90,0 script Charda NPC_CHILD8,{ +005-1,76,100,0 script Charda NPC_CHILD8,{ @kids = 0; if (getq(CandorQuest_HAS) == 2) { @@ -317,7 +317,7 @@ OnInit: .distance = 1; end; } -005-1,23,84,0 script Faris NPC_CHILD7,{ +005-1,30,94,0 script Faris NPC_CHILD7,{ @kids = 1; if (getq(CandorQuest_HAS) == 2) { @@ -332,7 +332,7 @@ OnInit: .distance = 1; end; } -005-1,84,21,0 script Ghada NPC_CHILD5,{ +005-1,91,31,0 script Ghada NPC_CHILD5,{ @kids = 2; if (getq(CandorQuest_HAS) == 2) { @@ -347,7 +347,7 @@ OnInit: .distance = 1; end; } -005-1,38,58,0 script Latif NPC_HUMAN_M_ARTIS,{ +005-1,45,68,0 script Latif NPC_HUMAN_M_ARTIS,{ @kids = 3; if (getq(CandorQuest_HAS) == 2) { @@ -362,7 +362,7 @@ OnInit: .distance = 1; end; } -005-1,18,43,0 script Rasin NPC_CHILD3,{ +005-1,25,53,0 script Rasin NPC_CHILD3,{ @kids = 4; if (getq(CandorQuest_HAS) == 2) { @@ -377,7 +377,7 @@ OnInit: .distance = 1; end; } -005-1,38,65,0 script Lilly NPC_CHILD6,{ +005-1,45,75,0 script Lilly NPC_CHILD6,{ @kids = 5; if (getq(CandorQuest_HAS) == 2) { @@ -393,7 +393,7 @@ OnInit: end; } -005-1,53,81,0 script AyashaDebug NPC_MONA,{ +005-1,60,91,0 script AyashaDebug NPC_MONA,{ showavatar NPC_MONA; // this is handled by avatars.xml mesn; mesq l("Reset?"); diff --git a/npc/005-1/liana.txt b/npc/005-1/liana.txt index e6f70c492..839121588 100644 --- a/npc/005-1/liana.txt +++ b/npc/005-1/liana.txt @@ -10,7 +10,7 @@ // a place to run, or maybe monsters there are natural and protect them from the // Mana Monsters, etc. -005-1,47,86,0 script Liana NPC_ELVEN_FEMALE,{ +005-1,54,96,0 script Liana NPC_ELVEN_FEMALE,{ mesn; //mesq l("Hurnscald is a large city. I'm sure glad I live in Candor because I know where everything's at."); diff --git a/npc/005-1/maya.txt b/npc/005-1/maya.txt index 32f7bba65..7f9537bf8 100644 --- a/npc/005-1/maya.txt +++ b/npc/005-1/maya.txt @@ -13,7 +13,7 @@ // 04 Second quest completed: Reward 700 GP (precise calculation) // 05 wolvern tooth +20k + 2000monster point ->claw pendant -005-1,42,37,0 script Maya NPC_RAIJIN_FEMALE_LEGION_ARTIS,{ +005-1,49,47,0 script Maya NPC_RAIJIN_FEMALE_LEGION_ARTIS,{ .@maya = getq(CandorQuest_Maya); if (.@maya == 0) diff --git a/npc/005-1/sailors.txt b/npc/005-1/sailors.txt index eafad9b98..b29c4afe2 100644 --- a/npc/005-1/sailors.txt +++ b/npc/005-1/sailors.txt @@ -10,7 +10,7 @@ // 2: Invite Elmo // 3: Completed -005-1,95,99,0 script Sailors#005-1 NPC_ELVEN_MAN_TRADER_SITTING,{ +005-1,102,109,0 script Sailors#005-1 NPC_ELVEN_MAN_TRADER_SITTING,{ .@q = getq(CandorQuest_Sailors); if (.@q == 1) goto L_Report; diff --git a/npc/005-1/ship.txt b/npc/005-1/ship.txt index 929d5a73c..3b333be05 100644 --- a/npc/005-1/ship.txt +++ b/npc/005-1/ship.txt @@ -4,7 +4,7 @@ // Description: // This script controls access to Nard's Ship, fixing variables. -005-1,43,107,0 script CandorShip NPC_HIDDEN,0,0,{ +005-1,50,117,0 script CandorShip NPC_HIDDEN,0,0,{ OnTouch: LOCATION$="Candor"; diff --git a/npc/005-1/soul-menhir.txt b/npc/005-1/soul-menhir.txt index ce2c070a8..b3684e8e5 100644 --- a/npc/005-1/soul-menhir.txt +++ b/npc/005-1/soul-menhir.txt @@ -4,10 +4,10 @@ // Description: // Soul Menhir -005-1,29,92,0 script Soul Menhir#candor NPC_SOUL_MOSS,{ +005-1,36,102,0 script Soul Menhir#candor NPC_SOUL_MOSS,{ @map$ = "005-1"; - setarray @Xs, 27, 28, 27, 28, 27, 28, 28; - setarray @Ys, 91, 92, 93, 91, 92, 93, 92; + setarray @Xs, 34, 35, 34, 35, 34, 35, 35; + setarray @Ys, 101, 102, 103, 101, 102, 103, 102; @x = 0; @y = 0; callfunc "SoulMenhir"; diff --git a/npc/005-1/vincent.txt b/npc/005-1/vincent.txt index 6d89ee983..57d9a5546 100644 --- a/npc/005-1/vincent.txt +++ b/npc/005-1/vincent.txt @@ -5,7 +5,7 @@ // CandorQuest_Vincent - quest var -005-1,92,95,0 script Vincent NPC_PLAYER,{ +005-1,99,105,0 script Vincent NPC_PLAYER,{ .LegsID = BugLeg; diff --git a/npc/005-1/warpcandorbattle.txt b/npc/005-1/warpcandorbattle.txt index 67dc0a00f..fe3c5cc86 100644 --- a/npc/005-1/warpcandorbattle.txt +++ b/npc/005-1/warpcandorbattle.txt @@ -3,7 +3,7 @@ // Crazyfefe // Jesusalva -005-1,59,52,0 script Magic Barrier NPC_HIDDEN,0,0,{ +005-1,66,62,0 script Magic Barrier NPC_HIDDEN,0,0,{ end; OnTouch: diff --git a/npc/005-1/wateranimation.txt b/npc/005-1/wateranimation.txt index cadd5e85d..109cee78a 100644 --- a/npc/005-1/wateranimation.txt +++ b/npc/005-1/wateranimation.txt @@ -4,7 +4,7 @@ // Description: // Water animations, splash, fishes, etc... -005-1,74,52,0 script #water_animation_candor0 NPC_WATER_SPLASH,{ +005-1,81,62,0 script #water_animation_candor0 NPC_WATER_SPLASH,{ fishing; // begin or continue fishing close; @@ -31,13 +31,13 @@ OnInit: end; } -005-1,77,56,0 duplicate(#water_animation_candor0) #water_animation_candor1 NPC_WATER_SPLASH -005-1,67,56,0 duplicate(#water_animation_candor0) #water_animation_candor2 NPC_WATER_SPLASH -005-1,69,60,0 duplicate(#water_animation_candor0) #water_animation_candor3 NPC_WATER_SPLASH -005-1,72,61,0 duplicate(#water_animation_candor0) #water_animation_candor4 NPC_WATER_SPLASH -005-1,71,52,0 duplicate(#water_animation_candor0) #water_animation_candor5 NPC_WATER_SPLASH -005-1,48,51,0 duplicate(#water_animation_candor0) #water_animation_candor6 NPC_WATER_SPLASH -005-1,42,54,0 duplicate(#water_animation_candor0) #water_animation_candor7 NPC_WATER_SPLASH -005-1,49,55,0 duplicate(#water_animation_candor0) #water_animation_candor8 NPC_WATER_SPLASH -005-1,41,56,0 duplicate(#water_animation_candor0) #water_animation_candor9 NPC_WATER_SPLASH +005-1,84,66,0 duplicate(#water_animation_candor0) #water_animation_candor1 NPC_WATER_SPLASH +005-1,74,66,0 duplicate(#water_animation_candor0) #water_animation_candor2 NPC_WATER_SPLASH +005-1,76,70,0 duplicate(#water_animation_candor0) #water_animation_candor3 NPC_WATER_SPLASH +005-1,79,71,0 duplicate(#water_animation_candor0) #water_animation_candor4 NPC_WATER_SPLASH +005-1,78,62,0 duplicate(#water_animation_candor0) #water_animation_candor5 NPC_WATER_SPLASH +005-1,55,61,0 duplicate(#water_animation_candor0) #water_animation_candor6 NPC_WATER_SPLASH +005-1,49,64,0 duplicate(#water_animation_candor0) #water_animation_candor7 NPC_WATER_SPLASH +005-1,56,65,0 duplicate(#water_animation_candor0) #water_animation_candor8 NPC_WATER_SPLASH +005-1,48,66,0 duplicate(#water_animation_candor0) #water_animation_candor9 NPC_WATER_SPLASH diff --git a/npc/005-1/zegas.txt b/npc/005-1/zegas.txt index 75d3a45bb..fdddf60f7 100644 --- a/npc/005-1/zegas.txt +++ b/npc/005-1/zegas.txt @@ -1,5 +1,10 @@ -//TMW2 Scrit -005-1,35,77,0 script Zegas NPC_MONA,{ +// TMW2 Script +// Author: +// Unknown +// Description: +// Saxso's widow. Asks new players to trigger a bug bomb on the storehouse. + +005-1,42,87,0 script Zegas NPC_MONA,{ .ItemCreate = CandorShorts; .@q = getq(CandorQuest_Barrel); if (BaseLevel < 5) diff --git a/npc/005-2/_warps.txt b/npc/005-2/_warps.txt index 430abf8e4..35e443619 100644 --- a/npc/005-2/_warps.txt +++ b/npc/005-2/_warps.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 005-2: Saxso's House warps -005-2,33,43,0 warp #005-2_33_43 0,0,005-1,31,80 +005-2,33,43,0 warp #005-2_33_43 0,0,005-1,38,90 diff --git a/npc/005-3/_mobs.txt b/npc/005-3/_mobs.txt index c2cfcaa6f..4ab4a44fd 100644 --- a/npc/005-3/_mobs.txt +++ b/npc/005-3/_mobs.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 005-3: Storage House mobs -005-3,34,37,10,3 monster House Maggot 1084,8,40000,300000,Trainer::OnKillHouseMaggot +005-3,34,37,10,3 monster House Maggot 1084,6,40000,300000,Trainer::OnKillHouseMaggot diff --git a/npc/005-3/_warps.txt b/npc/005-3/_warps.txt index 6fb61c763..93f150362 100644 --- a/npc/005-3/_warps.txt +++ b/npc/005-3/_warps.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 005-3: Storage House warps -005-3,25,43,0 warp #005-3_25_43 0,0,005-1,34,75 +005-3,25,43,0 warp #005-3_25_43 0,0,005-1,41,85 diff --git a/npc/005-4/_warps.txt b/npc/005-4/_warps.txt index 78e6d570c..21addc176 100644 --- a/npc/005-4/_warps.txt +++ b/npc/005-4/_warps.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 005-4: Armor Shop warps -005-4,25,43,0 warp #005-4_25_43 0,0,005-1,48,71 +005-4,25,43,0 warp #005-4_25_43 0,0,005-1,55,81 diff --git a/npc/005-5/_warps.txt b/npc/005-5/_warps.txt index b1f28d480..12df5de66 100644 --- a/npc/005-5/_warps.txt +++ b/npc/005-5/_warps.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 005-5: Candor Bank warps -005-5,25,43,0 warp #005-5_25_43 0,0,005-1,39,69 +005-5,25,43,0 warp #005-5_25_43 0,0,005-1,46,79 diff --git a/npc/005-6/_warps.txt b/npc/005-6/_warps.txt index 2ac22ab7d..545f754b7 100644 --- a/npc/005-6/_warps.txt +++ b/npc/005-6/_warps.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 005-6: Candor Magic House warps -005-6,33,43,0 warp #005-6_33_43 0,0,005-1,43,76 +005-6,33,43,0 warp #005-6_33_43 0,0,005-1,50,86 diff --git a/npc/005-7/_warps.txt b/npc/005-7/_warps.txt index 16e673c26..182902dd6 100644 --- a/npc/005-7/_warps.txt +++ b/npc/005-7/_warps.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 005-7: Training House warps -005-7,45,38,0 warp #005-7_45_38 0,0,005-1,22,91 +005-7,45,38,0 warp #005-7_45_38 0,0,005-1,29,101 diff --git a/npc/006-1/barrier.txt b/npc/006-1/barrier.txt index 99598d9cc..bbf8a102b 100644 --- a/npc/006-1/barrier.txt +++ b/npc/006-1/barrier.txt @@ -5,7 +5,7 @@ 006-1,49,54,0 script #FightCaveBarrier NPC_NO_SPRITE,0,0,{ if ($@FEFE_CAVE_LEVEL) goto L_Block; - warp "005-1", 59, 53; + warp "005-1", 66, 63; end; L_Block: diff --git a/npc/010-1/_mobs.txt b/npc/010-1/_mobs.txt index bb9ac2b30..48012a793 100644 --- a/npc/010-1/_mobs.txt +++ b/npc/010-1/_mobs.txt @@ -1,20 +1,20 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 010-1: Desert Mountains mobs -010-1,105,87,9,4 monster Desert Maggot 1083,12,35000,150000 -010-1,65,95,4,4 monster Scorpion 1071,8,35000,150000 -010-1,48,80,4,4 monster Scorpion 1071,6,35000,150000 -010-1,60,55,9,4 monster Sarracenus 1125,2,35000,300000 -010-1,56,98,9,4 monster Desert Maggot 1083,12,35000,150000 -010-1,88,74,3,8 monster Mountain Snake 1123,3,35000,300000 -010-1,103,27,3,8 monster Mountain Snake 1123,3,35000,300000 -010-1,120,30,3,2 monster Desert Bandit 1124,1,35000,300000 -010-1,115,45,3,2 monster Desert Bandit 1124,2,35000,300000 -010-1,53,85,3,2 monster Desert Bandit 1124,2,35000,300000 -010-1,93,77,6,5 monster Sarracenus 1125,2,35000,300000 -010-1,78,95,6,5 monster Sarracenus 1125,1,35000,300000 -010-1,75,43,6,5 monster Sarracenus 1125,1,35000,300000 -010-1,100,67,8,2 monster Snake 1122,12,35000,300000 -010-1,59,93,8,2 monster Snake 1122,2,35000,300000 -010-1,74,43,17,3 monster Snake 1122,4,35000,300000 -010-1,110,34,8,2 monster Desert Maggot 1083,10,35000,300000 -010-1,81,55,39,39 monster Desert Maggot 1083,60,35000,150000 +010-1,105,89,9,4 monster Desert Maggot 1083,12,35000,150000 +010-1,65,97,4,4 monster Scorpion 1071,8,35000,150000 +010-1,48,82,4,4 monster Scorpion 1071,6,35000,150000 +010-1,60,57,9,4 monster Sarracenus 1125,2,35000,300000 +010-1,56,100,9,4 monster Desert Maggot 1083,12,35000,150000 +010-1,88,76,3,8 monster Mountain Snake 1123,3,35000,300000 +010-1,103,29,3,8 monster Mountain Snake 1123,3,35000,300000 +010-1,120,32,3,2 monster Desert Bandit 1124,1,35000,300000 +010-1,115,47,3,2 monster Desert Bandit 1124,2,35000,300000 +010-1,53,87,3,2 monster Desert Bandit 1124,2,35000,300000 +010-1,93,79,6,5 monster Sarracenus 1125,2,35000,300000 +010-1,78,97,6,5 monster Sarracenus 1125,1,35000,300000 +010-1,75,45,6,5 monster Sarracenus 1125,1,35000,300000 +010-1,100,69,8,2 monster Snake 1122,12,35000,300000 +010-1,59,95,8,2 monster Snake 1122,2,35000,300000 +010-1,74,45,17,3 monster Snake 1122,4,35000,300000 +010-1,110,36,8,2 monster Desert Maggot 1083,10,35000,300000 +010-1,81,57,39,39 monster Desert Maggot 1083,60,35000,150000 diff --git a/npc/010-1/_warps.txt b/npc/010-1/_warps.txt index f345991fa..8b5d85c76 100644 --- a/npc/010-1/_warps.txt +++ b/npc/010-1/_warps.txt @@ -1,30 +1,30 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 010-1: Desert Mountains warps -010-1,92,17,0 warp #010-1_92_17 0,0,004-1,33,110 -010-1,89,27,0 warp #010-1_89_27 0,0,004-1,33,110 -010-1,96,30,0 warp #010-1_96_30 0,0,010-1-1,85,99 -010-1,87,36,0 warp #010-1_87_36 0,0,010-1-1,178,84 -010-1,62,54,0 warp #010-1_62_54 0,0,010-1-1,43,19 -010-1,52,50,0 warp #010-1_52_50 0,0,010-1-1,27,70 -010-1,47,48,0 warp #010-1_47_48 0,0,004-1,33,110 -010-1,50,63,0 warp #010-1_50_63 0,0,004-1,33,110 -010-1,45,70,0 warp #010-1_45_70 0,0,010-1-1,34,31 -010-1,59,76,0 warp #010-1_59_76 0,0,004-1,33,110 -010-1,53,90,0 warp #010-1_53_90 0,0,010-1-1,30,38 -010-1,81,88,0 warp #010-1_81_88 0,0,010-1-1,31,114 -010-1,78,80,0 warp #010-1_78_80 0,0,004-1,33,110 -010-1,65,73,0 warp #010-1_65_73 0,0,004-1,33,110 -010-1,122,89,0 warp #010-1_122_89 0,0,004-1,33,110 -010-1,110,81,0 warp #010-1_110_81 0,0,010-1-1,163,106 -010-1,93,66,0 warp #010-1_93_66 0,0,004-2-1,25,46 -010-1,76,66,0 warp #010-1_76_66 0,0,010-1-1,77,73 -010-1,68,60,0 warp #010-1_68_60 0,0,004-1,33,110 -010-1,75,52,0 warp #010-1_75_52 0,0,004-1,33,110 -010-1,126,60,0 warp #010-1_126_60 0,0,004-1,33,110 -010-1,88,48,0 warp #010-1_88_48 0,0,004-1,33,110 -010-1,92,45,0 warp #010-1_92_45 0,0,004-1,33,110 -010-1,108,38,0 warp #010-1_108_38 0,0,004-1,33,110 -010-1,124,24,0 warp #010-1_124_24 0,0,010-2,95,125 -010-1,105,27,0 warp #010-1_105_27 0,0,010-1-1,112,41 -010-1,42,32,0 warp #010-1_42_32 0,0,010-1-1,43,19 -010-1,46,26,0 warp #010-1_46_26 0,0,004-1,33,110 +010-1,92,19,0 warp #010-1_92_19 0,0,004-1,33,110 +010-1,89,29,0 warp #010-1_89_29 0,0,004-1,33,110 +010-1,96,32,0 warp #010-1_96_32 0,0,010-1-1,85,99 +010-1,87,38,0 warp #010-1_87_38 0,0,010-1-1,178,84 +010-1,62,56,0 warp #010-1_62_56 0,0,010-1-1,43,19 +010-1,52,52,0 warp #010-1_52_52 0,0,010-1-1,27,70 +010-1,47,50,0 warp #010-1_47_50 0,0,004-1,33,110 +010-1,50,65,0 warp #010-1_50_65 0,0,004-1,33,110 +010-1,45,72,0 warp #010-1_45_72 0,0,010-1-1,34,31 +010-1,59,78,0 warp #010-1_59_78 0,0,004-1,33,110 +010-1,53,92,0 warp #010-1_53_92 0,0,010-1-1,30,38 +010-1,81,90,0 warp #010-1_81_90 0,0,010-1-1,31,114 +010-1,78,82,0 warp #010-1_78_82 0,0,004-1,33,110 +010-1,65,75,0 warp #010-1_65_75 0,0,004-1,33,110 +010-1,122,91,0 warp #010-1_122_91 0,0,004-1,33,110 +010-1,110,83,0 warp #010-1_110_83 0,0,010-1-1,163,106 +010-1,93,68,0 warp #010-1_93_68 0,0,004-2-1,25,46 +010-1,76,68,0 warp #010-1_76_68 0,0,010-1-1,77,73 +010-1,68,62,0 warp #010-1_68_62 0,0,004-1,33,110 +010-1,75,54,0 warp #010-1_75_54 0,0,004-1,33,110 +010-1,126,62,0 warp #010-1_126_62 0,0,004-1,33,110 +010-1,88,50,0 warp #010-1_88_50 0,0,004-1,33,110 +010-1,92,47,0 warp #010-1_92_47 0,0,004-1,33,110 +010-1,108,40,0 warp #010-1_108_40 0,0,004-1,33,110 +010-1,124,26,0 warp #010-1_124_26 0,0,010-2,95,125 +010-1,105,29,0 warp #010-1_105_29 0,0,010-1-1,112,41 +010-1,42,34,0 warp #010-1_42_34 0,0,010-1-1,43,19 +010-1,46,28,0 warp #010-1_46_28 0,0,004-1,33,110 diff --git a/npc/_import.txt b/npc/_import.txt index f5e4e2aef..1de462e21 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -4,6 +4,7 @@ @include "npc/000-0/_import.txt" @include "npc/000-1/_import.txt" @include "npc/001-1/_import.txt" +@include "npc/001-10/_import.txt" @include "npc/001-2/_import.txt" @include "npc/001-3-1/_import.txt" @include "npc/001-3/_import.txt" |