diff options
55 files changed, 662 insertions, 14 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf index feae4da0..766f0803 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -96,6 +96,14 @@ map_list: ( "008-3-0", "008-3-1", "008-4-1", + "012-1", + "012-2-1", + "012-2-2", + "012-2-3", + "012-2-4", + "012-2-5", + "012-2-6", + "012-2-7", "test", "testbg", ) diff --git a/db/constants.conf b/db/constants.conf index 51b1c215..6cce7c25 100644 --- a/db/constants.conf +++ b/db/constants.conf @@ -4042,6 +4042,25 @@ constants_db: { NPC_SIMON: 187 NPC_MORCANT: 188 NPC_THAMAS: 189 + NPC_MORGAN: 190 + NPC_ZITONI: 191 + NPC_ROSEN: 192 + NPC_TANISHA: 193 + NPC_SORFINA: 194 + NPC_JESSIE: 195 + NPC_PRAWORS: 196 + NPC_KAAN: 197 + NPC_AIDAN: 198 + NPC_ISHI: 199 + NPC_LIANA: 200 + NPC_AYASHA: 201 + NPC_ZEGAS: 202 + NPC_NYLE: 203 + NPC_CYNRIC: 204 + NPC_VINCENT: 205 + NPC_AAHNA: 206 + NPC_HASAN: 207 + NPC_CRASMANDE: 208 NPC_CONFUSED_TREE: 400 NPC_ALIGE: 401 @@ -4107,6 +4126,7 @@ constants_db: { NPC_YANNIKA: 463 NPC_FLAG_L: 464 NPC_FLAG_R: 465 + NPC_TOICHI: 466 NPC_TEST1: 800 NPC_PLAYER: 801 diff --git a/db/map_index.txt b/db/map_index.txt index 3bac58a3..801a446a 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -93,5 +93,13 @@ 008-3-0 93 008-3-1 94 008-4-1 95 -test 96 -testbg 97 +012-1 96 +012-2-1 97 +012-2-2 98 +012-2-3 99 +012-2-4 100 +012-2-5 101 +012-2-6 102 +012-2-7 103 +test 104 +testbg 105 diff --git a/maps/re/008-3-0.mcache b/maps/re/008-3-0.mcache Binary files differindex 7e80234e..1dfb2b2b 100644 --- a/maps/re/008-3-0.mcache +++ b/maps/re/008-3-0.mcache diff --git a/maps/re/012-1.mcache b/maps/re/012-1.mcache Binary files differnew file mode 100644 index 00000000..2a30e443 --- /dev/null +++ b/maps/re/012-1.mcache diff --git a/maps/re/012-2-1.mcache b/maps/re/012-2-1.mcache Binary files differnew file mode 100644 index 00000000..6f602134 --- /dev/null +++ b/maps/re/012-2-1.mcache diff --git a/maps/re/012-2-2.mcache b/maps/re/012-2-2.mcache Binary files differnew file mode 100644 index 00000000..d8436dd3 --- /dev/null +++ b/maps/re/012-2-2.mcache diff --git a/maps/re/012-2-3.mcache b/maps/re/012-2-3.mcache Binary files differnew file mode 100644 index 00000000..c31a8f8c --- /dev/null +++ b/maps/re/012-2-3.mcache diff --git a/maps/re/012-2-4.mcache b/maps/re/012-2-4.mcache Binary files differnew file mode 100644 index 00000000..2ac98ccd --- /dev/null +++ b/maps/re/012-2-4.mcache diff --git a/maps/re/012-2-5.mcache b/maps/re/012-2-5.mcache Binary files differnew file mode 100644 index 00000000..4a9977a9 --- /dev/null +++ b/maps/re/012-2-5.mcache diff --git a/maps/re/012-2-6.mcache b/maps/re/012-2-6.mcache Binary files differnew file mode 100644 index 00000000..a868f507 --- /dev/null +++ b/maps/re/012-2-6.mcache diff --git a/maps/re/012-2-7.mcache b/maps/re/012-2-7.mcache Binary files differnew file mode 100644 index 00000000..7cfae81f --- /dev/null +++ b/maps/re/012-2-7.mcache diff --git a/npc/008-1-1/morcant.txt b/npc/008-1-1/morcant.txt index 0167353f..afb35ad8 100644 --- a/npc/008-1-1/morcant.txt +++ b/npc/008-1-1/morcant.txt @@ -2,7 +2,7 @@ // Author: // Micksha // Description: -// Galmatia the beekeeper. +// Morcant the Captain, taking care on harbor issues. // THIS IS A PLACEHOLDER! 008-1-1,58,57,0 script Morcant NPC_MORCANT,{ diff --git a/npc/008-2-32/thamas.txt b/npc/008-2-32/thamas.txt index 88b48968..f824493f 100644 --- a/npc/008-2-32/thamas.txt +++ b/npc/008-2-32/thamas.txt @@ -9,7 +9,7 @@ speech l("Hi there."), l("I am a legion soldier who never talks much, until Jesusalva or WildX puts words in my mouth."), - lg("Until then, let me be quiet. Talk to you later."); + l("Until then, let me be quiet. Talk to you later."); close; diff --git a/npc/008-3-0/_mobs.txt b/npc/008-3-0/_mobs.txt index 93710b2b..372c3898 100644 --- a/npc/008-3-0/_mobs.txt +++ b/npc/008-3-0/_mobs.txt @@ -1,7 +1,7 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 008-3-0: Rossy Cave mobs -008-3-0,83,62,21,7 monster Cave Maggot 1027,5,500,2000 -008-3-0,101,117,13,7 monster Cave Maggot 1027,5,500,2000 +008-3-0,30,113,7,14 monster Cave Maggot 1027,5,500,2000 +008-3-0,102,116,14,8 monster Cave Maggot 1027,5,500,2000 008-3-0,79,144,10,6 monster Cave Maggot 1027,7,500,2000 008-3-0,158,87,10,12 monster Cave Maggot 1027,7,500,2000 008-3-0,34,28,3,4 monster Poison Skull 1100,1,35000,60000 @@ -10,17 +10,74 @@ 008-3-0,128,146,5,3 monster Ratto 1005,4,35000,15000 008-3-0,120,61,5,3 monster Ratto 1005,4,35000,15000 008-3-0,138,64,10,7 monster Crafty 1018,10,1000,120000 -008-3-0,130,103,9,6 monster Crafty 1018,6,1000,120000 +008-3-0,129,102,11,6 monster Crafty 1018,6,1000,120000 008-3-0,67,114,10,2 monster Spider 1044,3,4000,8000 008-3-0,109,145,4,10 monster Spider 1044,5,4000,8000 008-3-0,68,84,3,7 monster Spider 1044,4,4000,8000 -008-3-0,83,166,0,0 monster Ruby Vein 1051,1,600000,60000 008-3-0,80,169,0,0 monster Diamond Vein 1045,1,600000,60000 -008-3-0,89,168,0,0 monster Emerald Vein 1052,1,600000,60000 -008-3-0,100,180,0,0 monster Topaz Vein 1054,1,600000,60000 -008-3-0,97,176,0,0 monster Sapphire Vein 1053,1,600000,60000 -008-3-0,94,180,0,0 monster Amethyst Vein 1055,1,600000,60000 -008-3-0,108,107,0,0 monster Gem Veinbloc 1069,1,600000,60000 008-3-0,118,96,0,0 monster Gem Veinbloc 1069,1,600000,60000 008-3-0,131,93,0,0 monster Gem Veinbloc 1069,1,600000,60000 008-3-0,119,101,0,0 monster Gold Veinbloc 1070,1,600000,60000 +008-3-0,113,60,23,8 monster Cave Maggot 1027,7,500,2000 +008-3-0,199,68,8,9 monster Crafty 1018,5,1000,60000 +008-3-0,160,47,17,5 monster Crafty 1018,5,1000,120000 +008-3-0,119,200,20,4 monster Spider 1044,5,4000,8000 +008-3-0,34,193,11,9 monster Spider 1044,5,4000,8000 +008-3-0,26,115,5,17 monster Spider 1044,5,4000,8000 +008-3-0,82,60,21,7 monster Cave Maggot 1027,5,500,2000 +008-3-0,38,193,16,4 monster Cave Maggot 1027,5,500,2000 +008-3-0,114,199,12,3 monster Ratto 1005,4,35000,15000 +008-3-0,106,30,10,7 monster Crafty 1018,5,1000,120000 +008-3-0,78,128,11,21 monster Ratto 1005,4,35000,15000 +008-3-0,117,141,35,11 monster Crafty 1018,10,1000,120000 +008-3-0,117,101,18,11 monster Ratto 1005,7,35000,15000 +008-3-0,130,88,0,0 monster Ruby Vein 1051,1,600000,60000 +008-3-0,122,94,0,0 monster Ruby Vein 1051,1,600000,60000 +008-3-0,31,181,0,0 monster Sapphire Vein 1053,1,600000,60000 +008-3-0,31,198,0,0 monster Sapphire Vein 1053,1,600000,60000 +008-3-0,135,127,0,0 monster Topaz Vein 1054,1,600000,60000 +008-3-0,120,125,0,0 monster Topaz Vein 1054,1,600000,60000 +008-3-0,31,112,0,0 monster Amethyst Vein 1055,1,600000,60000 +008-3-0,24,123,0,0 monster Amethyst Vein 1055,1,600000,60000 +008-3-0,193,123,0,0 monster Emerald Vein 1052,1,600000,60000 +008-3-0,204,116,0,0 monster Emerald Vein 1052,1,600000,60000 +008-3-0,89,168,0,0 monster Diamond Vein 1045,1,600000,60000 +008-3-0,132,192,0,0 monster Sapphire Vein 1053,1,600000,60000 +008-3-0,39,174,0,0 monster Amethyst Vein 1055,1,600000,60000 +008-3-0,44,174,0,0 monster Topaz Vein 1054,1,600000,60000 +008-3-0,118,196,0,0 monster Emerald Vein 1052,1,600000,60000 +008-3-0,65,105,0,0 monster Diamond Vein 1045,1,600000,60000 +008-3-0,143,139,0,0 monster Gem Veinbloc 1069,1,600000,60000 +008-3-0,156,121,0,0 monster Gem Veinbloc 1069,1,600000,60000 +008-3-0,155,166,0,0 monster Gem Veinbloc 1069,1,600000,60000 +008-3-0,125,162,0,0 monster Gem Veinbloc 1069,1,600000,60000 +008-3-0,107,141,0,0 monster Gem Veinbloc 1069,1,600000,60000 +008-3-0,77,148,0,0 monster Gem Veinbloc 1069,1,600000,60000 +008-3-0,62,119,0,0 monster Gem Veinbloc 1069,1,600000,60000 +008-3-0,162,95,0,0 monster Gem Veinbloc 1069,1,600000,60000 +008-3-0,157,66,0,0 monster Gem Veinbloc 1069,1,600000,60000 +008-3-0,112,60,0,0 monster Gem Veinbloc 1069,1,600000,60000 +008-3-0,66,54,0,0 monster Gem Veinbloc 1069,1,600000,60000 +008-3-0,63,91,0,0 monster Gold Veinbloc 1070,1,600000,60000 +008-3-0,76,127,0,0 monster Gold Veinbloc 1070,1,600000,60000 +008-3-0,111,148,0,0 monster Gold Veinbloc 1070,1,600000,60000 +008-3-0,101,27,3,4 monster Poison Skull 1100,1,35000,60000 +008-3-0,165,28,3,4 monster Poison Skull 1100,1,35000,60000 +008-3-0,199,67,3,4 monster Poison Skull 1100,1,35000,60000 +008-3-0,199,109,3,4 monster Poison Skull 1100,1,35000,60000 +008-3-0,197,194,3,4 monster Poison Skull 1100,1,35000,60000 +008-3-0,133,199,3,4 monster Poison Skull 1100,1,35000,60000 +008-3-0,34,194,3,4 monster Poison Skull 1100,1,35000,60000 +008-3-0,26,111,3,4 monster Poison Skull 1100,1,35000,60000 +008-3-0,88,48,0,0 monster Coal Vein 1048,1,600000,60000 +008-3-0,100,49,0,0 monster Coal Vein 1048,1,600000,60000 +008-3-0,130,44,0,0 monster Coal Vein 1048,1,600000,60000 +008-3-0,67,47,0,0 monster Coal Vein 1048,1,600000,60000 +008-3-0,124,94,0,0 monster Coal Vein 1048,1,600000,60000 +008-3-0,158,60,0,0 monster Coal Vein 1048,1,600000,60000 +008-3-0,56,53,0,0 monster Iron Vein 1047,1,600000,60000 +008-3-0,55,98,0,0 monster Iron Vein 1047,1,600000,60000 +008-3-0,62,103,0,0 monster Iron Vein 1047,1,600000,60000 +008-3-0,69,125,0,0 monster Iron Vein 1047,1,600000,60000 +008-3-0,62,153,0,0 monster Iron Vein 1047,1,600000,60000 +008-3-0,96,145,0,0 monster Iron Vein 1047,1,600000,60000 diff --git a/npc/012-1/_import.txt b/npc/012-1/_import.txt new file mode 100644 index 00000000..47036b7f --- /dev/null +++ b/npc/012-1/_import.txt @@ -0,0 +1,14 @@ +// Map 012-1: Candor Island +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/012-1/_warps.txt", +"npc/012-1/aahna.txt", +"npc/012-1/aidan.txt", +"npc/012-1/ayasha.txt", +"npc/012-1/crasmande.txt", +"npc/012-1/hasan.txt", +"npc/012-1/ishi.txt", +"npc/012-1/kaan.txt", +"npc/012-1/liana.txt", +"npc/012-1/prawors.txt", +"npc/012-1/vincent.txt", +"npc/012-1/zegas.txt", diff --git a/npc/012-1/_warps.txt b/npc/012-1/_warps.txt new file mode 100644 index 00000000..ada06743 --- /dev/null +++ b/npc/012-1/_warps.txt @@ -0,0 +1,8 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 012-1: Candor Island warps +012-1,38,115,0 warp #012-1_38_115 0,0,012-2-1,52,38 +012-1,50,104,0 warp #012-1_50_104 0,0,012-2-6,26,38 +012-1,65,105,0 warp #012-1_65_105 0,0,012-2-5,29,43 +012-1,64,95,0 warp #012-1_64_95 0,0,012-2-3,33,36 +012-1,51,93,0 warp #012-1_51_93 0,0,012-2-7,30,34 +012-1,57,101,0 warp #012-1_57_101 0,0,012-2-4,31,43 diff --git a/npc/012-1/aahna.txt b/npc/012-1/aahna.txt new file mode 100644 index 00000000..12df0924 --- /dev/null +++ b/npc/012-1/aahna.txt @@ -0,0 +1,18 @@ +// Evol scripts. +// Author: +// Micksha +// Description: +// Aahna, a low quality NPC ;) +// THIS IS A PLACEHOLDER! + +012-1,99,64,0 script Aahna NPC_AAHNA,{ + speech + l("Welcome."), + l("Someone was too lazy to even write a placeholder text, so please come back later"); + close; + +OnInit: + .sex = G_FEMALE; + .distance = 2; + end; +} diff --git a/npc/012-1/aidan.txt b/npc/012-1/aidan.txt new file mode 100644 index 00000000..1ff47e45 --- /dev/null +++ b/npc/012-1/aidan.txt @@ -0,0 +1,18 @@ +// Evol scripts. +// Author: +// Micksha +// Description: +// Aidan, a dawdler in Candor. +// THIS IS A PLACEHOLDER! + +012-1,52,114,0 script Aidan NPC_AIDAN,{ + speech + l("Welcome."), + l("Someone was too lazy to even write a placeholder text, so please come back later"); + close; + +OnInit: + .sex = G_MALE; + .distance = 2; + end; +} diff --git a/npc/012-1/ayasha.txt b/npc/012-1/ayasha.txt new file mode 100644 index 00000000..623954f6 --- /dev/null +++ b/npc/012-1/ayasha.txt @@ -0,0 +1,18 @@ +// Evol scripts. +// Author: +// Micksha +// Description: +// Vincent, a child at the Candor beach. +// THIS IS A PLACEHOLDER! + +012-1,65,111,0 script Ayasha NPC_AYASHA,{ + speech + l("Welcome."), + l("Someone was too lazy to even write a placeholder text, so please come back later"); + close; + +OnInit: + .sex = G_FEMALE; + .distance = 2; + end; +} diff --git a/npc/012-1/crasmande.txt b/npc/012-1/crasmande.txt new file mode 100644 index 00000000..5aef9e89 --- /dev/null +++ b/npc/012-1/crasmande.txt @@ -0,0 +1,18 @@ +// Evol scripts. +// Author: +// Micksha +// Description: +// Crasmande, the scared man. +// THIS IS A PLACEHOLDER! + +012-1,41,44,0 script Crasmande NPC_CRASMANDE,{ + speech + l("Welcome."), + l("Someone was too lazy to even write a placeholder text, so please come back later"); + close; + +OnInit: + .sex = G_MALE; + .distance = 2; + end; +} diff --git a/npc/012-1/hasan.txt b/npc/012-1/hasan.txt new file mode 100644 index 00000000..52a53f18 --- /dev/null +++ b/npc/012-1/hasan.txt @@ -0,0 +1,18 @@ +// Evol scripts. +// Author: +// Micksha +// Description: +// Hasan, the bad guy. +// THIS IS A PLACEHOLDER! + +012-1,39,44,0 script Hasan NPC_HASAN,{ + speech + l("Welcome."), + l("Someone was too lazy to even write a placeholder text, so please come back later"); + close; + +OnInit: + .sex = G_MALE; + .distance = 2; + end; +} diff --git a/npc/012-1/ishi.txt b/npc/012-1/ishi.txt new file mode 100644 index 00000000..c2390d4a --- /dev/null +++ b/npc/012-1/ishi.txt @@ -0,0 +1,18 @@ +// Evol scripts. +// Author: +// Micksha +// Description: +// Ishi, former trade-in for monster points. +// THIS IS A PLACEHOLDER! + +012-1,53,114,0 script Ishi NPC_ISHI,{ + speech + l("Welcome."), + l("Someone was too lazy to even write a placeholder text, so please come back later"); + close; + +OnInit: + .sex = G_FEMALE; + .distance = 2; + end; +} diff --git a/npc/012-1/kaan.txt b/npc/012-1/kaan.txt new file mode 100644 index 00000000..4ce8b3ab --- /dev/null +++ b/npc/012-1/kaan.txt @@ -0,0 +1,18 @@ +// Evol scripts. +// Author: +// Micksha +// Description: +// Kaan, a guy good for nothing. +// THIS IS A PLACEHOLDER! + +012-1,53,110,0 script Kaan NPC_KAAN,{ + speech + l("Welcome."), + l("Someone was too lazy to even write a placeholder text, so please come back later"); + close; + +OnInit: + .sex = G_MALE; + .distance = 2; + end; +} diff --git a/npc/012-1/liana.txt b/npc/012-1/liana.txt new file mode 100644 index 00000000..e2d318be --- /dev/null +++ b/npc/012-1/liana.txt @@ -0,0 +1,18 @@ +// Evol scripts. +// Author: +// Micksha +// Description: +// Liana. +// THIS IS A PLACEHOLDER! + +012-1,65,117,0 script Liana NPC_LIANA,{ + speech + l("Welcome."), + l("Someone was too lazy to even write a placeholder text, so please come back later"); + close; + +OnInit: + .sex = G_FEMALE; + .distance = 2; + end; +} diff --git a/npc/012-1/prawors.txt b/npc/012-1/prawors.txt new file mode 100644 index 00000000..3ee9159a --- /dev/null +++ b/npc/012-1/prawors.txt @@ -0,0 +1,18 @@ +// Evol scripts. +// Author: +// Micksha +// Description: +// Prawors, the captain in Candor. +// THIS IS A PLACEHOLDER! + +012-1,53,122,0 script Prawors NPC_PRAWORS,{ + speech + l("Welcome."), + l("Someone was too lazy to even write a placeholder text, so please come back later"); + close; + +OnInit: + .sex = G_MALE; + .distance = 2; + end; +} diff --git a/npc/012-1/vincent.txt b/npc/012-1/vincent.txt new file mode 100644 index 00000000..63f1268e --- /dev/null +++ b/npc/012-1/vincent.txt @@ -0,0 +1,18 @@ +// Evol scripts. +// Author: +// Micksha +// Description: +// Vincent, a child at the Candor beach. +// THIS IS A PLACEHOLDER! + +012-1,121,126,0 script Vincent NPC_VINCENT,{ + speech + l("Welcome."), + l("Someone was too lazy to even write a placeholder text, so please come back later"); + close; + +OnInit: + .sex = G_MALE; + .distance = 2; + end; +} diff --git a/npc/012-1/zegas.txt b/npc/012-1/zegas.txt new file mode 100644 index 00000000..12437d57 --- /dev/null +++ b/npc/012-1/zegas.txt @@ -0,0 +1,18 @@ +// Evol scripts. +// Author: +// Micksha +// Description: +// Zegas, the guy who want you to clean storage room. +// THIS IS A PLACEHOLDER! + +012-1,48,105,0 script Zegas NPC_ZEGAS,{ + speech + l("Welcome."), + l("Someone was too lazy to even write a placeholder text, so please come back later"); + close; + +OnInit: + .sex = G_MALE; + .distance = 2; + end; +} diff --git a/npc/012-2-1/_import.txt b/npc/012-2-1/_import.txt new file mode 100644 index 00000000..13ff23d2 --- /dev/null +++ b/npc/012-2-1/_import.txt @@ -0,0 +1,5 @@ +// Map 012-2-1: Sorfina's Home +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/012-2-1/_warps.txt", +"npc/012-2-1/jessie.txt", +"npc/012-2-1/tanisha.txt", diff --git a/npc/012-2-1/_warps.txt b/npc/012-2-1/_warps.txt new file mode 100644 index 00000000..4ccc3898 --- /dev/null +++ b/npc/012-2-1/_warps.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 012-2-1: Sorfina's Home warps +012-2-1,52,39,0 warp #012-2-1_52_39 0,0,012-1,38,116 +012-2-1,53,30,0 warp #012-2-1_53_30 0,0,012-2-2,30,34 diff --git a/npc/012-2-1/jessie.txt b/npc/012-2-1/jessie.txt new file mode 100644 index 00000000..c00e868d --- /dev/null +++ b/npc/012-2-1/jessie.txt @@ -0,0 +1,18 @@ +// Evol scripts. +// Author: +// Micksha +// Description: +// Jessie, Sorfina's old husband. +// THIS IS A PLACEHOLDER! + +012-2-1,38,30,0 script Jessie NPC_JESSIE,{ + speech + l("Welcome."), + l("Someone was too lazy to even write a placeholder text, so please come back later"); + close; + +OnInit: + .sex = G_MALE; + .distance = 2; + end; +} diff --git a/npc/012-2-1/tanisha.txt b/npc/012-2-1/tanisha.txt new file mode 100644 index 00000000..94848971 --- /dev/null +++ b/npc/012-2-1/tanisha.txt @@ -0,0 +1,18 @@ +// Evol scripts. +// Author: +// Micksha +// Description: +// Tanisha, the little girl in Sorfina's house. +// THIS IS A PLACEHOLDER! + +012-2-1,48,34,0 script Tanisha NPC_TANISHA,{ + speech + l("Welcome."), + l("Someone was too lazy to even write a placeholder text, so please come back later"); + close; + +OnInit: + .sex = G_FEMALE; + .distance = 2; + end; +} diff --git a/npc/012-2-2/_import.txt b/npc/012-2-2/_import.txt new file mode 100644 index 00000000..3990e3db --- /dev/null +++ b/npc/012-2-2/_import.txt @@ -0,0 +1,5 @@ +// Map 012-2-2: Sleeping Room +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/012-2-2/_savepoints.txt", +"npc/012-2-2/_warps.txt", +"npc/012-2-2/sorfina.txt", diff --git a/npc/012-2-2/_savepoints.txt b/npc/012-2-2/_savepoints.txt new file mode 100644 index 00000000..1aedace4 --- /dev/null +++ b/npc/012-2-2/_savepoints.txt @@ -0,0 +1,28 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 012-2-2: Sleeping Room saves +012-2-2,25,27,0 script #save_012-2-2_25_27 NPC_SAVE_POINT,0,0,{ + savepointparticle .map$, .x, .y, NO_INN; + close; + +OnInit: + .distance = 2; + .sex = G_OTHER; + end; + +OnTouch: + bedTouch(); + end; +} +012-2-2,28,27,0 script #save_012-2-2_28_27 NPC_SAVE_POINT,0,0,{ + savepointparticle .map$, .x, .y, NO_INN; + close; + +OnInit: + .distance = 2; + .sex = G_OTHER; + end; + +OnTouch: + bedTouch(); + end; +} diff --git a/npc/012-2-2/_warps.txt b/npc/012-2-2/_warps.txt new file mode 100644 index 00000000..f174dc7c --- /dev/null +++ b/npc/012-2-2/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 012-2-2: Sleeping Room warps +012-2-2,30,35,0 warp #012-2-2_30_35 0,0,012-2-1,53,31 diff --git a/npc/012-2-2/sorfina.txt b/npc/012-2-2/sorfina.txt new file mode 100644 index 00000000..682fa38d --- /dev/null +++ b/npc/012-2-2/sorfina.txt @@ -0,0 +1,18 @@ +// Evol scripts. +// Author: +// Micksha +// Description: +// Sorfina, the former starting NPC. Could need a new job. +// THIS IS A PLACEHOLDER! + +012-2-2,26,30,0 script Sorfina NPC_SORFINA,{ + speech + l("Welcome."), + l("Someone was too lazy to even write a placeholder text, so please come back later"); + close; + +OnInit: + .sex = G_FEMALE; + .distance = 2; + end; +} diff --git a/npc/012-2-3/_import.txt b/npc/012-2-3/_import.txt new file mode 100644 index 00000000..e04ba715 --- /dev/null +++ b/npc/012-2-3/_import.txt @@ -0,0 +1,5 @@ +// Map 012-2-3: Candor Shop +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/012-2-3/_warps.txt", +"npc/012-2-3/cynric.txt", +"npc/012-2-3/nyle.txt", diff --git a/npc/012-2-3/_warps.txt b/npc/012-2-3/_warps.txt new file mode 100644 index 00000000..a64e4ecb --- /dev/null +++ b/npc/012-2-3/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 012-2-3: Candor Shop warps +012-2-3,33,37,0 warp #012-2-3_33_37 0,0,012-1,64,96 diff --git a/npc/012-2-3/cynric.txt b/npc/012-2-3/cynric.txt new file mode 100644 index 00000000..83e2c00b --- /dev/null +++ b/npc/012-2-3/cynric.txt @@ -0,0 +1,18 @@ +// Evol scripts. +// Author: +// Micksha +// Description: +// Cynric, Candor's banker. +// THIS IS A PLACEHOLDER! + +012-2-3,27,28,0 script Cynric NPC_CYNRIC,{ + speech + l("Welcome."), + l("Someone was too lazy to even write a placeholder text, so please come back later"); + close; + +OnInit: + .sex = G_MALE; + .distance = 2; + end; +} diff --git a/npc/012-2-3/nyle.txt b/npc/012-2-3/nyle.txt new file mode 100644 index 00000000..0c81127a --- /dev/null +++ b/npc/012-2-3/nyle.txt @@ -0,0 +1,18 @@ +// Evol scripts. +// Author: +// Micksha +// Description: +// Nyle, Candor's shopkeeper. +// THIS IS A PLACEHOLDER! + +012-2-3,42,30,0 script Nyle NPC_NYLE,{ + speech + l("Welcome."), + l("Someone was too lazy to even write a placeholder text, so please come back later"); + close; + +OnInit: + .sex = G_MALE; + .distance = 2; + end; +} diff --git a/npc/012-2-4/_import.txt b/npc/012-2-4/_import.txt new file mode 100644 index 00000000..659fdc67 --- /dev/null +++ b/npc/012-2-4/_import.txt @@ -0,0 +1,5 @@ +// Map 012-2-4: Alchemy Hut +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/012-2-4/_warps.txt", +"npc/012-2-4/morgan.txt", +"npc/012-2-4/zitoni.txt", diff --git a/npc/012-2-4/_warps.txt b/npc/012-2-4/_warps.txt new file mode 100644 index 00000000..156a6e54 --- /dev/null +++ b/npc/012-2-4/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 012-2-4: Alchemy Hut warps +012-2-4,31,44,0 warp #012-2-4_31_44 0,0,012-1,57,102 diff --git a/npc/012-2-4/morgan.txt b/npc/012-2-4/morgan.txt new file mode 100644 index 00000000..23e97aaf --- /dev/null +++ b/npc/012-2-4/morgan.txt @@ -0,0 +1,21 @@ +// Evol scripts. +// Author: +// Micksha +// Description: +// Rosen, the salesman in Candor smith. +// THIS IS A PLACEHOLDER! + +012-2-4,26,37,0 script Morgan NPC_MORGAN,{ + speech + l("Hello Wanderer."), + l("I am Morgan, the alchimist."), + l("(People do not like to hear the word 'witch' so much, as we live close to Hurnscald)."), + l("Unfortunately my apprentice Zitoni does not bring fresh potions, so if you need something you should come back later."); + + close; + +OnInit: + .sex = G_MALE; + .distance = 2; + end; +} diff --git a/npc/012-2-4/zitoni.txt b/npc/012-2-4/zitoni.txt new file mode 100644 index 00000000..7b94cba3 --- /dev/null +++ b/npc/012-2-4/zitoni.txt @@ -0,0 +1,77 @@ +// Evol scripts. +// Author: +// Micksha +// Description: +// Zitoni, Morgan's apprentice. +// THIS IS A PLACEHOLDER! + +012-2-4,40,37,0 script Zitoni NPC_ZITONI,{ + +OnTalk: + mesn "The man shivers"; + mesq l("The world is so cruel! Oh, cruel world!"); + next; + + menu + lg("I do not like whiners."), -, + lg("What is your problem?"), L_toams; + + close; + +L_toams: + mesn "He looks at you."; + mesq l("I would so much like to brew potions, but..."); + next; + mesq l("I CANNOT WALK!"); + next; + mesq l("Please, please try to find a guy named toams - he is capable to make me walk again! Please!"); + next; + + menu + lg("Ok, I can try."), -, + lg("Ok, but do you have something else?"), L_jez; + + close; + +L_jez: + mesq l("Oh, yes! So kind that you ask"); + next; + mesq l("I forgot my tasks to do!"); + next; + mesq l("If only I remembered what I was supposed to do!"); + next; + mesq l("Please, can you look for a guy named Jesusalva? I am very sure he remembers what kind of quest I was going to accomplish."); + next; + + menu + lg("Ok, I will do that, but now I must leave."), -, + lg("Is that all, or do you have more problems?"), L_wildx; + close; + +L_wildx: + mesq l("Unfortunately yes."); + next; + mesq l("I totally forgot why I am here, and what I am doing here!"); + next; + mesq l("Please, please find WildX. He will explain to me what my role in this world has been."); + + menu + lg("Ok, but all that will keep me busy for a while. So, goodbye."), -, + lg("You do not have more problems, do you?"), L_mick; + close; + +L_mick: + mesq l("Sure I have one more problem."); + next; + mesq l("Did you ever look at me?!? That ugly robe, that weird whatever I hold in my hand, my strange face and all that!"); + next; + mesq l("Can you do a last task for me and try to find Micksha? He sure can help me to look a bit less ugly."); + next; + mesq("That would be so helpful! Please return soon to tell me about your progress."); + close; + +OnInit: + .sex = G_MALE; + .distance = 2; + end; +} diff --git a/npc/012-2-5/_import.txt b/npc/012-2-5/_import.txt new file mode 100644 index 00000000..1a36bb4d --- /dev/null +++ b/npc/012-2-5/_import.txt @@ -0,0 +1,5 @@ +// Map 012-2-5: Candor Smith +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/012-2-5/_warps.txt", +"npc/012-2-5/rosen.txt", +"npc/012-2-5/toichi.txt", diff --git a/npc/012-2-5/_warps.txt b/npc/012-2-5/_warps.txt new file mode 100644 index 00000000..d5a52d94 --- /dev/null +++ b/npc/012-2-5/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 012-2-5: Candor Smith warps +012-2-5,29,44,0 warp #012-2-5_29_44 0,0,012-1,65,106 diff --git a/npc/012-2-5/rosen.txt b/npc/012-2-5/rosen.txt new file mode 100644 index 00000000..3fa332c9 --- /dev/null +++ b/npc/012-2-5/rosen.txt @@ -0,0 +1,21 @@ +// Evol scripts. +// Author: +// Micksha +// Description: +// Rosen, the salesman in Candor smith. +// THIS IS A PLACEHOLDER! + +012-2-5,31,34,0 script Rosen NPC_ROSEN,{ + speech + l("Welcome."), + l("I am Rosen, I am selling the best weapons and armor you can get on this island."), + l("If only Toichi would work harder, I could even offer you something. But meh. Like things are, you must try to return at a later point."), + l("Toichi, go to work! Stop drinking beer!"); + + close; + +OnInit: + .sex = G_MALE; + .distance = 2; + end; +} diff --git a/npc/012-2-5/toichi.txt b/npc/012-2-5/toichi.txt new file mode 100644 index 00000000..255c140a --- /dev/null +++ b/npc/012-2-5/toichi.txt @@ -0,0 +1,21 @@ +// Evol scripts. +// Author: +// Micksha +// Description: +// Toichi, the smith in Candor island. +// THIS IS A PLACEHOLDER! + +012-2-5,40,35,0 script Toichi NPC_TOICHI,{ + speech + l("Hi there."), + l("My name is Toichi, and it seems I am the only one working on this lazy island."); + next; + l("So I kindly request you not to listen to that stupid Rosen, saying 'Toichi is lazy'."); + next; + l("At least I am doing something!"); + close; +OnInit: + .sex = G_MALE; + .distance = 2; + end; +} diff --git a/npc/012-2-6/_import.txt b/npc/012-2-6/_import.txt new file mode 100644 index 00000000..e239ad17 --- /dev/null +++ b/npc/012-2-6/_import.txt @@ -0,0 +1,3 @@ +// Map 012-2-6: Storage Room +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/012-2-6/_warps.txt", diff --git a/npc/012-2-6/_warps.txt b/npc/012-2-6/_warps.txt new file mode 100644 index 00000000..a56767e0 --- /dev/null +++ b/npc/012-2-6/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 012-2-6: Storage Room warps +012-2-6,26,39,0 warp #012-2-6_26_39 0,0,012-1,50,105 diff --git a/npc/012-2-7/_import.txt b/npc/012-2-7/_import.txt new file mode 100644 index 00000000..fe642729 --- /dev/null +++ b/npc/012-2-7/_import.txt @@ -0,0 +1,4 @@ +// Map 012-2-7: Small House +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/012-2-7/_savepoints.txt", +"npc/012-2-7/_warps.txt", diff --git a/npc/012-2-7/_savepoints.txt b/npc/012-2-7/_savepoints.txt new file mode 100644 index 00000000..0230a227 --- /dev/null +++ b/npc/012-2-7/_savepoints.txt @@ -0,0 +1,15 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 012-2-7: Small House saves +012-2-7,26,31,0 script #save_012-2-7_26_31 NPC_SAVE_POINT,0,0,{ + savepointparticle .map$, .x, .y, NO_INN; + close; + +OnInit: + .distance = 2; + .sex = G_OTHER; + end; + +OnTouch: + bedTouch(); + end; +} diff --git a/npc/012-2-7/_warps.txt b/npc/012-2-7/_warps.txt new file mode 100644 index 00000000..29b5aab2 --- /dev/null +++ b/npc/012-2-7/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 012-2-7: Small House warps +012-2-7,30,35,0 warp #012-2-7_30_35 0,0,012-1,51,94 diff --git a/npc/_anchors.txt b/npc/_anchors.txt index d46e49f2..36315554 100644 --- a/npc/_anchors.txt +++ b/npc/_anchors.txt @@ -36,7 +36,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, "^VEIN", "008-3-0 85 172"); + 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 e523471a..9417d136 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -95,6 +95,14 @@ @include "npc/008-3-0/_import.txt" @include "npc/008-3-1/_import.txt" @include "npc/008-4-1/_import.txt" +@include "npc/012-1/_import.txt" +@include "npc/012-2-1/_import.txt" +@include "npc/012-2-2/_import.txt" +@include "npc/012-2-3/_import.txt" +@include "npc/012-2-4/_import.txt" +@include "npc/012-2-5/_import.txt" +@include "npc/012-2-6/_import.txt" +@include "npc/012-2-7/_import.txt" @include "npc/test/_import.txt" @include "npc/testbg/_import.txt" "npc/_anchors.txt", |