diff --git a/db/re/item_db_equip.yml b/db/re/item_db_equip.yml index 6075354e2d..43123465c2 100644 --- a/db/re/item_db_equip.yml +++ b/db/re/item_db_equip.yml @@ -35138,7 +35138,7 @@ Body: AegisName: High_Quality_Cooler Name: High Quality Cooler Type: Armor - Buy: 100000 + Buy: 2000000 Weight: 2500 Slots: 1 Jobs: @@ -35156,7 +35156,7 @@ Body: AegisName: Special_Cooler Name: Special Cooler Type: Armor - Buy: 100000 + Buy: 5000000 Weight: 2500 Slots: 1 Jobs: diff --git a/db/re/item_db_etc.yml b/db/re/item_db_etc.yml index b0d3198875..261738c9f1 100644 --- a/db/re/item_db_etc.yml +++ b/db/re/item_db_etc.yml @@ -1874,7 +1874,7 @@ Body: AegisName: Booby_Trap Name: Trap Type: Etc - Buy: 75 + Buy: 50 Weight: 2 Flags: BuyingStore: true @@ -2110,7 +2110,7 @@ Body: Name: Silver Arrow Type: Ammo SubType: Arrow - Buy: 10 + Buy: 5 Weight: 1 Attack: 30 Jobs: @@ -2130,7 +2130,7 @@ Body: Name: Fire Arrow Type: Ammo SubType: Arrow - Buy: 8 + Buy: 5 Weight: 1 Attack: 30 Jobs: @@ -2168,7 +2168,7 @@ Body: Name: Crystal Arrow Type: Ammo SubType: Arrow - Buy: 3 + Buy: 5 Weight: 1 Attack: 30 Jobs: @@ -2188,7 +2188,7 @@ Body: Name: Arrow of Wind Type: Ammo SubType: Arrow - Buy: 3 + Buy: 5 Weight: 1 Attack: 30 Jobs: @@ -2208,7 +2208,7 @@ Body: Name: Stone Arrow Type: Ammo SubType: Arrow - Buy: 3 + Buy: 5 Weight: 1 Attack: 30 Jobs: @@ -2228,7 +2228,7 @@ Body: Name: Immaterial Arrow Type: Ammo SubType: Arrow - Buy: 3 + Buy: 5 Weight: 1 Attack: 30 Jobs: @@ -2329,7 +2329,7 @@ Body: Name: Rusty Arrow Type: Ammo SubType: Arrow - Buy: 3 + Buy: 5 Weight: 1 Attack: 30 Jobs: @@ -2428,7 +2428,7 @@ Body: Name: Arrow of Shadow Type: Ammo SubType: Arrow - Buy: 3 + Buy: 5 Weight: 1 Attack: 30 Jobs: @@ -2488,7 +2488,7 @@ Body: Name: Iron Arrow Type: Ammo SubType: Arrow - Buy: 4 + Buy: 3 Weight: 1 Attack: 30 Jobs: @@ -16810,7 +16810,7 @@ Body: AegisName: Vulcan_Bullet Name: Vulcan Bullet Type: Etc - Buy: 12 + Buy: 10 Weight: 1 Flags: BuyingStore: true @@ -16818,7 +16818,7 @@ Body: AegisName: Magic_Gear_Fuel Name: Magic Gear Fuel Type: Etc - Buy: 375 + Buy: 250 Weight: 1 Flags: BuyingStore: true @@ -16826,7 +16826,7 @@ Body: AegisName: Liquid_Condensed_Bullet Name: Liquid Condensed Bullet Type: Etc - Buy: 125 + Buy: 100 Weight: 1 Flags: BuyingStore: true @@ -20106,7 +20106,7 @@ Body: AegisName: Charm_Fire Name: Fire Amulet Type: Etc - Buy: 100 + Buy: 50 Weight: 1 Flags: BuyingStore: true @@ -20114,7 +20114,7 @@ Body: AegisName: Charm_Ice Name: Ice Amulet Type: Etc - Buy: 100 + Buy: 50 Weight: 1 Flags: BuyingStore: true @@ -20122,7 +20122,7 @@ Body: AegisName: Charm_Wind Name: Wind Amulet Type: Etc - Buy: 100 + Buy: 50 Weight: 1 Flags: BuyingStore: true @@ -27933,7 +27933,7 @@ Body: AegisName: Flame_Stone Name: Flame Stone Type: Etc - Buy: 112 + Buy: 50 Weight: 1 Flags: BuyingStore: true @@ -27941,7 +27941,7 @@ Body: AegisName: Ice_Stone Name: Ice Stone Type: Etc - Buy: 112 + Buy: 50 Weight: 1 Flags: BuyingStore: true @@ -27949,7 +27949,7 @@ Body: AegisName: Wind_Stone Name: Wind Stone Type: Etc - Buy: 112 + Buy: 50 Weight: 1 Flags: BuyingStore: true @@ -27957,7 +27957,7 @@ Body: AegisName: Shadow_Orb Name: Shadow Orb Type: Etc - Buy: 225 + Buy: 200 Weight: 1 Flags: BuyingStore: true @@ -29049,21 +29049,21 @@ Body: AegisName: Full_Metal_Jacket Name: Full Metal Jacket Type: Etc - Buy: 200 + Buy: 5 Weight: 1 Attack: 10 - Id: 7664 AegisName: Shooting_Mine Name: Grenade Launcher Type: Etc - Buy: 450 + Buy: 30 Weight: 1 Attack: 10 - Id: 7665 AegisName: Dragon_Tail_Missile Name: Dragon Tail Missile Type: Etc - Buy: 1500 + Buy: 15 Weight: 1 Attack: 10 - Id: 7666 @@ -31263,7 +31263,7 @@ Body: AegisName: Special_Alloy_Trap Name: Special Alloy Trap Type: Etc - Buy: 300 + Buy: 100 Weight: 2 Flags: BuyingStore: true @@ -32388,7 +32388,7 @@ Body: Name: Armor-Piercing Bullet Type: Ammo SubType: Bullet - Buy: 15 + Buy: 5 Weight: 1 Attack: 50 Jobs: @@ -32404,7 +32404,7 @@ Body: Name: Blazing Bullet Type: Ammo SubType: Bullet - Buy: 10 + Buy: 5 Weight: 1 Attack: 40 Jobs: @@ -32420,7 +32420,7 @@ Body: Name: Freezing Bullet Type: Ammo SubType: Bullet - Buy: 10 + Buy: 5 Weight: 1 Attack: 40 Jobs: @@ -32436,7 +32436,7 @@ Body: Name: Lightning Bullet Type: Ammo SubType: Bullet - Buy: 10 + Buy: 5 Weight: 1 Attack: 40 Jobs: @@ -32452,7 +32452,7 @@ Body: Name: Magic Stone Bullet Type: Ammo SubType: Bullet - Buy: 10 + Buy: 5 Weight: 1 Attack: 40 Jobs: @@ -32468,7 +32468,7 @@ Body: Name: Purifying Bullet Type: Ammo SubType: Bullet - Buy: 10 + Buy: 5 Weight: 1 Attack: 40 Jobs: @@ -32500,7 +32500,7 @@ Body: Name: Bloody Shell Type: Ammo SubType: Bullet - Buy: 10 + Buy: 5 Weight: 1 Attack: 30 Jobs: @@ -32586,7 +32586,7 @@ Body: Name: Flare Bullet Type: Ammo SubType: Bullet - Buy: 10 + Buy: 5 Weight: 1 Attack: 20 Jobs: @@ -32602,7 +32602,7 @@ Body: Name: Lightning Bullet Type: Ammo SubType: Bullet - Buy: 10 + Buy: 5 Weight: 1 Attack: 20 Jobs: @@ -32618,7 +32618,7 @@ Body: Name: Ice Bullet Type: Ammo SubType: Bullet - Buy: 10 + Buy: 5 Weight: 1 Attack: 20 Jobs: @@ -32634,7 +32634,7 @@ Body: Name: Poison Bullet Type: Ammo SubType: Bullet - Buy: 10 + Buy: 5 Weight: 1 Attack: 20 Jobs: @@ -32651,7 +32651,7 @@ Body: Name: Blind Bullet Type: Ammo SubType: Bullet - Buy: 10 + Buy: 5 Weight: 1 Attack: 20 Jobs: @@ -32668,7 +32668,7 @@ Body: Name: Shuriken Type: Ammo SubType: Shuriken - Buy: 4 + Buy: 2 Weight: 1 Attack: 10 Jobs: @@ -32682,7 +32682,7 @@ Body: Name: Nimbus Shuriken Type: Ammo SubType: Shuriken - Buy: 10 + Buy: 4 Weight: 1 Attack: 30 Jobs: @@ -32696,7 +32696,7 @@ Body: Name: Flash Shuriken Type: Ammo SubType: Shuriken - Buy: 20 + Buy: 6 Weight: 1 Attack: 45 Jobs: @@ -32710,7 +32710,7 @@ Body: Name: Sharp Leaf Shuriken Type: Ammo SubType: Shuriken - Buy: 40 + Buy: 12 Weight: 1 Attack: 70 Jobs: @@ -32724,7 +32724,7 @@ Body: Name: Thorn Needle Shuriken Type: Ammo SubType: Shuriken - Buy: 100 + Buy: 20 Weight: 1 Attack: 100 Jobs: @@ -32738,7 +32738,7 @@ Body: Name: Icicle Kunai Type: Ammo SubType: Kunai - Buy: 10 + Buy: 30 Weight: 1 Attack: 30 Jobs: @@ -32754,7 +32754,7 @@ Body: Name: Black Earth Kunai Type: Ammo SubType: Kunai - Buy: 10 + Buy: 30 Weight: 1 Attack: 30 Jobs: @@ -32770,7 +32770,7 @@ Body: Name: High Wind Kunai Type: Ammo SubType: Kunai - Buy: 10 + Buy: 30 Weight: 1 Attack: 30 Jobs: @@ -32786,7 +32786,7 @@ Body: Name: Heat Wave Kunai Type: Ammo SubType: Kunai - Buy: 10 + Buy: 30 Weight: 1 Attack: 30 Jobs: @@ -32802,7 +32802,7 @@ Body: Name: Fell Poison Kunai Type: Ammo SubType: Kunai - Buy: 10 + Buy: 30 Weight: 1 Attack: 30 Jobs: @@ -33415,7 +33415,7 @@ Body: Name: Explosive Kunai Type: Ammo SubType: Kunai - Buy: 100 + Buy: 50 Weight: 1 Attack: 50 Jobs: @@ -33484,7 +33484,7 @@ Body: Name: Cannon Ball Type: Ammo SubType: Cannonball - Buy: 100 + Buy: 30 Weight: 1 Attack: 100 Jobs: @@ -33501,7 +33501,7 @@ Body: Name: Holy Cannon Ball Type: Ammo SubType: Cannonball - Buy: 200 + Buy: 50 Weight: 1 Attack: 120 Jobs: @@ -33520,7 +33520,7 @@ Body: Name: Dark Cannon Ball Type: Ammo SubType: Cannonball - Buy: 200 + Buy: 50 Weight: 1 Attack: 120 Jobs: @@ -33539,7 +33539,7 @@ Body: Name: Soul Cannon Ball Type: Ammo SubType: Cannonball - Buy: 200 + Buy: 50 Weight: 1 Attack: 120 Jobs: @@ -33558,7 +33558,7 @@ Body: Name: Iron Cannon Ball Type: Ammo SubType: Cannonball - Buy: 500 + Buy: 80 Weight: 1 Attack: 250 Jobs: @@ -33575,6 +33575,7 @@ Body: Name: Ice Cannon Ball Type: Ammo SubType: Cannonball + Buy: 50 Weight: 1 Attack: 120 Jobs: @@ -33593,6 +33594,7 @@ Body: Name: Lightning Cannon Ball Type: Ammo SubType: Cannonball + Buy: 50 Weight: 1 Attack: 120 Jobs: @@ -33611,6 +33613,7 @@ Body: Name: Stone Cannon Ball Type: Ammo SubType: Cannonball + Buy: 50 Weight: 1 Attack: 120 Jobs: @@ -33629,6 +33632,7 @@ Body: Name: Fire Cannon Ball Type: Ammo SubType: Cannonball + Buy: 50 Weight: 1 Attack: 120 Jobs: @@ -34964,7 +34968,7 @@ Body: AegisName: Slug_Bullet Name: Slug Bullet Type: Etc - Buy: 1200 + Buy: 1000 Weight: 1200 - Id: 25188 AegisName: Handkerchief_of_Girl @@ -61535,31 +61539,37 @@ Body: - Id: 1000564 AegisName: Nw_Grenade Name: Nw Grenade + Buy: 30 Type: Etc Weight: 1 - Id: 1000565 AegisName: SS_Charm + Buy: 30 Name: SS Charm Type: Etc Weight: 1 - Id: 1000566 AegisName: SS_Charm_F Name: SS Charm F + Buy: 30 Type: Etc Weight: 1 - Id: 1000567 AegisName: SS_Charm_W Name: SS Charm W + Buy: 30 Type: Etc Weight: 1 - Id: 1000568 AegisName: SS_Charm_G Name: SS Charm G + Buy: 30 Type: Etc Weight: 1 - Id: 1000569 AegisName: SS_Charm_L Name: SS Charm L + Buy: 30 Type: Etc Weight: 1 - Id: 1000570 @@ -62462,6 +62472,7 @@ Body: Name: Kunai Type: Ammo SubType: Kunai + Buy: 30 Weight: 1 Attack: 30 Jobs: @@ -62475,6 +62486,7 @@ Body: Name: Kunai Of Nothing Type: Ammo SubType: Kunai + Buy: 30 Weight: 1 Attack: 30 Jobs: @@ -62490,6 +62502,7 @@ Body: Name: Kunai Of Shadow Type: Ammo SubType: Kunai + Buy: 30 Weight: 1 Attack: 30 Jobs: @@ -62505,6 +62518,7 @@ Body: Name: Kunai Of Hamaya Type: Ammo SubType: Kunai + Buy: 30 Weight: 1 Attack: 30 Jobs: diff --git a/npc/re/custom/lasagna/lasagna_npcs.txt b/npc/re/custom/lasagna/lasagna_npcs.txt index d21fbb5125..0dd2178dd0 100644 --- a/npc/re/custom/lasagna/lasagna_npcs.txt +++ b/npc/re/custom/lasagna/lasagna_npcs.txt @@ -10,6 +10,7 @@ //===== Changelogs: ========================================== //= 1.0 First version. [Capuche] //= 1.1 Moving Hair Designer to Merchants. [JohnnyPlayy] +//= 1.2 Tool Dealer Update. [JohnnyPlayy] //============================================================ lasa_fild01,47,297,0 script #doint_evt01 HIDDEN_WARP_NPC,1,1,{ @@ -977,7 +978,11 @@ lasagna,165,125,5 script Tool Merchant#doram05t 4_DR_M_01,{ mes "[Tool Merchant]"; mes "Do you need anything? I have basic potions, traps, magnifiers...You name it!"; close2; - callshop "tool_shop_lasagna",1; + if ( getbattleflag("feature.barter") ) { + callshop "tool_shop_lasagna#Extended",1; + } else { + callshop "tool_shop_lasagna",1; + } end; } mes "[Tool Merchant]"; @@ -992,6 +997,7 @@ OnInit: } - shop tool_shop_lasagna -1,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,713:-1,601:-1,602:-1,1065:-1 +- shop tool_shop_lasagna#Extended -1,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 lasagna,224,126,5 script Healer Haru#doram07t 4_DR_M_02,{ if (lasagna_quest[0] == 7) { diff --git a/npc/re/merchants/Dealer_Update.txt b/npc/re/merchants/Dealer_Update.txt new file mode 100644 index 0000000000..aa784991fc --- /dev/null +++ b/npc/re/merchants/Dealer_Update.txt @@ -0,0 +1,177 @@ +//===== rAthena Script ======================================= +//= Dealer Update +//===== Description: ========================================= +// This script is linked to the Extension of Ammunition Sales! +//===== Changelogs: ========================================== +//= 1.0 First Version. [JohnnyPlayy] +//============================================================ + +//= When the Barter Shop Feature is deactivated +//= The Old Dealers will be used again! +//============================================================ +- script Barter_Init HIDDEN_NPC,{ + end; + +OnInit: + if ( getbattleflag("feature.barter") ) { + //= Trap Specialist + unloadnpc "Trap Specialist#lhz"; + unloadnpc "Trap Specialist#mid"; + unloadnpc "Trap Specialist#pay"; + unloadnpc "Trap Specialist#prt"; + unloadnpc "Trap Specialist#ra"; + + //= Black Marketeer + unloadnpc "Black Marketeer#ein"; + unloadnpc "Black Marketeer#lhz"; + unloadnpc "Black Marketeer#mid"; + unloadnpc "Black Marketeer#prt"; + unloadnpc "Black Marketeer#ra"; + + //= Johnny Waiker + unloadnpc "Johnny Waiker"; + + //= Rebellion Sellers + unloadnpc "Rebellion Accessories"; + unloadnpc "Rebellion Weapons"; + + //= Arrow Quiver Event + unloadnpc "Inventor Jaax"; + + //= Ammunition Dealer + unloadnpc "Magazine Dealer Kenny#iz"; + unloadnpc "Magazine Dealer Kenny#al"; + + //= Ammunition Vending Machine + unloadnpc "Prop Vending Machine"; + + //= Unsold items + npcshopdelitem "Trading Merchant#alb",13200,13221,13222; + npcshopdelitem "Trading Merchant#iz",13200,13221,13222; + npcshopdelitem "Weapon Dealer#gef2",1750,1751; + npcshopdelitem "Weapon Dealer#iz",1750,1751; + npcshopdelitem "Weapon Dealer#yuno",1750,1751; + npcshopdelitem "Weapon Dealer#moc1",1750,1751; + npcshopdelitem "Weapon Dealer#pay",1750,1751; + npcshopdelitem "Weapon Dealer#prt",1750,1751; + npcshopdelitem "Tool Dealer#mora",1773,1774; + + //= NPC Moved Place + movenpc "Trading Merchant#iz", 72,110,3; + + //= Tool Dealer Before Upgrade! + unloadnpc "Tool Dealer#alb"; + unloadnpc "Tool Dealer#alb2"; + unloadnpc "Tool Dealer#alde"; + unloadnpc "Tool Dealer#ama"; + unloadnpc "Tool Dealer#ayo"; + unloadnpc "Tool Dealer#bra"; + unloadnpc "Tool Dealer#cmd"; + unloadnpc "Tool Dealer#cmd2"; + unloadnpc "Tool Dealer#ein"; + unloadnpc "Tool Dealer#gef"; + unloadnpc "Tool Dealer#gef2"; + unloadnpc "Tool Dealer#gon"; + unloadnpc "Tool Dealer#hu"; + unloadnpc "Tool Dealer#hu2"; + unloadnpc "Tool Dealer#yuno"; + unloadnpc "Tool Dealer#yuno1"; + unloadnpc "Tool Dealer#yuno2"; + unloadnpc "Tool Dealer#lhz"; + unloadnpc "Tool Dealer#lhz2"; + unloadnpc "Tool Dealer#lou"; + unloadnpc "Tool Dealer#xmas"; + unloadnpc "Tool Dealer#mosk"; + unloadnpc "Tool Dealer#pay"; + unloadnpc "Tool Dealer#pay2"; + unloadnpc "Tool Dealer#prt"; + unloadnpc "Tool Dealer#prt1"; + unloadnpc "Tool Dealer#ra"; + unloadnpc "Tool Dealer#tu"; + unloadnpc "Tool Dealer#um"; + unloadnpc "Tool Dealer#ve"; + unloadnpc "Tool Dealer#moc1"; + unloadnpc "Tool Dealer#moc2"; + unloadnpc "Tool Dealer#moc3"; + unloadnpc "Tool Dealer#moc4"; + } else { + //= About Sellers + unloadnpc "#over_arrow"; + unloadnpc "#over_bullet"; + unloadnpc "#over_kunai"; + unloadnpc "#over_madogear"; + unloadnpc "#over_talisman"; + + //= Tool Dealer After Upgrade! + unloadnpc "Tool Dealer#Extended_Alb"; + unloadnpc "Tool Dealer#Extended_Alb2"; + unloadnpc "Tool Dealer#Extended_Alde"; + unloadnpc "Tool Dealer#Extended_Ama"; + unloadnpc "Tool Dealer#Extended_Ayo"; + unloadnpc "Tool Dealer#Extended_Bra"; + unloadnpc "Tool Dealer#Extended_Cmd"; + unloadnpc "Tool Dealer#Extended_Cmd2"; + unloadnpc "Tool Dealer#Extended_Ein"; + unloadnpc "Tool Dealer#Extended_Gef"; + unloadnpc "Tool Dealer#Extended_Gef2"; + unloadnpc "Tool Dealer#Extended_Gon"; + unloadnpc "Tool Dealer#Extended_Hu2"; + unloadnpc "Tool Dealer#Extended_Yuno"; + unloadnpc "Tool Dealer#Extended_Yuno1"; + unloadnpc "Tool Dealer#Extended_Yuno2"; + unloadnpc "Tool Dealer#Extended_Lhz"; + unloadnpc "Tool Dealer#Extended_Lhz2"; + unloadnpc "Tool Dealer#Extended_Lou"; + unloadnpc "Tool Dealer#Extended_Xmas"; + unloadnpc "Tool Dealer#Extended_Mosk"; + unloadnpc "Tool Dealer#Extended_Pay"; + unloadnpc "Tool Dealer#Extended_Pay2"; + unloadnpc "Tool Dealer#Extended_Prt"; + unloadnpc "Tool Dealer#Extended_Prt1"; + unloadnpc "Tool Dealer#Extended_Ra"; + unloadnpc "Tool Dealer#Extended_Tu"; + unloadnpc "Tool Dealer#Extended_Um"; + unloadnpc "Tool Dealer#Extended_Ve"; + unloadnpc "Tool Dealer#Extended_Moc1"; + unloadnpc "Tool Dealer#Extended_Moc2"; + unloadnpc "Tool Dealer#Extended_Moc3"; + unloadnpc "Tool Dealer#Extended_Moc4"; + } + end; +} + +//= Tool Dealers +//============================================================ +alb2trea,87,65,5 shop Tool Dealer#Extended_Alb 83,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +alberta_in,182,97,0 shop Tool Dealer#Extended_Alb2 73,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +aldeba_in,94,56,5 shop Tool Dealer#Extended_Alde 83,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +ama_in01,24,30,5 shop Tool Dealer#Extended_Ama 763,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +ayo_in01,18,182,1 shop Tool Dealer#Extended_Ayo 840,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +brasilis,252,257,3 shop Tool Dealer#Extended_Bra 478,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +cmd_in01,79,182,5 shop Tool Dealer#Extended_Cmd 83,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +cmd_fild07,257,126,5 shop Tool Dealer#Extended_Cmd2 83,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +ein_in01,189,15,1 shop Tool Dealer#Extended_Ein 850,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +geffen_in,77,167,0 shop Tool Dealer#Extended_Gef 68,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +geffen_in,171,123,4 shop Tool Dealer#Extended_Gef2 64,1092:-1,1093:-1,713:-1 +gonryun,147,84,5 shop Tool Dealer#Extended_Gon 777,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +hu_in01,252,368,3 shop Tool Dealer#Extended_Hu2 90,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,1771:-1,717:-1 +yuno,218,97,5 shop Tool Dealer#Extended_Yuno 84,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +yuno,226,107,5 shop Tool Dealer#Extended_Yuno1 83,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +yuno_in01,25,34,5 shop Tool Dealer#Extended_Yuno2 83,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +lhz_in02,31,145,4 shop Tool Dealer#Extended_Lhz 90,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +lhz_in03,239,106,5 shop Tool Dealer#Extended_Lhz2 850,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +lou_in02,239,176,5 shop Tool Dealer#Extended_Lou 818,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +xmas_in,40,38,5 shop Tool Dealer#Extended_Xmas 83,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +mosk_in,21,254,5 shop Tool Dealer#Extended_Mosk 968,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +payon_in01,5,49,7 shop Tool Dealer#Extended_Pay 88,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +payon_in02,87,34,0 shop Tool Dealer#Extended_Pay2 75,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +prt_fild05,290,221,2 shop Tool Dealer#Extended_Prt 83,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +prt_in,126,76,0 shop Tool Dealer#Extended_Prt1 53,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +ra_in01,257,269,3 shop Tool Dealer#Extended_Ra 919,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +tur_dun01,158,54,6 shop Tool Dealer#Extended_Tu 99,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +um_in,104,124,3 shop Tool Dealer#Extended_Um 788,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +ve_in,243,303,5 shop Tool Dealer#Extended_Ve 943,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +moc_ruins,91,128,4 shop Tool Dealer#Extended_Moc1 93,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +moc_ruins,114,63,6 shop Tool Dealer#Extended_Moc2 99,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +morocc,146,103,6 shop Tool Dealer#Extended_Moc3 93,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 +morocc,151,241,4 shop Tool Dealer#Extended_Moc4 93,611:-1,602:-1,601:-1,23280:-1,23288:-1,645:-1,656:-1,657:-1,501:-1,502:-1,503:-1,504:-1,506:-1,610:-1,713:-1,717:-1,1771:-1 diff --git a/npc/re/merchants/Extended_Ammunition.txt b/npc/re/merchants/Extended_Ammunition.txt new file mode 100644 index 0000000000..288e63cb14 --- /dev/null +++ b/npc/re/merchants/Extended_Ammunition.txt @@ -0,0 +1,445 @@ +//===== rAthena Script ======================================= +//= Extension of Ammunition Sales +//===== Description: ========================================= +// The information in this script was taken from kro +//===== Changelogs: ========================================== +//= 1.0 First Version. [JohnnyPlayy] +//============================================================ + +//= Arrow Merchant Shop +//============================================================ +- script #over_arrow HIDDEN_NPC,{ + mes "[Arrow Merchant]"; + mes "Hi!"; + mes "Do you want to buy arrows or exchange the quiver?"; + next; + switch ( select( "Buy Arrows", "Quiver Exchange", "Sell Items", "Cancel" )) { + case 1: + close2; + callshop "Arrow_Archer", 1; + break; + case 2: + close2; + callshop "Quiver_Archer", 1; + break; + case 3: + close2; + callshop "Selling_Items", 2; + break; + case 4: + mes "[Arrow Merchant]"; + mes "You can take a look at other things more calmly."; + close; + } + end; + +OnInit: + setunitdata getnpcid(0),UNPC_GROUP_ID,7; + end; +} + +//= Ammunition Trader Shop +//============================================================ +- script #over_bullet HIDDEN_NPC,{ + mes "[Ammunition Merchant]"; + mes "Hi!"; + mes "What did you come to see?"; + next; + switch ( select( "Buy Ammunition", "Cartridge Exchange", "Sell Items", "Cancel" )) { + case 1: + mes "[Ammunition Merchant]"; + mes "I will start preparing the ammunition."; + close2; + callshop "Ammunition_Gunslinger", 1; + break; + case 2: + mes "[Ammunition Merchant]"; + mes "I will start preparing ammunition cartridges!"; + close2; + callshop "Box_Exchange_Gunslinger", 1; + break; + case 3: + mes "[Ammunition Merchant]"; + mes "What would you like to sell?"; + close2; + callshop "Selling_Items", 2; + break; + case 4: + mes "[Ammunition Merchant]"; + mes "You can take a look at other things more calmly."; + close; + } + end; + +OnInit: + setunitdata getnpcid(0),UNPC_GROUP_ID,13; + end; +} + +//= Ninja Tool Merchant +//============================================================ +- script #over_kunai HIDDEN_NPC,{ + mes "[Ninja Tool Merchant]"; + mes "Hi, what can I do to help you?"; + next; + switch ( select( "Buy Ninjutsu Tool", "Parchment Exchange", "Sell Items", "Cancel" )) { + case 1: + close2; + callshop "Weapons_Ninja", 1; + break; + case 2: + close2; + callshop "Box_Exchange_Ninja", 1; + break; + case 3: + close2; + callshop "Selling_Items", 2; + break; + case 4: + break; + } + end; + +OnInit: + setunitdata getnpcid(0),UNPC_GROUP_ID,14; + end; +} + +//= Mado Gear Merchant +//============================================================ +- script #over_madogear HIDDEN_NPC,{ + mes "[Mado Gear Merchant]"; + mes "Hi!"; + mes "Here you will find equipment for Madogear, except those that cannot be sold!"; + mes "How can I help you?"; + next; + switch ( select( "Buy Component", "Consumables and Cooling Device", "Box Exchange", "Sell Items", "Cancel" )) { + case 1: + mes "[Mado Gear Merchant]"; + mes "I will start preparing the Madogear pieces."; + close2; + callshop "Weapons_Mechanic", 1; + break; + case 2: + mes "[Mado Gear Merchant]"; + mes "I will start preparing the consumables used by Madogear."; + close2; + callshop "Ammunition_Mechanic", 1; + break; + case 3: + mes "[Mado Gear Merchant]"; + mes "I will arrange for the consumable packs used by MadoGear to be boxed!"; + close2; + callshop "Box_Exchange_Mechanic", 1; + break; + case 4: + mes "[Mado Gear Merchant]"; + mes "Do you have something to sell?"; + close2; + callshop "Selling_Items", 2; + break; + case 5: + mes "[Mado Gear Merchant]"; + mes "You can take a look at other things more calmly."; + close; + } + end; + +OnInit: + setunitdata getnpcid(0),UNPC_GROUP_ID,11; + end; +} + +//= Talisman Merchant +//============================================================ +- script #over_talisman HIDDEN_NPC,{ + mes "[Talisman Merchant]"; + mes "Hello. Did you come to see the spirits?"; + next; + switch ( select( "Buy Talisman", "Talisman Bundle Exchange", "Cancel" )) { + case 1: + mes "[Talisman Merchant]"; + mes "You'll like it."; + close2; + callshop "Talisman_Merchant", 1; + break; + case 2: + mes "[Talisman Merchant]"; + mes "We also exchange for bundles."; + close2; + callshop "Talisman_Bundle", 1; + break; + case 3: + mes "[Talisman Merchant]"; + mes "Thank you. Come again."; + close; + } + end; + +OnInit: + setunitdata getnpcid(0),UNPC_GROUP_ID,12; + end; +} + +//= Basic Shops +//============================================================ + +//= Archer +- marketshop Arrow_Archer HIDDEN_NPC,1750:-1:-1,1770:3:-1,1751:5:-1,1752:5:-1,1754:5:-1,1755:5:-1,1756:5:-1,1757:5:-1,1767:5:-1,1762:5:-1,1065:50:-1,7940:100:-1 + +//= Gunslinger + +- marketshop Ammunition_Gunslinger HIDDEN_NPC,13200:-1:-1,13221:-1:-1,13228:-1:-1,13229:-1:-1,13230:-1:-1,13231:-1:-1,13232:-1:-1,13222:-1:-1,13215:-1:-1,13216:-1:-1,13217:-1:-1,13218:-1:-1,13219:-1:-1,13220:-1:-1,7663:-1:-1,7665:15:-1,7664:-1:-1,25187:-1:-1,1000564:-1:-1 + +//= Ninja +- marketshop Weapons_Ninja HIDDEN_NPC,1220001:-1:-1,1220002:-1:-1,1220003:30:-1,1220004:-1:-1,13258:-1:-1,13257:-1:-1,13255:-1:-1,13256:-1:-1,13259:-1:-1,13294:-1:-1,6512:-1:-1,6513:-1:-1,6514:-1:-1,13250:-1:-1,13251:-1:-1,13252:-1:-1,13253:-1:-1,13254:-1:-1,7521:-1:-1,7522:-1:-1,7523:-1:-1,7524:-1:-1,1000565:-1:-1,1000566:-1:-1,1000567:-1:-1,1000568:-1:-1,1000569:-1:-1 + +//= Merchant +- marketshop Weapons_Mechanic HIDDEN_NPC,2139:-1:-1,2800:-1:-1,2801:-1:-1,2802:-1:-1,2803:-1:-1,2805:-1:-1,2806:-1:-1,6186:-1:-1,2808:-1:-1,2807:-1:-1 +- marketshop Ammunition_Mechanic HIDDEN_NPC,18000:-1:-1,18003:-1:-1,18001:-1:-1,18002:-1:-1,18004:-1:-1,18005:-1:-1,18006:-1:-1,18007:-1:-1,18008:-1:-1,6145:-1:-1,6146:-1:-1,12394:-1:-1,12393:-1:-1,12392:-1:-1,6147:-1:-1,23277:-1:-1,100158:-1:-1,2804:-1:-1,2809:-1:-1,2810:-1:-1 + +//= Talisman +- marketshop Talisman_Merchant HIDDEN_NPC,1000563:30:-1,101117:15000:-1 + +//= Sale Shop +- shop Selling_Items HIDDEN_NPC,512:-1 + +//= Duplicate of Prontera +//============================================================ + +prt_in,162,135,5 duplicate(#over_arrow) Arrow Merchant#over_arrow_0 4_M_ARCHER +prt_in,162,137,5 duplicate(#over_bullet) Ammunition Merchant#over_bullet_0 4_F_GUNSLINGER +prt_in,162,139,5 duplicate(#over_kunai) Ninja Tool Merchant#over_kunai_0 4_M_NINJA_RED +prt_in,162,141,5 duplicate(#over_madogear) Mado Gear Merchant#over_madogear_0 4_TOWER_17 +prt_in,162,133,4 duplicate(#over_talisman) Talisman Merchant#over_talisman_0 4_M_POORSCHOLAR + +//= Duplicate of Izlude +//============================================================ + +izlude_in,73,103,3 duplicate(#over_arrow) Arrow Merchant#over_arrow_1 4_M_ARCHER +izlude_in,73,105,3 duplicate(#over_bullet) Ammunition Merchant#over_bullet_1 4_F_GUNSLINGER +izlude_in,73,101,3 duplicate(#over_kunai) Ninja Tool Merchant#over_kunai_1 4_M_NINJA_RED +izlude_in,73,99,3 duplicate(#over_madogear) Mado Gear Merchant#over_madogear_1 4_TOWER_17 +izlude_in,72,106,3 duplicate(#over_talisman) Talisman Merchant#over_talisman_1 4_M_POORSCHOLAR + +//= Duplicate of Morocc +//============================================================ + +morocc_in,128,66,5 duplicate(#over_arrow) Arrow Merchant#over_arrow_2 4_M_ARCHER +morocc_in,128,68,5 duplicate(#over_bullet) Ammunition Merchant#over_bullet_2 4_F_GUNSLINGER +morocc_in,128,70,5 duplicate(#over_kunai) Ninja Tool Merchant#over_kunai_2 4_M_NINJA_RED +morocc_in,128,72,4 duplicate(#over_madogear) Mado Gear Merchant#over_madogear_2 4_TOWER_17 +morocc_in,128,64,4 duplicate(#over_talisman) Talisman Merchant#over_talisman_2 4_M_POORSCHOLAR + +//= Duplicate of Geffen +//============================================================ + +geffen_in,22,167,5 duplicate(#over_arrow) Arrow Merchant#over_arrow_3 4_M_ARCHER +geffen_in,22,169,5 duplicate(#over_bullet) Ammunition Merchant#over_bullet_3 4_F_GUNSLINGER +geffen_in,22,165,5 duplicate(#over_kunai) Ninja Tool Merchant#over_kunai_3 4_M_NINJA_RED +geffen_in,22,163,4 duplicate(#over_madogear) Mado Gear Merchant#over_madogear_3 4_TOWER_17 +geffen_in,22,161,6 duplicate(#over_talisman) Talisman Merchant#over_talisman_3 4_M_POORSCHOLAR + +//= Duplicate of Alberta +//============================================================ + +alberta_in,177,23,5 duplicate(#over_arrow) Arrow Merchant#over_arrow_4 4_M_ARCHER +alberta_in,177,25,7 duplicate(#over_bullet) Ammunition Merchant#over_bullet_4 4_F_GUNSLINGER +alberta_in,177,27,5 duplicate(#over_kunai) Ninja Tool Merchant#over_kunai_4 4_M_NINJA_RED +alberta_in,177,29,5 duplicate(#over_madogear) Mado Gear Merchant#over_madogear_4 4_TOWER_17 +alberta_in,177,21,5 duplicate(#over_talisman) Talisman Merchant#over_talisman_4 4_M_POORSCHOLAR + +//= Duplicate of Payon +//=========================================================== + +payon_in01,8,132,5 duplicate(#over_arrow) Arrow Merchant#over_arrow_5 4_M_ARCHER +payon_in01,10,132,7 duplicate(#over_bullet) Ammunition Merchant#over_bullet_5 4_F_GUNSLINGER +payon_in01,12,132,6 duplicate(#over_kunai) Ninja Tool Merchant#over_kunai_5 4_M_NINJA_RED +payon_in01,14,132,5 duplicate(#over_madogear) Mado Gear Merchant#over_madogear_5 4_TOWER_17 +payon_in01,6,132,6 duplicate(#over_talisman) Talisman Merchant#over_talisman_5 4_M_POORSCHOLAR + +//= Duplicate of Aldebaran +//=========================================================== + +aldeba_in,37,47,3 duplicate(#over_arrow) Arrow Merchant#over_arrow_6 4_M_ARCHER +aldeba_in,37,49,3 duplicate(#over_bullet) Ammunition Merchant#over_bullet_6 4_F_GUNSLINGER +aldeba_in,37,45,3 duplicate(#over_kunai) Ninja Tool Merchant#over_kunai_6 4_M_NINJA_RED +aldeba_in,37,43,4 duplicate(#over_madogear) Mado Gear Merchant#over_madogear_6 4_TOWER_17 +aldeba_in,35,50,2 duplicate(#over_talisman) Talisman Merchant#over_talisman_6 4_M_POORSCHOLAR + +//= Duplicate of Lutie +//=========================================================== + +xmas_in,169,93,5 duplicate(#over_arrow) Arrow Merchant#over_arrow_7 4_M_ARCHER +xmas_in,171,93,5 duplicate(#over_bullet) Ammunition Merchant#over_bullet_7 4_F_GUNSLINGER +xmas_in,173,93,5 duplicate(#over_kunai) Ninja Tool Merchant#over_kunai_7 4_M_NINJA_RED +xmas_in,175,93,5 duplicate(#over_madogear) Mado Gear Merchant#over_madogear_7 4_TOWER_17 +xmas_in,167,93,5 duplicate(#over_talisman) Talisman Merchant#over_talisman_7 4_M_POORSCHOLAR + +//= Duplicate of Comodo +//=========================================================== + +cmd_in01,117,173,5 duplicate(#over_arrow) Arrow Merchant#over_arrow_8 4_M_ARCHER +cmd_in01,119,173,5 duplicate(#over_bullet) Ammunition Merchant#over_bullet_8 4_F_GUNSLINGER +cmd_in01,115,173,5 duplicate(#over_kunai) Ninja Tool Merchant#over_kunai_8 4_M_NINJA_RED +cmd_in01,113,173,4 duplicate(#over_madogear) Mado Gear Merchant#over_madogear_8 4_TOWER_17 +cmd_in01,112,174,4 duplicate(#over_talisman) Talisman Merchant#over_talisman_8 4_M_POORSCHOLAR + +//= Duplicate of Umbala +//=========================================================== + +um_in,158,127,5 duplicate(#over_arrow) Arrow Merchant#over_arrow_9 4_M_ARCHER +um_in,156,127,5 duplicate(#over_bullet) Ammunition Merchant#over_bullet_9 4_F_GUNSLINGER +um_in,154,127,5 duplicate(#over_kunai) Ninja Tool Merchant#over_kunai_9 4_M_NINJA_RED +um_in,152,127,4 duplicate(#over_madogear) Mado Gear Merchant#over_madogear_9 4_TOWER_17 +um_in,150,127,4 duplicate(#over_talisman) Talisman Merchant#over_talisman_9 4_M_POORSCHOLAR + +//= Duplicate of Yuno +//=========================================================== + +yuno_in01,99,26,3 duplicate(#over_arrow) Arrow Merchant#over_arrow_10 4_M_ARCHER +yuno_in01,99,24,3 duplicate(#over_bullet) Ammunition Merchant#over_bullet_10 4_F_GUNSLINGER +yuno_in01,99,22,3 duplicate(#over_kunai) Ninja Tool Merchant#over_kunai_10 4_M_NINJA_RED +yuno_in01,99,20,2 duplicate(#over_madogear) Mado Gear Merchant#over_madogear_10 4_TOWER_17 +yuno_in01,99,18,2 duplicate(#over_talisman) Talisman Merchant#over_talisman_10 4_M_POORSCHOLAR + +//= Duplicate of Hugel +//=========================================================== + +hu_in01,99,383,5 duplicate(#over_arrow) Arrow Merchant#over_arrow_11 4_M_ARCHER +hu_in01,95,383,5 duplicate(#over_bullet) Ammunition Merchant#over_bullet_11 4_F_GUNSLINGER +hu_in01,93,383,5 duplicate(#over_kunai) Ninja Tool Merchant#over_kunai_11 4_M_NINJA_RED +hu_in01,101,383,4 duplicate(#over_madogear) Mado Gear Merchant#over_madogear_11 4_TOWER_17 +hu_in01,91,383,4 duplicate(#over_talisman) Talisman Merchant#over_talisman_11 4_M_POORSCHOLAR + +//= Duplicate of Lighthalzen +//=========================================================== + +lhz_in02,268,92,5 duplicate(#over_arrow) Arrow Merchant#over_arrow_12 4_M_ARCHER +lhz_in02,266,92,5 duplicate(#over_bullet) Ammunition Merchant#over_bullet_12 4_F_GUNSLINGER +lhz_in02,264,92,5 duplicate(#over_kunai) Ninja Tool Merchant#over_kunai_12 4_M_NINJA_RED +lhz_in02,262,92,4 duplicate(#over_madogear) Mado Gear Merchant#over_madogear_12 4_TOWER_17 +lhz_in02,270,92,4 duplicate(#over_talisman) Talisman Merchant#over_talisman_12 4_M_POORSCHOLAR + +//= Duplicate of Einbroch +//=========================================================== + +ein_in01,95,22,5 duplicate(#over_arrow) Arrow Merchant#over_arrow_13 4_M_ARCHER +ein_in01,95,24,5 duplicate(#over_bullet) Ammunition Merchant#over_bullet_13 4_F_GUNSLINGER +ein_in01,95,20,5 duplicate(#over_kunai) Ninja Tool Merchant#over_kunai_13 4_M_NINJA_RED +ein_in01,95,18,4 duplicate(#over_madogear) Mado Gear Merchant#over_madogear_13 4_TOWER_17 +ein_in01,95,26,4 duplicate(#over_talisman) Talisman Merchant#over_talisman_13 4_M_POORSCHOLAR + +//= Duplicate of Rachel +//=========================================================== + +ra_in01,169,363,5 duplicate(#over_arrow) Arrow Merchant#over_arrow_14 4_M_ARCHER +ra_in01,169,365,5 duplicate(#over_bullet) Ammunition Merchant#over_bullet_14 4_F_GUNSLINGER +ra_in01,169,367,5 duplicate(#over_kunai) Ninja Tool Merchant#over_kunai_14 4_M_NINJA_RED +ra_in01,169,361,4 duplicate(#over_madogear) Mado Gear Merchant#over_madogear_14 4_TOWER_17 +ra_in01,169,359,4 duplicate(#over_talisman) Talisman Merchant#over_talisman_14 4_M_POORSCHOLAR + +//= Duplicate of Veins +//=========================================================== + +ve_in,349,243,5 duplicate(#over_arrow) Arrow Merchant#over_arrow_15 4_M_ARCHER +ve_in,351,243,5 duplicate(#over_bullet) Arrow Merchant#over_bullet_15 4_F_GUNSLINGER +ve_in,353,243,5 duplicate(#over_kunai) Arrow Merchant#over_kunai_15 4_M_NINJA_RED +ve_in,355,243,4 duplicate(#over_madogear) Arrow Merchant#over_madogear_15 4_TOWER_17 +ve_in,347,243,4 duplicate(#over_talisman) Talisman Merchant#over_talisman_15 4_M_POORSCHOLAR + +//= Duplicate of Amatsu +//=========================================================== + +ama_in01,100,17,3 duplicate(#over_arrow) Arrow Merchant#over_arrow_16 4_M_ARCHER +ama_in01,100,19,3 duplicate(#over_bullet) Ammunition Merchant#over_bullet_16 4_F_GUNSLINGER +ama_in01,100,21,3 duplicate(#over_kunai) Ninja Tool Merchant#over_kunai_16 4_M_NINJA_RED +ama_in01,100,23,2 duplicate(#over_madogear) Mado Gear Merchant#over_madogear_16 4_TOWER_17 +ama_in01,100,25,2 duplicate(#over_talisman) Talisman Merchant#over_talisman_16 4_M_POORSCHOLAR + +//= Duplicate of Kunlun +//=========================================================== + +gonryun,175,95,3 duplicate(#over_arrow) Arrow Merchant#over_arrow_17 4_M_ARCHER +gonryun,175,97,3 duplicate(#over_bullet) Ammunition Merchant#over_bullet_17 4_F_GUNSLINGER +gonryun,175,99,3 duplicate(#over_kunai) Ninja Tool Merchant#over_kunai_17 4_M_NINJA_RED +gonryun,175,93,3 duplicate(#over_madogear) Mado Gear Merchant#over_madogear_17 4_TOWER_17 +gonryun,175,91,3 duplicate(#over_talisman) Talisman Merchant#over_talisman_17 4_M_POORSCHOLAR + +//= Duplicate of Louyang +//=========================================================== + +lou_in02,134,176,3 duplicate(#over_arrow) Arrow Merchant#over_arrow_18 4_M_ARCHER +lou_in02,134,178,3 duplicate(#over_bullet) Ammunition Merchant#over_bullet_18 4_F_GUNSLINGER +lou_in02,134,180,3 duplicate(#over_kunai) Ninja Tool Merchant#over_kunai_18 4_M_NINJA_RED +lou_in02,134,174,2 duplicate(#over_madogear) Mado Gear Merchant#over_madogear_18 4_TOWER_17 +lou_in02,134,172,2 duplicate(#over_talisman) Talisman Merchant#over_talisman_18 4_M_POORSCHOLAR + +//= Duplicate of Ayotaya +//=========================================================== + +ayo_in01,77,161,5 duplicate(#over_arrow) Arrow Merchant#over_arrow_19 4_M_ARCHER +ayo_in01,77,163,5 duplicate(#over_bullet) Ammunition Merchant#over_bullet_19 4_F_GUNSLINGER +ayo_in01,77,165,5 duplicate(#over_kunai) Ninja Tool Merchant#over_kunai_19 4_M_NINJA_RED +ayo_in01,77,159,5 duplicate(#over_madogear) Mado Gear Merchant#over_madogear_19 4_TOWER_17 +ayo_in01,77,157,3 duplicate(#over_talisman) Talisman Merchant#over_talisman_19 4_M_POORSCHOLAR + +//= Duplicate of Brasilis +//=========================================================== + +brasilis,252,247,3 duplicate(#over_arrow) Arrow Merchant#over_arrow_20 4_M_ARCHER +brasilis,252,249,3 duplicate(#over_bullet) Ammunition Merchant#over_bullet_20 4_F_GUNSLINGER +brasilis,252,251,3 duplicate(#over_kunai) Ninja Tool Merchant#over_kunai_20 4_M_NINJA_RED +brasilis,252,253,3 duplicate(#over_madogear) Mado Gear Merchant#over_madogear_20 4_TOWER_17 +brasilis,252,245,3 duplicate(#over_talisman) Talisman Merchant#over_talisman_20 4_M_POORSCHOLAR + +//= Duplicate of Malaya +//=========================================================== + +ma_in01,69,21,5 duplicate(#over_arrow) Arrow Merchant#over_arrow_21 4_M_ARCHER +ma_in01,67,21,5 duplicate(#over_bullet) Ammunition Merchant#over_bullet_21 4_F_GUNSLINGER +ma_in01,65,21,5 duplicate(#over_kunai) Ninja Tool Merchant#over_kunai_21 4_M_NINJA_RED +ma_in01,71,21,4 duplicate(#over_madogear) Mado Gear Merchant#over_madogear_21 4_TOWER_17 +ma_in01,63,19,4 duplicate(#over_talisman) Talisman Merchant#over_talisman_21 4_M_POORSCHOLAR + +//= Duplicate of Dewata +//=========================================================== + +dewata,223,167,3 duplicate(#over_arrow) Arrow Merchant#over_arrow_22 4_M_ARCHER +dewata,223,169,3 duplicate(#over_bullet) Ammunition Merchant#over_bullet_22 4_F_GUNSLINGER +dewata,223,171,3 duplicate(#over_kunai) Ninja Tool Merchant#over_kunai_22 4_M_NINJA_RED +dewata,223,173,2 duplicate(#over_madogear) Mado Gear Merchant#over_madogear_22 4_TOWER_17 +dewata,223,165,2 duplicate(#over_talisman) Talisman Merchant#over_talisman_22 4_M_POORSCHOLAR + +//= Duplicate of Moscovia +//=========================================================== + +mosk_in,24,173,3 duplicate(#over_arrow) Arrow Merchant#over_arrow_23 4_M_ARCHER +mosk_in,26,174,3 duplicate(#over_bullet) Ammunition Merchant#over_bullet_23 4_F_GUNSLINGER +mosk_in,22,172,3 duplicate(#over_kunai) Ninja Tool Merchant#over_kunai_23 4_M_NINJA_RED +mosk_in,20,172,2 duplicate(#over_madogear) Mado Gear Merchant#over_madogear_23 4_TOWER_17 +mosk_in,18,174,2 duplicate(#over_talisman) Talisman Merchant#over_talisman_23 4_M_POORSCHOLAR + +//= Duplicate of Rock Ridge +//=========================================================== + +har_in01,32,81,3 duplicate(#over_arrow) Arrow Merchant#over_arrow_24 4_M_ARCHER +har_in01,32,77,3 duplicate(#over_bullet) Ammunition Merchant#over_bullet_24 4_F_GUNSLINGER +har_in01,32,79,3 duplicate(#over_kunai) Ninja Tool Merchant#over_kunai_24 4_M_NINJA_RED +har_in01,32,83,2 duplicate(#over_madogear) Mado Gear Merchant#over_madogear_24 4_TOWER_17 +har_in01,30,84,2 duplicate(#over_talisman) Talisman Merchant#over_talisman_24 4_M_POORSCHOLAR + +//= Duplicate of Hunter Guild +//=========================================================== + +in_hunter,104,108,3 duplicate(#over_arrow) Arrow Merchant#over_arrow_25 4_M_ARCHER + +//= Duplicate of Unknown Place +//=========================================================== + +que_ng,180,79,3 duplicate(#over_bullet) Ammunition Merchant#over_bullet_25 4_F_GUNSLINGER + +//= Duplicate of Liberation Shelter +//=========================================================== + +job_gun,220,138,5 duplicate(#over_bullet) Ammunition Merchant#over_bullet_26 4_F_GUNSLINGER diff --git a/npc/re/merchants/barters.yml b/npc/re/merchants/barters.yml index cf74851141..7456714e62 100644 --- a/npc/re/merchants/barters.yml +++ b/npc/re/merchants/barters.yml @@ -44,3 +44,7 @@ Header: Type: BARTER_DB Version: 1 + +Footer: + Imports: + - Path: npc/re/merchants/barters/Extended_Ammunition.yml diff --git a/npc/re/merchants/barters/Extended_Ammunition.yml b/npc/re/merchants/barters/Extended_Ammunition.yml new file mode 100644 index 0000000000..121e5dc6b3 --- /dev/null +++ b/npc/re/merchants/barters/Extended_Ammunition.yml @@ -0,0 +1,545 @@ +# This file is a part of rAthena. +# Copyright(C) 2022 rAthena Development Team +# https://rathena.org - https://github.com/rathena +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +########################################################################### +# Barter Database +########################################################################### +# +# Barter Settings +# +########################################################################### +# - Name NPC name. +# Map Map name. (Default: not on a map) +# X Map x coordinate. (Default: 0) +# Y Map y coordinate. (Default: 0) +# Direction Direction the NPC is looking. (Default: North) +# Sprite Sprite name of the NPC. (Default: FakeNpc) +# Items: List of sold items. +# - Index Index of the item inside the shop. (0-...) +# Maximum index depends on client. +# Item Aegis name of the item. +# Stock Amount of item in stock. 0 means unlimited. (Default: 0) +# Zeny Cost of them item in Zeny. (Default: 0) +# RequiredItems: List of required items (Optional) +# - Index Index of the required item. (0-4) +# Item Aegis name of required item. +# Amount Amount of required item. (Default: 1) +# Refine Refine level of required item. (Default: 0) +########################################################################### + +Header: + Type: BARTER_DB + Version: 1 + +Body: +########################################################################### +##= Ammunition Trader Shop +########################################################################### + - Name: Quiver_Archer + Items: + - Index: 0 + Item: Arrow_Container + RequiredItems: + - Index: 0 + Item: Arrow + Amount: 500 + - Index: 1 + Item: Iron_Arrow_Container + RequiredItems: + - Index: 0 + Item: Iron_Arrow + Amount: 500 + - Index: 2 + Item: Steel_Arrow_Container + RequiredItems: + - Index: 0 + Item: Steel_Arrow + Amount: 500 + - Index: 3 + Item: Ori_Arrow_Container + RequiredItems: + - Index: 0 + Item: Oridecon_Arrow + Amount: 500 + - Index: 4 + Item: Fire_Arrow_Container + RequiredItems: + - Index: 0 + Item: Fire_Arrow + Amount: 500 + - Index: 5 + Item: Silver_Arrow_Container + RequiredItems: + - Index: 0 + Item: Silver_Arrow + Amount: 500 + - Index: 6 + Item: Wind_Arrow_Container + RequiredItems: + - Index: 0 + Item: Arrow_Of_Wind + Amount: 500 + - Index: 7 + Item: Stone_Arrow_Container + RequiredItems: + - Index: 0 + Item: Stone_Arrow + Amount: 500 + - Index: 8 + Item: Crystal_Arrow_Container + RequiredItems: + - Index: 0 + Item: Crystal_Arrow + Amount: 500 + - Index: 9 + Item: Shadow_Arrow_Container + RequiredItems: + - Index: 0 + Item: Arrow_Of_Shadow + Amount: 500 + - Index: 10 + Item: Imma_Arrow_Container + RequiredItems: + - Index: 0 + Item: Immatrial_Arrow + Amount: 500 + - Index: 11 + Item: Rusty_Arrow_Container + RequiredItems: + - Index: 0 + Item: Rusty_Arrow + Amount: 500 + - Index: 12 + Item: Holy_Arrow_Quiver + RequiredItems: + - Index: 0 + Item: Holy_Arrow + Amount: 500 + - Index: 13 + Item: Arrow_Of_Elf_Cntr + RequiredItems: + - Index: 0 + Item: Arrow_Of_Elf + Amount: 500 + - Index: 14 + Item: Hunting_Arrow_Cntr + RequiredItems: + - Index: 0 + Item: Hunting_Arrow + Amount: 500 + - Index: 15 + Item: Poison_Arrow_Container + RequiredItems: + - Index: 0 + Item: Poison_Arrow + Amount: 500 + - Index: 16 + Item: Siege_Arrow_Quiver_A + RequiredItems: + - Index: 0 + Item: Siege_Arrow_A + Amount: 500 + - Index: 17 + Item: Siege_Arrow_Quiver_S + RequiredItems: + - Index: 0 + Item: Siege_Arrow_S + Amount: 500 + - Index: 18 + Item: Booby_Trap_Box + RequiredItems: + - Index: 0 + Item: Booby_Trap + Amount: 500 + - Index: 19 + Item: Special_Alloy_Trap_Box + RequiredItems: + - Index: 0 + Item: Special_Alloy_Trap + Amount: 500 + +########################################################################### +##= Ammunition Trader Shop +########################################################################### + - Name: Box_Exchange_Gunslinger + Items: + - Index: 0 + Item: Bullet_Case + RequiredItems: + - Index: 0 + Item: Bullet + Amount: 500 + - Index: 1 + Item: Bullet_Case_Silver_ + RequiredItems: + - Index: 0 + Item: Silver_Bullet_ + Amount: 500 + - Index: 2 + Item: Bullet_Case_Flare + RequiredItems: + - Index: 0 + Item: Flare_Bullet + Amount: 500 + - Index: 3 + Item: Bullet_Case_Lighting + RequiredItems: + - Index: 0 + Item: Lightning_Bullet + Amount: 500 + - Index: 4 + Item: Bullet_Case_Ice + RequiredItems: + - Index: 0 + Item: Ice_Bullet + Amount: 500 + - Index: 5 + Item: Bullet_Case_Poison + RequiredItems: + - Index: 0 + Item: Poison_Bullet + Amount: 500 + - Index: 6 + Item: Bullet_Case_Blind + RequiredItems: + - Index: 0 + Item: Blind_Bullet + Amount: 500 + - Index: 7 + Item: Bullet_Case_Blood_ + RequiredItems: + - Index: 0 + Item: Shell_Of_Blood_ + Amount: 500 + - Index: 8 + Item: Bullet_Case_AP + RequiredItems: + - Index: 0 + Item: AP_Ammo + Amount: 500 + - Index: 9 + Item: Bullet_Case_Blaze + RequiredItems: + - Index: 0 + Item: Blaze_Bullet + Amount: 500 + - Index: 10 + Item: Bullet_Case_Fleeze + RequiredItems: + - Index: 0 + Item: Freezing_Bullet + Amount: 500 + - Index: 11 + Item: Bullet_Case_Electric + RequiredItems: + - Index: 0 + Item: Electric_Shock_Bullet + Amount: 500 + - Index: 12 + Item: Bullet_Case_Stone + RequiredItems: + - Index: 0 + Item: Magical_Stone_Bullet + Amount: 500 + - Index: 13 + Item: Sanctified_Bullet_Case + RequiredItems: + - Index: 0 + Item: Sanctified_Bullet + Amount: 500 + - Index: 14 + Item: aegis_100195 + RequiredItems: + - Index: 0 + Item: Full_Metal_Jacket + Amount: 500 + - Index: 15 + Item: aegis_100197 + RequiredItems: + - Index: 0 + Item: Dragon_Tail_Missile + Amount: 500 + - Index: 16 + Item: aegis_100196 + RequiredItems: + - Index: 0 + Item: Shooting_Mine + Amount: 500 + - Index: 17 + Item: Nw_Grenade_Box + RequiredItems: + - Index: 0 + Item: Nw_Grenade + Amount: 500 + +########################################################################### +##= Ninja Tool Merchant +########################################################################### + - Name: Box_Exchange_Ninja + Items: + - Index: 0 + Item: Kunai_Scroll + RequiredItems: + - Index: 0 + Item: Kunai + Amount: 500 + - Index: 1 + Item: Kunai_Scroll_Nothing + RequiredItems: + - Index: 0 + Item: Kunai_Of_Nothing + Amount: 500 + - Index: 2 + Item: Kunai_Scroll_Shadow + RequiredItems: + - Index: 0 + Item: Kunai_Of_Shadow + Amount: 500 + - Index: 3 + Item: Kunai_Scroll_Hamaya + RequiredItems: + - Index: 0 + Item: Kunai_Of_Hamaya + Amount: 500 + - Index: 4 + Item: Kunai_Scroll_Of_Flame + RequiredItems: + - Index: 0 + Item: Kunai_Of_Fierce_Flame + Amount: 500 + - Index: 5 + Item: Kunai_Scroll_Of_Wind + RequiredItems: + - Index: 0 + Item: Kunai_Of_Furious_Wind + Amount: 500 + - Index: 6 + Item: Kunai_Scroll_Of_Icicle + RequiredItems: + - Index: 0 + Item: Kunai_Of_Icicle + Amount: 500 + - Index: 7 + Item: Kunai_Scroll_Of_Soil + RequiredItems: + - Index: 0 + Item: Kunai_Of_Black_Soil + Amount: 500 + - Index: 8 + Item: Kunai_Scroll_Of_Poison + RequiredItems: + - Index: 0 + Item: Kunai_Of_Deadly_Poison + Amount: 500 + - Index: 9 + Item: Kunai_Scroll_Explosive + RequiredItems: + - Index: 0 + Item: Explosive_Kunai + Amount: 500 + - Index: 10 + Item: Charm_Fire_Bundle + RequiredItems: + - Index: 0 + Item: Charm_Fire + Amount: 500 + - Index: 11 + Item: Charm_Ice_Bundle + RequiredItems: + - Index: 0 + Item: Charm_Ice + Amount: 500 + - Index: 12 + Item: Charm_Wind_Bundle + RequiredItems: + - Index: 0 + Item: Charm_Wind + Amount: 500 + - Index: 13 + Item: Charm_Earth_Bundle + RequiredItems: + - Index: 0 + Item: Charm_Earth + Amount: 500 + - Index: 14 + Item: Flame_Stone_Bundle + RequiredItems: + - Index: 0 + Item: Flame_Stone + Amount: 500 + - Index: 15 + Item: Ice_Stone_Bundle + RequiredItems: + - Index: 0 + Item: Ice_Stone + Amount: 500 + - Index: 16 + Item: Wind_Stone_Bundle + RequiredItems: + - Index: 0 + Item: Wind_Stone + Amount: 500 + - Index: 17 + Item: Shadow_Orb_Bundle + RequiredItems: + - Index: 0 + Item: Shadow_Orb + Amount: 500 + - Index: 18 + Item: Shadow_Orb_Bundle + RequiredItems: + - Index: 0 + Item: Shadow_Orb + Amount: 500 + - Index: 19 + Item: SS_Charm_Box + RequiredItems: + - Index: 0 + Item: SS_Charm_F + Amount: 500 + - Index: 20 + Item: SS_Charm_W_Box + RequiredItems: + - Index: 0 + Item: SS_Charm_W + Amount: 500 + - Index: 21 + Item: SS_Charm_G_Box + RequiredItems: + - Index: 0 + Item: SS_Charm_G + Amount: 500 + - Index: 22 + Item: SS_Charm_L_Box + RequiredItems: + - Index: 0 + Item: SS_Charm_L + Amount: 500 + +########################################################################### +##= Mado Gear Merchant +########################################################################### + - Name: Box_Exchange_Mechanic + Items: + - Index: 0 + Item: Cannon_Ball_Box + RequiredItems: + - Index: 0 + Item: Cannon_Ball + Amount: 500 + - Index: 1 + Item: Iron_Cannon_Ball_Box + RequiredItems: + - Index: 0 + Item: Iron_Cannon_Ball + Amount: 500 + - Index: 2 + Item: Soul_Cannon_Ball_Box + RequiredItems: + - Index: 0 + Item: Soul_Cannon_Ball + Amount: 500 + - Index: 3 + Item: Dark_Cannon_Ball_Box + RequiredItems: + - Index: 0 + Item: Dark_Cannon_Ball + Amount: 500 + - Index: 4 + Item: Holy_Cannon_Ball_Box + RequiredItems: + - Index: 0 + Item: Holy_Cannon_Ball + Amount: 500 + - Index: 5 + Item: aegis_100178 + RequiredItems: + - Index: 0 + Item: Liquid_Condensed_Bullet + Amount: 500 + - Index: 6 + Item: Cannon_Box_Ice + RequiredItems: + - Index: 0 + Item: Ice_Cannon_Ball + Amount: 500 + - Index: 7 + Item: Cannon_Box_Lightning + RequiredItems: + - Index: 0 + Item: Lightning_Cannon_Ball + Amount: 500 + - Index: 8 + Item: Cannon_Box_Stone + RequiredItems: + - Index: 0 + Item: Stone_Cannon_Ball + Amount: 500 + - Index: 9 + Item: Cannon_Box_Flare + RequiredItems: + - Index: 0 + Item: Flare_Cannon_Ball + Amount: 500 + - Index: 10 + Item: Cannon_Box_Poisoning + RequiredItems: + - Index: 0 + Item: Poisoning_Cannon_Ball + Amount: 500 + - Index: 11 + Item: Vulcan_Bullet_Magazine + RequiredItems: + - Index: 0 + Item: Vulcan_Bullet + Amount: 500 + - Index: 12 + Item: Magic_Gear_Fuel_Box + RequiredItems: + - Index: 0 + Item: Magic_Gear_Fuel + Amount: 500 + - Index: 13 + Item: RepairA_Box + RequiredItems: + - Index: 0 + Item: RepairA + Amount: 500 + - Index: 14 + Item: RepairB_Box + RequiredItems: + - Index: 0 + Item: RepairB + Amount: 500 + - Index: 15 + Item: RepairC_Box + RequiredItems: + - Index: 0 + Item: RepairC + Amount: 500 + +########################################################################### +##= Talisman Merchant +########################################################################### + - Name: Talisman_Bundle + Items: + - Index: 0 + Item: Soa_Charm_Bundle + RequiredItems: + - Index: 0 + Item: Soa_Charm + Amount: 500 diff --git a/npc/re/merchants/quivers.txt b/npc/re/merchants/quivers.txt index 8d76643395..9c589dad6f 100644 --- a/npc/re/merchants/quivers.txt +++ b/npc/re/merchants/quivers.txt @@ -17,11 +17,12 @@ //===== Additional Comments: ================================= //= 1.0 Added Mora NPC. [Euphy] //= 1.1 Updated to match the official scripts. [Euphy] +//= 1.2 Update regarding the Barter Shop [JohnnyPlayy, Capuche] //============================================================ // Mora :: ep14_1_tre //============================================================ -mora,106,117,3 script Quiver Maker#mora 516,{ +mora,106,117,3 script Quiver Maker#mora 4_M_RAFLE_GR,{ if (checkweight(1201,1) == 0) { mes "[Quiver Maker]"; mes "You have too many things with you."; @@ -38,8 +39,18 @@ mora,106,117,3 script Quiver Maker#mora 516,{ mes "Mora villagers ask what good quivers are. They just don't know how the world works."; mes "No wonder they don't know a thing about quivers - spreading jam over leaves all day long."; next; - switch(select("Please make me a quiver.:What's a quiver?")) { + if (getbattleflag("feature.barter")) { + .@menu$ = "I want arrows"; + } + switch( select("Please make me a quiver.", .@menu$, "What's a quiver?") ) { case 1: + if (getbattleflag("feature.barter")) { + mes "[Quiver Maker]"; + mes "Finally, someone has appeared who knows the true value of a quiver. I will do it for those who know its worth."; + close2; + callshop "Quiver_Archer", 1; + end; + } mes "[Quiver Maker]"; mes "At last someone appreciates a quiver!"; mes "I can make Elven Quivers and Hunting Quivers."; @@ -53,7 +64,16 @@ mora,106,117,3 script Quiver Maker#mora 516,{ mes "You can buy arrows off the tool merchant next to me."; close; } + end; case 2: + if (getbattleflag("feature.barter")) { + mes "[Quiver Maker]"; + mes "I don't sell ordinary arrows. These are artisan arrows that can only be purchased here. Would you really recognize its worth, right?"; + close2; + callshop "Catch_Arrows", 1; + } + end; + case 3: mes "[Quiver Maker]"; mes "An arrow may be thin and light, but carrying hundreds and thousands of arrows is like carrying a whole log."; next; @@ -124,3 +144,9 @@ S_BuyQuiver: getitem getarg(3),.@quiver; close; } + +//= Basic Shops +//============================================================ + +//= Arrows +- marketshop Catch_Arrows HIDDEN_NPC,1773:5:-1,1774:5:-1 diff --git a/npc/re/scripts_athena.conf b/npc/re/scripts_athena.conf index 5c5e1b2ed8..df6e6aaef6 100644 --- a/npc/re/scripts_athena.conf +++ b/npc/re/scripts_athena.conf @@ -113,12 +113,14 @@ npc: npc/re/merchants/card_separation.txt npc: npc/re/merchants/catalog.txt npc: npc/re/merchants/clothing_buff_removal.txt npc: npc/re/merchants/coin_exchange.txt +npc: npc/re/merchants/Dealer_Update.txt npc: npc/re/merchants/diamond.txt npc: npc/re/merchants/enchan_ko.txt npc: npc/re/merchants/enchan_mal.txt npc: npc/re/merchants/enchan_mora.txt npc: npc/re/merchants/enchan_rockridge.txt npc: npc/re/merchants/enchan_verus.txt +npc: npc/re/merchants/Extended_Ammunition.txt npc: npc/re/merchants/Extended_Stylist.txt npc: npc/re/merchants/flute.txt npc: npc/re/merchants/gld_mission_exchange.txt