diff options
author | Haru <haru@dotalux.com> | 2017-09-03 06:34:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-03 06:34:57 +0200 |
commit | 209201d9bcda0347619addc0110bf8476dcbceba (patch) | |
tree | 1bc304742ee8e3c254b4d00126b87992f9716603 | |
parent | 7c2f6afe542bf42f1c527877bde082274c473f29 (diff) | |
parent | 47cdfa0845bbe0177ff11777c511aa09ab37c673 (diff) | |
download | hercules-209201d9bcda0347619addc0110bf8476dcbceba.tar.gz hercules-209201d9bcda0347619addc0110bf8476dcbceba.tar.bz2 hercules-209201d9bcda0347619addc0110bf8476dcbceba.tar.xz hercules-209201d9bcda0347619addc0110bf8476dcbceba.zip |
Merge pull request #1835 from MathyM/diamond-seller-weight-fix
Fix Diamond Seller weight check
-rw-r--r-- | npc/other/comodo_gambling.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/npc/other/comodo_gambling.txt b/npc/other/comodo_gambling.txt index 89a2b0e8a..bd2b0d692 100644 --- a/npc/other/comodo_gambling.txt +++ b/npc/other/comodo_gambling.txt @@ -541,13 +541,13 @@ mjolnir_02,85,362,3 script Blacksmith Miner 4_F_JOB_BLACKSMITH,{ mes "please enter '0' to cancel."; next; input .@amount; - if (.@amount == 0){ + if (.@amount == 0) { mes "[Dwayne]"; mes "Alright, you've"; mes "canceled the trade."; mes "Take care!"; close; - }else if (.@amount < 1 || .@amount > 500){ + } else if (.@amount < 1 || .@amount > 500){ mes "[Dwayne]"; mes "The maximum"; mes "amount is 500."; @@ -555,8 +555,7 @@ mjolnir_02,85,362,3 script Blacksmith Miner 4_F_JOB_BLACKSMITH,{ close; } .@cost = .@amount * 55000; - .@weight = .@amount * 100; - if (Zeny < .@cost){ + if (Zeny < .@cost) { mes "[Dwayne]"; mes "Errr..."; mes "I'm sorry, but you"; @@ -565,7 +564,7 @@ mjolnir_02,85,362,3 script Blacksmith Miner 4_F_JOB_BLACKSMITH,{ mes "I sell them at that price."; close; } - if (Weight < .@weight){ + if (!checkweight(Crystal_Jewel__, .@amount)) { mes "[Dwayne]"; mes "Errr..."; mes "You're carrying too many items."; @@ -573,7 +572,7 @@ mjolnir_02,85,362,3 script Blacksmith Miner 4_F_JOB_BLACKSMITH,{ close; } Zeny -= .@cost; - getitem 732,.@amount; + getitem(Crystal_Jewel__, .@amount); mes "[Dwayne]"; mes "Thank you for"; mes "buying my diamonds!"; |