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

Fixes issue https://github.com/rathena/rathena/issues/1482

Browse Source
This commit is contained in:
Limestone 2016-08-07 17:28:15 +08:00
parent 49088dfe10
commit e00adfef81
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
npc/merchants/ammo_boxes.txt
View File

@ -3,7 +3,7 @@
//===== By: ================================================== //===== By: ==================================================
//= rAthena Dev Team //= rAthena Dev Team
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 2.0 //= 2.1
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= rAthena Project //= rAthena Project
//===== Description: ========================================= //===== Description: =========================================
@ -17,11 +17,12 @@
//= 1.4 Updated to match AEGIS script again. [Masao] //= 1.4 Updated to match AEGIS script again. [Masao]
//= 1.5 Moved Izlude duplicate to pre-re/re paths. [Euphy] //= 1.5 Moved Izlude duplicate to pre-re/re paths. [Euphy]
//= 2.0 Clean-up. [Capuche] //= 2.0 Clean-up. [Capuche]
//= 2.1 Fixes Issue #1482, where Rebellion jobs cannot use this npc. [Limestone]
//============================================================ //============================================================
alberta,118,157,3 script Magazine Dealer Kenny::mdk 4_M_01,{ alberta,118,157,3 script Magazine Dealer Kenny::mdk 4_M_01,{
mes "[Kenny]"; mes "[Kenny]";
if (BaseJob == Job_Gunslinger) { if (BaseClass == Job_Gunslinger) {
mes "Welcome to my Magazine Shop."; mes "Welcome to my Magazine Shop.";
mes "As you may know, large numbers"; mes "As you may know, large numbers";
mes "of bullets can be carried more"; mes "of bullets can be carried more";

5
npc/merchants/ammo_dealer.txt
View File

@ -3,7 +3,7 @@
//===== By =================================================== //===== By ===================================================
//= Playtester, Paradox924X //= Playtester, Paradox924X
//===== Version ============================================== //===== Version ==============================================
//= 2.0 //= 2.1
//===== Compatible With ====================================== //===== Compatible With ======================================
//= rAthena Project //= rAthena Project
//===== Description ========================================== //===== Description ==========================================
@ -18,11 +18,12 @@
//= 1.5 Updated to match AEGIS script again. [Masao] //= 1.5 Updated to match AEGIS script again. [Masao]
//= 1.6 Moved Izlude duplicate to pre-re/re paths. [Euphy] //= 1.6 Moved Izlude duplicate to pre-re/re paths. [Euphy]
//= 2.0 Clean-up. [Capuche] //= 2.0 Clean-up. [Capuche]
//= 2.1 Fixes Issue #1482, where Rebellion jobs cannot use this npc. [Limestone]
//============================================================ //============================================================
alberta,118,160,3 script Bullet Dealer Tony#alb::bdt 4_M_04,{ alberta,118,160,3 script Bullet Dealer Tony#alb::bdt 4_M_04,{
mes "[Tony]"; mes "[Tony]";
if (BaseJob == Job_Gunslinger) { if (BaseClass == Job_Gunslinger) {
mes "I'm Tony, the Bullet Dealer."; mes "I'm Tony, the Bullet Dealer.";
mes "Come to me whenever you're"; mes "Come to me whenever you're";
mes "short on ammo. Just bring me"; mes "short on ammo. Just bring me";