Index: scripts/globals/abilities/pets/Hastega.lua =================================================================== --- scripts/globals/abilities/pets/Hastega.lua (revision 2591) +++ scripts/globals/abilities/pets/Hastega.lua (working copy) @@ -15,7 +15,7 @@ end; target:delStatusEffect(EFFECT_HASTE); target:delStatusEffect(EFFECT_SLOW); - target:addStatusEffect(EFFECT_HASTE,15,0,duration); + target:addStatusEffect(EFFECT_HASTE,150,0,duration); skill:setMsg(MSG_BUFF); return EFFECT_HASTE; end \ No newline at end of file Index: scripts/globals/abilities/pets/Slowga.lua =================================================================== --- scripts/globals/abilities/pets/Slowga.lua (revision 2591) +++ scripts/globals/abilities/pets/Slowga.lua (working copy) @@ -15,7 +15,7 @@ end; target:delStatusEffect(EFFECT_SLOW); target:delStatusEffect(EFFECT_HASTE); - target:addStatusEffect(EFFECT_SLOW,30,0,duration); + target:addStatusEffect(EFFECT_SLOW,300,0,duration); skill:setMsg(MSG_BUFF); return EFFECT_HASTE; end \ No newline at end of file Index: scripts/globals/effects/elegy.lua =================================================================== --- scripts/globals/effects/elegy.lua (revision 2591) +++ scripts/globals/effects/elegy.lua (working copy) @@ -11,7 +11,7 @@ ----------------------------------- function onEffectGain(target,effect) - target:addMod(MOD_HASTE,-effect:getPower()); + target:addMod(MOD_HASTE_MAGIC,-effect:getPower()); end; ----------------------------------- @@ -26,5 +26,5 @@ ----------------------------------- function onEffectLose(target,effect) - target:delMod(MOD_HASTE,-effect:getPower()); + target:delMod(MOD_HASTE_MAGIC,-effect:getPower()); end; \ No newline at end of file Index: scripts/globals/effects/hasso.lua =================================================================== --- scripts/globals/effects/hasso.lua (revision 2591) +++ scripts/globals/effects/hasso.lua (working copy) @@ -12,7 +12,7 @@ function onEffectGain(target,effect) target:addMod(MOD_STR,effect:getPower()); - target:addMod(MOD_HASTE,10); + target:addMod(MOD_HASTE_ABILITY,102); target:addMod(MOD_ACC,10); target:addMod(MOD_FASTCAST,-50); end; @@ -30,7 +30,7 @@ function onEffectLose(target,effect) target:delMod(MOD_STR,effect:getPower()); - target:delMod(MOD_HASTE,10); + target:delMod(MOD_HASTE_ABILITY,102); target:delMod(MOD_ACC,10); target:delMod(MOD_FASTCAST,-50); end; \ No newline at end of file Index: scripts/globals/effects/haste.lua =================================================================== --- scripts/globals/effects/haste.lua (revision 2591) +++ scripts/globals/effects/haste.lua (working copy) @@ -9,7 +9,7 @@ ----------------------------------- function onEffectGain(target,effect) - target:addMod(MOD_HASTE,effect:getPower()); + target:addMod(MOD_HASTE_MAGIC,effect:getPower()); end; ----------------------------------- @@ -24,5 +24,5 @@ ----------------------------------- function onEffectLose(target,effect) - target:delMod(MOD_HASTE,effect:getPower()); + target:delMod(MOD_HASTE_MAGIC,effect:getPower()); end; \ No newline at end of file Index: scripts/globals/effects/march.lua =================================================================== --- scripts/globals/effects/march.lua (revision 2591) +++ scripts/globals/effects/march.lua (working copy) @@ -11,7 +11,7 @@ ----------------------------------- function onEffectGain(target,effect) - target:addMod(MOD_HASTE,effect:getPower()); + target:addMod(MOD_HASTE_MAGIC,effect:getPower()); end; ----------------------------------- @@ -26,5 +26,5 @@ ----------------------------------- function onEffectLose(target,effect) - target:delMod(MOD_HASTE,effect:getPower()); + target:delMod(MOD_HASTE_MAGIC,effect:getPower()); end; \ No newline at end of file Index: scripts/globals/effects/slow.lua =================================================================== --- scripts/globals/effects/slow.lua (revision 2591) +++ scripts/globals/effects/slow.lua (working copy) @@ -9,7 +9,7 @@ ----------------------------------- function onEffectGain(target,effect) - target:addMod(MOD_HASTE,-effect:getPower()); + target:addMod(MOD_HASTE_MAGIC,-effect:getPower()); end; ----------------------------------- @@ -24,5 +24,5 @@ ----------------------------------- function onEffectLose(target,effect) - target:delMod(MOD_HASTE,-effect:getPower()); + target:delMod(MOD_HASTE_MAGIC,-effect:getPower()); end; \ No newline at end of file Index: scripts/globals/effects/velocity_shot.lua =================================================================== --- scripts/globals/effects/velocity_shot.lua (revision 2591) +++ scripts/globals/effects/velocity_shot.lua (working copy) @@ -10,7 +10,7 @@ function onEffectGain(target,effect) target:addMod(MOD_ATTP,-15); - target:addMod(MOD_HASTE,-15); + target:addMod(MOD_HASTE_ABILITY,-150); target:addMod(MOD_RATTP,15); target:addMod(MOD_RANGED_DELAYP,-10); end; @@ -28,7 +28,7 @@ function onEffectLose(target,effect) target:delMod(MOD_ATTP,-15); - target:delMod(MOD_HASTE,-15); + target:delMod(MOD_HASTE_ABILITY,-150); target:delMod(MOD_RATTP,15); target:delMod(MOD_RANGED_DELAYP,-10); end; \ No newline at end of file Index: scripts/globals/effects/weakness.lua =================================================================== --- scripts/globals/effects/weakness.lua (revision 2591) +++ scripts/globals/effects/weakness.lua (working copy) @@ -15,7 +15,7 @@ --NOTE: The power amount dictates the amount to REDUCE MAX VALUES BY. E.g. Power=75 means 'reduce max hp/mp by 75%' target:addMod(MOD_HPP,-75); target:addMod(MOD_MPP,-75); - target:addMod(MOD_HASTE,-100); + target:addMod(MOD_HASTE_MAGIC,-1024); end; ----------------------------------- @@ -33,5 +33,5 @@ --restore HP and MP to its former state. Remove 100% slow target:delMod(MOD_HPP,-75); target:delMod(MOD_MPP,-75); - target:delMod(MOD_HASTE,-100); + target:delMod(MOD_HASTE_MAGIC,-1024); end; \ No newline at end of file Index: scripts/globals/gear_sets.lua =================================================================== --- scripts/globals/gear_sets.lua (revision 2591) +++ scripts/globals/gear_sets.lua (working copy) @@ -15,7 +15,7 @@ item_set = {16084,{14546,14961,15625,15711,MOD_DOUBLE_ATTACK,5}, -- Ares's set (5% DA) 16088,{14550,14965,15629,15715,MOD_CRITHITRATE,5}, -- Skadi's set (5% critrate is guess) - 16092,{14554,14969,15633,15719,MOD_HASTE,5}, -- Usukane's set (5% Haste) + 16092,{14554,14969,15633,15719,MOD_HASTE_GEAR,50}, -- Usukane's set (5% Haste) 16107,{14569,14984,15648,15734,MOD_ACC,20}, -- Denali Jacket Set (Increases Accuracy +20) 16106,{14568,14983,15647,15733,MOD_HPP,10}, -- Askar Korazin Set (Max HP Boost %10) 16069,{14530,14940,15609,15695,MOD_SUBTLE_BLOW,8}, -- Pahluwan Khazagand Set (8% is guess) @@ -23,10 +23,10 @@ 16096,{14558,14973,15637,15723,MOD_FASTCAST,5}, -- Marduk's Jubbah Set (5% fastcast) 16108,{14570,14985,15649,15735,MOD_MDEF,10}, -- Goliard Saio Set - Total Set Bonus +10% Magic Def. Bonus 16064,{14527,14935,15606,15690,MOD_REFRESH,1}, -- Yigit Gomlek Set (1mp per tick) Adds "Refresh" effect - 11503,{13759,12745,14210,11413,MOD_HASTE,5}, -- Perle Hauberk Set 5% haste + 11503,{13759,12745,14210,11413,MOD_HASTE_GEAR,50}, -- Perle Hauberk Set 5% haste 11504,{13760,12746,14257,11414,MOD_STORETP,8}, -- Aurore Doublet Set store tp +8 11505,{13778,12747,14258,11415,MOD_FASTCAST,10}, -- Teal Saio Set fastcast 10% - 10890,{10462,10512,11980,10610,MOD_HASTE,6}, -- Calma Armor Set haste%6 + 10890,{10462,10512,11980,10610,MOD_HASTE_GEAR,61}, -- Calma Armor Set haste%6 10892,{10464,10514,11982,10612,MOD_MACC,5}, -- Magavan Armor Set magic accuracy +5 10891,{10463,10513,11981,10611,MOD_CRITHITRATE,5}}; -- Mustela Harness Set crit rate 5% Index: scripts/globals/items/haste_belt.lua =================================================================== --- scripts/globals/items/haste_belt.lua (revision 2591) +++ scripts/globals/items/haste_belt.lua (working copy) @@ -20,7 +20,7 @@ function onItemUse(target) if(target:hasStatusEffect(EFFECT_HASTE) == false) then - target:addStatusEffect(EFFECT_HASTE,10,0,180); + target:addStatusEffect(EFFECT_HASTE,102,0,180); else target:messageBasic(423); end Index: scripts/globals/mobskills/Bad_Breath.lua =================================================================== --- scripts/globals/mobskills/Bad_Breath.lua (revision 2591) +++ scripts/globals/mobskills/Bad_Breath.lua (working copy) @@ -21,7 +21,7 @@ if(target:hasStatusEffect(typeEffect) == false) then if(resist > 0.2) then target:delStatusEffect(EFFECT_HASTE); - target:addStatusEffect(typeEffect,25,0,60*resist);--power=15;tic=0;duration=60; + target:addStatusEffect(typeEffect,256,0,60*resist);--power=15;tic=0;duration=60; end end Index: scripts/globals/mobskills/Chomp_Rush.lua =================================================================== --- scripts/globals/mobskills/Chomp_Rush.lua (revision 2591) +++ scripts/globals/mobskills/Chomp_Rush.lua (working copy) @@ -32,7 +32,7 @@ local resist = applyPlayerResistance(mob,typeEffect,target,mob:getStat(statmod)-target:getStat(statmod),0,ELE_EARTH); if(resist > 0.2) then target:delStatusEffect(EFFECT_HASTE); - target:addStatusEffect(typeEffect,25,0,60*resist);--power=25;tic=0;duration=30; + target:addStatusEffect(typeEffect,256,0,60*resist);--power=256;tic=0;duration=30; end end Index: scripts/globals/mobskills/Demonic_Howl.lua =================================================================== --- scripts/globals/mobskills/Demonic_Howl.lua (revision 2591) +++ scripts/globals/mobskills/Demonic_Howl.lua (working copy) @@ -21,7 +21,7 @@ if(resist > 0.1) then target:delStatusEffect(EFFECT_HASTE); skill:setMsg(MSG_ENFEEB_IS); - target:addStatusEffect(typeEffect,50,0,180*resist); + target:addStatusEffect(typeEffect,512,0,180*resist); else skill:setMsg(MSG_MISS); -- resist ! end Index: scripts/globals/mobskills/Dice_Slow.lua =================================================================== --- scripts/globals/mobskills/Dice_Slow.lua (revision 2591) +++ scripts/globals/mobskills/Dice_Slow.lua (working copy) @@ -26,7 +26,7 @@ slowed = true; skill:setMsg(MSG_ENFEEB_IS); target:delStatusEffect(EFFECT_HASTE); - target:addStatusEffect(typeEffect,25,0,120*resist);--power=20;tic=0;duration=120; + target:addStatusEffect(typeEffect,256,0,120*resist);--power=20;tic=0;duration=120; end else skill:setMsg(MSG_NO_EFFECT); -- no effect Index: scripts/globals/mobskills/Fear_Touch.lua =================================================================== --- scripts/globals/mobskills/Fear_Touch.lua (revision 2591) +++ scripts/globals/mobskills/Fear_Touch.lua (working copy) @@ -36,7 +36,7 @@ duration = 120; end target:delStatusEffect(EFFECT_HASTE); - target:addStatusEffect(typeEffect,30,0,duration); + target:addStatusEffect(typeEffect,300,0,duration); end end Index: scripts/globals/mobskills/Filamented_Hold.lua =================================================================== --- scripts/globals/mobskills/Filamented_Hold.lua (revision 2591) +++ scripts/globals/mobskills/Filamented_Hold.lua (working copy) @@ -21,7 +21,7 @@ if(resist > 0.2) then target:delStatusEffect(EFFECT_HASTE); skill:setMsg(MSG_ENFEEB_IS); - target:addStatusEffect(typeEffect,25,0,120*resist); -- 30% ? + target:addStatusEffect(typeEffect,256,0,120*resist); -- 30% ? else skill:setMsg(MSG_MISS); -- resist ! end Index: scripts/globals/mobskills/Gloeosuccus.lua =================================================================== --- scripts/globals/mobskills/Gloeosuccus.lua (revision 2591) +++ scripts/globals/mobskills/Gloeosuccus.lua (working copy) @@ -23,7 +23,7 @@ if(resist > 0.1) then skill:setMsg(MSG_ENFEEB_IS); target:delStatusEffect(EFFECT_HASTE); - target:addStatusEffect(typeEffect,30,0,180*resist);--power=20;tic=0;duration=120; + target:addStatusEffect(typeEffect,300,0,180*resist);--power=20;tic=0;duration=120; else skill:setMsg(MSG_MISS); -- resist ! end Index: scripts/globals/mobskills/Gravity_Field.lua =================================================================== --- scripts/globals/mobskills/Gravity_Field.lua (revision 2591) +++ scripts/globals/mobskills/Gravity_Field.lua (working copy) @@ -21,7 +21,7 @@ if(resist > 0.1) then skill:setMsg(MSG_ENFEEB_IS); target:delStatusEffect(EFFECT_HASTE); - target:addStatusEffect(typeEffect,20,0,120*resist);--power=20;tic=0;duration=120; + target:addStatusEffect(typeEffect,204,0,120*resist);--power=20;tic=0;duration=120; else skill:setMsg(MSG_MISS); -- resist ! end Index: scripts/globals/mobskills/Heavy_Strike.lua =================================================================== --- scripts/globals/mobskills/Heavy_Strike.lua (revision 2591) +++ scripts/globals/mobskills/Heavy_Strike.lua (working copy) @@ -27,7 +27,7 @@ local resist = applyPlayerResistance(mob,typeEffect,target,mob:getStat(statmod)-target:getStat(statmod),0,ELE_ICE); if(resist > 0.2) then target:delStatusEffect(EFFECT_HASTE); - target:addStatusEffect(typeEffect,25,0,60*resist);--power=25;tic=0;duration=30; + target:addStatusEffect(typeEffect,256,0,60*resist);--power=25;tic=0;duration=30; end end Index: scripts/globals/mobskills/Horror_Cloud.lua =================================================================== --- scripts/globals/mobskills/Horror_Cloud.lua (revision 2591) +++ scripts/globals/mobskills/Horror_Cloud.lua (working copy) @@ -25,7 +25,7 @@ if(resist > 0.2) then message = MSG_ENFEEB_IS; target:delStatusEffect(EFFECT_HASTE); - target:addStatusEffect(typeEffect,35,0,120*resist);--power=35;tic=0;duration=60; + target:addStatusEffect(typeEffect,358,0,120*resist);--power=35;tic=0;duration=60; end else message = MSG_NO_EFFECT; Index: scripts/globals/mobskills/Impalement.lua =================================================================== --- scripts/globals/mobskills/Impalement.lua (revision 2591) +++ scripts/globals/mobskills/Impalement.lua (working copy) @@ -23,7 +23,7 @@ if(target:hasStatusEffect(EFFECT_SLOW) == false) then target:delStatusEffect(EFFECT_HASTE); - target:addStatusEffect(EFFECT_SLOW,25,0,60); + target:addStatusEffect(EFFECT_SLOW,256,0,60); end local currentHP = target:getHP(); Index: scripts/globals/mobskills/Intimidate.lua =================================================================== --- scripts/globals/mobskills/Intimidate.lua (revision 2591) +++ scripts/globals/mobskills/Intimidate.lua (working copy) @@ -21,7 +21,7 @@ if(resist > 0.2) then skill:setMsg(MSG_ENFEEB_IS); target:delStatusEffect(EFFECT_HASTE); - target:addStatusEffect(typeEffect,30,0,120*resist); -- 30% ? + target:addStatusEffect(typeEffect,300,0,120*resist); -- 30% ? else skill:setMsg(MSG_MISS); -- resist ! end Index: scripts/globals/mobskills/Miasma.lua =================================================================== --- scripts/globals/mobskills/Miasma.lua (revision 2591) +++ scripts/globals/mobskills/Miasma.lua (working copy) @@ -29,7 +29,7 @@ end if(target:hasStatusEffect(EFFECT_SLOW) == false) then target:delStatusEffect(EFFECT_HASTE); - target:addStatusEffect(EFFECT_SLOW,20,0,duration); + target:addStatusEffect(EFFECT_SLOW,204,0,duration); end if(target:hasStatusEffect(EFFECT_PLAGUE) == false) then target:addStatusEffect(EFFECT_PLAGUE,5,0,45); Index: scripts/globals/mobskills/Murk.lua =================================================================== --- scripts/globals/mobskills/Murk.lua (revision 2591) +++ scripts/globals/mobskills/Murk.lua (working copy) @@ -23,7 +23,7 @@ if(target:hasStatusEffect(EFFECT_SLOW) == false) then slowed = true; target:delStatusEffect(EFFECT_HASTE); - target:addStatusEffect(EFFECT_SLOW,50,0,60); + target:addStatusEffect(EFFECT_SLOW,512,0,60); end if(target:hasStatusEffect(EFFECT_WEIGHT) == false) then Index: scripts/globals/mobskills/Negative_Whirl.lua =================================================================== --- scripts/globals/mobskills/Negative_Whirl.lua (revision 2591) +++ scripts/globals/mobskills/Negative_Whirl.lua (working copy) @@ -21,7 +21,7 @@ local resist = applyPlayerResistance(mob,typeEffect,target,mob:getStat(statmod)-target:getStat(statmod),0,ELE_WIND); if(resist > 0.2) then target:delStatusEffect(EFFECT_HASTE); - target:addStatusEffect(typeEffect,30,3,120*resist);--tic=3;duration=60; + target:addStatusEffect(typeEffect,300,3,120*resist);--tic=3;duration=60; end end Index: scripts/globals/mobskills/Pleiades_Ray.lua =================================================================== --- scripts/globals/mobskills/Pleiades_Ray.lua (revision 2591) +++ scripts/globals/mobskills/Pleiades_Ray.lua (working copy) @@ -46,7 +46,7 @@ end if(target:hasStatusEffect(EFFECT_SLOW) == false) then target:delStatusEffect(EFFECT_HASTE); - target:addStatusEffect(EFFECT_SLOW,40,tic,duration); + target:addStatusEffect(EFFECT_SLOW,409,tic,duration); end end Index: scripts/globals/mobskills/Radiant_Breath.lua =================================================================== --- scripts/globals/mobskills/Radiant_Breath.lua (revision 2591) +++ scripts/globals/mobskills/Radiant_Breath.lua (working copy) @@ -22,7 +22,7 @@ resist = applyPlayerResistance(mob,typeEffect,target,mob:getStat(statmod)-target:getStat(statmod),0,ELE_LIGHT); if(resist > 0.2) then target:delStatusEffect(EFFECT_HASTE); - target:addStatusEffect(typeEffect,20,0,90*resist);--power=12;tic=0;duration=60; + target:addStatusEffect(typeEffect,204,0,90*resist);--power=12;tic=0;duration=60; end end Index: scripts/globals/mobskills/Refueling.lua =================================================================== --- scripts/globals/mobskills/Refueling.lua (revision 2591) +++ scripts/globals/mobskills/Refueling.lua (working copy) @@ -17,6 +17,6 @@ skill:setMsg(MSG_BUFF); local typeEffect = EFFECT_HASTE; mob:delStatusEffect(typeEffect); - mob:addStatusEffect(typeEffect,10,0,300); + mob:addStatusEffect(typeEffect,102,0,300); return typeEffect; end Index: scripts/globals/mobskills/Ripper_Fang.lua =================================================================== --- scripts/globals/mobskills/Ripper_Fang.lua (revision 2591) +++ scripts/globals/mobskills/Ripper_Fang.lua (working copy) @@ -33,7 +33,7 @@ duration = duration - ((resist -.7)* 10) * math.random(1,5); end target:delStatusEffect(EFFECT_HASTE); - target:addStatusEffect(typeEffect,25,0,duration*resist);--power=10;tic=0; + target:addStatusEffect(typeEffect,256,0,duration*resist);--power=10;tic=0; end end Index: scripts/globals/mobskills/Sheep_Bleat.lua =================================================================== --- scripts/globals/mobskills/Sheep_Bleat.lua (revision 2591) +++ scripts/globals/mobskills/Sheep_Bleat.lua (working copy) @@ -23,7 +23,7 @@ if(resist > 0.2) then skill:setMsg(MSG_ENFEEB_IS); target:delStatusEffect(EFFECT_HASTE); - target:addStatusEffect(typeEffect,30,0,120*resist); -- 30% ? power=30;tic=0;duration=120; + target:addStatusEffect(typeEffect,300,0,120*resist); -- 30% ? power=30;tic=0;duration=120; else skill:setMsg(MSG_MISS); -- resist ! end Index: scripts/globals/mobskills/Spider_Web.lua =================================================================== --- scripts/globals/mobskills/Spider_Web.lua (revision 2591) +++ scripts/globals/mobskills/Spider_Web.lua (working copy) @@ -21,7 +21,7 @@ if(resist > 0.2) then skill:setMsg(MSG_ENFEEB_IS); target:delStatusEffect(EFFECT_HASTE); - target:addStatusEffect(typeEffect,30,0,120*resist);--power=20;tic=0;duration=120; + target:addStatusEffect(typeEffect,300,0,120*resist);--power=20;tic=0;duration=120; else skill:setMsg(MSG_MISS); -- resist ! end Index: scripts/globals/mobskills/Sprout_Smack.lua =================================================================== --- scripts/globals/mobskills/Sprout_Smack.lua (revision 2591) +++ scripts/globals/mobskills/Sprout_Smack.lua (working copy) @@ -29,7 +29,7 @@ local resist = applyPlayerResistance(mob,typeEffect,target,mob:getStat(statmod)-target:getStat(statmod),0,ELE_EARTH); if(resist > 0.2) then target:delStatusEffect(EFFECT_HASTE); - target:addStatusEffect(typeEffect,15,0,60*resist);--power=10;tic=0; + target:addStatusEffect(typeEffect,150,0,60*resist);--power=10;tic=0; end end Index: scripts/globals/mobskills/Sticky_Thread.lua =================================================================== --- scripts/globals/mobskills/Sticky_Thread.lua (revision 2591) +++ scripts/globals/mobskills/Sticky_Thread.lua (working copy) @@ -21,7 +21,7 @@ if(resist > 0.2) then target:delStatusEffect(EFFECT_HASTE); skill:setMsg(MSG_ENFEEB_IS); - target:addStatusEffect(typeEffect,37,0,120*resist); -- 30% ? + target:addStatusEffect(typeEffect,378,0,120*resist); -- 30% ? else skill:setMsg(MSG_MISS); -- resist ! end Index: scripts/globals/mobskills/Viscid_Nectar.lua =================================================================== --- scripts/globals/mobskills/Viscid_Nectar.lua (revision 2591) +++ scripts/globals/mobskills/Viscid_Nectar.lua (working copy) @@ -25,7 +25,7 @@ if(resist > 0.2) then skill:setMsg(MSG_ENFEEB_IS); target:delStatusEffect(EFFECT_HASTE); - target:addStatusEffect(typeEffect,30,0,120*resist);--power=30;tic=0;duration=120; + target:addStatusEffect(typeEffect,300,0,120*resist);--power=30;tic=0;duration=120; else skill:setMsg(MSG_MISS); end Index: scripts/globals/spells/advancing_march.lua =================================================================== --- scripts/globals/spells/advancing_march.lua (revision 2591) +++ scripts/globals/spells/advancing_march.lua (working copy) @@ -11,18 +11,18 @@ function onSpellCast(caster,target,spell) - local haste = 7; + local haste = 64; local sItem = caster:getEquipID(2); local duration = 120; -- Royal Spearman's Horn, Kingdom Horn, San d'Orian Horn Adds +1 haste if(sItem == 17367 or sItem == 17836 or sItem == 17835) then - haste = haste + 1; + haste = haste + 16; end -- Faerie Piccolo and Iron Ram Horn Adds +2 haste if(sItem == 17349 or sItem == 17853) then - haste = haste + 2; + haste = haste + 32; end -- half is subjob is brd Index: scripts/globals/spells/battlefield_elegy.lua =================================================================== --- scripts/globals/spells/battlefield_elegy.lua (revision 2591) +++ scripts/globals/spells/battlefield_elegy.lua (working copy) @@ -9,7 +9,7 @@ function onSpellCast(caster,target,spell) duration = 120; - power = 25; + power = 256; bonus = AffinityBonus(caster, spell); pCHR = caster:getStat(MOD_CHR); @@ -28,22 +28,22 @@ -- horn +1 if(sItem == 17371) then - power = power + 2; + power = power + 20; duration = duration * 1.2; end if(sItem == 17352) then - power = power + 1; + power = power + 11; duration = duration * 1.1; end if(sItem == 18342) then - power = power + 2; + power = power + 20; duration = duration * 1.2; end if(sItem == 17856) then - power = power + 3; + power = power + 30; duration = duration * 1.3; end Index: scripts/globals/spells/bluemagic/refueling.lua =================================================================== --- scripts/globals/spells/bluemagic/refueling.lua (revision 2591) +++ scripts/globals/spells/bluemagic/refueling.lua (working copy) @@ -15,7 +15,7 @@ local slow = target:getStatusEffect(EFFECT_SLOW); local haste = target:getStatusEffect(EFFECT_HASTE); if(haste == nil and slow == nil) then - target:addStatusEffect(EFFECT_HASTE,10,0,300); + target:addStatusEffect(EFFECT_HASTE,102,0,300); else spell:setMsg(75); end Index: scripts/globals/spells/carnage_elegy.lua =================================================================== --- scripts/globals/spells/carnage_elegy.lua (revision 2591) +++ scripts/globals/spells/carnage_elegy.lua (working copy) @@ -9,7 +9,7 @@ function onSpellCast(caster,target,spell) duration = 180; - power = 50; + power = 512; bonus = AffinityBonus(caster, spell); pCHR = caster:getStat(MOD_CHR); @@ -28,22 +28,22 @@ -- horn +1 if(sItem == 17371) then - power = power + 2; + power = power + 20; duration = duration * 1.2; end if(sItem == 17352) then - power = power + 1; + power = power + 11; duration = duration * 1.1; end if(sItem == 18342) then - power = power + 2; + power = power + 20; duration = duration * 1.2; end if(sItem == 17856) then - power = power + 3; + power = power + 30; duration = duration * 1.3; end Index: scripts/globals/spells/haste.lua =================================================================== --- scripts/globals/spells/haste.lua (revision 2591) +++ scripts/globals/spells/haste.lua (working copy) @@ -16,7 +16,7 @@ if (caster:hasStatusEffect(EFFECT_COMPOSURE) == true and caster:getID() == target:getID()) then duration = duration * 3; end - power = 15; + power = 150; slow = target:getStatusEffect(EFFECT_SLOW); haste = target:getStatusEffect(EFFECT_HASTE); if(haste ~= nil) then @@ -28,7 +28,7 @@ end elseif(slow ~= nil) then if(slow:getPower() > (-1 * power)) then - target:delStatusEffect(EFFECT_SLOW); + target:delStatusEffect(EFFECT_SLOW); target:addStatusEffect(EFFECT_HASTE,power,0,duration); else spell:setMsg(75); Index: scripts/globals/spells/hojo_ichi.lua =================================================================== --- scripts/globals/spells/hojo_ichi.lua (revision 2591) +++ scripts/globals/spells/hojo_ichi.lua (working copy) @@ -16,7 +16,7 @@ dINT = (caster:getStat(MOD_INT) - target:getStat(MOD_INT)); bonus = AffinityBonus(caster,spell); --Power for Hojo is a flat 14.6% reduction - power = 14.6; + power = 150; --Duration and Resistance calculation duration = 180 * applyResistance(caster,spell,target,dINT,NINJUTSU_SKILL,bonus); --Calculates the resist chance from Resist Blind trait Index: scripts/globals/spells/hojo_ni.lua =================================================================== --- scripts/globals/spells/hojo_ni.lua (revision 2591) +++ scripts/globals/spells/hojo_ni.lua (working copy) @@ -16,7 +16,7 @@ dINT = (caster:getStat(MOD_INT) - target:getStat(MOD_INT)); bonus = AffinityBonus(caster,spell); --Power for Hojo is a flat 19.5% reduction - power = 19.5; + power = 200; --Duration and Resistance calculation duration = 300 * applyResistance(caster,spell,target,dINT,NINJUTSU_SKILL,bonus); --Calculates the resist chance from Resist Blind trait Index: scripts/globals/spells/hojo_san.lua =================================================================== --- scripts/globals/spells/hojo_san.lua (revision 2591) +++ scripts/globals/spells/hojo_san.lua (working copy) @@ -16,7 +16,7 @@ dINT = (caster:getStat(MOD_INT) - target:getStat(MOD_INT)); bonus = AffinityBonus(caster,spell); --Power for Hojo is a flat 30% reduction - power = 24.5; + power = 300; --Duration and Resistance calculation duration = 420 * applyResistance(caster,spell,target,dINT,NINJUTSU_SKILL,bonus); --Calculates the resist chance from Resist Blind trait Index: scripts/globals/spells/massacre_elegy.lua =================================================================== --- scripts/globals/spells/massacre_elegy.lua (revision 2591) +++ scripts/globals/spells/massacre_elegy.lua (working copy) @@ -9,7 +9,7 @@ function onSpellCast(caster,target,spell) duration = 240; - power = 100; + power = 1024; bonus = AffinityBonus(caster, spell); pCHR = caster:getStat(MOD_CHR); @@ -28,22 +28,22 @@ -- horn +1 if(sItem == 17371) then - power = power + 2; + power = power + 20; duration = duration * 1.2; end if(sItem == 17352) then - power = power + 1; + power = power + 11; duration = duration * 1.1; end if(sItem == 18342) then - power = power + 2; + power = power + 20; duration = duration * 1.2; end if(sItem == 17856) then - power = power + 3; + power = power + 30; duration = duration * 1.3; end Index: scripts/globals/spells/slow.lua =================================================================== --- scripts/globals/spells/slow.lua (revision 2591) +++ scripts/globals/spells/slow.lua (working copy) @@ -18,9 +18,9 @@ bonus = AffinityBonus(caster,spell); --Power. - power = math.floor((100 / 1024) * (150 + dMND * 2)) - if(power > 29.3) then - power = 29.3; + power = 150 + dMND * 2; + if(power > 300) then + power = 300; end --Duration, including resistance. @@ -63,7 +63,7 @@ -- end end --print(power); - --print(target:getMod(MOD_HASTE)); + --print(target:getMod(MOD_HASTE_MAGIC)); else -- if(spell:isAOE() == false) then spell:setMsg(85); Index: scripts/globals/spells/victory_march.lua =================================================================== --- scripts/globals/spells/victory_march.lua (revision 2591) +++ scripts/globals/spells/victory_march.lua (working copy) @@ -11,7 +11,7 @@ function onSpellCast(caster,target,spell) - local haste = 0; + local haste = 96; local sItem = caster:getEquipID(2); local duration = 120; @@ -19,12 +19,12 @@ -- Royal Spearman's Horn, Kingdom Horn, San d'Orian Horn Adds +1 haste if(sItem == 17367 or sItem == 17836 or sItem == 17835) then - power = power + 1; + power = power + 16; end -- Faerie Piccolo and Iron Ram Horn Adds +2 haste if(sItem == 17349 or sItem == 17853) then - power = power + 2; + power = power + 32; end -- Until someone finds a way to delete Effects by tier we should not allow bard spells to stack. Index: scripts/globals/status.lua =================================================================== --- scripts/globals/status.lua (revision 2592) +++ scripts/globals/status.lua (working copy) @@ -641,7 +641,7 @@ MOD_DMGRANGE = 0xA4 MOD_CRITHITRATE = 0xA5 MOD_ENEMYCRITRATE = 0xA6 -MOD_HASTE = 0xA7 +MOD_HASTE_MAGIC = 0xA7 MOD_SPELLINT = 0xA8 MOD_MOVE = 0xA9 MOD_FASTCAST = 0xAA @@ -781,7 +781,10 @@ MOD_DELAYP = 0x17C MOD_RANGED_DELAYP = 0x17D MOD_EXP_BONUS = 0x17E +MOD_HASTE_ABILITY = 0x17F +MOD_HASTE_GEAR = 0x180 + ----------------------------------- -- Merit Definitions ----------------------------------- Index: scripts/globals/weaponskills/ukkos_fury.lua =================================================================== --- scripts/globals/weaponskills/ukkos_fury.lua (revision 2591) +++ scripts/globals/weaponskills/ukkos_fury.lua (working copy) @@ -35,7 +35,7 @@ local damage, tpHits, extraHits = doPhysicalWeaponskill(player, target, params); if damage > 0 and (target:hasStatusEffect(EFFECT_SLOW) == false) then - target:addStatusEffect(EFFECT_SLOW, 15, 0, 60); + target:addStatusEffect(EFFECT_SLOW, 153, 0, 60); end return tpHits, extraHits, damage; Index: sql/item_mods.sql =================================================================== --- sql/item_mods.sql (revision 2588) +++ sql/item_mods.sql (working copy) @@ -357,7 +357,7 @@ INSERT INTO `item_mods` VALUES(11376, 23, 5); INSERT INTO `item_mods` VALUES(11376, 25, 5); INSERT INTO `item_mods` VALUES(11376, 68, -5); -INSERT INTO `item_mods` VALUES(11376, 167, 2); +INSERT INTO `item_mods` VALUES(11376, 383, 20); INSERT INTO `item_mods` VALUES(11377, 1, 13); INSERT INTO `item_mods` VALUES(11377, 2, 15); INSERT INTO `item_mods` VALUES(11377, 5, 25); @@ -368,7 +368,7 @@ INSERT INTO `item_mods` VALUES(11378, 11, 3); INSERT INTO `item_mods` VALUES(11378, 23, 4); INSERT INTO `item_mods` VALUES(11378, 24, 4); -INSERT INTO `item_mods` VALUES(11378, 167, 2); +INSERT INTO `item_mods` VALUES(11378, 383, 20); INSERT INTO `item_mods` VALUES(11378, 289, 2); INSERT INTO `item_mods` VALUES(11379, 1, 17); INSERT INTO `item_mods` VALUES(11379, 2, 12); @@ -480,7 +480,7 @@ INSERT INTO `item_mods` VALUES(11403, 1, 1); INSERT INTO `item_mods` VALUES(11404, 1, 9); INSERT INTO `item_mods` VALUES(11404, 25, 2); -INSERT INTO `item_mods` VALUES(11404, 167, 2); +INSERT INTO `item_mods` VALUES(11404, 383, 20); INSERT INTO `item_mods` VALUES(11405, 1, 9); INSERT INTO `item_mods` VALUES(11406, 1, 11); INSERT INTO `item_mods` VALUES(11406, 5, 8); @@ -497,7 +497,7 @@ INSERT INTO `item_mods` VALUES(11410, 9, 4); INSERT INTO `item_mods` VALUES(11410, 25, 3); INSERT INTO `item_mods` VALUES(11410, 68, 3); -INSERT INTO `item_mods` VALUES(11410, 167, 2); +INSERT INTO `item_mods` VALUES(11410, 383, 20); INSERT INTO `item_mods` VALUES(11411, 1, 14); INSERT INTO `item_mods` VALUES(11411, 28, 3); INSERT INTO `item_mods` VALUES(11411, 115, 4); @@ -612,16 +612,16 @@ INSERT INTO `item_mods` VALUES(11495, 1, 19); INSERT INTO `item_mods` VALUES(11495, 23, 2); INSERT INTO `item_mods` VALUES(11495, 25, 2); -INSERT INTO `item_mods` VALUES(11495, 167, 1); +INSERT INTO `item_mods` VALUES(11495, 383, 11); INSERT INTO `item_mods` VALUES(11496, 1, 10); INSERT INTO `item_mods` VALUES(11496, 5, 12); INSERT INTO `item_mods` VALUES(11497, 1, 17); INSERT INTO `item_mods` VALUES(11497, 25, 3); -INSERT INTO `item_mods` VALUES(11497, 167, 3); +INSERT INTO `item_mods` VALUES(11497, 383, 30); INSERT INTO `item_mods` VALUES(11498, 1, 20); INSERT INTO `item_mods` VALUES(11498, 23, 3); INSERT INTO `item_mods` VALUES(11498, 25, 3); -INSERT INTO `item_mods` VALUES(11498, 167, 2); +INSERT INTO `item_mods` VALUES(11498, 383, 20); INSERT INTO `item_mods` VALUES(11527, 1, 24); INSERT INTO `item_mods` VALUES(11527, 5, 23); INSERT INTO `item_mods` VALUES(11527, 28, 4); @@ -2482,7 +2482,7 @@ INSERT INTO `item_mods` VALUES(12701, 1, 24); INSERT INTO `item_mods` VALUES(12701, 2, 20); INSERT INTO `item_mods` VALUES(12701, 23, 5); -INSERT INTO `item_mods` VALUES(12701, 167, 3); +INSERT INTO `item_mods` VALUES(12701, 383, 30); INSERT INTO `item_mods` VALUES(12701, 169, -3); INSERT INTO `item_mods` VALUES(12702, 1, 14); INSERT INTO `item_mods` VALUES(12702, 54, -3); @@ -2724,7 +2724,7 @@ INSERT INTO `item_mods` VALUES(12818, 1, 42); INSERT INTO `item_mods` VALUES(12818, 9, 15); INSERT INTO `item_mods` VALUES(12818, 58, 50); -INSERT INTO `item_mods` VALUES(12818, 167, 5); +INSERT INTO `item_mods` VALUES(12818, 383, 50); INSERT INTO `item_mods` VALUES(12819, 1, 30); INSERT INTO `item_mods` VALUES(12819, 58, -5); INSERT INTO `item_mods` VALUES(12819, 59, 5); @@ -3013,7 +3013,7 @@ INSERT INTO `item_mods` VALUES(12957, 1, 23); INSERT INTO `item_mods` VALUES(12957, 2, 25); INSERT INTO `item_mods` VALUES(12957, 23, 4); -INSERT INTO `item_mods` VALUES(12957, 167, 2); +INSERT INTO `item_mods` VALUES(12957, 383, 20); INSERT INTO `item_mods` VALUES(12957, 169, -3); INSERT INTO `item_mods` VALUES(12958, 1, 11); INSERT INTO `item_mods` VALUES(12958, 54, -3); @@ -3201,7 +3201,7 @@ INSERT INTO `item_mods` VALUES(13052, 1, 4); INSERT INTO `item_mods` VALUES(13052, 68, 3); INSERT INTO `item_mods` VALUES(13054, 1, 7); -INSERT INTO `item_mods` VALUES(13054, 167, 3); +INSERT INTO `item_mods` VALUES(13054, 383, 30); INSERT INTO `item_mods` VALUES(13055, 1, 1); INSERT INTO `item_mods` VALUES(13055, 5, 25); INSERT INTO `item_mods` VALUES(13056, 61, -10); @@ -3476,13 +3476,13 @@ INSERT INTO `item_mods` VALUES(13186, 1, 7); INSERT INTO `item_mods` VALUES(13186, 8, 7); INSERT INTO `item_mods` VALUES(13186, 161, -5); -INSERT INTO `item_mods` VALUES(13186, 167, 12); +INSERT INTO `item_mods` VALUES(13186, 383, 122); INSERT INTO `item_mods` VALUES(13186, 289, 5); INSERT INTO `item_mods` VALUES(13187, 1, 6); INSERT INTO `item_mods` VALUES(13188, 1, 8); INSERT INTO `item_mods` VALUES(13188, 5, 15); INSERT INTO `item_mods` VALUES(13188, 168, 8); -INSERT INTO `item_mods` VALUES(13189, 167, 6); +INSERT INTO `item_mods` VALUES(13189, 383, 61); INSERT INTO `item_mods` VALUES(13190, 1, 2); INSERT INTO `item_mods` VALUES(13190, 168, 8); INSERT INTO `item_mods` VALUES(13191, 1, 3); @@ -3503,10 +3503,10 @@ INSERT INTO `item_mods` VALUES(13200, 1, 4); INSERT INTO `item_mods` VALUES(13201, 1, 2); INSERT INTO `item_mods` VALUES(13201, 8, 3); -INSERT INTO `item_mods` VALUES(13201, 167, 4); +INSERT INTO `item_mods` VALUES(13201, 383, 40); INSERT INTO `item_mods` VALUES(13202, 1, 3); INSERT INTO `item_mods` VALUES(13202, 8, 5); -INSERT INTO `item_mods` VALUES(13202, 167, 8); +INSERT INTO `item_mods` VALUES(13202, 383, 81); INSERT INTO `item_mods` VALUES(13203, 1, 2); INSERT INTO `item_mods` VALUES(13203, 8, 1); INSERT INTO `item_mods` VALUES(13203, 9, -1); @@ -3625,9 +3625,9 @@ INSERT INTO `item_mods` VALUES(13248, 11, 1); INSERT INTO `item_mods` VALUES(13248, 56, 3); INSERT INTO `item_mods` VALUES(13249, 1, 3); -INSERT INTO `item_mods` VALUES(13249, 167, 6); +INSERT INTO `item_mods` VALUES(13249, 383, 61); INSERT INTO `item_mods` VALUES(13250, 1, 4); -INSERT INTO `item_mods` VALUES(13250, 167, 6); +INSERT INTO `item_mods` VALUES(13250, 383, 61); INSERT INTO `item_mods` VALUES(13251, 1, 4); INSERT INTO `item_mods` VALUES(13251, 2, 30); INSERT INTO `item_mods` VALUES(13251, 8, 3); @@ -4256,7 +4256,7 @@ INSERT INTO `item_mods` VALUES(13551, 23, 3); INSERT INTO `item_mods` VALUES(13552, 1, 3); INSERT INTO `item_mods` VALUES(13552, 7, 50); -INSERT INTO `item_mods` VALUES(13553, 167, 1); +INSERT INTO `item_mods` VALUES(13553, 383, 11); INSERT INTO `item_mods` VALUES(13554, 1, 5); INSERT INTO `item_mods` VALUES(13555, 7, 10); INSERT INTO `item_mods` VALUES(13555, 27, -1); @@ -5442,12 +5442,12 @@ INSERT INTO `item_mods` VALUES(13927, 2, 12); INSERT INTO `item_mods` VALUES(13927, 8, 11); INSERT INTO `item_mods` VALUES(13927, 9, 5); -INSERT INTO `item_mods` VALUES(13927, 167, -9); +INSERT INTO `item_mods` VALUES(13927, 383, -90); INSERT INTO `item_mods` VALUES(13928, 1, 34); INSERT INTO `item_mods` VALUES(13928, 2, 14); INSERT INTO `item_mods` VALUES(13928, 8, 12); INSERT INTO `item_mods` VALUES(13928, 9, 6); -INSERT INTO `item_mods` VALUES(13928, 167, -11); +INSERT INTO `item_mods` VALUES(13928, 383, -112); INSERT INTO `item_mods` VALUES(13929, 1, 28); INSERT INTO `item_mods` VALUES(13929, 8, -2); INSERT INTO `item_mods` VALUES(13929, 9, -2); @@ -5513,12 +5513,12 @@ INSERT INTO `item_mods` VALUES(13941, 68, -4); INSERT INTO `item_mods` VALUES(13942, 1, 28); INSERT INTO `item_mods` VALUES(13942, 14, 5); -INSERT INTO `item_mods` VALUES(13942, 167, 2); +INSERT INTO `item_mods` VALUES(13942, 383, 20); INSERT INTO `item_mods` VALUES(13942, 227, 2); INSERT INTO `item_mods` VALUES(13942, 242, 2); INSERT INTO `item_mods` VALUES(13943, 1, 29); INSERT INTO `item_mods` VALUES(13943, 14, 6); -INSERT INTO `item_mods` VALUES(13943, 167, 3); +INSERT INTO `item_mods` VALUES(13943, 383, 30); INSERT INTO `item_mods` VALUES(13943, 227, 2); INSERT INTO `item_mods` VALUES(13943, 242, 2); INSERT INTO `item_mods` VALUES(13944, 1, 30); @@ -5922,12 +5922,12 @@ INSERT INTO `item_mods` VALUES(14076, 2, 8); INSERT INTO `item_mods` VALUES(14076, 8, 7); INSERT INTO `item_mods` VALUES(14076, 9, 4); -INSERT INTO `item_mods` VALUES(14076, 167, -5); +INSERT INTO `item_mods` VALUES(14076, 383, -50); INSERT INTO `item_mods` VALUES(14077, 1, 26); INSERT INTO `item_mods` VALUES(14077, 2, 10); INSERT INTO `item_mods` VALUES(14077, 8, 8); INSERT INTO `item_mods` VALUES(14077, 9, 5); -INSERT INTO `item_mods` VALUES(14077, 167, -7); +INSERT INTO `item_mods` VALUES(14077, 383, -70); INSERT INTO `item_mods` VALUES(14078, 1, 20); INSERT INTO `item_mods` VALUES(14078, 2, -20); INSERT INTO `item_mods` VALUES(14078, 5, 20); @@ -6251,12 +6251,12 @@ INSERT INTO `item_mods` VALUES(14180, 2, 7); INSERT INTO `item_mods` VALUES(14180, 8, 6); INSERT INTO `item_mods` VALUES(14180, 9, 3); -INSERT INTO `item_mods` VALUES(14180, 167, -4); +INSERT INTO `item_mods` VALUES(14180, 383, -40); INSERT INTO `item_mods` VALUES(14181, 1, 23); INSERT INTO `item_mods` VALUES(14181, 2, 9); INSERT INTO `item_mods` VALUES(14181, 8, 7); INSERT INTO `item_mods` VALUES(14181, 9, 4); -INSERT INTO `item_mods` VALUES(14181, 167, -6); +INSERT INTO `item_mods` VALUES(14181, 383, -61); INSERT INTO `item_mods` VALUES(14182, 1, 18); INSERT INTO `item_mods` VALUES(14182, 2, -20); INSERT INTO `item_mods` VALUES(14182, 5, 20); @@ -6288,7 +6288,7 @@ INSERT INTO `item_mods` VALUES(14188, 1, 24); INSERT INTO `item_mods` VALUES(14188, 2, 27); INSERT INTO `item_mods` VALUES(14188, 23, 5); -INSERT INTO `item_mods` VALUES(14188, 167, 3); +INSERT INTO `item_mods` VALUES(14188, 383, 30); INSERT INTO `item_mods` VALUES(14188, 169, -3); INSERT INTO `item_mods` VALUES(14189, 1, 7); INSERT INTO `item_mods` VALUES(14189, 5, 10); @@ -6730,12 +6730,12 @@ INSERT INTO `item_mods` VALUES(14308, 2, 15); INSERT INTO `item_mods` VALUES(14308, 9, 8); INSERT INTO `item_mods` VALUES(14308, 23, 20); -INSERT INTO `item_mods` VALUES(14308, 167, -12); +INSERT INTO `item_mods` VALUES(14308, 383, -122); INSERT INTO `item_mods` VALUES(14309, 1, 43); INSERT INTO `item_mods` VALUES(14309, 2, 17); INSERT INTO `item_mods` VALUES(14309, 9, 9); INSERT INTO `item_mods` VALUES(14309, 23, 22); -INSERT INTO `item_mods` VALUES(14309, 167, -14); +INSERT INTO `item_mods` VALUES(14309, 383, -142); INSERT INTO `item_mods` VALUES(14310, 1, 19); INSERT INTO `item_mods` VALUES(14310, 10, -1); INSERT INTO `item_mods` VALUES(14310, 12, 2); @@ -6955,12 +6955,12 @@ INSERT INTO `item_mods` VALUES(14378, 2, 16); INSERT INTO `item_mods` VALUES(14378, 8, 12); INSERT INTO `item_mods` VALUES(14378, 25, 10); -INSERT INTO `item_mods` VALUES(14378, 167, -13); +INSERT INTO `item_mods` VALUES(14378, 383, -130); INSERT INTO `item_mods` VALUES(14379, 1, 51); INSERT INTO `item_mods` VALUES(14379, 2, 18); INSERT INTO `item_mods` VALUES(14379, 8, 13); INSERT INTO `item_mods` VALUES(14379, 25, 11); -INSERT INTO `item_mods` VALUES(14379, 167, -15); +INSERT INTO `item_mods` VALUES(14379, 383, -150); INSERT INTO `item_mods` VALUES(14380, 1, 42); INSERT INTO `item_mods` VALUES(14380, 8, -7); INSERT INTO `item_mods` VALUES(14380, 9, -7); @@ -7059,7 +7059,7 @@ INSERT INTO `item_mods` VALUES(14402, 27, 1); INSERT INTO `item_mods` VALUES(14403, 1, 32); INSERT INTO `item_mods` VALUES(14403, 26, 2); -INSERT INTO `item_mods` VALUES(14403, 167, 4); +INSERT INTO `item_mods` VALUES(14403, 383, 40); INSERT INTO `item_mods` VALUES(14404, 1, 37); INSERT INTO `item_mods` VALUES(14405, 1, 36); INSERT INTO `item_mods` VALUES(14406, 1, 29); @@ -7086,11 +7086,11 @@ INSERT INTO `item_mods` VALUES(14414, 1, 42); INSERT INTO `item_mods` VALUES(14414, 5, 14); INSERT INTO `item_mods` VALUES(14414, 14, 7); -INSERT INTO `item_mods` VALUES(14414, 167, 2); +INSERT INTO `item_mods` VALUES(14414, 383, 20); INSERT INTO `item_mods` VALUES(14415, 1, 43); INSERT INTO `item_mods` VALUES(14415, 5, 16); INSERT INTO `item_mods` VALUES(14415, 14, 8); -INSERT INTO `item_mods` VALUES(14415, 167, 3); +INSERT INTO `item_mods` VALUES(14415, 383, 30); INSERT INTO `item_mods` VALUES(14416, 1, 45); INSERT INTO `item_mods` VALUES(14416, 23, 13); INSERT INTO `item_mods` VALUES(14416, 27, 2); @@ -7319,7 +7319,7 @@ INSERT INTO `item_mods` VALUES(14489, 30, 5); INSERT INTO `item_mods` VALUES(14489, 112, 5); INSERT INTO `item_mods` VALUES(14489, 116, 5); -INSERT INTO `item_mods` VALUES(14489, 167, 3); +INSERT INTO `item_mods` VALUES(14489, 383, 30); INSERT INTO `item_mods` VALUES(14490, 1, 9); INSERT INTO `item_mods` VALUES(14491, 1, 27); INSERT INTO `item_mods` VALUES(14492, 1, 39); @@ -7412,7 +7412,7 @@ INSERT INTO `item_mods` VALUES(14513, 1, 50); INSERT INTO `item_mods` VALUES(14513, 2, 33); INSERT INTO `item_mods` VALUES(14513, 110, 15); -INSERT INTO `item_mods` VALUES(14513, 167, 2); +INSERT INTO `item_mods` VALUES(14513, 383, 20); INSERT INTO `item_mods` VALUES(14514, 1, 39); INSERT INTO `item_mods` VALUES(14514, 5, 20); INSERT INTO `item_mods` VALUES(14514, 357, 3); @@ -7640,7 +7640,7 @@ INSERT INTO `item_mods` VALUES(14570, 2, 42); INSERT INTO `item_mods` VALUES(14570, 5, 42); INSERT INTO `item_mods` VALUES(14570, 27, -5); -INSERT INTO `item_mods` VALUES(14570, 167, 4); +INSERT INTO `item_mods` VALUES(14570, 383, 40); INSERT INTO `item_mods` VALUES(14570, 296, 5); INSERT INTO `item_mods` VALUES(14571, 1, 36); INSERT INTO `item_mods` VALUES(14571, 8, 1); @@ -7684,7 +7684,7 @@ INSERT INTO `item_mods` VALUES(14577, 2, 50); INSERT INTO `item_mods` VALUES(14577, 27, 4); INSERT INTO `item_mods` VALUES(14577, 160, -5); -INSERT INTO `item_mods` VALUES(14577, 167, -5); +INSERT INTO `item_mods` VALUES(14577, 383, -50); INSERT INTO `item_mods` VALUES(14578, 1, 38); INSERT INTO `item_mods` VALUES(14578, 2, 20); INSERT INTO `item_mods` VALUES(14578, 8, 2); @@ -8213,7 +8213,7 @@ INSERT INTO `item_mods` VALUES(14825, 1, 25); INSERT INTO `item_mods` VALUES(14825, 2, 22); INSERT INTO `item_mods` VALUES(14825, 23, 6); -INSERT INTO `item_mods` VALUES(14825, 167, 4); +INSERT INTO `item_mods` VALUES(14825, 383, 40); INSERT INTO `item_mods` VALUES(14825, 169, -3); INSERT INTO `item_mods` VALUES(14826, 1, 8); INSERT INTO `item_mods` VALUES(14826, 5, 15); @@ -8397,14 +8397,14 @@ INSERT INTO `item_mods` VALUES(14875, 5, 15); INSERT INTO `item_mods` VALUES(14875, 13, 7); INSERT INTO `item_mods` VALUES(14875, 27, -3); -INSERT INTO `item_mods` VALUES(14875, 167, 5); +INSERT INTO `item_mods` VALUES(14875, 383, 50); INSERT INTO `item_mods` VALUES(14876, 1, 19); INSERT INTO `item_mods` VALUES(14876, 8, 4); INSERT INTO `item_mods` VALUES(14877, 1, 19); INSERT INTO `item_mods` VALUES(14877, 5, 18); INSERT INTO `item_mods` VALUES(14877, 13, 8); INSERT INTO `item_mods` VALUES(14877, 27, -4); -INSERT INTO `item_mods` VALUES(14877, 167, 6); +INSERT INTO `item_mods` VALUES(14877, 383, 61); INSERT INTO `item_mods` VALUES(14878, 1, 20); INSERT INTO `item_mods` VALUES(14878, 8, 5); INSERT INTO `item_mods` VALUES(14879, 1, 18); @@ -8441,7 +8441,7 @@ INSERT INTO `item_mods` VALUES(14886, 1, 15); INSERT INTO `item_mods` VALUES(14886, 27, -3); INSERT INTO `item_mods` VALUES(14886, 161, -3); -INSERT INTO `item_mods` VALUES(14886, 167, -3); +INSERT INTO `item_mods` VALUES(14886, 383, -30); INSERT INTO `item_mods` VALUES(14889, 1, 12); INSERT INTO `item_mods` VALUES(14889, 10, -4); INSERT INTO `item_mods` VALUES(14889, 23, 12); @@ -8530,11 +8530,11 @@ INSERT INTO `item_mods` VALUES(14905, 5, 20); INSERT INTO `item_mods` VALUES(14905, 25, 4); INSERT INTO `item_mods` VALUES(14905, 27, 3); -INSERT INTO `item_mods` VALUES(14905, 167, 3); +INSERT INTO `item_mods` VALUES(14905, 383, 30); INSERT INTO `item_mods` VALUES(14906, 1, 18); INSERT INTO `item_mods` VALUES(14906, 27, -4); INSERT INTO `item_mods` VALUES(14906, 30, 3); -INSERT INTO `item_mods` VALUES(14906, 167, 1); +INSERT INTO `item_mods` VALUES(14906, 383, 11); INSERT INTO `item_mods` VALUES(14906, 346, 1); INSERT INTO `item_mods` VALUES(14907, 1, 10); INSERT INTO `item_mods` VALUES(14907, 27, -4); @@ -8677,7 +8677,7 @@ INSERT INTO `item_mods` VALUES(14943, 26, 7); INSERT INTO `item_mods` VALUES(14944, 1, 12); INSERT INTO `item_mods` VALUES(14944, 26, 6); -INSERT INTO `item_mods` VALUES(14944, 167, -5); +INSERT INTO `item_mods` VALUES(14944, 383, -50); INSERT INTO `item_mods` VALUES(14945, 1, 16); INSERT INTO `item_mods` VALUES(14945, 2, 18); INSERT INTO `item_mods` VALUES(14945, 23, 6); @@ -8815,7 +8815,7 @@ INSERT INTO `item_mods` VALUES(14983, 9, 5); INSERT INTO `item_mods` VALUES(14983, 27, 4); INSERT INTO `item_mods` VALUES(14983, 68, 8); -INSERT INTO `item_mods` VALUES(14983, 167, 2); +INSERT INTO `item_mods` VALUES(14983, 383, 20); INSERT INTO `item_mods` VALUES(14984, 1, 17); INSERT INTO `item_mods` VALUES(14984, 8, 4); INSERT INTO `item_mods` VALUES(14984, 13, 4); @@ -8939,7 +8939,7 @@ INSERT INTO `item_mods` VALUES(15017, 252, 2); INSERT INTO `item_mods` VALUES(15018, 1, 29); INSERT INTO `item_mods` VALUES(15018, 2, 25); -INSERT INTO `item_mods` VALUES(15018, 167, -4); +INSERT INTO `item_mods` VALUES(15018, 383, -40); INSERT INTO `item_mods` VALUES(15021, 1, 23); INSERT INTO `item_mods` VALUES(15021, 8, 2); INSERT INTO `item_mods` VALUES(15021, 9, 2); @@ -8996,12 +8996,12 @@ INSERT INTO `item_mods` VALUES(15031, 2, 16); INSERT INTO `item_mods` VALUES(15031, 9, 2); INSERT INTO `item_mods` VALUES(15031, 14, 2); -INSERT INTO `item_mods` VALUES(15031, 167, 3); +INSERT INTO `item_mods` VALUES(15031, 383, 30); INSERT INTO `item_mods` VALUES(15032, 1, 19); INSERT INTO `item_mods` VALUES(15032, 2, 25); INSERT INTO `item_mods` VALUES(15032, 9, 3); INSERT INTO `item_mods` VALUES(15032, 14, 3); -INSERT INTO `item_mods` VALUES(15032, 167, 3); +INSERT INTO `item_mods` VALUES(15032, 383, 30); INSERT INTO `item_mods` VALUES(15033, 1, 21); INSERT INTO `item_mods` VALUES(15033, 291, 2); INSERT INTO `item_mods` VALUES(15034, 1, 28); @@ -9463,11 +9463,11 @@ INSERT INTO `item_mods` VALUES(15153, 1, 17); INSERT INTO `item_mods` VALUES(15153, 5, 9); INSERT INTO `item_mods` VALUES(15153, 14, 3); -INSERT INTO `item_mods` VALUES(15153, 167, 1); +INSERT INTO `item_mods` VALUES(15153, 383, 11); INSERT INTO `item_mods` VALUES(15154, 1, 18); INSERT INTO `item_mods` VALUES(15154, 5, 10); INSERT INTO `item_mods` VALUES(15154, 14, 4); -INSERT INTO `item_mods` VALUES(15154, 167, 2); +INSERT INTO `item_mods` VALUES(15154, 383, 20); INSERT INTO `item_mods` VALUES(15155, 1, 24); INSERT INTO `item_mods` VALUES(15155, 23, 5); INSERT INTO `item_mods` VALUES(15155, 27, 1); @@ -9698,7 +9698,7 @@ INSERT INTO `item_mods` VALUES(15221, 8, 2); INSERT INTO `item_mods` VALUES(15221, 27, -5); INSERT INTO `item_mods` VALUES(15221, 68, -5); -INSERT INTO `item_mods` VALUES(15221, 167, 2); +INSERT INTO `item_mods` VALUES(15221, 383, 20); INSERT INTO `item_mods` VALUES(15222, 25, -10); INSERT INTO `item_mods` VALUES(15222, 26, -10); INSERT INTO `item_mods` VALUES(15222, 68, -10); @@ -9706,7 +9706,7 @@ INSERT INTO `item_mods` VALUES(15223, 8, 4); INSERT INTO `item_mods` VALUES(15223, 25, 7); INSERT INTO `item_mods` VALUES(15223, 68, -7); -INSERT INTO `item_mods` VALUES(15223, 167, 4); +INSERT INTO `item_mods` VALUES(15223, 383, 40); INSERT INTO `item_mods` VALUES(15224, 2, -15); INSERT INTO `item_mods` VALUES(15224, 9, 3); INSERT INTO `item_mods` VALUES(15224, 11, 3); @@ -9791,11 +9791,11 @@ INSERT INTO `item_mods` VALUES(15240, 5, 22); INSERT INTO `item_mods` VALUES(15240, 25, 4); INSERT INTO `item_mods` VALUES(15240, 30, 4); -INSERT INTO `item_mods` VALUES(15240, 167, 3); +INSERT INTO `item_mods` VALUES(15240, 383, 30); INSERT INTO `item_mods` VALUES(15241, 1, 19); INSERT INTO `item_mods` VALUES(15241, 27, -5); INSERT INTO `item_mods` VALUES(15241, 30, 5); -INSERT INTO `item_mods` VALUES(15241, 167, 2); +INSERT INTO `item_mods` VALUES(15241, 383, 20); INSERT INTO `item_mods` VALUES(15241, 168, 10); INSERT INTO `item_mods` VALUES(15242, 1, 15); INSERT INTO `item_mods` VALUES(15242, 27, -7); @@ -9934,7 +9934,7 @@ INSERT INTO `item_mods` VALUES(15269, 57, 8); INSERT INTO `item_mods` VALUES(15270, 2, 30); INSERT INTO `item_mods` VALUES(15270, 5, 30); -INSERT INTO `item_mods` VALUES(15270, 167, 5); +INSERT INTO `item_mods` VALUES(15270, 383, 50); INSERT INTO `item_mods` VALUES(15286, 1, 3); INSERT INTO `item_mods` VALUES(15286, 25, 5); INSERT INTO `item_mods` VALUES(15286, 68, -5); @@ -9976,11 +9976,11 @@ INSERT INTO `item_mods` VALUES(15303, 1, 18); INSERT INTO `item_mods` VALUES(15303, 5, 11); INSERT INTO `item_mods` VALUES(15303, 14, 4); -INSERT INTO `item_mods` VALUES(15303, 167, 1); +INSERT INTO `item_mods` VALUES(15303, 383, 11); INSERT INTO `item_mods` VALUES(15304, 1, 19); INSERT INTO `item_mods` VALUES(15304, 5, 12); INSERT INTO `item_mods` VALUES(15304, 14, 5); -INSERT INTO `item_mods` VALUES(15304, 167, 2); +INSERT INTO `item_mods` VALUES(15304, 383, 20); INSERT INTO `item_mods` VALUES(15305, 1, 19); INSERT INTO `item_mods` VALUES(15305, 8, 2); INSERT INTO `item_mods` VALUES(15305, 23, 5); @@ -10045,14 +10045,14 @@ INSERT INTO `item_mods` VALUES(15327, 1, 21); INSERT INTO `item_mods` VALUES(15327, 2, 12); INSERT INTO `item_mods` VALUES(15327, 11, 3); -INSERT INTO `item_mods` VALUES(15327, 167, 3); +INSERT INTO `item_mods` VALUES(15327, 383, 30); INSERT INTO `item_mods` VALUES(15328, 1, 18); INSERT INTO `item_mods` VALUES(15328, 2, 35); INSERT INTO `item_mods` VALUES(15329, 1, 14); INSERT INTO `item_mods` VALUES(15329, 5, 17); INSERT INTO `item_mods` VALUES(15329, 13, 3); INSERT INTO `item_mods` VALUES(15329, 27, -4); -INSERT INTO `item_mods` VALUES(15329, 167, 2); +INSERT INTO `item_mods` VALUES(15329, 383, 20); INSERT INTO `item_mods` VALUES(15330, 1, 17); INSERT INTO `item_mods` VALUES(15330, 8, 2); INSERT INTO `item_mods` VALUES(15330, 48, 2); @@ -10060,7 +10060,7 @@ INSERT INTO `item_mods` VALUES(15331, 5, 20); INSERT INTO `item_mods` VALUES(15331, 13, 4); INSERT INTO `item_mods` VALUES(15331, 27, -5); -INSERT INTO `item_mods` VALUES(15331, 167, 3); +INSERT INTO `item_mods` VALUES(15331, 383, 30); INSERT INTO `item_mods` VALUES(15332, 1, 18); INSERT INTO `item_mods` VALUES(15332, 8, 3); INSERT INTO `item_mods` VALUES(15332, 48, 3); @@ -10128,7 +10128,7 @@ INSERT INTO `item_mods` VALUES(15349, 8, 3); INSERT INTO `item_mods` VALUES(15349, 10, 2); INSERT INTO `item_mods` VALUES(15349, 23, 5); -INSERT INTO `item_mods` VALUES(15349, 167, -2); +INSERT INTO `item_mods` VALUES(15349, 383, -20); INSERT INTO `item_mods` VALUES(15350, 1, 20); INSERT INTO `item_mods` VALUES(15350, 2, -30); INSERT INTO `item_mods` VALUES(15350, 5, 30); @@ -10231,7 +10231,7 @@ INSERT INTO `item_mods` VALUES(15372, 13, 2); INSERT INTO `item_mods` VALUES(15373, 1, 20); INSERT INTO `item_mods` VALUES(15373, 26, 3); -INSERT INTO `item_mods` VALUES(15373, 167, 2); +INSERT INTO `item_mods` VALUES(15373, 383, 20); INSERT INTO `item_mods` VALUES(15374, 1, 24); INSERT INTO `item_mods` VALUES(15374, 112, 5); INSERT INTO `item_mods` VALUES(15374, 115, 5); @@ -10271,14 +10271,14 @@ INSERT INTO `item_mods` VALUES(15391, 5, 25); INSERT INTO `item_mods` VALUES(15391, 13, 6); INSERT INTO `item_mods` VALUES(15391, 27, -5); -INSERT INTO `item_mods` VALUES(15391, 167, 3); +INSERT INTO `item_mods` VALUES(15391, 383, 30); INSERT INTO `item_mods` VALUES(15392, 1, 36); INSERT INTO `item_mods` VALUES(15392, 48, 6); INSERT INTO `item_mods` VALUES(15393, 1, 33); INSERT INTO `item_mods` VALUES(15393, 5, 30); INSERT INTO `item_mods` VALUES(15393, 13, 7); INSERT INTO `item_mods` VALUES(15393, 27, -6); -INSERT INTO `item_mods` VALUES(15393, 167, 4); +INSERT INTO `item_mods` VALUES(15393, 383, 40); INSERT INTO `item_mods` VALUES(15394, 1, 37); INSERT INTO `item_mods` VALUES(15394, 48, 7); INSERT INTO `item_mods` VALUES(15395, 1, 38); @@ -10366,7 +10366,7 @@ INSERT INTO `item_mods` VALUES(15431, 7, 15); INSERT INTO `item_mods` VALUES(15431, 27, 2); INSERT INTO `item_mods` VALUES(15432, 2, -15); -INSERT INTO `item_mods` VALUES(15432, 167, 2); +INSERT INTO `item_mods` VALUES(15432, 383, 20); INSERT INTO `item_mods` VALUES(15433, 1, 3); INSERT INTO `item_mods` VALUES(15433, 12, 2); INSERT INTO `item_mods` VALUES(15433, 13, 2); @@ -10390,10 +10390,10 @@ INSERT INTO `item_mods` VALUES(15456, 27, 2); INSERT INTO `item_mods` VALUES(15457, 23, -5); INSERT INTO `item_mods` VALUES(15457, 25, 3); -INSERT INTO `item_mods` VALUES(15457, 167, 4); +INSERT INTO `item_mods` VALUES(15457, 383, 40); INSERT INTO `item_mods` VALUES(15458, 1, 6); INSERT INTO `item_mods` VALUES(15458, 23, 6); -INSERT INTO `item_mods` VALUES(15458, 167, 6); +INSERT INTO `item_mods` VALUES(15458, 383, 61); INSERT INTO `item_mods` VALUES(15458, 168, 6); INSERT INTO `item_mods` VALUES(15458, 289, 6); INSERT INTO `item_mods` VALUES(15459, 1, 3); @@ -10697,13 +10697,13 @@ INSERT INTO `item_mods` VALUES(15576, 2, 26); INSERT INTO `item_mods` VALUES(15576, 5, 26); INSERT INTO `item_mods` VALUES(15576, 25, 3); -INSERT INTO `item_mods` VALUES(15576, 167, 3); +INSERT INTO `item_mods` VALUES(15576, 383, 30); INSERT INTO `item_mods` VALUES(15576, 170, 2); INSERT INTO `item_mods` VALUES(15577, 1, 30); INSERT INTO `item_mods` VALUES(15577, 30, 3); INSERT INTO `item_mods` VALUES(15577, 111, 5); INSERT INTO `item_mods` VALUES(15577, 114, 5); -INSERT INTO `item_mods` VALUES(15577, 167, 2); +INSERT INTO `item_mods` VALUES(15577, 383, 20); INSERT INTO `item_mods` VALUES(15578, 1, 20); INSERT INTO `item_mods` VALUES(15578, 27, -5); INSERT INTO `item_mods` VALUES(15578, 68, 5); @@ -10860,7 +10860,7 @@ INSERT INTO `item_mods` VALUES(15617, 1, 36); INSERT INTO `item_mods` VALUES(15617, 8, 4); INSERT INTO `item_mods` VALUES(15617, 10, 4); -INSERT INTO `item_mods` VALUES(15617, 167, 3); +INSERT INTO `item_mods` VALUES(15617, 383, 30); INSERT INTO `item_mods` VALUES(15618, 1, 39); INSERT INTO `item_mods` VALUES(15618, 2, 25); INSERT INTO `item_mods` VALUES(15618, 5, 25); @@ -10906,7 +10906,7 @@ INSERT INTO `item_mods` VALUES(15629, 24, 5); INSERT INTO `item_mods` VALUES(15629, 25, 4); INSERT INTO `item_mods` VALUES(15629, 26, 4); -INSERT INTO `item_mods` VALUES(15629, 167, 2); +INSERT INTO `item_mods` VALUES(15629, 383, 20); INSERT INTO `item_mods` VALUES(15630, 1, 8); INSERT INTO `item_mods` VALUES(15630, 26, 1); INSERT INTO `item_mods` VALUES(15631, 1, 13); @@ -10920,7 +10920,7 @@ INSERT INTO `item_mods` VALUES(15633, 8, 5); INSERT INTO `item_mods` VALUES(15633, 9, 5); INSERT INTO `item_mods` VALUES(15633, 23, 10); -INSERT INTO `item_mods` VALUES(15633, 167, 3); +INSERT INTO `item_mods` VALUES(15633, 383, 30); INSERT INTO `item_mods` VALUES(15634, 1, 9); INSERT INTO `item_mods` VALUES(15634, 8, 1); INSERT INTO `item_mods` VALUES(15635, 1, 14); @@ -11040,12 +11040,12 @@ INSERT INTO `item_mods` VALUES(15661, 5, 31); INSERT INTO `item_mods` VALUES(15661, 25, 6); INSERT INTO `item_mods` VALUES(15661, 26, 6); -INSERT INTO `item_mods` VALUES(15661, 167, 3); +INSERT INTO `item_mods` VALUES(15661, 383, 30); INSERT INTO `item_mods` VALUES(15662, 1, 13); INSERT INTO `item_mods` VALUES(15662, 30, 2); INSERT INTO `item_mods` VALUES(15662, 115, 5); INSERT INTO `item_mods` VALUES(15662, 117, 5); -INSERT INTO `item_mods` VALUES(15662, 167, 1); +INSERT INTO `item_mods` VALUES(15662, 383, 11); INSERT INTO `item_mods` VALUES(15663, 1, 8); INSERT INTO `item_mods` VALUES(15663, 27, -4); INSERT INTO `item_mods` VALUES(15663, 68, 4); @@ -11273,7 +11273,7 @@ INSERT INTO `item_mods` VALUES(15719, 23, 7); INSERT INTO `item_mods` VALUES(15719, 25, 7); INSERT INTO `item_mods` VALUES(15719, 27, 5); -INSERT INTO `item_mods` VALUES(15719, 167, 2); +INSERT INTO `item_mods` VALUES(15719, 383, 20); INSERT INTO `item_mods` VALUES(15720, 1, 4); INSERT INTO `item_mods` VALUES(15720, 23, 1); INSERT INTO `item_mods` VALUES(15721, 1, 5); @@ -11349,7 +11349,7 @@ INSERT INTO `item_mods` VALUES(15736, 11, 2); INSERT INTO `item_mods` VALUES(15736, 169, 12); INSERT INTO `item_mods` VALUES(15737, 1, 7); -INSERT INTO `item_mods` VALUES(15737, 167, 3); +INSERT INTO `item_mods` VALUES(15737, 383, 30); INSERT INTO `item_mods` VALUES(15738, 1, 11); INSERT INTO `item_mods` VALUES(15738, 25, 1); INSERT INTO `item_mods` VALUES(15738, 68, 1); @@ -11392,7 +11392,7 @@ INSERT INTO `item_mods` VALUES(15745, 54, 15); INSERT INTO `item_mods` VALUES(15745, 55, 15); INSERT INTO `item_mods` VALUES(15745, 56, 15); -INSERT INTO `item_mods` VALUES(15745, 167, 1); +INSERT INTO `item_mods` VALUES(15745, 383, 11); INSERT INTO `item_mods` VALUES(15746, 1, 14); INSERT INTO `item_mods` VALUES(15746, 2, 7); INSERT INTO `item_mods` VALUES(15746, 23, 5); @@ -11435,7 +11435,7 @@ INSERT INTO `item_mods` VALUES(15759, 1, 9); INSERT INTO `item_mods` VALUES(15759, 28, 2); INSERT INTO `item_mods` VALUES(15759, 29, 2); -INSERT INTO `item_mods` VALUES(15759, 167, -5); +INSERT INTO `item_mods` VALUES(15759, 383, -50); INSERT INTO `item_mods` VALUES(15759, 169, -12); INSERT INTO `item_mods` VALUES(15760, 1, 12); INSERT INTO `item_mods` VALUES(15760, 54, 10); @@ -11652,7 +11652,7 @@ INSERT INTO `item_mods` VALUES(15877, 1, 4); INSERT INTO `item_mods` VALUES(15877, 30, 2); INSERT INTO `item_mods` VALUES(15877, 68, 4); -INSERT INTO `item_mods` VALUES(15877, 167, 4); +INSERT INTO `item_mods` VALUES(15877, 383, 40); INSERT INTO `item_mods` VALUES(15878, 1, 5); INSERT INTO `item_mods` VALUES(15878, 10, 5); INSERT INTO `item_mods` VALUES(15878, 23, 7); @@ -11712,7 +11712,7 @@ INSERT INTO `item_mods` VALUES(15894, 28, 2); INSERT INTO `item_mods` VALUES(15894, 30, -1); INSERT INTO `item_mods` VALUES(15894, 68, -20); -INSERT INTO `item_mods` VALUES(15894, 167, -5); +INSERT INTO `item_mods` VALUES(15894, 383, -50); INSERT INTO `item_mods` VALUES(15895, 1, 5); INSERT INTO `item_mods` VALUES(15895, 2, 14); INSERT INTO `item_mods` VALUES(15895, 27, 4); @@ -11726,7 +11726,7 @@ INSERT INTO `item_mods` VALUES(15897, 13, 3); INSERT INTO `item_mods` VALUES(15898, 1, 7); INSERT INTO `item_mods` VALUES(15898, 168, 8); -INSERT INTO `item_mods` VALUES(15899, 167, 6); +INSERT INTO `item_mods` VALUES(15899, 383, 61); INSERT INTO `item_mods` VALUES(15900, 1, 6); INSERT INTO `item_mods` VALUES(15900, 25, 10); INSERT INTO `item_mods` VALUES(15901, 1, 6); @@ -11812,7 +11812,7 @@ INSERT INTO `item_mods` VALUES(15940, 1, 2); INSERT INTO `item_mods` VALUES(15940, 308, 5); INSERT INTO `item_mods` VALUES(15941, 23, 4); -INSERT INTO `item_mods` VALUES(15941, 167, 3); +INSERT INTO `item_mods` VALUES(15941, 383, 30); INSERT INTO `item_mods` VALUES(15942, 5, 6); INSERT INTO `item_mods` VALUES(15942, 117, 2); INSERT INTO `item_mods` VALUES(15943, 23, 4); @@ -11954,7 +11954,7 @@ INSERT INTO `item_mods` VALUES(16072, 1, 22); INSERT INTO `item_mods` VALUES(16072, 23, 2); INSERT INTO `item_mods` VALUES(16072, 25, 2); -INSERT INTO `item_mods` VALUES(16072, 167, 1); +INSERT INTO `item_mods` VALUES(16072, 383, 11); INSERT INTO `item_mods` VALUES(16073, 1, 30); INSERT INTO `item_mods` VALUES(16073, 9, 1); INSERT INTO `item_mods` VALUES(16073, 11, 2); @@ -12006,7 +12006,7 @@ INSERT INTO `item_mods` VALUES(16088, 11, 4); INSERT INTO `item_mods` VALUES(16088, 23, 6); INSERT INTO `item_mods` VALUES(16088, 24, 6); -INSERT INTO `item_mods` VALUES(16088, 167, 3); +INSERT INTO `item_mods` VALUES(16088, 383, 30); INSERT INTO `item_mods` VALUES(16089, 1, 4); INSERT INTO `item_mods` VALUES(16089, 24, 1); INSERT INTO `item_mods` VALUES(16090, 1, 9); @@ -12021,7 +12021,7 @@ INSERT INTO `item_mods` VALUES(16092, 11, 3); INSERT INTO `item_mods` VALUES(16092, 25, 7); INSERT INTO `item_mods` VALUES(16092, 68, 7); -INSERT INTO `item_mods` VALUES(16092, 167, 3); +INSERT INTO `item_mods` VALUES(16092, 383, 30); INSERT INTO `item_mods` VALUES(16093, 1, 5); INSERT INTO `item_mods` VALUES(16093, 11, 1); INSERT INTO `item_mods` VALUES(16094, 1, 10); @@ -12076,13 +12076,13 @@ INSERT INTO `item_mods` VALUES(16106, 8, 4); INSERT INTO `item_mods` VALUES(16106, 9, 4); INSERT INTO `item_mods` VALUES(16106, 10, 4); -INSERT INTO `item_mods` VALUES(16106, 167, 4); +INSERT INTO `item_mods` VALUES(16106, 383, 40); INSERT INTO `item_mods` VALUES(16107, 1, 21); INSERT INTO `item_mods` VALUES(16107, 11, 4); INSERT INTO `item_mods` VALUES(16107, 13, 4); INSERT INTO `item_mods` VALUES(16107, 23, 3); INSERT INTO `item_mods` VALUES(16107, 68, 3); -INSERT INTO `item_mods` VALUES(16107, 167, 4); +INSERT INTO `item_mods` VALUES(16107, 383, 40); INSERT INTO `item_mods` VALUES(16108, 1, 20); INSERT INTO `item_mods` VALUES(16108, 2, 20); INSERT INTO `item_mods` VALUES(16108, 5, 20); @@ -12126,7 +12126,7 @@ INSERT INTO `item_mods` VALUES(16117, 2, 30); INSERT INTO `item_mods` VALUES(16117, 10, 4); INSERT INTO `item_mods` VALUES(16117, 160, -5); -INSERT INTO `item_mods` VALUES(16117, 167, -5); +INSERT INTO `item_mods` VALUES(16117, 383, -50); INSERT INTO `item_mods` VALUES(16121, 1, 21); INSERT INTO `item_mods` VALUES(16122, 1, 23); INSERT INTO `item_mods` VALUES(16123, 1, 21); @@ -12134,7 +12134,7 @@ INSERT INTO `item_mods` VALUES(16125, 1, 22); INSERT INTO `item_mods` VALUES(16125, 25, 4); INSERT INTO `item_mods` VALUES(16125, 27, -3); -INSERT INTO `item_mods` VALUES(16125, 167, 1); +INSERT INTO `item_mods` VALUES(16125, 383, 11); INSERT INTO `item_mods` VALUES(16126, 1, 25); INSERT INTO `item_mods` VALUES(16126, 9, 4); INSERT INTO `item_mods` VALUES(16126, 26, 10); @@ -12219,7 +12219,7 @@ INSERT INTO `item_mods` VALUES(16155, 23, 4); INSERT INTO `item_mods` VALUES(16155, 25, 4); INSERT INTO `item_mods` VALUES(16155, 68, -7); -INSERT INTO `item_mods` VALUES(16155, 167, 2); +INSERT INTO `item_mods` VALUES(16155, 383, 20); INSERT INTO `item_mods` VALUES(16156, 1, 19); INSERT INTO `item_mods` VALUES(16156, 2, 15); INSERT INTO `item_mods` VALUES(16156, 5, 25); @@ -12235,7 +12235,7 @@ INSERT INTO `item_mods` VALUES(16158, 8, 6); INSERT INTO `item_mods` VALUES(16158, 9, 4); INSERT INTO `item_mods` VALUES(16158, 23, 8); -INSERT INTO `item_mods` VALUES(16158, 167, -5); +INSERT INTO `item_mods` VALUES(16158, 383, -50); INSERT INTO `item_mods` VALUES(16159, 1, 23); INSERT INTO `item_mods` VALUES(16159, 24, 8); INSERT INTO `item_mods` VALUES(16159, 26, 8); @@ -12263,7 +12263,7 @@ INSERT INTO `item_mods` VALUES(16167, 1, 1); INSERT INTO `item_mods` VALUES(16168, 1, 10); INSERT INTO `item_mods` VALUES(16168, 8, 3); -INSERT INTO `item_mods` VALUES(16168, 167, 1); +INSERT INTO `item_mods` VALUES(16168, 383, 11); INSERT INTO `item_mods` VALUES(16169, 1, 21); INSERT INTO `item_mods` VALUES(16169, 27, 2); INSERT INTO `item_mods` VALUES(16169, 29, 2); @@ -12297,7 +12297,7 @@ INSERT INTO `item_mods` VALUES(16179, 1, 17); INSERT INTO `item_mods` VALUES(16179, 14, 2); INSERT INTO `item_mods` VALUES(16179, 25, 2); -INSERT INTO `item_mods` VALUES(16179, 167, 1); +INSERT INTO `item_mods` VALUES(16179, 383, 11); INSERT INTO `item_mods` VALUES(16180, 1, 13); INSERT INTO `item_mods` VALUES(16180, 28, 3); INSERT INTO `item_mods` VALUES(16180, 30, 3); @@ -12680,11 +12680,11 @@ INSERT INTO `item_mods` VALUES(16360, 1, 28); INSERT INTO `item_mods` VALUES(16360, 8, 3); INSERT INTO `item_mods` VALUES(16360, 14, 3); -INSERT INTO `item_mods` VALUES(16360, 167, 3); +INSERT INTO `item_mods` VALUES(16360, 383, 30); INSERT INTO `item_mods` VALUES(16361, 1, 29); INSERT INTO `item_mods` VALUES(16361, 8, 4); INSERT INTO `item_mods` VALUES(16361, 14, 4); -INSERT INTO `item_mods` VALUES(16361, 167, 3); +INSERT INTO `item_mods` VALUES(16361, 383, 30); INSERT INTO `item_mods` VALUES(16362, 1, 27); INSERT INTO `item_mods` VALUES(16362, 2, 15); INSERT INTO `item_mods` VALUES(16362, 5, 15); @@ -12725,12 +12725,12 @@ INSERT INTO `item_mods` VALUES(16375, 1, 36); INSERT INTO `item_mods` VALUES(16375, 23, 6); INSERT INTO `item_mods` VALUES(16375, 25, 12); -INSERT INTO `item_mods` VALUES(16375, 167, -8); +INSERT INTO `item_mods` VALUES(16375, 383, -81); INSERT INTO `item_mods` VALUES(16376, 1, 36); INSERT INTO `item_mods` VALUES(16376, 8, 5); INSERT INTO `item_mods` VALUES(16376, 25, 12); INSERT INTO `item_mods` VALUES(16376, 68, -4); -INSERT INTO `item_mods` VALUES(16376, 167, -10); +INSERT INTO `item_mods` VALUES(16376, 383, -102); INSERT INTO `item_mods` VALUES(16377, 1, 21); INSERT INTO `item_mods` VALUES(16377, 8, 1); INSERT INTO `item_mods` VALUES(16377, 292, 2); @@ -13691,7 +13691,7 @@ INSERT INTO `item_mods` VALUES(17575, 14, -1); INSERT INTO `item_mods` VALUES(17576, 8, 5); INSERT INTO `item_mods` VALUES(17576, 13, 6); -INSERT INTO `item_mods` VALUES(17577, 167, 5); +INSERT INTO `item_mods` VALUES(17577, 383, 50); INSERT INTO `item_mods` VALUES(17578, 5, 24); INSERT INTO `item_mods` VALUES(17578, 71, 2); INSERT INTO `item_mods` VALUES(17580, 12, 1); @@ -13988,7 +13988,7 @@ INSERT INTO `item_mods` VALUES(17836, 14, 3); INSERT INTO `item_mods` VALUES(17837, 14, 3); INSERT INTO `item_mods` VALUES(17837, 60, 6); -INSERT INTO `item_mods` VALUES(17840, 167, 2); +INSERT INTO `item_mods` VALUES(17840, 383, 20); INSERT INTO `item_mods` VALUES(17843, 23, 3); INSERT INTO `item_mods` VALUES(17843, 25, 3); INSERT INTO `item_mods` VALUES(17844, 2, 5); @@ -14524,7 +14524,7 @@ INSERT INTO `item_mods` VALUES(18498, 161, -8); INSERT INTO `item_mods` VALUES(18499, 2, 10); INSERT INTO `item_mods` VALUES(18499, 5, 10); -INSERT INTO `item_mods` VALUES(18500, 167, 1); +INSERT INTO `item_mods` VALUES(18500, 383, 11); INSERT INTO `item_mods` VALUES(18504, 11, 4); INSERT INTO `item_mods` VALUES(18504, 229, 2); INSERT INTO `item_mods` VALUES(18506, 288, 1); Index: src/map/ai/ai_char_normal.cpp =================================================================== --- src/map/ai/ai_char_normal.cpp (revision 2592) +++ src/map/ai/ai_char_normal.cpp (working copy) @@ -1299,7 +1299,10 @@ if (!m_PChar->StatusEffectContainer->HasStatusEffect(EFFECT_CHAINSPELL)) { uint32 RecastTime = (float)m_PSpell->getRecastTime() * ((100.0f-dsp_cap((float)m_PChar->getMod(MOD_FASTCAST)/2.0f,0.0f,25.0f))/100.0f); - RecastTime = RecastTime * ((100.0f-dsp_cap((float)m_PChar->getMod(MOD_HASTE),0.0f,25.0f))/100.0f); + // Only haste from spells or equipment is counted; ignore MOD_HASTE_ABILITY and cap at 25% (256/1024) + int16 Haste = m_PChar->getMod(MOD_HASTE_MAGIC) + m_PChar->getMod(MOD_HASTE_GEAR); + RecastTime = RecastTime * ((float)(1024-dsp_cap(Haste,-1024,256))/1024); + //needed so the client knows of the reduced recast time! m_PSpell->setModifiedRecast(RecastTime); Index: src/map/ai/ai_mob_dummy.cpp =================================================================== --- src/map/ai/ai_mob_dummy.cpp (revision 2588) +++ src/map/ai/ai_mob_dummy.cpp (working copy) @@ -1331,7 +1331,9 @@ { WeaponDelay = 600; } else { - WeaponDelay -= ((m_PMob->getMod(MOD_HASTE) * WeaponDelay) / 100); + int16 hasteMagic = (m_PMob->getMod(MOD_HASTE_MAGIC) > 448) ? 448 : m_PMob->getMod(MOD_HASTE_MAGIC); + int16 hasteAbility = (m_PMob->getMod(MOD_HASTE_ABILITY) > 256) ? 256 : m_PMob->getMod(MOD_HASTE_ABILITY); + WeaponDelay -= (((float)(hasteMagic + hasteAbility) * WeaponDelay) / 1024); } if ((m_Tick - m_LastActionTime) > WeaponDelay) Index: src/map/battleentity.cpp =================================================================== --- src/map/battleentity.cpp (revision 2588) +++ src/map/battleentity.cpp (working copy) @@ -168,6 +168,7 @@ { return 1700; } + uint16 MinimumDelay = m_Weapons[SLOT_MAIN]->getDelay(); // Track base delay. We will need this later. MOD_DELAY is ignored for now. uint16 WeaponDelay = m_Weapons[SLOT_MAIN]->getDelay() - getMod(MOD_DELAY); if (m_Weapons[SLOT_MAIN]->getDmgType() == DAMAGE_HTH) { @@ -175,6 +176,7 @@ } else if (m_Weapons[SLOT_SUB]->getDmgType() > 0 && m_Weapons[SLOT_SUB]->getDmgType() < 4 ) { + MinimumDelay += m_Weapons[SLOT_SUB]->getDelay(); WeaponDelay += m_Weapons[SLOT_SUB]->getDelay(); //apply dual wield delay reduction WeaponDelay = WeaponDelay * ((100.0f - (float)getMod(MOD_DUAL_WIELD))/100.0f); @@ -182,9 +184,19 @@ //apply haste and delay reductions that don't affect tp if (!tp) { - WeaponDelay = (WeaponDelay * (100 - getMod(MOD_HASTE))) / 100; + // Cap haste at appropriate levels. + int16 hasteMagic = (getMod(MOD_HASTE_MAGIC) > 448) ? 448 : getMod(MOD_HASTE_MAGIC); + int16 hasteAbility = (getMod(MOD_HASTE_ABILITY) > 256) ? 256 : getMod(MOD_HASTE_ABILITY); + int16 hasteGear = (getMod(MOD_HASTE_GEAR) > 256) ? 256 : getMod(MOD_HASTE_GEAR); + WeaponDelay = WeaponDelay * ((float)(1024 - hasteMagic - hasteAbility - hasteGear) / 1024); } WeaponDelay = WeaponDelay * ((float)(100 + getMod(MOD_DELAYP))/100); + + // Global delay reduction cap of "about 80%" being enforced. + // This should be enforced on -delay equipment, martial arts, dual wield, and haste, hence MinimumDelay * 0.2. + // TODO: Could be converted to value/1024 if the exact cap is ever determined. + MinimumDelay -= (MinimumDelay * 0.8); + WeaponDelay = (WeaponDelay < MinimumDelay) ? MinimumDelay : WeaponDelay; return WeaponDelay; } Index: src/map/battleutils.cpp =================================================================== --- src/map/battleutils.cpp (revision 2588) +++ src/map/battleutils.cpp (working copy) @@ -1087,7 +1087,7 @@ PDefender->StatusEffectContainer->DelStatusEffect(EFFECT_DRAIN_DAZE); PDefender->StatusEffectContainer->AddStatusEffect(new CStatusEffect(EFFECT_HASTE_DAZE,EFFECT_HASTE_DAZE,10,0,10)); if (PAttacker->StatusEffectContainer->HasStatusEffect(EFFECT_HASTE)){break;} - PAttacker->StatusEffectContainer->AddStatusEffect(new CStatusEffect(EFFECT_HASTE, EFFECT_HASTE, 5, 0, 10)); + PAttacker->StatusEffectContainer->AddStatusEffect(new CStatusEffect(EFFECT_HASTE, EFFECT_HASTE, 50, 0, 10)); return; } } @@ -1134,7 +1134,7 @@ if (PDefender->StatusEffectContainer->HasStatusEffect(EFFECT_HASTE_DAZE)) { if (PAttacker->StatusEffectContainer->HasStatusEffect(EFFECT_HASTE)){return;} - PAttacker->StatusEffectContainer->AddStatusEffect(new CStatusEffect(EFFECT_HASTE, EFFECT_HASTE, 5, 0, 10)); + PAttacker->StatusEffectContainer->AddStatusEffect(new CStatusEffect(EFFECT_HASTE, EFFECT_HASTE, 50, 0, 10)); return; } Index: src/map/modifier.h =================================================================== --- src/map/modifier.h (revision 2592) +++ src/map/modifier.h (working copy) @@ -201,7 +201,9 @@ MOD_CRITHITRATE = 0xA5, // Raises chance to crit MOD_ENEMYCRITRATE = 0xA6, // Raises chance enemy will crit - MOD_HASTE = 0xA7, // % Percent Haste (and Slow) + MOD_HASTE_MAGIC = 0xA7, // Haste (and Slow) from magic - 1024 base! (448 cap) + MOD_HASTE_ABILITY = 0x17F, // Haste (and Slow) from abilities - 1024 base! (256 cap?) + MOD_HASTE_GEAR = 0x180, // Haste (and Slow) from equipment - 1024 base! (256 cap) MOD_SPELLINTERRUPT = 0xA8, // % Spell Interruption Rate MOD_MOVE = 0xA9, // % Movement Speed MOD_FASTCAST = 0xAA, // Increases Spell Cast Time (TRAIT) @@ -411,13 +413,12 @@ // Use these for new modifiers. - - //SPARE_MOD = 0x17F - //SPARE_MOD = 0x180 //SPARE_MOD = 0x181 + //SPARE_MOD = 0x182 + //SPARE_MOD = 0x183 }; -#define MAX_MODIFIER 0x17F +#define MAX_MODIFIER 0x181