summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-06-05 07:19:01 +0000
committerLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-06-05 07:19:01 +0000
commitdecea4a40ac3858ef716b158ac75548e7f45e52b (patch)
tree035049ae06acc78d944e4a1ded36718592715504
parent4e3a69acc542f6aa59626f50e34404661d1e8fdd (diff)
downloadhercules-decea4a40ac3858ef716b158ac75548e7f45e52b.tar.gz
hercules-decea4a40ac3858ef716b158ac75548e7f45e52b.tar.bz2
hercules-decea4a40ac3858ef716b158ac75548e7f45e52b.tar.xz
hercules-decea4a40ac3858ef716b158ac75548e7f45e52b.zip
updated some headers in 3 merchants scripts
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10693 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/merchants/ammo_boxes.txt52
-rw-r--r--npc/merchants/ammo_dealer.txt49
-rw-r--r--npc/merchants/shops.txt5
4 files changed, 47 insertions, 60 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 8aa174027..4e61e0e43 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
Date Added
======
2007/06/04
+ * Updated versions in some merchants scripts [Lupus]
* Cleaned up Rachel donation prizes a bit [Playtester]
* Added 11.2 guns to gunslinger shop [Playtester]
* Reverted Bullet Dealer Tony to Stable [Playtester]
diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt
index eaec0d687..ee3aa324c 100644
--- a/npc/merchants/ammo_boxes.txt
+++ b/npc/merchants/ammo_boxes.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= eAthena dev team
//===== Current Version: =====================================
-//= 1.2
+//= 1.2a
//===== Compatible With: =====================================
//= eAthena 1.0+
//===== Description: =========================================
@@ -12,14 +12,14 @@
//= 1.0 First version. [SinSloth]
//= 1.1 Optimized version - Reduced to only one function [SinSloth]
//= 1.2 Optimized^2, corrected npc's name [ultramage]
+//= 1.2a Optimized. Please, ommit extra NPC names [Lupus]
//============================================================
que_ng,187,149,3 script Magazine Dealer Kenny 83,{
-
- if(BaseJob != Job_Gunslinger)
- {
- mes "[Kenny]";
- mes "I am the Casing Dealer, Kenny!";
+
+ mes "[Kenny]";
+ mes "I am the Casing Dealer, Kenny!";
+ if(BaseJob != Job_Gunslinger) {
mes "I'm here to package the Shells";
mes "and Bullets for Gunslingers.";
next;
@@ -30,9 +30,6 @@ que_ng,187,149,3 script Magazine Dealer Kenny 83,{
mes "after you're done looking around.";
close;
}
-
- mes "[Kenny]";
- mes "I am the Casing Dealer, Kenny!";
mes "If your bullets are getting";
mes "too heavy, come to me!";
next;
@@ -70,7 +67,10 @@ function script Func_Casing {
next;
mes "[Kenny]";
mes "" +getitemname(getarg(1))+ " will";
- if(getarg(0) == 13202) { mes "cost 500 Shells of Blood"; } else mes "cost 500 " +getitemname(getarg(0))+ "s";
+ if(getarg(0) == 13202)
+ mes "cost 500 Shells of Blood";
+ else
+ mes "cost 500 " +getitemname(getarg(0))+ "s";
mes "and 500 zeny each.";
next;
mes "[Kenny]";
@@ -78,17 +78,14 @@ function script Func_Casing {
mes "Input 0 if you want to cancel.";
next;
input .@caser_amount;
- if(.@caser_amount < 1)
- {
- mes "[Kenny]";
+ mes "[Kenny]";
+ if(.@caser_amount < 1) {
mes "Alright. If there's";
mes "something else I can help";
mes "you with, please tell me.";
close;
}
- if(.@caser_amount > 50)
- {
- mes "[Kenny]";
+ if(.@caser_amount > 50) {
mes "You've exceeded the limit!";
mes "Try again next time?";
close;
@@ -96,18 +93,14 @@ function script Func_Casing {
set .@caser_bullet, .@caser_amount * 500;
//Weight checking
- if(checkweight(getarg(1), .@caser_amount) != 1)
- {
- mes "[Kenny]";
+ if(checkweight(getarg(1), .@caser_amount) != 1) {
mes "You are overweight.";
mes "Please clear your inventory.";
close;
}
//Materials checking
- if(countitem(getarg(0)) < .@caser_bullet)
- {
- mes "[Kenny]";
+ if(countitem(getarg(0)) < .@caser_bullet) {
mes "Huh......";
mes "You don't have enough";
mes "materials to trade for";
@@ -118,22 +111,21 @@ function script Func_Casing {
}
//Zeny checking
- if(Zeny < .@caser_bullet)
- {
- mes "[Kenny]";
+ if(Zeny < .@caser_bullet) {
mes "Erm... You don't have enough money.";
mes "The fee is 500 zeny";
mes "Check your zeny and come again.";
close;
}
-
- mes "[Kenny]";
+
mes "Ah very well!";
mes "The number is confirmed!";
- if(getarg(1) < 12149) mes "I'll get you the Packs right away.";
- else mes "I'll get you the Casings right away.";
+ if(getarg(1) < 12149)
+ mes "I'll get you the Packs right away.";
+ else
+ mes "I'll get you the Casings right away.";
set Zeny, Zeny - .@caser_bullet;
delitem getarg(0), .@caser_bullet;
getitem getarg(1), .@caser_amount;
close;
-}
+} \ No newline at end of file
diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt
index c7c4e5e9c..56870d633 100644
--- a/npc/merchants/ammo_dealer.txt
+++ b/npc/merchants/ammo_dealer.txt
@@ -3,7 +3,7 @@
//===== By ===================================================
//= Playtester, Paradox924X
//===== Version ==============================================
-//= 1.1
+//= 1.3
//===== Compatible With ======================================
//= eAthena SVN with jAthena scripting engine and . variables
//===== Description ==========================================
@@ -11,12 +11,15 @@
//===== Comments =============================================
//= 1.0 First version [Playtester]
//= 1.1 Converted from Aegis [Paradox924X]
+//= 1.2 More optimized conversion [Legionaire]
+//= 1.2a Removed .GATs [Lupus]
+//= 1.3 Fixed [Playtester]
//============================================================
que_ng,187,156,3 script Bullet Dealer Tony 86,{
+ mes "[Tony]";
if (BaseJob == Job_Gunslinger) {
- mes "[Tony]";
mes "I'm Bullet-tooth Tony!";
mes "Whenever your out of bullets,";
mes "Visit me!!!";
@@ -28,16 +31,11 @@ que_ng,187,156,3 script Bullet Dealer Tony 86,{
mes "And pay money~!";
next;
switch(select("Poison Sphere:Flare Sphere:Lighting Sphere:Blind Sphere:Freezing Sphere:Cancel")) {
- case 1:
- callfunc "Bullet_Trade",937,10,13205;
- case 2:
- callfunc "Bullet_Trade",7097,2,13203;
- case 3:
- callfunc "Bullet_Trade",7053,3,13204;
- case 4:
- callfunc "Bullet_Trade",1024,5,13206;
- case 5:
- callfunc "Bullet_Trade",7054,2,13207;
+ case 1: callfunc "Bullet_Trade",937,10,13205; break;
+ case 2: callfunc "Bullet_Trade",7097,2,13203; break;
+ case 3: callfunc "Bullet_Trade",7053,3,13204; break;
+ case 4: callfunc "Bullet_Trade",1024,5,13206; break;
+ case 5: callfunc "Bullet_Trade",7054,2,13207; break;
case 6:
mes "[Tony]";
mes "Mmm~ Okay~";
@@ -46,18 +44,16 @@ que_ng,187,156,3 script Bullet Dealer Tony 86,{
mes "Will always be here~!!!";
close;
}
- } else {
- mes "[Tony]";
- mes "I'm a trader who supplies";
- mes "Gunslingers with trade items.";
- mes "I am called Bullet-tooth Tony.";
- next;
- mes "[Tony]";
- mes "I don't think you are a Gunslinger";
- mes "So just look around";
- mes "and go.";
- close;
}
+ mes "I'm a trader who supplies";
+ mes "Gunslingers with trade items.";
+ mes "I am called Bullet-tooth Tony.";
+ next;
+ mes "[Tony]";
+ mes "I don't think you are a Gunslinger";
+ mes "So just look around";
+ mes "and go.";
+ close;
}
function script Bullet_Trade {
@@ -78,18 +74,16 @@ function script Bullet_Trade {
set @tony,.@input;
set @tony1,.@input;
set @tony2,.@input * getarg(1);
+ mes "[Tony]";
if (.@input < 1 || .@input > 500) {
- mes "[Tony]";
mes "Invalid Amount!";
mes "Enter again~!";
close;
} else if ((countitem(1010) >= @tony) && (countitem(1011) >= @tony1) && (countitem(getarg(0)) >= @tony2)) {
if (checkweight(getarg(2),.@input * 30) == 0) {
- mes "[Tony]";
mes "I cannot give it to you because your inventory is full. Come back after your inventory has more space.";
close;
} else {
- mes "[Tony]";
mes "Oh~ Good!";
mes "Trade number checked!";
mes "I'll trade immediately.";
@@ -100,7 +94,6 @@ function script Bullet_Trade {
close;
}
} else {
- mes "[Tony]";
mes "Tsk Tsk~";
mes "You do not have";
mes "enough items for the";
@@ -108,4 +101,4 @@ function script Bullet_Trade {
mes "Prepare again and come back.";
close;
}
-}
+} \ No newline at end of file
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index bd283843c..19e3fb639 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -3,9 +3,9 @@
//===== By: ==================================================
//= eAthena Dev Team
//===== Current Version: =====================================
-//= 1.9a
+//= 1.9b
//===== Compatible With: =====================================
-//= eAthena 7.15 +
+//= eAthena 1.0+
//===== Description: =========================================
//=
//===== Additional Comments: =================================
@@ -24,6 +24,7 @@
//= 1.8 Added Rachel Official shops. Special Thanks to RockmanEXE. [erKURITA]
//= 1.9 Uncommented Homunculus shop, since Homunculus is working on trunk now. [Evera]
//= 1.9a Pet Merchant -> Lighthalzen [erKURITA]
+//= 1.9b Added items to Chivas Regal
//============================================================