summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorMicksha <ms-shaman@gmx.de>2020-06-18 13:12:18 +0000
committerMicksha <ms-shaman@gmx.de>2020-06-18 13:12:18 +0000
commit4fe61e3252848199a8d23c2f6b91e9604de29c5c (patch)
tree4c4cc1ba21eaf07260340f3ed759167569f37278 /npc
parent496adfa98798beeb2ce7b9a2c1baf3a3dbde99a1 (diff)
downloadserverdata-4fe61e3252848199a8d23c2f6b91e9604de29c5c.tar.gz
serverdata-4fe61e3252848199a8d23c2f6b91e9604de29c5c.tar.bz2
serverdata-4fe61e3252848199a8d23c2f6b91e9604de29c5c.tar.xz
serverdata-4fe61e3252848199a8d23c2f6b91e9604de29c5c.zip
Content
Diffstat (limited to 'npc')
-rw-r--r--npc/001-1/calypsan.txt6
-rw-r--r--npc/001-1/shop.txt34
-rw-r--r--npc/008-3-4/_mobs.txt2
-rw-r--r--npc/008-3-5/_mobs.txt2
-rw-r--r--npc/020-1/_import.txt4
-rw-r--r--npc/020-1/_mobs.txt57
-rw-r--r--npc/020-1/_warps.txt4
-rw-r--r--npc/_anchors.txt6
-rw-r--r--npc/_import.txt1
9 files changed, 104 insertions, 12 deletions
diff --git a/npc/001-1/calypsan.txt b/npc/001-1/calypsan.txt
index 36668f1b..ac3cbf3f 100644
--- a/npc/001-1/calypsan.txt
+++ b/npc/001-1/calypsan.txt
@@ -19,7 +19,7 @@
speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
l("Look at your equipment, can you guess what material it is made from?"),
l("Seek a colorant for that material:"),
- l("Cotton, cashmere, leather, ..."),
+ l("Cotton, Silk, leather, ..."),
l("Zinc-Titanium Oxide, Phthalocyanides, Cadmiums, Lazulite..."),
l("Colorant is not the yeying color. Some wear out from light, others look great but inflict itai-itai, and others become spotty or wash-away."),
l("What yoiis should know:"),
@@ -34,7 +34,7 @@
function sell_dye {
speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("For what kind of tissue?");
- .@tissue_type = select(l("Cotton"), l("Cashmere"));
+ .@tissue_type = select(l("Cotton"), l("Silk"));
closeclientdialog;
switch (.@tissue_type)
@@ -43,7 +43,7 @@
shop "Cotton#Dye001-1";
break;
case 2:
- shop "Cashmere#Dye001-1";
+ shop "Silk#Dye001-1";
break;
default:
consolemes(CONSOLEMES_ERROR, "Calypsan script error, tissue_type is incorrect");
diff --git a/npc/001-1/shop.txt b/npc/001-1/shop.txt
index 9d49736f..85e43235 100644
--- a/npc/001-1/shop.txt
+++ b/npc/001-1/shop.txt
@@ -83,23 +83,43 @@ OnClock0000:
restoreshopitem YellowCottonDye, 10;
}
-001-1,48,125,0 trader Cashmere#Dye001-1 NPC_NO_SPRITE,{
+001-1,48,125,0 trader Silk#Dye001-1 NPC_NO_SPRITE,{
OnInit:
tradertype(NST_MARKET);
- sellitem CrimsonCashmereDye, -1, 7;
- sellitem ChocolateCashmereDye, -1, 7;
- sellitem MintCashmereDye, -1, 7;
+ sellitem PitchBlackSilkDye, -1, 7;
+ sellitem ChocolateSilkDye, -1, 7;
+ sellitem CrimsonSilkDye, -1, 7;
+ sellitem TomatoSilkDye, -1, 7;
+ sellitem GoldenrodSilkDye, -1, 7;
+ sellitem SunflowerSilkDye, -1, 7;
+ sellitem OliveSilkDye, -1, 7;
+ sellitem SeaGreenSilkDye, -1, 7;
+ sellitem MintSilkDye, -1, 7;
+ sellitem MidnightBlueSilkDye, -1, 7;
+ sellitem SlatBlueSilkDye, -1, 7;
+ sellitem OrchidSilkDye, -1, 7;
+ sellitem PinkiePinkSilkDye, -1, 7;
.sex = G_OTHER;
.distance = 4;
end;
OnClock0000:
- restoreshopitem CrimsonCashmereDye, 7;
- restoreshopitem ChocolateCashmereDye, 7;
- restoreshopitem MintCashmereDye, 7;
+ restoreshopitem PitchBlackSilkDye, -1, 7;
+ restoreshopitem ChocolateSilkDye, -1, 7;
+ restoreshopitem CrimsonSilkDye, -1, 7;
+ restoreshopitem TomatoSilkDye, -1, 7;
+ restoreshopitem GoldenrodSilkDye, -1, 7;
+ restoreshopitem SunflowerSilkDye, -1, 7;
+ restoreshopitem OliveSilkDye, -1, 7;
+ restoreshopitem SeaGreenSilkDye, -1, 7;
+ restoreshopitem MintSilkDye, -1, 7;
+ restoreshopitem MidnightBlueSilkDye, -1, 7;
+ restoreshopitem SlatBlueSilkDye, -1, 7;
+ restoreshopitem OrchidSilkDye, -1, 7;
+ restoreshopitem PinkiePinkSilkDye, -1, 7;
}
001-1,64,114,0 trader Store#Aquada001-1 NPC_NO_SPRITE,{
diff --git a/npc/008-3-4/_mobs.txt b/npc/008-3-4/_mobs.txt
index db3cc108..37fb788a 100644
--- a/npc/008-3-4/_mobs.txt
+++ b/npc/008-3-4/_mobs.txt
@@ -29,4 +29,4 @@
008-3-4,83,44,14,9 monster Red Slime 1074,5,10000,50000
008-3-4,115,67,13,29 monster Red Slime 1074,4,10000,50000
008-3-4,37,79,24,27 monster Yellow Slime 1073,4,10000,50000
-008-3-4,111,67,13,29 monster Red Slime 1074,8,20000,75000
+008-3-4,111,67,13,29 monster Yellow Slime 1073,8,20000,75000
diff --git a/npc/008-3-5/_mobs.txt b/npc/008-3-5/_mobs.txt
index de960072..5331e5e6 100644
--- a/npc/008-3-5/_mobs.txt
+++ b/npc/008-3-5/_mobs.txt
@@ -3,7 +3,7 @@
008-3-5,87,83,22,16 monster Cave Maggot 1027,8,2000,20000
008-3-5,79,68,54,12 monster Crafty 1018,12,2500,35000
008-3-5,71,62,49,39 monster Thief Slime 1105,3,20000,100000
-008-3-5,90,70,13,29 monster Red Slime 1074,8,20000,75000
+008-3-5,90,70,13,29 monster Yellow Slime 1073,8,20000,75000
008-3-5,79,82,21,15 monster Bandit 1063,3,2000,20000
008-3-5,74,66,38,21 monster Snake 1075,3,10000,100000
008-3-5,54,41,26,21 monster Robin Bandit 1064,2,2000,20000
diff --git a/npc/020-1/_import.txt b/npc/020-1/_import.txt
new file mode 100644
index 00000000..9af8d519
--- /dev/null
+++ b/npc/020-1/_import.txt
@@ -0,0 +1,4 @@
+// Map 020-1: Tulimshar
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/020-1/_mobs.txt",
+"npc/020-1/_warps.txt",
diff --git a/npc/020-1/_mobs.txt b/npc/020-1/_mobs.txt
new file mode 100644
index 00000000..e9ad346a
--- /dev/null
+++ b/npc/020-1/_mobs.txt
@@ -0,0 +1,57 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-1: Tulimshar mobs
+020-1,165,77,14,12 monster Maggot 1026,6,5000,10000
+020-1,222,172,54,18 monster Maggot 1026,15,5000,10000
+020-1,282,114,12,39 monster Maggot 1026,5,5000,10000
+020-1,175,209,128,38 monster Desert Scorpion 1078,15,12000,36000
+020-1,59,158,18,26 monster Desert Scorpion 1078,5,12000,36000
+020-1,92,189,58,56 monster Desert Snake 1077,8,18000,72000
+020-1,60,174,23,29 monster Black Slime 1079,4,8500,36000
+020-1,188,216,84,32 monster Maggot 1026,20,5000,10000
+020-1,157,252,9,3 monster Golden Scorpion 1110,1,120000,120000
+020-1,167,81,21,11 monster Brotherhood Fighter 1081,3,6000,18000
+020-1,279,96,13,15 monster Legion Swordswoman 1066,3,6000,18000
+020-1,74,185,23,46 monster Yellow Slime 1073,6,13500,60000
+020-1,254,226,44,30 monster Desert Snake 1077,4,18000,36000
+020-1,277,248,18,10 monster Thief Slime 1105,3,11500,45000
+020-1,126,200,45,11 monster Giant Maggot 1076,2,36000,120000
+020-1,70,73,10,16 monster Giant Maggot 1076,2,36000,120000
+020-1,70,87,14,16 monster Maggot 1026,6,5000,10000
+020-1,70,74,7,10 monster Thief Slime 1105,1,11500,45000
+020-1,103,187,58,57 monster Fire Goblin 1080,10,8000,50000
+020-1,74,95,0,0 monster Manana Tree 1017,1,420000,240000
+020-1,157,130,123,35 monster Tortuga 1004,20,35000,120000
+020-1,43,180,4,22 monster Blub 1008,1,60000,120000
+020-1,282,249,12,7 monster Blub 1008,1,60000,120000
+020-1,114,119,54,62 monster Little Blub 1007,12,25000,120000
+020-1,294,95,0,0 monster Crocotree 1010,1,420000,240000
+020-1,274,105,0,0 monster Crocotree 1010,1,420000,240000
+020-1,278,125,0,0 monster Crocotree 1010,1,420000,240000
+020-1,259,146,0,0 monster Crocotree 1010,1,420000,240000
+020-1,289,144,0,0 monster Crocotree 1010,1,420000,240000
+020-1,246,160,0,0 monster Crocotree 1010,1,420000,240000
+020-1,215,184,0,0 monster Crocotree 1010,1,420000,240000
+020-1,194,175,0,0 monster Crocotree 1010,1,420000,240000
+020-1,187,157,0,0 monster Crocotree 1010,1,420000,240000
+020-1,172,154,0,0 monster Crocotree 1010,1,420000,240000
+020-1,140,133,0,0 monster Crocotree 1010,1,420000,240000
+020-1,176,137,0,0 monster Crocotree 1010,1,420000,240000
+020-1,156,84,0,0 monster Crocotree 1010,1,420000,240000
+020-1,142,77,0,0 monster Crocotree 1010,1,420000,240000
+020-1,104,183,0,0 monster Crocotree 1010,1,420000,240000
+020-1,80,194,0,0 monster Crocotree 1010,1,420000,240000
+020-1,50,188,0,0 monster Crocotree 1010,1,420000,240000
+020-1,49,169,0,0 monster Crocotree 1010,1,420000,240000
+020-1,71,166,0,0 monster Crocotree 1010,1,420000,240000
+020-1,80,154,0,0 monster Crocotree 1010,1,420000,240000
+020-1,90,138,0,0 monster Crocotree 1010,1,420000,240000
+020-1,67,142,0,0 monster Crocotree 1010,1,420000,240000
+020-1,40,139,0,0 monster Crocotree 1010,1,420000,240000
+020-1,39,125,0,0 monster Crocotree 1010,1,420000,240000
+020-1,77,124,0,0 monster Crocotree 1010,1,420000,240000
+020-1,89,97,0,0 monster Crocotree 1010,1,420000,240000
+020-1,63,83,0,0 monster Crocotree 1010,1,420000,240000
+020-1,55,96,0,0 monster Crocotree 1010,1,420000,240000
+020-1,66,64,0,0 monster Crocotree 1010,1,420000,240000
+020-1,291,254,0,0 monster Crocotree 1010,1,420000,240000
+020-1,285,246,0,0 monster Crocotree 1010,1,420000,240000
diff --git a/npc/020-1/_warps.txt b/npc/020-1/_warps.txt
new file mode 100644
index 00000000..3c273cc5
--- /dev/null
+++ b/npc/020-1/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 020-1: Tulimshar warps
+020-1,166,242,0 warp #020-1_166_242 1,0,020-1,165,250
+020-1,166,249,0 warp #020-1_166_249 1,0,020-1,165,241
diff --git a/npc/_anchors.txt b/npc/_anchors.txt
index 36315554..c0574e8d 100644
--- a/npc/_anchors.txt
+++ b/npc/_anchors.txt
@@ -8,11 +8,13 @@ OnInit:
htput(.ht, "^ART", "001-1 89 86");
htput(.ht, "^BLACK|SMITH", "001-2-27 35 32");
htput(.ht, "^CAMP|FIRE", "008-1 55 46");
+ htput(.ht, "^CANDOR", "012-1 49 114");
htput(.ht, "^CITY|^HALL", "001-2-7 36 41");
htput(.ht, "^DIMOND|COVE", "008-1 106 222");
htput(.ht, "^DRA|ISLAND", "000-1 62 111");
htput(.ht, "^FARM|MOUB", "008-1 71 129");
htput(.ht, "^FIRST|^DECK1?$", "000-2-0 23 28");
+ htput(.ht, "^GARDEN", "020-1 76 99");
htput(.ht, "^HARB|^MASTER", "001-2-16 28 32");
htput(.ht, "^HOLD$", "000-2-2 42 31");
htput(.ht, "^HURN", "008-1 250 109");
@@ -21,7 +23,9 @@ OnInit:
htput(.ht, "^LIB", "001-2-4 42 35");
htput(.ht, "^LIGHT", "001-2-0 37 32");
htput(.ht, "^LUVIA", "008-1 256 206");
+ htput(.ht, "^MAGIC|ACAD", "020-1 51 119");
htput(.ht, "^MERCH|^BANK", "001-2-19 28 30");
+ htput(.ht, "^MINE", "020-1 76 237");
htput(.ht, "^MOON", "001-2-2 40 34");
htput(.ht, "^NARD", "000-2-3 21 28");
htput(.ht, "^NOBLE1?$", "001-2-1 37 37");
@@ -29,6 +33,7 @@ OnInit:
htput(.ht, "^NOBLE3$", "001-2-11 45 33");
htput(.ht, "^NOBLE4$", "001-2-12 34 32");
htput(.ht, "^NOBLE5$", "001-2-15 34 38");
+ htput(.ht, "^OASIS", "020-1 287 246");
htput(.ht, "^RED|PLUSH|^INN", "001-2-28 30 35");
htput(.ht, "^ROSSY", "008-3-0 130 108");
htput(.ht, "^SECOND|^DECK2$", "000-2-1 67 32");
@@ -36,6 +41,7 @@ OnInit:
htput(.ht, "^START2$", "000-0-0 26 28");
htput(.ht, "^START3$", "000-0-1 26 28");
htput(.ht, "^START|^BEGIN", "000-0 22 24");
+ htput(.ht, "^TULIM|MARKET", "020-1 224 175");
htput(.ht, "^VEIN", "008-3-0 87 172");
htput(.ht, "^WARE", "001-2-18 37 31");
htput(.ht, "^WEST|PORT", "008-1-1 52 60");
diff --git a/npc/_import.txt b/npc/_import.txt
index dfe1ab2b..7fba4b92 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -111,6 +111,7 @@
@include "npc/012-3-1/_import.txt"
@include "npc/012-3-2/_import.txt"
@include "npc/012-3-3/_import.txt"
+@include "npc/020-1/_import.txt"
@include "npc/sec_pri/_import.txt"
@include "npc/test/_import.txt"
@include "npc/testbg/_import.txt"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-08 21:37:45 +0000