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

Merge pull request #1484 from jgoog999/06-Bullet_Magazine_Seller_Fix

Browse Source 
Fixes issue https://github.com/rathena/rathena/issues/1482
This commit is contained in:
Jittapan Pluemsumran 2016-08-07 16:40:43 +07:00 committed by GitHub
commit 3d8eca4930
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: ==================================================
//= rAthena Dev Team
//===== Current Version: =====================================
//= 2.0
//= 2.1
//===== Compatible With: =====================================
//= rAthena Project
//===== Description: =========================================
@ -17,11 +17,12 @@
//= 1.4 Updated to match AEGIS script again. [Masao]
//= 1.5 Moved Izlude duplicate to pre-re/re paths. [Euphy]
//= 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,{
mes "[Kenny]";
if (BaseJob == Job_Gunslinger) {
if (BaseClass == Job_Gunslinger) {
mes "Welcome to my Magazine Shop.";
mes "As you may know, large numbers";
mes "of bullets can be carried more";

5
npc/merchants/ammo_dealer.txt
View File

@ -3,7 +3,7 @@
//===== By ===================================================
//= Playtester, Paradox924X
//===== Version ==============================================
//= 2.0
//= 2.1
//===== Compatible With ======================================
//= rAthena Project
//===== Description ==========================================
@ -18,11 +18,12 @@
//= 1.5 Updated to match AEGIS script again. [Masao]
//= 1.6 Moved Izlude duplicate to pre-re/re paths. [Euphy]
//= 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,{
mes "[Tony]";
if (BaseJob == Job_Gunslinger) {
if (BaseClass == Job_Gunslinger) {
mes "I'm Tony, the Bullet Dealer.";
mes "Come to me whenever you're";
mes "short on ammo. Just bring me";