fix: Fixes quiver damage type modifier (#792)
This commit is contained in:
parent
56c348ac68
commit
ee6be3d0dc
8 changed files with 17 additions and 25 deletions
|
|
@ -16,8 +16,8 @@ namespace Server.Items
|
||||||
public override int LabelNumber => 1075040; // Quiver of the Elements
|
public override int LabelNumber => 1075040; // Quiver of the Elements
|
||||||
|
|
||||||
public override void AlterBowDamage(
|
public override void AlterBowDamage(
|
||||||
out int phys, out int fire, out int cold, out int pois, out int nrgy,
|
ref int phys, ref int fire, ref int cold, ref int pois, ref int nrgy,
|
||||||
out int chaos, out int direct
|
ref int chaos, ref int direct
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
phys = fire = cold = pois = nrgy = direct = 0;
|
phys = fire = cold = pois = nrgy = direct = 0;
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,8 @@ namespace Server.Items
|
||||||
public override int LabelNumber => 1075038; // Quiver of Rage
|
public override int LabelNumber => 1075038; // Quiver of Rage
|
||||||
|
|
||||||
public override void AlterBowDamage(
|
public override void AlterBowDamage(
|
||||||
out int phys, out int fire, out int cold, out int pois, out int nrgy,
|
ref int phys, ref int fire, ref int cold, ref int pois, ref int nrgy,
|
||||||
out int chaos, out int direct
|
ref int chaos, ref int direct
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
chaos = direct = 0;
|
chaos = direct = 0;
|
||||||
|
|
|
||||||
|
|
@ -265,15 +265,9 @@ namespace Server.Items
|
||||||
list.Add(1074762, prop.ToString()); // Damage modifier: ~1_PERCENT~%
|
list.Add(1074762, prop.ToString()); // Damage modifier: ~1_PERCENT~%
|
||||||
}
|
}
|
||||||
|
|
||||||
AlterBowDamage(
|
int phys = 0, fire = 0, cold = 0, pois = 0, nrgy = 0, chaos = 0, direct = 0;
|
||||||
out var phys,
|
|
||||||
out var fire,
|
AlterBowDamage(ref phys, ref fire, ref cold, ref pois, ref nrgy, ref chaos, ref direct);
|
||||||
out var cold,
|
|
||||||
out var pois,
|
|
||||||
out var nrgy,
|
|
||||||
out var chaos,
|
|
||||||
out var direct
|
|
||||||
);
|
|
||||||
|
|
||||||
if (phys != 0)
|
if (phys != 0)
|
||||||
{
|
{
|
||||||
|
|
@ -550,11 +544,9 @@ namespace Server.Items
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual void AlterBowDamage(
|
public virtual void AlterBowDamage(
|
||||||
out int phys, out int fire, out int cold, out int pois, out int nrgy,
|
ref int phys, ref int fire, ref int cold, ref int pois, ref int nrgy, ref int chaos, ref int direct
|
||||||
out int chaos, out int direct
|
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
phys = fire = cold = pois = nrgy = chaos = direct = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void InvalidateWeight()
|
public void InvalidateWeight()
|
||||||
|
|
|
||||||
|
|
@ -12,8 +12,8 @@ namespace Server.Items
|
||||||
public override int LabelNumber => 1073111; // Quiver of Blight
|
public override int LabelNumber => 1073111; // Quiver of Blight
|
||||||
|
|
||||||
public override void AlterBowDamage(
|
public override void AlterBowDamage(
|
||||||
out int phys, out int fire, out int cold, out int pois, out int nrgy,
|
ref int phys, ref int fire, ref int cold, ref int pois, ref int nrgy,
|
||||||
out int chaos, out int direct
|
ref int chaos, ref int direct
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
phys = fire = nrgy = chaos = direct = 0;
|
phys = fire = nrgy = chaos = direct = 0;
|
||||||
|
|
|
||||||
|
|
@ -12,8 +12,8 @@ namespace Server.Items
|
||||||
public override int LabelNumber => 1073109; // quiver of fire
|
public override int LabelNumber => 1073109; // quiver of fire
|
||||||
|
|
||||||
public override void AlterBowDamage(
|
public override void AlterBowDamage(
|
||||||
out int phys, out int fire, out int cold, out int pois, out int nrgy,
|
ref int phys, ref int fire, ref int cold, ref int pois, ref int nrgy,
|
||||||
out int chaos, out int direct
|
ref int chaos, ref int direct
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
cold = pois = nrgy = chaos = direct = 0;
|
cold = pois = nrgy = chaos = direct = 0;
|
||||||
|
|
|
||||||
|
|
@ -12,8 +12,8 @@ namespace Server.Items
|
||||||
public override int LabelNumber => 1073110; // quiver of ice
|
public override int LabelNumber => 1073110; // quiver of ice
|
||||||
|
|
||||||
public override void AlterBowDamage(
|
public override void AlterBowDamage(
|
||||||
out int phys, out int fire, out int cold, out int pois, out int nrgy,
|
ref int phys, ref int fire, ref int cold, ref int pois, ref int nrgy,
|
||||||
out int chaos, out int direct
|
ref int chaos, ref int direct
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
fire = pois = nrgy = chaos = direct = 0;
|
fire = pois = nrgy = chaos = direct = 0;
|
||||||
|
|
|
||||||
|
|
@ -12,8 +12,8 @@ namespace Server.Items
|
||||||
public override int LabelNumber => 1073112; // Quiver of Lightning
|
public override int LabelNumber => 1073112; // Quiver of Lightning
|
||||||
|
|
||||||
public override void AlterBowDamage(
|
public override void AlterBowDamage(
|
||||||
out int phys, out int fire, out int cold, out int pois, out int nrgy,
|
ref int phys, ref int fire, ref int cold, ref int pois, ref int nrgy,
|
||||||
out int chaos, out int direct
|
ref int chaos, ref int direct
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
fire = cold = pois = chaos = direct = 0;
|
fire = cold = pois = chaos = direct = 0;
|
||||||
|
|
|
||||||
|
|
@ -1786,7 +1786,7 @@ namespace Server.Items
|
||||||
|
|
||||||
if (Core.ML && this is BaseRanged && attacker.FindItemOnLayer(Layer.Cloak) is BaseQuiver quiver)
|
if (Core.ML && this is BaseRanged && attacker.FindItemOnLayer(Layer.Cloak) is BaseQuiver quiver)
|
||||||
{
|
{
|
||||||
quiver.AlterBowDamage(out phys, out fire, out cold, out pois, out nrgy, out chaos, out direct);
|
quiver.AlterBowDamage(ref phys, ref fire, ref cold, ref pois, ref nrgy, ref chaos, ref direct);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Consecrated)
|
if (Consecrated)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue