- 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

4 files changed, 13 insertions, 15 deletions

diff --git a/db/abra_db.txt b/db/abra_db.txt
index 788a7243b..8f5176428 100644
--- a/db/abra_db.txt
+++ b/db/abra_db.txt
@@ -96,7 +96,7 @@
 81,Sighttrasher,2,4000
 //82,Fire Ivy,1,0
 83,Meteor Storm,6,4000
-84,Jupiter Thunder,2,4000
+84,Jupitel Thunder,2,4000
 85,Lord of Vermilion,6,4000
 86,Water Ball,4,4000
 87,Ice Wall,2,4000
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 5efdaa380..1c75bb062 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -6340,7 +6340,7 @@ Example:
 
 *compare (<string>,<substring>)
 
-This command returns 1 or 0 when a the substring is in the main string (1) or not (0).
+This command returns 1 or 0 when the substring is in the main string (1) or not (0).
 This command is not case sensitive.
 
 Example(s):
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;
 	}
diff --git a/src/map/battle.c b/src/map/battle.c
index b520b1d97..acd61b23f 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2860,20 +2860,17 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
 		int race2 = status_get_race2(src);
 		if (!(nk&NK_NO_ELEFIX))
 		{
-			if (!(nk&NK_NO_ELEFIX))
+			int ele_fix = tsd->subele[s_ele];
+			for (i = 0; ARRAYLENGTH(tsd->subele2) > i && tsd->subele2[i].rate != 0; i++)
 			{
-				int ele_fix = tsd->subele[s_ele];
-				for (i = 0; ARRAYLENGTH(tsd->subele2) > i && tsd->subele2[i].rate != 0; i++)
-				{
-					if(tsd->subele2[i].ele != s_ele) continue;
-					if(!(tsd->subele2[i].flag&md.flag&BF_WEAPONMASK &&
-						 tsd->subele2[i].flag&md.flag&BF_RANGEMASK &&
-						 tsd->subele2[i].flag&md.flag&BF_SKILLMASK))
-						continue;
-					ele_fix += tsd->subele2[i].rate;
-				}
-				cardfix=cardfix*(100-ele_fix)/100;
+				if(tsd->subele2[i].ele != s_ele) continue;
+				if(!(tsd->subele2[i].flag&md.flag&BF_WEAPONMASK &&
+					 tsd->subele2[i].flag&md.flag&BF_RANGEMASK &&
+					 tsd->subele2[i].flag&md.flag&BF_SKILLMASK))
+					continue;
+				ele_fix += tsd->subele2[i].rate;
 			}
+			cardfix=cardfix*(100-ele_fix)/100;
 		}
 		cardfix=cardfix*(100-tsd->subsize[sstatus->size])/100;
 		cardfix=cardfix*(100-tsd->subrace2[race2])/100;