summaryrefslogtreecommitdiff
path: root/npc/merchants/milk_trader.txt
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2014-11-03 08:15:05 -0200
committershennetsind <ind@henn.et>2014-11-03 08:15:05 -0200
commitbee4c9d36f4a27e39cc76dc5d6c5f876ed44a678 (patch)
tree79f9aec5171e8aed2d701bf67167f260e05f41db /npc/merchants/milk_trader.txt
parent239d480487e24294975f35ed55f210837ad1088e (diff)
parentce3f4bfbe016ea69c855146667ba9bd9e0e2e221 (diff)
downloadhercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.gz
hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.bz2
hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.xz
hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.zip
Merge branch 'master' of github.com:HerculesWS/Hercules
Signed-off-by: shennetsind <ind@henn.et> Conflicts: src/map/battle.c
Diffstat (limited to 'npc/merchants/milk_trader.txt')
-rw-r--r--npc/merchants/milk_trader.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/npc/merchants/milk_trader.txt b/npc/merchants/milk_trader.txt
index 3f2c46a20..d9c7efe47 100644
--- a/npc/merchants/milk_trader.txt
+++ b/npc/merchants/milk_trader.txt
@@ -46,9 +46,9 @@ prontera,73,140,0 script Milk Vendor 4_M_04,{
mes "way, you know...";
close;
}
- set .@bottles,countitem(713);
- set .@total_weight,.@bottles * 50;
- set .@total_cost,.@bottles * 15;
+ .@bottles = countitem(713);
+ .@total_weight = .@bottles * 50;
+ .@total_cost = .@bottles * 15;
if (Zeny < .@total_cost) {
mes "[Milk Vendor]";
mes "Oh, whoa~!";