lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Weak point calculations already done at calcChargeSkillsDam.

Browse Source 
Thanks to ver.
This commit is contained in:
MobiusDevelopment
2022-03-29 11:24:06 +00:00
parent 01b7ca51af
commit 383a190524
2 changed files with 32 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skill/Formulas.java
View File

@@ -21,7 +21,6 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.data.sql.ClanHallTable; import org.l2jmobius.gameserver.data.sql.ClanHallTable;
import org.l2jmobius.gameserver.enums.NpcRace;
import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.enums.PlayerState;
import org.l2jmobius.gameserver.instancemanager.ClassDamageManager; import org.l2jmobius.gameserver.instancemanager.ClassDamageManager;
import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager;
@@ -1538,52 +1537,13 @@ public class Formulas
} }
} }
if (attacker instanceof Npc)
{
// Skill Race : Undead
if (((Npc) attacker).getTemplate().getRace() == NpcRace.UNDEAD)
{
damage /= attacker.getPDefUndead(target);
}
if (((Npc) attacker).getTemplate().getRace() == NpcRace.PLANT)
{
damage /= attacker.getPDefPlants(target);
}
if (((Npc) attacker).getTemplate().getRace() == NpcRace.BUG)
{
damage /= attacker.getPDefInsects(target);
}
if (((Npc) attacker).getTemplate().getRace() == NpcRace.ANIMAL)
{
damage /= attacker.getPDefAnimals(target);
}
if (((Npc) attacker).getTemplate().getRace() == NpcRace.BEAST)
{
damage /= attacker.getPDefMonsters(target);
}
if (((Npc) attacker).getTemplate().getRace() == NpcRace.DRAGON)
{
damage /= attacker.getPDefDragons(target);
}
}
if (target instanceof Npc) if (target instanceof Npc)
{ {
switch (((Npc) target).getTemplate().getRace()) switch (((Npc) target).getTemplate().getRace())
{ {
case UNDEAD: case ANGEL:
{ {
damage *= attacker.getPAtkUndead(target); damage *= attacker.getPAtkAngels(target);
break;
}
case BEAST:
{
damage *= attacker.getPAtkMonsters(target);
break; break;
} }
case ANIMAL: case ANIMAL:
@@ -1591,19 +1551,9 @@ public class Formulas
damage *= attacker.getPAtkAnimals(target); damage *= attacker.getPAtkAnimals(target);
break; break;
} }
case PLANT: case BEAST:
{ {
damage *= attacker.getPAtkPlants(target); damage *= attacker.getPAtkMonsters(target);
break;
}
case DRAGON:
{
damage *= attacker.getPAtkDragons(target);
break;
}
case ANGEL:
{
damage *= attacker.getPAtkAngels(target);
break; break;
} }
case BUG: case BUG:
@@ -1611,9 +1561,19 @@ public class Formulas
damage *= attacker.getPAtkInsects(target); damage *= attacker.getPAtkInsects(target);
break; break;
} }
default: case DRAGON:
{ {
// nothing damage *= attacker.getPAtkDragons(target);
break;
}
case PLANT:
{
damage *= attacker.getPAtkPlants(target);
break;
}
case UNDEAD:
{
damage *= attacker.getPAtkUndead(target);
break; break;
} }
} }
@@ -1760,7 +1720,6 @@ public class Formulas
{ {
attacker.sendPacket(new SystemMessage(SystemMessageId.YOUR_ATTACK_HAS_FAILED)); attacker.sendPacket(new SystemMessage(SystemMessageId.YOUR_ATTACK_HAS_FAILED));
} }
damage /= 2; damage /= 2;
} }
else else
@@ -1769,7 +1728,6 @@ public class Formulas
sm.addString(target.getName()); sm.addString(target.getName());
sm.addSkillName(skill.getId()); sm.addSkillName(skill.getId());
attacker.sendPacket(sm); attacker.sendPacket(sm);
damage = 1; damage = 1;
} }
} }
@@ -3201,11 +3159,6 @@ public class Formulas
damage *= multiplier; damage *= multiplier;
break; break;
} }
default:
{
// nothing
break;
}
} }
} }

79
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skill/Formulas.java
View File

@@ -21,7 +21,6 @@ import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.data.sql.ClanHallTable; import org.l2jmobius.gameserver.data.sql.ClanHallTable;
import org.l2jmobius.gameserver.enums.NpcRace;
import org.l2jmobius.gameserver.enums.PlayerState; import org.l2jmobius.gameserver.enums.PlayerState;
import org.l2jmobius.gameserver.instancemanager.ClassDamageManager; import org.l2jmobius.gameserver.instancemanager.ClassDamageManager;
import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.SiegeManager;
@@ -1538,52 +1537,13 @@ public class Formulas
} }
} }
if (attacker instanceof Npc)
{
// Skill Race : Undead
if (((Npc) attacker).getTemplate().getRace() == NpcRace.UNDEAD)
{
damage /= attacker.getPDefUndead(target);
}
if (((Npc) attacker).getTemplate().getRace() == NpcRace.PLANT)
{
damage /= attacker.getPDefPlants(target);
}
if (((Npc) attacker).getTemplate().getRace() == NpcRace.BUG)
{
damage /= attacker.getPDefInsects(target);
}
if (((Npc) attacker).getTemplate().getRace() == NpcRace.ANIMAL)
{
damage /= attacker.getPDefAnimals(target);
}
if (((Npc) attacker).getTemplate().getRace() == NpcRace.BEAST)
{
damage /= attacker.getPDefMonsters(target);
}
if (((Npc) attacker).getTemplate().getRace() == NpcRace.DRAGON)
{
damage /= attacker.getPDefDragons(target);
}
}
if (target instanceof Npc) if (target instanceof Npc)
{ {
switch (((Npc) target).getTemplate().getRace()) switch (((Npc) target).getTemplate().getRace())
{ {
case UNDEAD: case ANGEL:
{ {
damage *= attacker.getPAtkUndead(target); damage *= attacker.getPAtkAngels(target);
break;
}
case BEAST:
{
damage *= attacker.getPAtkMonsters(target);
break; break;
} }
case ANIMAL: case ANIMAL:
@@ -1591,19 +1551,9 @@ public class Formulas
damage *= attacker.getPAtkAnimals(target); damage *= attacker.getPAtkAnimals(target);
break; break;
} }
case PLANT: case BEAST:
{ {
damage *= attacker.getPAtkPlants(target); damage *= attacker.getPAtkMonsters(target);
break;
}
case DRAGON:
{
damage *= attacker.getPAtkDragons(target);
break;
}
case ANGEL:
{
damage *= attacker.getPAtkAngels(target);
break; break;
} }
case BUG: case BUG:
@@ -1611,9 +1561,19 @@ public class Formulas
damage *= attacker.getPAtkInsects(target); damage *= attacker.getPAtkInsects(target);
break; break;
} }
default: case DRAGON:
{ {
// nothing damage *= attacker.getPAtkDragons(target);
break;
}
case PLANT:
{
damage *= attacker.getPAtkPlants(target);
break;
}
case UNDEAD:
{
damage *= attacker.getPAtkUndead(target);
break; break;
} }
} }
@@ -1760,7 +1720,6 @@ public class Formulas
{ {
attacker.sendPacket(new SystemMessage(SystemMessageId.YOUR_ATTACK_HAS_FAILED)); attacker.sendPacket(new SystemMessage(SystemMessageId.YOUR_ATTACK_HAS_FAILED));
} }
damage /= 2; damage /= 2;
} }
else else
@@ -1769,7 +1728,6 @@ public class Formulas
sm.addString(target.getName()); sm.addString(target.getName());
sm.addSkillName(skill.getId()); sm.addSkillName(skill.getId());
attacker.sendPacket(sm); attacker.sendPacket(sm);
damage = 1; damage = 1;
} }
} }
@@ -3201,11 +3159,6 @@ public class Formulas
damage *= multiplier; damage *= multiplier;
break; break;
} }
default:
{
// nothing
break;
}
} }
} }