summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--npc/001-1_Tulimshar/bleacher.txt244
-rw-r--r--npc/019-1_Snow_field/monsters.txt6
-rw-r--r--npc/019-1_Snow_field/snowman.txt4
-rw-r--r--npc/019-1_Snow_field/taro.txt2
-rw-r--r--npc/020-1/amrak.txt2
-rw-r--r--npc/020-1/monsters.txt4
-rw-r--r--npc/020-1/sexchanger.txt4
-rw-r--r--npc/020-1/soul-menhir.txt6
-rw-r--r--npc/020-1/startrek.txt6
-rw-r--r--npc/020-2/furquest.txt2
-rw-r--r--npc/020-2/shops.txt10
-rw-r--r--npc/020-3_Ice_cave/monsters.txt10
-rw-r--r--npc/020-4_Ice_cave/monsters.txt10
13 files changed, 165 insertions, 145 deletions
diff --git a/npc/001-1_Tulimshar/bleacher.txt b/npc/001-1_Tulimshar/bleacher.txt
index 06d7495a..48b5c6c6 100644
--- a/npc/001-1_Tulimshar/bleacher.txt
+++ b/npc/001-1_Tulimshar/bleacher.txt
@@ -1,126 +1,140 @@
//
001-1.gat,27,53,0 script Candide 156,{
- mes "[Candide]";
- mes "\"I've figured out how that volcanic ash bleaches cloth.";
- mes "I could do it for you, but I'll need three piles of ash and 5,000 GP for supplies per item.\"";
- next;
-
- if (countitem(701) < 3) goto L_no_ash;
-
- if (zeny < 5000) goto L_no_money;
-
- menu "I'd like to bleach something", -,
- "No thanks", L_close;
-
+ mes "[Candide]";
+ mes "\"I've figured out how that volcanic ash bleaches cloth.";
+ mes "I could do it for you, but I'll need three piles of ash and 5,000 GP for supplies per item.\"";
+ next;
+
+ if (countitem(701) < 3) goto L_no_ash;
+
+ if (zeny < 5000) goto L_no_money;
+
+ menu "I'd like to bleach something", -,
+ "No thanks", L_close;
+
L_bleach_menu:
- mes "[Candide]";
- mes "\"What would you like to bleach?\"";
- next;
-
- menu "Cotton shirt", L_cottonshirt,
- "V-Neck sweater", L_vneck,
- "Turtleneck sweater", L_tneck,
- "Cotton shorts", L_shorts,
- "Cotton skirt", L_skirt,
- "Tank top ", L_tanktop,
- "Short tank top", L_tanktop_short,
- "Silk robe", L_robe,
- "Nevermind", -;
- goto L_close;
-
-L_cottonshirt: set @normal, 1202;
- set @dyeBase, 2050;
- goto L_choose_color;
-
-L_vneck: set @normal, 624;
- set @dyeBase, 2060;
- goto L_choose_color;
-
-L_tneck: set @normal, 564;
- set @dyeBase, 2070;
- goto L_choose_color;
-
-L_shorts: set @normal, 586;
- set @dyeBase, 2110;
- goto L_choose_color;
-
-L_skirt: set @normal, 632;
- set @dyeBase, 2100;
- goto L_choose_color;
-
-L_tanktop: set @normal, 688;
- set @dyeBase, 2090;
- goto L_choose_color;
-
-L_tanktop_short: set @normal, 689;
- set @dyeBase, 2120;
- goto L_choose_color;
-
-L_robe: set @normal, 720;
- set @dyeBase, 2080;
- goto L_choose_color;
-
+ mes "[Candide]";
+ mes "\"What would you like to bleach?\"";
+ next;
+
+ menu
+ "Cotton shirt", L_cottonshirt,
+ "V-Neck sweater", L_vneck,
+ "Turtleneck sweater", L_tneck,
+ "Cotton shorts", L_shorts,
+ "Cotton skirt", L_skirt,
+ "Tank top ", L_tanktop,
+ "Short tank top", L_tanktop_short,
+ "Silk robe", L_robe,
+ "Cotton headband", L_cotton_headband,
+ "Desert hat", L_desert_hat,
+ "Nevermind", -;
+ goto L_close;
+
+L_cottonshirt: set @normal, 1202;
+ set @dyeBase, 2050;
+ goto L_choose_color;
+
+L_vneck: set @normal, 624;
+ set @dyeBase, 2060;
+ goto L_choose_color;
+
+L_tneck: set @normal, 564;
+ set @dyeBase, 2070;
+ goto L_choose_color;
+
+L_shorts: set @normal, 586;
+ set @dyeBase, 2110;
+ goto L_choose_color;
+
+L_skirt: set @normal, 632;
+ set @dyeBase, 2100;
+ goto L_choose_color;
+
+L_tanktop: set @normal, 688;
+ set @dyeBase, 2090;
+ goto L_choose_color;
+
+L_tanktop_short: set @normal, 689;
+ set @dyeBase, 2120;
+ goto L_choose_color;
+
+L_robe:
+ set @normal, 720;
+ set @dyeBase, 2080;
+ goto L_choose_color;
+
+L_cotton_headband:
+ set @normal, 724;
+ set @dyeBase, 2140;
+ goto L_choose_color;
+
+L_desert_hat:
+ set @normal, 723;
+ set @dyeBase, 2130;
+ goto L_choose_color;
+
L_choose_color:
- mes "[Candide]";
- mes "\"And the color?\"";
- next;
-
- menu "Red", -,
- "Green", -,
- "Dark Blue", -,
- "Yellow", -,
- "Light Blue", -,
- "Pink", -,
- "Black", -,
- "Orange", -,
- "Purple", -,
- "Dark Green", -;
-
- set @del, @dyeBase + @menu - 1;
-
- if (countitem(@del) == 0) goto L_no_item;
-
- if (countitem(701) < 3) goto L_no_ash;
-
- if (zeny < 5000) goto L_no_money;
-
- delitem @del, 1;
- getitem @normal, 1;
- delitem 701, 3;
- set zeny, zeny - 5000;
-
+ mes "[Candide]";
+ mes "\"And the color?\"";
+ next;
+
+ menu "Red", -,
+ "Green", -,
+ "Dark Blue", -,
+ "Yellow", -,
+ "Light Blue", -,
+ "Pink", -,
+ "Black", -,
+ "Orange", -,
+ "Purple", -,
+ "Dark Green", -;
+
+ set @del, @dyeBase + @menu - 1;
+
+ if (countitem(@del) == 0) goto L_no_item;
+
+ if (countitem(701) < 3) goto L_no_ash;
+
+ if (zeny < 5000) goto L_no_money;
+
+ delitem @del, 1;
+ getitem @normal, 1;
+ delitem 701, 3;
+ set zeny, zeny - 5000;
+
L_again:
- mes "[Candide]";
- mes "\"Would you like to bleach something else?\"";
- next;
-
- menu "Yes", L_bleach_menu,
- "No", L_close;
-
+ mes "[Candide]";
+ mes "\"Would you like to bleach something else?\"";
+ next;
+
+ menu "Yes", L_bleach_menu,
+ "No", L_close;
+
L_no_item:
- mes "[Candide]";
- mes "\"You don't have one of those.\"";
- next;
-
- goto L_again;
-
+ mes "[Candide]";
+ mes "\"You don't have one of those.\"";
+ next;
+
+ goto L_again;
+
L_no_ash:
- mes "[Candide]";
- mes "\"You don't have enough ash for me to bleach anything.";
- mes "I need three piles.\"";
- next;
-
- goto L_close;
-
+ mes "[Candide]";
+ mes "\"You don't have enough ash for me to bleach anything.";
+ mes "I need three piles.\"";
+ next;
+
+ goto L_close;
+
L_no_money:
- mes "[Candide]";
- mes "\"You don't have enough gold for me to bleach anything.";
- mes "I need 5,000 GP for supplies.\"";
- next;
-
+ mes "[Candide]";
+ mes "\"You don't have enough gold for me to bleach anything.";
+ mes "I need 5,000 GP for supplies.\"";
+ next;
+
L_close:
- mes "[Candide]";
- mes "\"Come again.\"";
- close;
+ mes "[Candide]";
+ mes "\"Come again.\"";
+ close;
}
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";
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-05 19:52:20 +0000