diff options
27 files changed, 180 insertions, 107 deletions
diff --git a/conf/char_athena.conf b/conf/char_athena.conf index c7b14429..b488623b 100644 --- a/conf/char_athena.conf +++ b/conf/char_athena.conf @@ -44,7 +44,7 @@ backup_txt_flag: no backup_txt: save/athena_backup.txt // Start point, Map name followed by coordinates (x,y) -start_point: new_3-1.gat,29,28 +start_point: 001-1.gat,29,28 // Starting weapon for new characters start_weapon: 1201 diff --git a/conf/magic.conf b/conf/magic.conf index 7d3918b5..bfe56741 100644 --- a/conf/magic.conf +++ b/conf/magic.conf @@ -492,8 +492,8 @@ SPELL shroud : "#aw" = CONST MIN_MARRY_LEVEL = 32; -SILENT SPELL marriage (target : PC) : "marry" = - (REQUIRE is_in(location(caster), @("new_29-1.gat", 28,39) @+ (8, 6)))=> +NONMAGIC SILENT SPELL marriage (target : PC) : "marry" = + (REQUIRE is_in(location(caster), @("014-1.gat", 28,39) @+ (8, 6)))=> EFFECT IF target == caster # no valid target or tried to marry self? THEN ABORT; diff --git a/db/mob_db.txt b/db/mob_db.txt index 8074d699..be8baa07 100644 --- a/db/mob_db.txt +++ b/db/mob_db.txt @@ -34,5 +34,5 @@ 1031, GambogePlant, Gamboge Plant, 1, 1, 0, 1, 1, 1, 0, 0, 100, 100, 0, 0, 0, 0, 0, 0, 1, 1, 1, 3, 22, 0, 800, 800, 672, 480, 682, 3000, 682, 3000, 682, 3000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , 1032, AlizarinPlant, Alizarin Plant, 1, 1, 0, 1, 1, 1, 0, 0, 100, 100, 0, 0, 0, 0, 0, 0, 1, 1, 1, 3, 22, 0, 800, 800, 672, 480, 683, 3000, 683, 3000, 683, 3000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , 1033, SeaSlime, Sea Slime, 70, 600, 0, 90, 9, 1, 30, 40, 3, 7, 1, 25, 1, 0, 30, 30, 1, 1, 1, 0, 41, 131, 1500, 1872, 672, 480, 535, 800, 657, 800, 518, 500, 510, 1000, 700, 100, 1199, 5000, 568, 100, 541, 50, 0, 0, 0, 0, , , , , , -1034, GrassSnake, Grass Snake, 150, 1000, 0, 700, 100, 1, 80, 120, 2, 10, 20, 40, 10, 10, 40, 50, 1, 1, 1, 0, 20, 133, 500, 1100, 672, 480, 716, 400, 716, 400, 712, 500, 676, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , +1034, GrassSnake, Grass Snake, 150, 1000, 0, 700, 100, 1, 80, 120, 2, 10, 20, 40, 10, 10, 40, 50, 1, 1, 1, 0, 20, 133, 500, 1100, 672, 480, 716, 400, 716, 400, 712, 500, 676, 500, 660, 350, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , 1035, Silkworm, Silkworm, 20, 1, 0, 1, 1, 1, 0, 0, 2, 10, 20, 11, 10, 10, 40, 10, 1, 1, 1, 0, 20, 129, 1300, 1100, 672, 480, 718, 5000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, , , , , , diff --git a/npc/001-1_Tulimshar/_import.txt b/npc/001-1_Tulimshar/_import.txt index 7c475922..5aad5934 100644 --- a/npc/001-1_Tulimshar/_import.txt +++ b/npc/001-1_Tulimshar/_import.txt @@ -1,22 +1,22 @@ map: 001-1.gat +npc: npc/001-1_Tulimshar/merchant.txt +npc: npc/001-1_Tulimshar/bleacher.txt +npc: npc/001-1_Tulimshar/elanore.txt +npc: npc/001-1_Tulimshar/constable.txt npc: npc/001-1_Tulimshar/workers.txt -npc: npc/001-1_Tulimshar/vincent.txt -npc: npc/001-1_Tulimshar/soul-menhir.txt -npc: npc/001-1_Tulimshar/sandra.txt -npc: npc/001-1_Tulimshar/rules.txt npc: npc/001-1_Tulimshar/rewards_master.txt -npc: npc/001-1_Tulimshar/monsters.txt -npc: npc/001-1_Tulimshar/monster_guide.txt -npc: npc/001-1_Tulimshar/merchant.txt -npc: npc/001-1_Tulimshar/man.txt +npc: npc/001-1_Tulimshar/soul-menhir.txt npc: npc/001-1_Tulimshar/guide.txt +npc: npc/001-1_Tulimshar/monsters.txt npc: npc/001-1_Tulimshar/guards.txt -npc: npc/001-1_Tulimshar/elanore.txt -npc: npc/001-1_Tulimshar/constable.txt -npc: npc/001-1_Tulimshar/children.txt -npc: npc/001-1_Tulimshar/bleacher.txt -npc: npc/001-1_Tulimshar/bard.txt npc: npc/001-1_Tulimshar/barber.txt -npc: npc/001-1_Tulimshar/banker.txt +npc: npc/001-1_Tulimshar/bard.txt npc: npc/001-1_Tulimshar/_warps.txt npc: npc/001-1_Tulimshar/_mobs.txt +npc: npc/001-1_Tulimshar/man.txt +npc: npc/001-1_Tulimshar/vincent.txt +npc: npc/001-1_Tulimshar/monster_guide.txt +npc: npc/001-1_Tulimshar/sandra.txt +npc: npc/001-1_Tulimshar/rules.txt +npc: npc/001-1_Tulimshar/banker.txt +npc: npc/001-1_Tulimshar/children.txt diff --git a/npc/001-1_Tulimshar/merchant.txt b/npc/001-1_Tulimshar/merchant.txt index 74e994f4..cd7ecd02 100644 --- a/npc/001-1_Tulimshar/merchant.txt +++ b/npc/001-1_Tulimshar/merchant.txt @@ -1,3 +1,3 @@ // -001-1.gat,39,52,0 shop Neko 101,501:50,502:60,1201:100,522:300,521:1000,656:250,1202:1000,523:8000,603:-1 +001-1.gat,39,52,0 shop Neko 101,501:50,502:60,1201:100,522:300,521:1000,656:250,1202:1000,523:8000,603:-1,724:3000 diff --git a/npc/001-2_Tulimshar/_import.txt b/npc/001-2_Tulimshar/_import.txt index 15ecfe64..8e4299a0 100644 --- a/npc/001-2_Tulimshar/_import.txt +++ b/npc/001-2_Tulimshar/_import.txt @@ -1,8 +1,8 @@ map: 001-2.gat -npc: npc/001-2_Tulimshar/troupe_leader.txt npc: npc/001-2_Tulimshar/shops.txt -npc: npc/001-2_Tulimshar/phaet.txt -npc: npc/001-2_Tulimshar/omar.txt -npc: npc/001-2_Tulimshar/casino.txt npc: npc/001-2_Tulimshar/_warps.txt npc: npc/001-2_Tulimshar/_mobs.txt +npc: npc/001-2_Tulimshar/casino.txt +npc: npc/001-2_Tulimshar/phaet.txt +npc: npc/001-2_Tulimshar/omar.txt +npc: npc/001-2_Tulimshar/troupe_leader.txt diff --git a/npc/002-1_Sandstorm/_import.txt b/npc/002-1_Sandstorm/_import.txt index 4697808e..081efc41 100644 --- a/npc/002-1_Sandstorm/_import.txt +++ b/npc/002-1_Sandstorm/_import.txt @@ -1,8 +1,8 @@ map: 002-1.gat -npc: npc/002-1_Sandstorm/rogue.txt -npc: npc/002-1_Sandstorm/nomads.txt -npc: npc/002-1_Sandstorm/monsters.txt npc: npc/002-1_Sandstorm/merchant.txt npc: npc/002-1_Sandstorm/dark_mage.txt +npc: npc/002-1_Sandstorm/nomads.txt +npc: npc/002-1_Sandstorm/rogue.txt +npc: npc/002-1_Sandstorm/monsters.txt npc: npc/002-1_Sandstorm/_warps.txt npc: npc/002-1_Sandstorm/_mobs.txt diff --git a/npc/002-3_Desert_mines/_import.txt b/npc/002-3_Desert_mines/_import.txt index 8cb14224..0a67b2bb 100644 --- a/npc/002-3_Desert_mines/_import.txt +++ b/npc/002-3_Desert_mines/_import.txt @@ -1,5 +1,4 @@ map: 002-3.gat -npc: npc/002-3_Desert_mines/monsters.txt -npc: npc/002-3_Desert_mines/miners.txt npc: npc/002-3_Desert_mines/_warps.txt npc: npc/002-3_Desert_mines/_mobs.txt +npc: npc/002-3_Desert_mines/miners.txt diff --git a/npc/002-4_Desert_mines/_import.txt b/npc/002-4_Desert_mines/_import.txt index 5d87397b..2fe848bb 100644 --- a/npc/002-4_Desert_mines/_import.txt +++ b/npc/002-4_Desert_mines/_import.txt @@ -1,6 +1,5 @@ map: 002-4.gat -npc: npc/002-4_Desert_mines/miners.txt npc: npc/002-4_Desert_mines/monsters.txt -npc: npc/002-4_Desert_mines/chest.txt npc: npc/002-4_Desert_mines/_warps.txt npc: npc/002-4_Desert_mines/_mobs.txt +npc: npc/002-4_Desert_mines/chest.txt diff --git a/npc/005-1_Snake_desert/_import.txt b/npc/005-1_Snake_desert/_import.txt index 88bd9e5d..1e044ebb 100644 --- a/npc/005-1_Snake_desert/_import.txt +++ b/npc/005-1_Snake_desert/_import.txt @@ -1,5 +1,5 @@ map: 005-1.gat -npc: npc/005-1_Snake_desert/npcs.txt npc: npc/005-1_Snake_desert/monsters.txt +npc: npc/005-1_Snake_desert/npcs.txt npc: npc/005-1_Snake_desert/_warps.txt npc: npc/005-1_Snake_desert/_mobs.txt diff --git a/npc/006-1_Desert_mountains/_import.txt b/npc/006-1_Desert_mountains/_import.txt index 607997ed..f9b8cbc5 100644 --- a/npc/006-1_Desert_mountains/_import.txt +++ b/npc/006-1_Desert_mountains/_import.txt @@ -1,6 +1,6 @@ map: 006-1.gat npc: npc/006-1_Desert_mountains/pachua.txt npc: npc/006-1_Desert_mountains/monsters.txt -npc: npc/006-1_Desert_mountains/mika.txt npc: npc/006-1_Desert_mountains/_warps.txt npc: npc/006-1_Desert_mountains/_mobs.txt +npc: npc/006-1_Desert_mountains/mika.txt diff --git a/npc/008-1_Hurnscald_outskirts/_import.txt b/npc/008-1_Hurnscald_outskirts/_import.txt index a734d9f3..4b580a56 100644 --- a/npc/008-1_Hurnscald_outskirts/_import.txt +++ b/npc/008-1_Hurnscald_outskirts/_import.txt @@ -1,6 +1,6 @@ map: 008-1.gat -npc: npc/008-1_Hurnscald_outskirts/monsters.txt npc: npc/008-1_Hurnscald_outskirts/hinnak.txt +npc: npc/008-1_Hurnscald_outskirts/monsters.txt npc: npc/008-1_Hurnscald_outskirts/george.txt npc: npc/008-1_Hurnscald_outskirts/_warps.txt npc: npc/008-1_Hurnscald_outskirts/_mobs.txt diff --git a/npc/009-1_Hurnscald/_import.txt b/npc/009-1_Hurnscald/_import.txt index 94bf97b6..30460185 100644 --- a/npc/009-1_Hurnscald/_import.txt +++ b/npc/009-1_Hurnscald/_import.txt @@ -1,9 +1,9 @@ map: 009-1.gat npc: npc/009-1_Hurnscald/soul-menhir.txt -npc: npc/009-1_Hurnscald/sabine.txt -npc: npc/009-1_Hurnscald/old_woman.txt -npc: npc/009-1_Hurnscald/old_man.txt -npc: npc/009-1_Hurnscald/milly.txt npc: npc/009-1_Hurnscald/jack.txt +npc: npc/009-1_Hurnscald/old_man.txt npc: npc/009-1_Hurnscald/_warps.txt npc: npc/009-1_Hurnscald/_mobs.txt +npc: npc/009-1_Hurnscald/sabine.txt +npc: npc/009-1_Hurnscald/milly.txt +npc: npc/009-1_Hurnscald/old_woman.txt diff --git a/npc/009-2_Hurnscald/_import.txt b/npc/009-2_Hurnscald/_import.txt index 84ddc0a2..09ac6fb5 100644 --- a/npc/009-2_Hurnscald/_import.txt +++ b/npc/009-2_Hurnscald/_import.txt @@ -1,15 +1,15 @@ map: 009-2.gat +npc: npc/009-2_Hurnscald/nicholas.txt +npc: npc/009-2_Hurnscald/alan.txt +npc: npc/009-2_Hurnscald/doctor.txt npc: npc/009-2_Hurnscald/waitress.txt npc: npc/009-2_Hurnscald/shops.txt -npc: npc/009-2_Hurnscald/selim.txt -npc: npc/009-2_Hurnscald/richard.txt -npc: npc/009-2_Hurnscald/nurse.txt -npc: npc/009-2_Hurnscald/nicholas.txt -npc: npc/009-2_Hurnscald/misc.txt npc: npc/009-2_Hurnscald/kfahr.txt -npc: npc/009-2_Hurnscald/inspector.txt -npc: npc/009-2_Hurnscald/drunks.txt -npc: npc/009-2_Hurnscald/doctor.txt -npc: npc/009-2_Hurnscald/alan.txt npc: npc/009-2_Hurnscald/_warps.txt npc: npc/009-2_Hurnscald/_mobs.txt +npc: npc/009-2_Hurnscald/misc.txt +npc: npc/009-2_Hurnscald/drunks.txt +npc: npc/009-2_Hurnscald/nurse.txt +npc: npc/009-2_Hurnscald/richard.txt +npc: npc/009-2_Hurnscald/selim.txt +npc: npc/009-2_Hurnscald/inspector.txt diff --git a/npc/009-2_Hurnscald/selim.txt b/npc/009-2_Hurnscald/selim.txt index 952bac9e..cc7a8863 100644 --- a/npc/009-2_Hurnscald/selim.txt +++ b/npc/009-2_Hurnscald/selim.txt @@ -5,7 +5,7 @@ //# # //################################################################################# -new_20-1.gat,32,104,0 script Selim 142,{ +009-2.gat,32,104,0 script Selim 142,{ setarray @all_colours$, "red", "green", "dark blue", "yellow", "light blue", "pink", "black", "orange", "purple", "dark green"; setarray @all_colours_cap$, "Red", "Green", "Dark Blue", "Yellow", "Light Blue", "Pink", "Black", "Orange", "Purple", "Dark Green"; @@ -26,6 +26,8 @@ L_clothes_choice: "Tank top ", L_tanktop, "Short tank top", L_tanktop_short, "Silk robe", L_robe, + "Cotton headband", L_headband, + "Desert hat", L_desert_hat, "I'm fine for now, thanks.", -; close; @@ -79,6 +81,18 @@ L_robe: set @name$, "silk robe"; goto L_picked_item; +L_headband: + set @del, 724; + set @new, 2140; + set @name$, "cotton headband"; + goto L_picked_item; + +L_desert_hat: + set @del, 723; + set @new, 2130; + set @name$, "desert hat"; + goto L_picked_item; + L_picked_item: if (countitem(@del) == 0) goto L_havenone; L_colour: diff --git a/npc/009-2_Hurnscald/shops.txt b/npc/009-2_Hurnscald/shops.txt index d965cf68..ebd9f767 100644 --- a/npc/009-2_Hurnscald/shops.txt +++ b/npc/009-2_Hurnscald/shops.txt @@ -6,11 +6,11 @@ // Bartender // sells beer, cake and steak -new_20-1.gat,65,49,0 shop Barkeeper 112,539:-1,513:-1,676:-1 +009-2.gat,65,49,0 shop Barkeeper 112,539:-1,513:-1,676:-1 // Receptionist // Offers the player to rest at the inn for 100gp -new_20-1.gat,50,48,0 script Receptionist 108,{ +009-2.gat,50,48,0 script Receptionist 108,{ set @npcName$, "Receptionist"; set @cost, 100; callfunc "Inn"; @@ -18,17 +18,17 @@ new_20-1.gat,50,48,0 script Receptionist 108,{ // Archer Shop // sells bow, short bow, arrows and iron arrows -new_20-1.gat,97,24,0 shop Apprentice 120,1199:3,529:5,1200:1000,530:3000 +009-2.gat,97,24,0 shop Apprentice 120,1199:3,529:5,1200:1000,530:3000 // Potion Shop // sells cactus drink, cactus potion, iron potion and concentration potion -new_20-1.gat,121,26,0 shop Witch 103,501:50,502:70,567:500,568:500 +009-2.gat,121,26,0 shop Witch 103,501:50,502:70,567:500,568:500 // Blacksmith // Sells all knives, chainmail armor, light platemail -new_20-1.gat,183,57,0 shop Blacksmith 135,625:20000,626:50000,658:100000,1201:25,522:100,521:1000 +009-2.gat,183,57,0 shop Blacksmith 135,625:20000,626:50000,658:100000,1201:25,522:100,521:1000 // General Store // Sells various things, many not sold elsewhere -new_20-1.gat,32,99,0 shop General Store 112,527:-1,541:-1,1202:-1,586:-1,528:-1,656:-1 +009-2.gat,32,99,0 shop General Store 112,527:-1,541:-1,1202:-1,586:-1,528:-1,656:-1,724:3000 diff --git a/npc/010-2_Dimond's_Cove/_import.txt b/npc/010-2_Dimond's_Cove/_import.txt index 0ffbdeed..d6dce5d1 100644 --- a/npc/010-2_Dimond's_Cove/_import.txt +++ b/npc/010-2_Dimond's_Cove/_import.txt @@ -1,7 +1,7 @@ map: 010-2.gat -npc: npc/010-2_Dimond's_Cove/workers.txt npc: npc/010-2_Dimond's_Cove/loratay.txt +npc: npc/010-2_Dimond's_Cove/workers.txt npc: npc/010-2_Dimond's_Cove/doug.txt -npc: npc/010-2_Dimond's_Cove/dimonds.txt npc: npc/010-2_Dimond's_Cove/_warps.txt npc: npc/010-2_Dimond's_Cove/_mobs.txt +npc: npc/010-2_Dimond's_Cove/dimonds.txt diff --git a/npc/010-2_Dimond's_Cove/loratay.txt b/npc/010-2_Dimond's_Cove/loratay.txt index 744557e7..559ba578 100644 --- a/npc/010-2_Dimond's_Cove/loratay.txt +++ b/npc/010-2_Dimond's_Cove/loratay.txt @@ -1,4 +1,4 @@ -new_23-1.gat,85,85,0 script Lora Tay 151,{ +010-2.gat,85,85,0 script Lora Tay 151,{ set @COTTON, 660; set @SILK_COCOON, 718; @@ -233,6 +233,7 @@ L_main_menu: "Can you make fur boots for me?", -, "Can you make winter gloves me?", -, "Can you sew a robe for me?", L_robe, + "Can you make a desert hat for me?", L_desert_hat, "Goodbye for now!", L_end; mes "[Lora Tay the Seamstress]"; @@ -240,6 +241,65 @@ L_main_menu: next; goto L_main_menu; +L_desert_hat: + mes "[Lora Tay the Seamstress]"; + mes "The seamstress sighs."; + mes "\"One of these days it would be nice to have an actual challenge... yes, of course I can make a desert hat. A cotton headband, three pieces of cotton cloth. Hmm. And let's add 300 GP to that.\""; + next; + + set @default_choice$, "Never mind."; + setarray @items, 724, 2140, 2141, 2142, 2143, 2144, 2145, 2146, 2147, 2148, 2149; + setarray @item_names$, "Here is a white headband", "Here is a red headband", "Here is a green headband", "Here is a dark blue headband", "Here is a yellow headband", "Here is a light blue headband", "Here is a pink headband", "Here is a black headband", "Here is a orange headband", "Here is a puple headband", "Here is a dark green headband"; + set @items_nr, 11; + + callsub SUB_pick_one_of_many_items; + if (@item == 0) goto L_main_menu; + + if (@item == 724) + set @genitem, 723; + if (@item != 724) + set @genitem, @item - 10; + + if (countitem(@item) < 1) + goto L_desert_hat_noheadband; + if (countitem(@COTTON) < 3) + goto L_desert_hat_nocotton; + if (zeny < 300) + goto L_desert_hat_nogp; + + delitem @item, 1; + delitem @COTTON, 3; + set zeny, zeny - 300; + getitem @genitem, 1; + mes "[Lora Tay the Seamstress]"; + mes "\"Now then, this should only take a minute.\""; + mes "The seamstress folds your cotton cloth in a complicated fashion, wraps the resulting bundle into and out of the headband, and finally sews together several loose ends."; + next; + mes "[Lora Tay the Seamstress]"; + mes "The result resembles a huge knot."; + mes "Lora picks two ends and pulls, hard-- to your amazement, the knot unfolds, yielding a desert hat."; + mes "\"Here you are.\""; + next; + goto L_main_menu; + +L_desert_hat_nocotton: + mes "[Lora Tay the Seamstress]"; + mes "\"You're asking me to make a desert hat without enough cloth? Here, have your headband back-- see, that's how much I can do without cloth! And since I'm generous today, you can even keep your GP...\""; + next; + goto L_main_menu; + +L_desert_hat_nogp: + mes "[Lora Tay the Seamstress]"; + mes "\"No, no, no. 300 GP. That's not that much, I've been told. I can't just work for free, now can I?\""; + next; + goto L_main_menu; + +L_desert_hat_noheadband: + mes "[Lora Tay the Seamstress]"; + mes "\"Now that is odd. Where did your headband vanish to? Well, I'm not going to make you something as silly as a headband, so get one from elsewhere.\""; + next; + goto L_main_menu; + L_trim: mes "[Lora Tay the Seamstress]"; mes "\"Trimming... you mean that you can't do that yourself? Well, alright... I suppose I should charge 100 GP and do it.\""; @@ -249,8 +309,8 @@ L_trim: set @default_choice$, "Never mind."; setarray @items, 1202, 2050, 2051, 2052, 2053, 2054, 2055, 2056, 2057, 2058, 2059, 688, 2090, 2091, 2092, 2093, 2094, 2095, 2096, 2097, 2098, 2099; - setarray @item_names$, "cotton shirt", "red cotton shirt", "green cotton shirt", "dark blue cotton shirt", "yellow cotton shirt", "light blue cotton shirt", "pink cotton shirt", "black cotton shirt", "orange cotton shirt", "puple cotton shirt", "cotton shirt 9", - "tank top", "red tank top", "green tank top", "dark blue tank top", "yellow tank top", "light blue tank top", "pink tank top", "black tank top", "orange tank top", "purple tank top", "tank top 9"; + setarray @item_names$, "cotton shirt", "red cotton shirt", "green cotton shirt", "dark blue cotton shirt", "yellow cotton shirt", "light blue cotton shirt", "pink cotton shirt", "black cotton shirt", "orange cotton shirt", "puple cotton shirt", "dark green cotton shirt", + "tank top", "red tank top", "green tank top", "dark blue tank top", "yellow tank top", "light blue tank top", "pink tank top", "black tank top", "orange tank top", "purple tank top", "dark green tank top"; set @items_nr, 22; callsub SUB_pick_one_of_many_items; if (@item == 0) goto L_main_menu; @@ -297,8 +357,8 @@ L_lengthen: set @default_choice$, "Never mind."; setarray @items, 688, 2090, 2091, 2092, 2093, 2094, 2095, 2096, 2097, 2098, 2099, 689, 2120, 2121, 2122, 2123, 2124, 2125, 2126, 2127, 2128, 2129; - setarray @item_names$, "tank top", "red tank top", "green tank top", "dark blue tank top", "yellow tank top", "light blue tank top", "pink tank top", "black tank top", "orange tank top", "purple tank top", "tank top 9", - "short tank top", "red short tank top", "green short tank top", "dark blue short tank top", "yellow short tank top", "light blue short tank top", "pink short tank top", "black short tank top", "orange short tank top", "purple short tank top", "short tank top 9"; + setarray @item_names$, "tank top", "red tank top", "green tank top", "dark blue tank top", "yellow tank top", "light blue tank top", "pink tank top", "black tank top", "orange tank top", "purple tank top", "dark green tank top", + "short tank top", "red short tank top", "green short tank top", "dark blue short tank top", "yellow short tank top", "light blue short tank top", "pink short tank top", "black short tank top", "orange short tank top", "purple short tank top", "dark green short tank top"; set @items_nr, 22; callsub SUB_pick_one_of_many_items; if (@item == 0) goto L_main_menu; diff --git a/npc/011-1_Woodland/_import.txt b/npc/011-1_Woodland/_import.txt index 2afbca54..94c4f6c9 100644 --- a/npc/011-1_Woodland/_import.txt +++ b/npc/011-1_Woodland/_import.txt @@ -1,6 +1,6 @@ map: 011-1.gat -npc: npc/011-1_Woodland/oscar.txt -npc: npc/011-1_Woodland/monsters.txt npc: npc/011-1_Woodland/alchemist.txt +npc: npc/011-1_Woodland/monsters.txt npc: npc/011-1_Woodland/_warps.txt +npc: npc/011-1_Woodland/oscar.txt npc: npc/011-1_Woodland/_mobs.txt diff --git a/npc/011-3_Hermit's_cave/_import.txt b/npc/011-3_Hermit's_cave/_import.txt index 08b2f921..f97408df 100644 --- a/npc/011-3_Hermit's_cave/_import.txt +++ b/npc/011-3_Hermit's_cave/_import.txt @@ -1,5 +1,5 @@ map: 011-3.gat -npc: npc/011-3_Hermit's_cave/monsters.txt npc: npc/011-3_Hermit's_cave/hermit.txt +npc: npc/011-3_Hermit's_cave/monsters.txt npc: npc/011-3_Hermit's_cave/_warps.txt npc: npc/011-3_Hermit's_cave/_mobs.txt diff --git a/npc/012-1_Woodland_Hills/_import.txt b/npc/012-1_Woodland_Hills/_import.txt index 178bca3f..0b283c90 100644 --- a/npc/012-1_Woodland_Hills/_import.txt +++ b/npc/012-1_Woodland_Hills/_import.txt @@ -1,5 +1,5 @@ map: 012-1.gat -npc: npc/012-1_Woodland_Hills/shops.txt npc: npc/012-1_Woodland_Hills/monsters.txt +npc: npc/012-1_Woodland_Hills/shops.txt npc: npc/012-1_Woodland_Hills/_warps.txt npc: npc/012-1_Woodland_Hills/_mobs.txt diff --git a/npc/018-1_Woodland_mining_camp/_import.txt b/npc/018-1_Woodland_mining_camp/_import.txt index c8cd0a44..38e14457 100644 --- a/npc/018-1_Woodland_mining_camp/_import.txt +++ b/npc/018-1_Woodland_mining_camp/_import.txt @@ -1,5 +1,5 @@ map: 018-1.gat npc: npc/018-1_Woodland_mining_camp/monsters.txt -npc: npc/018-1_Woodland_mining_camp/miners.txt npc: npc/018-1_Woodland_mining_camp/_warps.txt npc: npc/018-1_Woodland_mining_camp/_mobs.txt +npc: npc/018-1_Woodland_mining_camp/miners.txt diff --git a/npc/018-2_Woodland_minning_camp/_import.txt b/npc/018-2_Woodland_minning_camp/_import.txt index 0f2ce698..247fe1d3 100644 --- a/npc/018-2_Woodland_minning_camp/_import.txt +++ b/npc/018-2_Woodland_minning_camp/_import.txt @@ -1,9 +1,9 @@ map: 018-2.gat -npc: npc/018-2_Woodland_minning_camp/receptionist.txt -npc: npc/018-2_Woodland_minning_camp/monsters.txt -npc: npc/018-2_Woodland_minning_camp/miners.txt -npc: npc/018-2_Woodland_minning_camp/caul.txt npc: npc/018-2_Woodland_minning_camp/books.txt npc: npc/018-2_Woodland_minning_camp/angus.txt +npc: npc/018-2_Woodland_minning_camp/monsters.txt npc: npc/018-2_Woodland_minning_camp/_warps.txt npc: npc/018-2_Woodland_minning_camp/_mobs.txt +npc: npc/018-2_Woodland_minning_camp/receptionist.txt +npc: npc/018-2_Woodland_minning_camp/miners.txt +npc: npc/018-2_Woodland_minning_camp/caul.txt diff --git a/npc/019-1_Snow_field/_import.txt b/npc/019-1_Snow_field/_import.txt index 9d59edc8..0b6958a8 100644 --- a/npc/019-1_Snow_field/_import.txt +++ b/npc/019-1_Snow_field/_import.txt @@ -1,6 +1,7 @@ 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/taro.txt npc: npc/019-1_Snow_field/monsters.txt +npc: npc/019-1_Snow_field/santa.txt npc: npc/019-1_Snow_field/_warps.txt npc: npc/019-1_Snow_field/_mobs.txt diff --git a/npc/020-1/_import.txt b/npc/020-1/_import.txt index bae7c91f..c6c4d3b5 100644 --- a/npc/020-1/_import.txt +++ b/npc/020-1/_import.txt @@ -1,8 +1,8 @@ map: 020-1.gat -npc: npc/020-1/startrek.txt -npc: npc/020-1/soul-menhir.txt +npc: npc/020-1/amrak.txt npc: npc/020-1/sexchanger.txt +npc: npc/020-1/soul-menhir.txt npc: npc/020-1/monsters.txt -npc: npc/020-1/amrak.txt npc: npc/020-1/_warps.txt npc: npc/020-1/_mobs.txt +npc: npc/020-1/startrek.txt diff --git a/npc/020-2/_import.txt b/npc/020-2/_import.txt index 2190955a..b49bb059 100644 --- a/npc/020-2/_import.txt +++ b/npc/020-2/_import.txt @@ -1,5 +1,5 @@ map: 020-2.gat -npc: npc/020-2/shops.txt npc: npc/020-2/furquest.txt +npc: npc/020-2/shops.txt npc: npc/020-2/_warps.txt npc: npc/020-2/_mobs.txt diff --git a/npc/_import.txt b/npc/_import.txt index 7a74dfed..bb22ec47 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -1,41 +1,41 @@ -import: npc/001-1_Tulimshar/_import.txt -import: npc/001-2_Tulimshar/_import.txt -import: npc/001-3_Tulimshar_arena/_import.txt -import: npc/002-1_Sandstorm/_import.txt -import: npc/002-3_Desert_mines/_import.txt -import: npc/002-4_Desert_mines/_import.txt -import: npc/003-1_Beach/_import.txt -import: npc/004-1_Beach/_import.txt -import: npc/005-1_Snake_desert/_import.txt -import: npc/005-3_Snake_pit/_import.txt -import: npc/006-1_Desert_mountains/_import.txt +import: npc/020-3_Ice_cave/_import.txt +import: npc/018-1_Woodland_mining_camp/_import.txt +import: npc/012-3_Cave/_import.txt +import: npc/010-2_Dimond's_Cove/_import.txt +import: npc/009-3_Cave_beneath_Hurnscald/_import.txt +import: npc/020-2/_import.txt +import: npc/018-3_Cave/_import.txt +import: npc/008-1_Hurnscald_outskirts/_import.txt import: npc/006-3_Desert_mountain_caves/_import.txt +import: npc/019-1_Snow_field/_import.txt +import: npc/001-3_Tulimshar_arena/_import.txt +import: npc/020-1/_import.txt +import: npc/002-2/_import.txt import: npc/007-1_Woodland/_import.txt -import: npc/008-1_Hurnscald_outskirts/_import.txt -import: npc/009-1_Hurnscald/_import.txt -import: npc/009-2_Hurnscald/_import.txt -import: npc/009-3_Cave_beneath_Hurnscald/_import.txt +import: npc/013-1_Woodland_hills/_import.txt +import: npc/016-1_Woodland/_import.txt import: npc/010-1_Woodland/_import.txt -import: npc/010-2_Dimond's_Cove/_import.txt -import: npc/011-1_Woodland/_import.txt -import: npc/011-3_Hermit's_cave/_import.txt +import: npc/014-1_Woodland/_import.txt +import: npc/004-1_Beach/_import.txt +import: npc/005-1_Snake_desert/_import.txt +import: npc/002-1_Sandstorm/_import.txt +import: npc/018-2_Woodland_minning_camp/_import.txt import: npc/011-4_Lake_cave/_import.txt -import: npc/012-1_Woodland_Hills/_import.txt -import: npc/012-3_Cave/_import.txt -import: npc/013-1_Woodland_hills/_import.txt import: npc/013-2_Magic_house/_import.txt -import: npc/013-3_Cave/_import.txt -import: npc/014-1_Woodland/_import.txt -import: npc/014-3_Cave/_import.txt +import: npc/003-1_Beach/_import.txt import: npc/015-1_Woodland/_import.txt -import: npc/016-1_Woodland/_import.txt +import: npc/005-3_Snake_pit/_import.txt +import: npc/014-3_Cave/_import.txt +import: npc/011-3_Hermit's_cave/_import.txt import: npc/017-1_Woodland_hills/_import.txt -import: npc/018-1_Woodland_mining_camp/_import.txt -import: npc/018-2_Woodland_minning_camp/_import.txt -import: npc/018-3_Cave/_import.txt -import: npc/019-1_Snow_field/_import.txt -import: npc/020-1/_import.txt -import: npc/020-2/_import.txt -import: npc/020-3_Ice_cave/_import.txt +import: npc/001-2_Tulimshar/_import.txt +import: npc/009-2_Hurnscald/_import.txt +import: npc/012-1_Woodland_Hills/_import.txt +import: npc/001-1_Tulimshar/_import.txt +import: npc/002-4_Desert_mines/_import.txt +import: npc/013-3_Cave/_import.txt +import: npc/009-1_Hurnscald/_import.txt +import: npc/006-1_Desert_mountains/_import.txt import: npc/020-4_Ice_cave/_import.txt -import: npc/021-1_Tulimshar/_import.txt +import: npc/002-3_Desert_mines/_import.txt +import: npc/011-1_Woodland/_import.txt |