From 2b9845b6dbf242fe3213d82ac5a2b0dfaec184f0 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Fri, 21 Nov 2008 22:13:33 +0000 Subject: Move more scripts --- npc/019-1_Snow_field/_import.txt | 1 - npc/019-1_Snow_field/monsters.txt | 6 +++--- npc/019-1_Snow_field/snowman.txt | 4 +++- npc/019-1_Snow_field/taro.txt | 2 +- npc/020-1/amrak.txt | 2 +- npc/020-1/monsters.txt | 4 ++-- npc/020-1/sexchanger.txt | 4 +++- npc/020-1/soul-menhir.txt | 6 ++++-- npc/020-1/startrek.txt | 6 ++++-- npc/020-2/furquest.txt | 2 +- npc/020-2/shops.txt | 10 ++++++---- npc/020-3_Ice_cave/monsters.txt | 10 ++++------ npc/020-4_Ice_cave/monsters.txt | 10 ++++------ 13 files changed, 36 insertions(+), 31 deletions(-) diff --git a/npc/019-1_Snow_field/_import.txt b/npc/019-1_Snow_field/_import.txt index 3db5780c..9d59edc8 100644 --- a/npc/019-1_Snow_field/_import.txt +++ b/npc/019-1_Snow_field/_import.txt @@ -1,7 +1,6 @@ map: 019-1.gat npc: npc/019-1_Snow_field/taro.txt npc: npc/019-1_Snow_field/snowman.txt -npc: npc/019-1_Snow_field/santa.txt npc: npc/019-1_Snow_field/monsters.txt npc: npc/019-1_Snow_field/_warps.txt npc: npc/019-1_Snow_field/_mobs.txt diff --git a/npc/019-1_Snow_field/monsters.txt b/npc/019-1_Snow_field/monsters.txt index b4515cf2..607ade82 100644 --- a/npc/019-1_Snow_field/monsters.txt +++ b/npc/019-1_Snow_field/monsters.txt @@ -2,10 +2,10 @@ // This is the Snow Fields. // -new_10-1.gat,0,0,0,0 monster SantaSlime 1015,10,0,0,Mob10::OnSantaSlime -new_10-1.gat,0,0,0,0 monster RudolphSlime 1016,25,0,0,Mob10::OnRudolphSlime +019-1.gat,0,0,0,0 monster SantaSlime 1015,10,0,0,Mob10::OnSantaSlime +019-1.gat,0,0,0,0 monster RudolphSlime 1016,25,0,0,Mob10::OnRudolphSlime -new_10-1.gat,0,0,0 script Mob10 -1,{ +019-1.gat,0,0,0 script Mob10 -1,{ OnSantaSlime: set @mobID, 1015; callfunc "MobPoints"; diff --git a/npc/019-1_Snow_field/snowman.txt b/npc/019-1_Snow_field/snowman.txt index 1e5ba412..1f56e4f2 100644 --- a/npc/019-1_Snow_field/snowman.txt +++ b/npc/019-1_Snow_field/snowman.txt @@ -1,4 +1,6 @@ -new_10-1.gat,77,44,0 script Snowman 129,{ +// + +019-1.gat,77,44,0 script Snowman 129,{ if( ChristmasQuest == 1) goto L_Done; mes "[Snowman]"; diff --git a/npc/019-1_Snow_field/taro.txt b/npc/019-1_Snow_field/taro.txt index c5ab3289..00976aa4 100644 --- a/npc/019-1_Snow_field/taro.txt +++ b/npc/019-1_Snow_field/taro.txt @@ -1,6 +1,6 @@ // Snow Taro -new_10-1.gat,57,61,0 script Taro 114,{ +019-1.gat,57,61,0 script Taro 114,{ if (getequipid(equip_head) == 511 || getequipid(equip_head) == 1206) goto L_Santa; if (getequipid(equip_head) == 633) goto L_Elf; if (getequipid(equip_head) == 628) goto L_NearElf; diff --git a/npc/020-1/amrak.txt b/npc/020-1/amrak.txt index b5b52962..19979ca0 100644 --- a/npc/020-1/amrak.txt +++ b/npc/020-1/amrak.txt @@ -1,6 +1,6 @@ // -new_11-1.gat,66,90,0 script Amrak 103, { +020-1.gat,66,90,0 script Amrak 103, { mes "[Amrak]"; mes "\"This... stone..."; mes "I have never seen a mineral like this"; diff --git a/npc/020-1/monsters.txt b/npc/020-1/monsters.txt index 92c95f81..9259cfdb 100644 --- a/npc/020-1/monsters.txt +++ b/npc/020-1/monsters.txt @@ -2,9 +2,9 @@ // This is Snow Town. // -new_11-1.gat,56,63,1,1 monster Maggot 1002,2,0,0,Mob11::OnMaggot +020-1.gat,56,63,1,1 monster Maggot 1002,2,0,0,Mob11::OnMaggot -new_11-1.gat,0,0,0 script Mob11 -1,{ +020-1.gat,0,0,0 script Mob11 -1,{ OnMaggot: set @mobID, 1002; callfunc "MobPoints"; diff --git a/npc/020-1/sexchanger.txt b/npc/020-1/sexchanger.txt index b26f9e14..168f47a3 100644 --- a/npc/020-1/sexchanger.txt +++ b/npc/020-1/sexchanger.txt @@ -1,4 +1,6 @@ -new_11-1.gat,50,49,0 script Xanith 136,{ +// + +020-1.gat,50,49,0 script Xanith 136,{ mes "[Xanith the Surgeon]"; mes "\"No sex changes right now, sorry.\""; close; diff --git a/npc/020-1/soul-menhir.txt b/npc/020-1/soul-menhir.txt index 7769530c..3d0bc82a 100644 --- a/npc/020-1/soul-menhir.txt +++ b/npc/020-1/soul-menhir.txt @@ -1,5 +1,7 @@ -new_11-1.gat,64,89,0 script Soul Menhir 144, { - set @map$, "new_11-1.gat"; +// + +020-1.gat,64,89,0 script Soul Menhir 144, { + set @map$, "020-1.gat"; set @x, 64; set @y, 90; callfunc "SoulMenhir"; diff --git a/npc/020-1/startrek.txt b/npc/020-1/startrek.txt index 72afe5e3..5c8847ad 100644 --- a/npc/020-1/startrek.txt +++ b/npc/020-1/startrek.txt @@ -1,11 +1,13 @@ -new_11-1.gat,79,77,0 script Kirk 133,{ +// + +020-1.gat,79,77,0 script Kirk 133,{ mes "[Capt. Kirk]"; mes "\"Spock: We're breaking the prime directive."; mes "This is not the right way to have the first contact.\""; close; } -new_11-1.gat,81,77,0 script Spock 134,{ +020-1.gat,81,77,0 script Spock 134,{ mes "[Spock]"; mes "\"Live long and prosper captain.\""; next; diff --git a/npc/020-2/furquest.txt b/npc/020-2/furquest.txt index 01b6c546..4d67f8c4 100644 --- a/npc/020-2/furquest.txt +++ b/npc/020-2/furquest.txt @@ -3,7 +3,7 @@ //################################################################################# // Santa's Inn - Agostine, The Legendary Tailor -new_13-1.gat,102,28,0 script Agostine 137, { +020-2.gat,102,28,0 script Agostine 137, { if (QUEST_WG_state == 1) goto L_State_0_3; if (QUEST_WG_state == 2) goto L_State_1; if (QUEST_WG_state == 3) goto L_State_2; diff --git a/npc/020-2/shops.txt b/npc/020-2/shops.txt index eb84181e..f3d9dedc 100644 --- a/npc/020-2/shops.txt +++ b/npc/020-2/shops.txt @@ -1,12 +1,14 @@ +// Snow town shops + // Clothes shop -new_13-1.gat,27,26,0 shop Taylor 137,523:2000,524:1600,543:800,544:5000,546:10000,586:1000,610,2000 +020-2.gat,27,26,0 shop Taylor 137,523:2000,524:1600,543:800,544:5000,546:10000,586:1000,610,2000 // Weapons shop -new_13-1.gat,25,65,0 shop Bracco 135,1201:50,521:1000,522:100,545:20000,529:5 +020-2.gat,25,65,0 shop Bracco 135,1201:50,521:1000,522:100,545:20000,529:5 // Potions shop -new_13-1.gat,75,26,0 shop Mede 103,501:50,502:70,567:500,568:500 +020-2.gat,75,26,0 shop Mede 103,501:50,502:70,567:500,568:500 // INN -new_13-1.gat,111,23,0 script Kane 120,{ +020-2.gat,111,23,0 script Kane 120,{ set @npcName$, "Kane the Inn Keeper"; set @cost, 100; diff --git a/npc/020-3_Ice_cave/monsters.txt b/npc/020-3_Ice_cave/monsters.txt index b9dce5f5..062c6a9f 100644 --- a/npc/020-3_Ice_cave/monsters.txt +++ b/npc/020-3_Ice_cave/monsters.txt @@ -1,11 +1,9 @@ -// Map: new_12-1 -// This is the Ice Cave below Snow Town. -// +// Ice Cave level 1 -new_12-1.gat,0,0,0,0 monster Bat 1017,20,0,0,Mob12::OnBat -new_12-1.gat,0,0,0,0 monster Pinkie 1018,10,0,0,Mob12::OnPinkie +020-3.gat,0,0,0,0 monster Bat 1017,20,0,0,Mob12::OnBat +020-3.gat,0,0,0,0 monster Pinkie 1018,10,0,0,Mob12::OnPinkie -new_12-1.gat,0,0,0 script Mob12 -1,{ +020-3.gat,0,0,0 script Mob12 -1,{ OnBat: set @mobID, 1017; callfunc "MobPoints"; diff --git a/npc/020-4_Ice_cave/monsters.txt b/npc/020-4_Ice_cave/monsters.txt index b1a238b3..5aadddab 100644 --- a/npc/020-4_Ice_cave/monsters.txt +++ b/npc/020-4_Ice_cave/monsters.txt @@ -1,11 +1,9 @@ -// Map: new_21-1 -// This is the second level of the Ice Cave beneath Snow Town. -// +// Ice Cave second level -new_21-1.gat,0,0,0,0 monster Bat 1017,5,0,0,Mob21::OnBat -new_21-1.gat,0,0,0,0 monster Fluffy 1020,15,0,0,Mob21::OnFluffy +020-4.gat,0,0,0,0 monster Bat 1017,5,0,0,Mob21::OnBat +020-4.gat,0,0,0,0 monster Fluffy 1020,15,0,0,Mob21::OnFluffy -new_21-1.gat,0,0,0 script Mob21 -1,{ +020-4.gat,0,0,0 script Mob21 -1,{ OnBat: set @mobID, 1017; callfunc "MobPoints"; -- cgit v1.2.3-60-g2f50