summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-13 18:23:35 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-13 18:23:35 +0000
commit79b707807f76af7510b364a4896ad12d08207407 (patch)
tree190210cb47350f72210fc38db63d91460f1e2a62 /npc
parentf23c3d7d5d1dc9805959c9a43ca61582eddae1ab (diff)
downloadhercules-79b707807f76af7510b364a4896ad12d08207407.tar.gz
hercules-79b707807f76af7510b364a4896ad12d08207407.tar.bz2
hercules-79b707807f76af7510b364a4896ad12d08207407.tar.xz
hercules-79b707807f76af7510b364a4896ad12d08207407.zip
- Fixed a typo in abra_db.txt (bugreport:4548)
- Fixed a weight check in Level 4 Weapon Quest. (bugreport:4533) - Removed a duplicate if() in battle.c, follow up to r14381. (bugreport:4549) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14461 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/quests/Lvl4_weapon_quest.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/npc/quests/Lvl4_weapon_quest.txt b/npc/quests/Lvl4_weapon_quest.txt
index dfcea8e08..2e26fe5b2 100644
--- a/npc/quests/Lvl4_weapon_quest.txt
+++ b/npc/quests/Lvl4_weapon_quest.txt
@@ -2139,7 +2139,8 @@ niflheim,240,193,3 script Kayron#lv4 794,{
}
niflheim,99,268,5 script Reyghema#lv4 794,{
- if (now_weight < 3000) {
+ set .@now_weight,MaxWeight-Weight;
+ if (.@now_weight < 3000) {
mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
close;
}