Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fixed a typo in abra_db.txt (bugreport:4548)

Browse Source 
- 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://svn.code.sf.net/p/rathena/svn/trunk@14461 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
brianluau 2010-11-13 18:23:35 +00:00
parent af0e9da5b5
commit f61f849488
4 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/abra_db.txt
View File

@ -96,7 +96,7 @@
81,Sighttrasher,2,4000 81,Sighttrasher,2,4000
//82,Fire Ivy,1,0 //82,Fire Ivy,1,0
83,Meteor Storm,6,4000 83,Meteor Storm,6,4000
84,Jupiter Thunder,2,4000 84,Jupitel Thunder,2,4000
85,Lord of Vermilion,6,4000 85,Lord of Vermilion,6,4000
86,Water Ball,4,4000 86,Water Ball,4,4000
87,Ice Wall,2,4000 87,Ice Wall,2,4000

2
doc/script_commands.txt
View File

@ -6340,7 +6340,7 @@ Example:
*compare (<string>,<substring>) *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. This command is not case sensitive.
Example(s): Example(s):

3
npc/quests/Lvl4_weapon_quest.txt
View File

@ -2139,7 +2139,8 @@ niflheim,240,193,3 script Kayron#lv4 794,{
} }
niflheim,99,268,5 script Reyghema#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"; 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; close;
} }

21
src/map/battle.c
View File

@ -2860,20 +2860,17 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *
int race2 = status_get_race2(src); int race2 = status_get_race2(src);
if (!(nk&NK_NO_ELEFIX)) 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]; if(tsd->subele2[i].ele != s_ele) continue;
for (i = 0; ARRAYLENGTH(tsd->subele2) > i && tsd->subele2[i].rate != 0; i++) if(!(tsd->subele2[i].flag&md.flag&BF_WEAPONMASK &&
{ tsd->subele2[i].flag&md.flag&BF_RANGEMASK &&
if(tsd->subele2[i].ele != s_ele) continue; tsd->subele2[i].flag&md.flag&BF_SKILLMASK))
if(!(tsd->subele2[i].flag&md.flag&BF_WEAPONMASK && continue;
tsd->subele2[i].flag&md.flag&BF_RANGEMASK && ele_fix += tsd->subele2[i].rate;
tsd->subele2[i].flag&md.flag&BF_SKILLMASK))
continue;
ele_fix += tsd->subele2[i].rate;
}
cardfix=cardfix*(100-ele_fix)/100;
} }
cardfix=cardfix*(100-ele_fix)/100;
} }
cardfix=cardfix*(100-tsd->subsize[sstatus->size])/100; cardfix=cardfix*(100-tsd->subsize[sstatus->size])/100;
cardfix=cardfix*(100-tsd->subrace2[race2])/100; cardfix=cardfix*(100-tsd->subrace2[race2])/100;