summaryrefslogtreecommitdiff
path: root/npc/merchants/ammo_dealer.txt
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2015-12-18 05:22:33 +0100
committerHaru <haru@dotalux.com>2015-12-18 05:22:33 +0100
commit8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a (patch)
tree54669433655bb853309ea1cae12da049622324fa /npc/merchants/ammo_dealer.txt
parent53abb8cdf92cd3d153b0a3d5b99b55cbd631f36c (diff)
parent0828824948c77bbfc357e08e8a5a0a96671b1ca6 (diff)
downloadhercules-8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a.tar.gz
hercules-8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a.tar.bz2
hercules-8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a.tar.xz
hercules-8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a.zip
Merge branch 'dastgir-ScriptCleanup2' into hercules
Closes #920 as merged
Diffstat (limited to 'npc/merchants/ammo_dealer.txt')
-rw-r--r--npc/merchants/ammo_dealer.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt
index 227bd6218..0c85a19bb 100644
--- a/npc/merchants/ammo_dealer.txt
+++ b/npc/merchants/ammo_dealer.txt
@@ -108,7 +108,7 @@ function script Bullet_Trade {
mes "items for some bullets.";
close;
}
- if (countitem(1010) >= .@amount && countitem(1011) >= .@amount && countitem(getarg(0)) >= (.@amount*getarg(1))) {
+ if (countitem(Phracon) >= .@amount && countitem(Emveretarcon) >= .@amount && countitem(getarg(0)) >= (.@amount*getarg(1))) {
if (checkweight(getarg(2),.@amount * 30) == 0) {
mes "[Tony]";
mes "Eh? Your Inventory doesn't";