Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added a missing rebellion weapon shop (#6953)

Browse Source 
* Correction a shop type

Thanks to @mazvi
This commit is contained in:
Atemo
2022-05-23 17:25:32 +02:00
committed by GitHub
parent 60813b28f0
commit 4b7fb7d6b4
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
npc/re/merchants/Extended_Ammunition.txt
View File

@@ -45,26 +45,32 @@ OnInit:
mes "Hi!";
mes "What did you come to see?";
next;
switch ( select( "Buy Ammunition", "Cartridge Exchange", "Sell Items", "Cancel" )) {
switch ( select( "Buy Weapons", "Buy Ammunition", "Cartridge Exchange", "Sell Items", "Cancel" )) {
case 1:
mes "[Ammunition Merchant]";
mes "I will prepare the weapon.";
close2;
callshop "Weapons_Gunslinger", 1;
break;
case 2:
mes "[Ammunition Merchant]";
mes "I will start preparing the ammunition.";
close2;
callshop "Ammunition_Gunslinger", 1;
break;
case 2:
case 3:
mes "[Ammunition Merchant]";
mes "I will start preparing ammunition cartridges!";
close2;
callshop "Box_Exchange_Gunslinger", 1;
break;
case 3:
case 4:
mes "[Ammunition Merchant]";
mes "What would you like to sell?";
close2;
callshop "Selling_Items", 2;
break;
case 4:
case 5:
mes "[Ammunition Merchant]";
mes "You can take a look at other things more calmly.";
close;
@@ -188,6 +194,7 @@ OnInit:
- 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
- shop Weapons_Gunslinger -1,13120:-1,13122:-1,13189:-1,13195:-1,13192:-1,13193:-1,13194:-1,13197:-1,13198:-1,28200:-1,28201:-1
- 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
@@ -195,7 +202,8 @@ OnInit:
- 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
- shop Weapons_Mechanic -1,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2805:-1,2806:-1,6186:-1,2808:-1,2807:-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