Changed weapon grade bonus heal calculation.
This commit is contained in:
@@ -98,7 +98,7 @@ public final class Heal extends AbstractEffect
|
|||||||
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
||||||
if (weaponInst != null)
|
if (weaponInst != null)
|
||||||
{
|
{
|
||||||
mAtkMul = weaponInst.getItem().getCrystalType() == CrystalType.S84 ? 4 : weaponInst.getItem().getCrystalType() == CrystalType.S80 ? 2 : 1;
|
mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1;
|
||||||
}
|
}
|
||||||
// shot dynamic bonus
|
// shot dynamic bonus
|
||||||
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
||||||
|
@@ -94,7 +94,7 @@ public final class HpCpHeal extends AbstractEffect
|
|||||||
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
||||||
if (weaponInst != null)
|
if (weaponInst != null)
|
||||||
{
|
{
|
||||||
mAtkMul = weaponInst.getItem().getCrystalType() == CrystalType.S84 ? 4 : weaponInst.getItem().getCrystalType() == CrystalType.S80 ? 2 : 1;
|
mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1;
|
||||||
}
|
}
|
||||||
// shot dynamic bonus
|
// shot dynamic bonus
|
||||||
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
||||||
|
@@ -98,7 +98,7 @@ public final class Heal extends AbstractEffect
|
|||||||
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
||||||
if (weaponInst != null)
|
if (weaponInst != null)
|
||||||
{
|
{
|
||||||
mAtkMul = weaponInst.getItem().getCrystalType() == CrystalType.S84 ? 4 : weaponInst.getItem().getCrystalType() == CrystalType.S80 ? 2 : 1;
|
mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1;
|
||||||
}
|
}
|
||||||
// shot dynamic bonus
|
// shot dynamic bonus
|
||||||
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
||||||
|
@@ -94,7 +94,7 @@ public final class HpCpHeal extends AbstractEffect
|
|||||||
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
||||||
if (weaponInst != null)
|
if (weaponInst != null)
|
||||||
{
|
{
|
||||||
mAtkMul = weaponInst.getItem().getCrystalType() == CrystalType.S84 ? 4 : weaponInst.getItem().getCrystalType() == CrystalType.S80 ? 2 : 1;
|
mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1;
|
||||||
}
|
}
|
||||||
// shot dynamic bonus
|
// shot dynamic bonus
|
||||||
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
||||||
|
@@ -98,7 +98,7 @@ public final class Heal extends AbstractEffect
|
|||||||
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
||||||
if (weaponInst != null)
|
if (weaponInst != null)
|
||||||
{
|
{
|
||||||
mAtkMul = weaponInst.getItem().getCrystalType() == CrystalType.S84 ? 4 : weaponInst.getItem().getCrystalType() == CrystalType.S80 ? 2 : 1;
|
mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1;
|
||||||
}
|
}
|
||||||
// shot dynamic bonus
|
// shot dynamic bonus
|
||||||
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
||||||
|
@@ -94,7 +94,7 @@ public final class HpCpHeal extends AbstractEffect
|
|||||||
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
||||||
if (weaponInst != null)
|
if (weaponInst != null)
|
||||||
{
|
{
|
||||||
mAtkMul = weaponInst.getItem().getCrystalType() == CrystalType.S84 ? 4 : weaponInst.getItem().getCrystalType() == CrystalType.S80 ? 2 : 1;
|
mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1;
|
||||||
}
|
}
|
||||||
// shot dynamic bonus
|
// shot dynamic bonus
|
||||||
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
||||||
|
@@ -98,7 +98,7 @@ public final class Heal extends AbstractEffect
|
|||||||
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
||||||
if (weaponInst != null)
|
if (weaponInst != null)
|
||||||
{
|
{
|
||||||
mAtkMul = weaponInst.getItem().getCrystalType() == CrystalType.S84 ? 4 : weaponInst.getItem().getCrystalType() == CrystalType.S80 ? 2 : 1;
|
mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1;
|
||||||
}
|
}
|
||||||
// shot dynamic bonus
|
// shot dynamic bonus
|
||||||
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
||||||
|
@@ -94,7 +94,7 @@ public final class HpCpHeal extends AbstractEffect
|
|||||||
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
||||||
if (weaponInst != null)
|
if (weaponInst != null)
|
||||||
{
|
{
|
||||||
mAtkMul = weaponInst.getItem().getCrystalType() == CrystalType.S84 ? 4 : weaponInst.getItem().getCrystalType() == CrystalType.S80 ? 2 : 1;
|
mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1;
|
||||||
}
|
}
|
||||||
// shot dynamic bonus
|
// shot dynamic bonus
|
||||||
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
||||||
|
@@ -98,7 +98,7 @@ public final class Heal extends AbstractEffect
|
|||||||
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
||||||
if (weaponInst != null)
|
if (weaponInst != null)
|
||||||
{
|
{
|
||||||
mAtkMul = weaponInst.getItem().getCrystalType() == CrystalType.S84 ? 4 : weaponInst.getItem().getCrystalType() == CrystalType.S80 ? 2 : 1;
|
mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1;
|
||||||
}
|
}
|
||||||
// shot dynamic bonus
|
// shot dynamic bonus
|
||||||
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
||||||
|
@@ -94,7 +94,7 @@ public final class HpCpHeal extends AbstractEffect
|
|||||||
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
||||||
if (weaponInst != null)
|
if (weaponInst != null)
|
||||||
{
|
{
|
||||||
mAtkMul = weaponInst.getItem().getCrystalType() == CrystalType.S84 ? 4 : weaponInst.getItem().getCrystalType() == CrystalType.S80 ? 2 : 1;
|
mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1;
|
||||||
}
|
}
|
||||||
// shot dynamic bonus
|
// shot dynamic bonus
|
||||||
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
||||||
|
@@ -98,7 +98,7 @@ public final class Heal extends AbstractEffect
|
|||||||
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
||||||
if (weaponInst != null)
|
if (weaponInst != null)
|
||||||
{
|
{
|
||||||
mAtkMul = weaponInst.getItem().getCrystalType() == CrystalType.S84 ? 4 : weaponInst.getItem().getCrystalType() == CrystalType.S80 ? 2 : 1;
|
mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1;
|
||||||
}
|
}
|
||||||
// shot dynamic bonus
|
// shot dynamic bonus
|
||||||
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
||||||
|
@@ -94,7 +94,7 @@ public final class HpCpHeal extends AbstractEffect
|
|||||||
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
||||||
if (weaponInst != null)
|
if (weaponInst != null)
|
||||||
{
|
{
|
||||||
mAtkMul = weaponInst.getItem().getCrystalType() == CrystalType.S84 ? 4 : weaponInst.getItem().getCrystalType() == CrystalType.S80 ? 2 : 1;
|
mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1;
|
||||||
}
|
}
|
||||||
// shot dynamic bonus
|
// shot dynamic bonus
|
||||||
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
||||||
|
@@ -98,7 +98,7 @@ public final class Heal extends AbstractEffect
|
|||||||
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
||||||
if (weaponInst != null)
|
if (weaponInst != null)
|
||||||
{
|
{
|
||||||
mAtkMul = weaponInst.getItem().getCrystalType() == CrystalType.S84 ? 4 : weaponInst.getItem().getCrystalType() == CrystalType.S80 ? 2 : 1;
|
mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1;
|
||||||
}
|
}
|
||||||
// shot dynamic bonus
|
// shot dynamic bonus
|
||||||
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
||||||
|
@@ -94,7 +94,7 @@ public final class HpCpHeal extends AbstractEffect
|
|||||||
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
final ItemInstance weaponInst = effector.getActiveWeaponInstance();
|
||||||
if (weaponInst != null)
|
if (weaponInst != null)
|
||||||
{
|
{
|
||||||
mAtkMul = weaponInst.getItem().getCrystalType() == CrystalType.S84 ? 4 : weaponInst.getItem().getCrystalType() == CrystalType.S80 ? 2 : 1;
|
mAtkMul = weaponInst.getItem().getCrystalTypePlus() == CrystalType.R ? 4 : weaponInst.getItem().getCrystalTypePlus() == CrystalType.S ? 2 : 1;
|
||||||
}
|
}
|
||||||
// shot dynamic bonus
|
// shot dynamic bonus
|
||||||
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
mAtkMul = bss ? mAtkMul * 4 : mAtkMul + 1;
|
||||||
|
Reference in New Issue
Block a user