diff options
author | Reid <reidyaro@gmail.com> | 2012-11-19 18:27:18 +0100 |
---|---|---|
committer | Reid <reidyaro@gmail.com> | 2012-11-19 18:27:18 +0100 |
commit | ea30beddf6803a892cf101d8d0f0dcf0a6985033 (patch) | |
tree | b7944d6c1c8eaea0cbddb085ed4fa99e0ce81e89 | |
parent | 7bc9e612d093481ea7753bb200caf84abcc34991 (diff) | |
download | serverdata-ea30beddf6803a892cf101d8d0f0dcf0a6985033.tar.gz serverdata-ea30beddf6803a892cf101d8d0f0dcf0a6985033.tar.bz2 serverdata-ea30beddf6803a892cf101d8d0f0dcf0a6985033.tar.xz serverdata-ea30beddf6803a892cf101d8d0f0dcf0a6985033.zip |
Update 000-2-1 map,
Add +10 offsetX to every scripts which rely to the 000-2-1 map.
-rw-r--r-- | data/000-2-1.wlk | bin | 4901 -> 5491 bytes | |||
-rw-r--r-- | npc/000-2-0/_warps.txt | 2 | ||||
-rw-r--r-- | npc/000-2-1/_mobs.txt | 2 | ||||
-rw-r--r-- | npc/000-2-1/_warps.txt | 2 | ||||
-rw-r--r-- | npc/000-2-1/alige.txt | 4 | ||||
-rw-r--r-- | npc/000-2-1/arpan.txt | 18 | ||||
-rw-r--r-- | npc/000-2-1/chefgado.txt | 2 | ||||
-rw-r--r-- | npc/000-2-1/chest.txt | 2 | ||||
-rw-r--r-- | npc/000-2-1/dan.txt | 2 | ||||
-rw-r--r-- | npc/000-2-1/devis.txt | 2 | ||||
-rw-r--r-- | npc/000-2-1/hammock.txt | 16 | ||||
-rw-r--r-- | npc/000-2-1/knife.txt | 2 | ||||
-rw-r--r-- | npc/000-2-1/peter.txt | 10 | ||||
-rw-r--r-- | npc/000-2-1/q'onan.txt | 2 | ||||
-rw-r--r-- | npc/000-2-1/savepoint.txt | 16 | ||||
-rw-r--r-- | npc/000-2-2/doors.txt | 2 |
16 files changed, 42 insertions, 42 deletions
diff --git a/data/000-2-1.wlk b/data/000-2-1.wlk Binary files differindex 3e190dd32..2ffb13804 100644 --- a/data/000-2-1.wlk +++ b/data/000-2-1.wlk diff --git a/npc/000-2-0/_warps.txt b/npc/000-2-0/_warps.txt index dff86b6d9..3d2a10ebb 100644 --- a/npc/000-2-0/_warps.txt +++ b/npc/000-2-0/_warps.txt @@ -1,3 +1,3 @@ // 000-2-0 warps -000-2-0.gat,30,25 warp ToLevel1 -1,-1,000-2-1.gat,61,29 +000-2-0.gat,30,25 warp ToLevel1 -1,-1,000-2-1.gat,71,29 diff --git a/npc/000-2-1/_mobs.txt b/npc/000-2-1/_mobs.txt index 4db3bb26b..bfffe744c 100644 --- a/npc/000-2-1/_mobs.txt +++ b/npc/000-2-1/_mobs.txt @@ -1,3 +1,3 @@ // 000-2-1 mobs -000-2-1.gat,41,32,41,19 monster Piou 1002,3,30000,20000 +000-2-1.gat,61,32,41,19 monster Piou 1002,3,30000,20000 diff --git a/npc/000-2-1/_warps.txt b/npc/000-2-1/_warps.txt index 390caf7d8..4dc56dab0 100644 --- a/npc/000-2-1/_warps.txt +++ b/npc/000-2-1/_warps.txt @@ -1,3 +1,3 @@ // 000-2-1 warps -000-2-1.gat,61,30 warp ToLevel0 -1,-1,000-2-0.gat,30,26 +000-2-1.gat,71,30 warp ToLevel0 -1,-1,000-2-0.gat,30,26 diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt index 5ebc5f24b..571070e68 100644 --- a/npc/000-2-1/alige.txt +++ b/npc/000-2-1/alige.txt @@ -15,7 +15,7 @@ // 2 Accept the task. // 3 Bring first food. -000-2-1.gat,33,32,0,1 script AligeTrigger 0,1,1,{ +000-2-1.gat,43,32,0,1 script AligeTrigger 0,1,1,{ OnTouch: if (getq(ShipQuests_Alige) > 0) close; @@ -46,7 +46,7 @@ OnTimer190: } -000-2-1.gat,33,31,0,1 script Alige 301;2,{ +000-2-1.gat,43,31,0,1 script Alige 301;2,{ set @q, getq(ShipQuests_Alige); if (@q > 1) goto l_AskForFood; diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt index d2420c5b0..b4664bf25 100644 --- a/npc/000-2-1/arpan.txt +++ b/npc/000-2-1/arpan.txt @@ -15,7 +15,7 @@ // 11 Need to see Julia // 12 Has been registered by Julia -000-2-1.gat,39,36,0,1 script LeftDoorCheck 0,0,0,{ +000-2-1.gat,49,36,0,1 script LeftDoorCheck 0,0,0,{ set @q, getq(ShipQuests_Arpan); if (@q == 0) doevent "Magic Arpan::OnTalk"; @@ -23,7 +23,7 @@ } -000-2-1.gat,44,36,0,1 script RightDoorCheck 0,0,0,{ +000-2-1.gat,54,36,0,1 script RightDoorCheck 0,0,0,{ set @q, getq(ShipQuests_Arpan); if (@q == 0) doevent "Magic Arpan::OnTalk"; @@ -31,20 +31,20 @@ } -000-2-1.gat,37,32,0,1 script LeftBarrierCheck 0,0,2,{ +000-2-1.gat,47,32,0,1 script LeftBarrierCheck 0,0,2,{ set @q, getq(ShipQuests_Arpan); if (@q > 2) close; if (@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto l_EquipDone; if (@q == 1) goto l_GetCloth; doevent "Magic Arpan::OnClothNotTaken"; - warp "000-2-1.gat", 39, 32; + warp "000-2-1.gat", 49, 32; doevent "Magic Arpan::OnEquip"; close; l_GetCloth: - warp "000-2-1.gat", 39, 32; + warp "000-2-1.gat", 49, 32; doevent "Magic Arpan::OnClothNotTaken"; close; @@ -56,20 +56,20 @@ l_EquipDone: } -000-2-1.gat,46,32,0,1 script RightBarrierCheck 0,0,2,{ +000-2-1.gat,56,32,0,1 script RightBarrierCheck 0,0,2,{ set @q, getq(ShipQuests_Arpan); if (@q > 2) close; if (@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto l_EquipDone; if (@q == 1) goto l_GetCloth; doevent "Magic Arpan::OnClothNotTaken"; - warp "000-2-1.gat", 45, 32; + warp "000-2-1.gat", 55, 32; doevent "Magic Arpan::OnEquip"; close; l_GetCloth: - warp "000-2-1.gat", 45, 32; + warp "000-2-1.gat", 55, 32; doevent "Magic Arpan::OnClothNotTaken"; close; @@ -81,7 +81,7 @@ l_EquipDone: } -000-2-1.gat,39,33,0,1 script Magic Arpan 307;5,{ +000-2-1.gat,49,33,0,1 script Magic Arpan 307;5,{ set @q, getq(ShipQuests_Arpan); set @q_julia, getq(ShipQuests_Julia); diff --git a/npc/000-2-1/chefgado.txt b/npc/000-2-1/chefgado.txt index e7ff5ec52..22f711a7f 100644 --- a/npc/000-2-1/chefgado.txt +++ b/npc/000-2-1/chefgado.txt @@ -14,7 +14,7 @@ // 4 Quest complete. // 5 Quest aborted. Julia wins. -000-2-1.gat,17,28,0,1 script Chef Gado 318;2,{ +000-2-1.gat,27,28,0,1 script Chef Gado 318;2,{ set @q, getq(ShipQuests_ChefGado); set @n, getq(ShipQuests_Nard); diff --git a/npc/000-2-1/chest.txt b/npc/000-2-1/chest.txt index 130b2c1a7..47af50c0d 100644 --- a/npc/000-2-1/chest.txt +++ b/npc/000-2-1/chest.txt @@ -10,7 +10,7 @@ // 1 Talked to Arpan and needs to get clothes. // 2 Has the clothes. -000-2-1.gat,41,37,0 script Chest#0 317;2,{ +000-2-1.gat,51,37,0 script Chest#0 317;2,{ set @q, getq(ShipQuests_Arpan); if (getnpcdir ("") == 4) goto l_Give; diff --git a/npc/000-2-1/dan.txt b/npc/000-2-1/dan.txt index e9b930739..35b385e1b 100644 --- a/npc/000-2-1/dan.txt +++ b/npc/000-2-1/dan.txt @@ -5,7 +5,7 @@ // There are two kinds of dialogues in this script. // Dan will randomly choose between a useless sentence, and a quest in Artis. -000-2-1.gat, 22,31,0,1 script Dan 101;2,{ +000-2-1.gat, 32,31,0,1 script Dan 101;2,{ mesn; set @q, rand(3); diff --git a/npc/000-2-1/devis.txt b/npc/000-2-1/devis.txt index 06ede267e..cd04cab35 100644 --- a/npc/000-2-1/devis.txt +++ b/npc/000-2-1/devis.txt @@ -5,7 +5,7 @@ // Description: // Sleeping and grumbling NPC. -000-2-1.gat,22,38,0,1 script Devis 310;2,{ +000-2-1.gat,32,38,0,1 script Devis 310;2,{ mesn; set @q, rand(2); if (@q == 0) goto l_Zzz; diff --git a/npc/000-2-1/hammock.txt b/npc/000-2-1/hammock.txt index 79b5d6616..ad28764b3 100644 --- a/npc/000-2-1/hammock.txt +++ b/npc/000-2-1/hammock.txt @@ -4,7 +4,7 @@ // Description: // Animated hammock at the mid level of the ship. -000-2-1.gat,22,27,0 script #hammock1 904,1,0{ +000-2-1.gat,32,27,0 script #hammock1 904,1,0{ OnTouchFirst: setnpcdir 0; @@ -22,7 +22,7 @@ OnTimer5440: } -000-2-1.gat,22,25,0 script #hammock2 904,1,0{ +000-2-1.gat,32,25,0 script #hammock2 904,1,0{ OnTouchFirst: setnpcdir 0; @@ -40,7 +40,7 @@ OnTimer5440: } -000-2-1.gat,27,25,0 script #hammock3 905,1,0{ +000-2-1.gat,37,25,0 script #hammock3 905,1,0{ OnTouchFirst: setnpcdir 0; @@ -58,7 +58,7 @@ OnTimer5440: } -000-2-1.gat,27,27,0 script #hammock4 905,1,0{ +000-2-1.gat,37,27,0 script #hammock4 905,1,0{ OnTouchFirst: setnpcdir 0; @@ -76,7 +76,7 @@ OnTimer5440: } -000-2-1.gat,27,29,0 script #hammock5 905,1,0{ +000-2-1.gat,37,29,0 script #hammock5 905,1,0{ OnTouchFirst: setnpcdir 0; @@ -94,7 +94,7 @@ OnTimer5440: } -000-2-1.gat,27,34,0 script #hammock6 905,1,0{ +000-2-1.gat,37,34,0 script #hammock6 905,1,0{ OnTouchFirst: setnpcdir 0; @@ -112,7 +112,7 @@ OnTimer5440: } -000-2-1.gat,27,36,0 script #hammock7 905,1,0{ +000-2-1.gat,37,36,0 script #hammock7 905,1,0{ OnTouchFirst: setnpcdir 0; @@ -130,7 +130,7 @@ OnTimer5440: } -000-2-1.gat,27,38,0 script #hammock8 905,1,0{ +000-2-1.gat,37,38,0 script #hammock8 905,1,0{ OnTouchFirst: setnpcdir 0; diff --git a/npc/000-2-1/knife.txt b/npc/000-2-1/knife.txt index 4372b9691..ed233d396 100644 --- a/npc/000-2-1/knife.txt +++ b/npc/000-2-1/knife.txt @@ -9,7 +9,7 @@ // 0 Default, not taken. // 1 Knife taken. -000-2-1.gat,40,24,0,2 script #name 100;2,{ +000-2-1.gat,50,24,0,2 script #name 100;2,{ set @q, getq(ShipQuests_Knife); if (@q) close; diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt index 76c3602cb..b155133f0 100644 --- a/npc/000-2-1/peter.txt +++ b/npc/000-2-1/peter.txt @@ -33,7 +33,7 @@ // [8] = Shows how many seconds passed since Ratto number 4 died. // [9] = Shows how many seconds passed since the player started the quest. -000-2-1.gat,61,34,0,1 script AreaNPC 0,0,1,{ +000-2-1.gat,71,34,0,1 script AreaNPC 0,0,1,{ OnTouch: if (BaseLevel < 5) goto L_Stop; @@ -71,7 +71,7 @@ L_Rwin: } -000-2-1.gat,60,35,0,1 script Peter 303;3,{ +000-2-1.gat,70,35,0,1 script Peter 303;3,{ if (BaseLevel < 5) goto OnTooWeak; @@ -107,7 +107,7 @@ OnTooWeak: goto L_Close; OnStop: - warp "000-2-1",61,36; + warp "000-2-1",71,36; mesn; mesq l("You can't go there!"); @@ -224,7 +224,7 @@ OnDontneedHelp: L_Timeout: mesn; mesq l("Hey! Be careful. You can't stay in this basement for so long, you're going to get sick. Come outside and take a break, maybe you can try again later."); - warp "000-2-1", 61, 36; + warp "000-2-1", 71, 36; goto L_CleaningClose; @@ -238,7 +238,7 @@ L_Dead: goto L_CleaningEnd; L_Done: - warp "000-2-1", 61, 36; + warp "000-2-1", 71, 36; set @q, getq(ShipQuests_Peter); if (@q == 2 || @q == 4) goto L_Reward; diff --git a/npc/000-2-1/q'onan.txt b/npc/000-2-1/q'onan.txt index a57024a7c..dd5079e98 100644 --- a/npc/000-2-1/q'onan.txt +++ b/npc/000-2-1/q'onan.txt @@ -4,7 +4,7 @@ // Description: // Sleeping and snorring NPC. -000-2-1.gat,43,38,0,1 script Q'Onan 302;2,{ +000-2-1.gat,53,38,0,1 script Q'Onan 302;2,{ mesn; diff --git a/npc/000-2-1/savepoint.txt b/npc/000-2-1/savepoint.txt index 5d6f6ecf3..2d30a20c4 100644 --- a/npc/000-2-1/savepoint.txt +++ b/npc/000-2-1/savepoint.txt @@ -4,39 +4,39 @@ // Description: // Saves locations in 000-2-1 map. -000-2-1.gat,30,37,0,2 script #name 900;2,{ +000-2-1.gat,40,37,0,2 script #name 900;2,{ set @map$, "000-2-1.gat"; - set @x, 30; + set @x, 40; set @y, 37; callfunc "SavePoint"; close; } -000-2-1.gat,36,37,0,2 script #name 900;2,{ +000-2-1.gat,46,37,0,2 script #name 900;2,{ set @map$, "000-2-1.gat"; - set @x, 36; + set @x, 46; set @y, 37; callfunc "SavePoint"; close; } -000-2-1.gat,40,38,0,2 script #name 900;2,{ +000-2-1.gat,50,38,0,2 script #name 900;2,{ set @map$, "000-2-1.gat"; - set @x, 40; + set @x, 50; set @y, 38; callfunc "SavePoint"; close; } -000-2-1.gat,45,40,0,2 script #name 900;2,{ +000-2-1.gat,55,40,0,2 script #name 900;2,{ set @map$, "000-2-1.gat"; - set @x, 45; + set @x, 55; set @y, 40; callfunc "SavePoint"; close; diff --git a/npc/000-2-2/doors.txt b/npc/000-2-2/doors.txt index 8304f759d..d8887b8d0 100644 --- a/npc/000-2-2/doors.txt +++ b/npc/000-2-2/doors.txt @@ -29,7 +29,7 @@ l_Warn: close; l_Warp: - warp "000-2-1", 61, 36; + warp "000-2-1", 71, 36; close; } |