diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Ah6Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Ah6Entity.java index 138636e83..f41d1f700 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Ah6Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Ah6Entity.java @@ -142,21 +142,19 @@ public class Ah6Entity extends ContainerMobileVehicleEntity implements GeoEntity @Override public DamageModifier getDamageModifier() { return super.getDamageModifier() - .multiply(0.1f, DamageTypes.ARROW) - .multiply(0.2f, DamageTypes.TRIDENT) - .multiply(0.2f, DamageTypes.MOB_ATTACK) - .multiply(0.2f, DamageTypes.MOB_ATTACK_NO_AGGRO) - .multiply(0.2f, DamageTypes.MOB_PROJECTILE) - .multiply(0.2f, DamageTypes.PLAYER_ATTACK) - .multiply(2, DamageTypes.LAVA) - .multiply(2, DamageTypes.EXPLOSION) - .multiply(2, DamageTypes.PLAYER_EXPLOSION) - .multiply(0.5f, ModDamageTypes.MINE) - .multiply(0.5f, ModDamageTypes.LUNGE_MINE) - .multiply(0.4f, ModDamageTypes.CANNON_FIRE) - .multiply(0.08f, ModTags.DamageTypes.PROJECTILE) - .multiply(0.5f, ModTags.DamageTypes.PROJECTILE_ABSOLUTE) - .multiply(5, ModDamageTypes.VEHICLE_STRIKE) + .multiply(0.5f) + .multiply(0.2f, DamageTypes.ARROW) + .multiply(0.4f, DamageTypes.TRIDENT) + .multiply(0.4f, DamageTypes.MOB_ATTACK) + .multiply(0.4f, DamageTypes.MOB_ATTACK_NO_AGGRO) + .multiply(0.4f, DamageTypes.MOB_PROJECTILE) + .multiply(0.4f, DamageTypes.PLAYER_ATTACK) + .multiply(4, DamageTypes.LAVA) + .multiply(4, DamageTypes.EXPLOSION) + .multiply(4, DamageTypes.PLAYER_EXPLOSION) + .multiply(0.8f, ModDamageTypes.CANNON_FIRE) + .multiply(0.16f, ModTags.DamageTypes.PROJECTILE) + .multiply(10, ModDamageTypes.VEHICLE_STRIKE) .reduce(2); } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/AnnihilatorEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/AnnihilatorEntity.java index 3f27dd527..f585aed75 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/AnnihilatorEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/AnnihilatorEntity.java @@ -195,6 +195,7 @@ public class AnnihilatorEntity extends EnergyVehicleEntity implements GeoEntity, @Override public DamageModifier getDamageModifier() { return super.getDamageModifier() + .multiply(0.1f) .immuneTo(DamageTypes.ARROW) .immuneTo(DamageTypes.TRIDENT) .immuneTo(DamageTypes.MOB_ATTACK) @@ -203,14 +204,14 @@ public class AnnihilatorEntity extends EnergyVehicleEntity implements GeoEntity, .immuneTo(DamageTypes.PLAYER_ATTACK) .immuneTo(ModTags.DamageTypes.PROJECTILE) .immuneTo(ModDamageTypes.VEHICLE_STRIKE) - .multiply(0.35f, DamageTypes.EXPLOSION) - .multiply(0.1f, ModDamageTypes.CUSTOM_EXPLOSION) - .multiply(0.1f, ModDamageTypes.PROJECTILE_BOOM) - .multiply(0.1f, ModDamageTypes.MINE) - .multiply(0.12f, ModDamageTypes.LUNGE_MINE) - .multiply(0.15f, ModDamageTypes.CANNON_FIRE) - .multiply(0.02f, ModTags.DamageTypes.PROJECTILE_ABSOLUTE) - .reduce(10); + .multiply(0.7f, DamageTypes.EXPLOSION) + .multiply(0.2f, ModDamageTypes.CUSTOM_EXPLOSION) + .multiply(0.2f, ModDamageTypes.PROJECTILE_BOOM) + .multiply(0.2f, ModDamageTypes.MINE) + .multiply(0.24f, ModDamageTypes.LUNGE_MINE) + .multiply(0.3f, ModDamageTypes.CANNON_FIRE) + .multiply(0.04f, ModTags.DamageTypes.PROJECTILE_ABSOLUTE) + .reduce(12); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Bmp2Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Bmp2Entity.java index a580f71ea..a76d9dbf0 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Bmp2Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Bmp2Entity.java @@ -128,23 +128,23 @@ public class Bmp2Entity extends ContainerMobileVehicleEntity implements GeoEntit @Override public DamageModifier getDamageModifier() { return super.getDamageModifier() - .multiply(0.3f, DamageTypes.ARROW) - .multiply(0.3f, DamageTypes.TRIDENT) - .multiply(0.5f, DamageTypes.MOB_ATTACK) - .multiply(0.4f, DamageTypes.MOB_ATTACK_NO_AGGRO) - .multiply(0.3f, DamageTypes.MOB_PROJECTILE) - .multiply(0.2f, DamageTypes.PLAYER_ATTACK) - .multiply(2.5f, DamageTypes.LAVA) - .multiply(1.2f, DamageTypes.EXPLOSION) - .multiply(1.2f, DamageTypes.PLAYER_EXPLOSION) - .multiply(0.4f, ModDamageTypes.CUSTOM_EXPLOSION) - .multiply(0.4f, ModDamageTypes.PROJECTILE_BOOM) - .multiply(0.14f, ModDamageTypes.MINE) - .multiply(0.18f, ModDamageTypes.LUNGE_MINE) - .multiply(0.3f, ModDamageTypes.CANNON_FIRE) - .multiply(0.02f, ModTags.DamageTypes.PROJECTILE) - .multiply(0.14f, ModTags.DamageTypes.PROJECTILE_ABSOLUTE) - .multiply(1.7f, ModDamageTypes.VEHICLE_STRIKE) + .multiply(0.2f) + .multiply(1.5f, DamageTypes.ARROW) + .multiply(1.5f, DamageTypes.TRIDENT) + .multiply(2.5f, DamageTypes.MOB_ATTACK) + .multiply(2f, DamageTypes.MOB_ATTACK_NO_AGGRO) + .multiply(1.5f, DamageTypes.MOB_PROJECTILE) + .multiply(12.5f, DamageTypes.LAVA) + .multiply(6f, DamageTypes.EXPLOSION) + .multiply(6f, DamageTypes.PLAYER_EXPLOSION) + .multiply(2f, ModDamageTypes.CUSTOM_EXPLOSION) + .multiply(2f, ModDamageTypes.PROJECTILE_BOOM) + .multiply(0.7f, ModDamageTypes.MINE) + .multiply(0.9f, ModDamageTypes.LUNGE_MINE) + .multiply(1.5f, ModDamageTypes.CANNON_FIRE) + .multiply(0.1f, ModTags.DamageTypes.PROJECTILE) + .multiply(0.7f, ModTags.DamageTypes.PROJECTILE_ABSOLUTE) + .multiply(8.5f, ModDamageTypes.VEHICLE_STRIKE) .reduce(8); } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Lav150Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Lav150Entity.java index 9e5548f6b..d21ae4356 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Lav150Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Lav150Entity.java @@ -118,23 +118,22 @@ public class Lav150Entity extends ContainerMobileVehicleEntity implements GeoEnt @Override public DamageModifier getDamageModifier() { return super.getDamageModifier() - .multiply(0.3f, DamageTypes.ARROW) - .multiply(0.3f, DamageTypes.TRIDENT) - .multiply(0.5f, DamageTypes.MOB_ATTACK) - .multiply(0.4f, DamageTypes.MOB_ATTACK_NO_AGGRO) - .multiply(0.3f, DamageTypes.MOB_PROJECTILE) - .multiply(0.2f, DamageTypes.PLAYER_ATTACK) - .multiply(2.5f, DamageTypes.LAVA) - .multiply(1.2f, DamageTypes.EXPLOSION) - .multiply(1.2f, DamageTypes.PLAYER_EXPLOSION) - .multiply(0.4f, ModDamageTypes.CUSTOM_EXPLOSION) - .multiply(0.4f, ModDamageTypes.PROJECTILE_BOOM) - .multiply(0.15f, ModDamageTypes.MINE) - .multiply(0.2f, ModDamageTypes.LUNGE_MINE) - .multiply(0.3f, ModDamageTypes.CANNON_FIRE) - .multiply(0.05f, ModTags.DamageTypes.PROJECTILE) - .multiply(0.17f, ModTags.DamageTypes.PROJECTILE_ABSOLUTE) - .multiply(2f, ModDamageTypes.VEHICLE_STRIKE) + .multiply(0.2f) + .multiply(1.5f, DamageTypes.ARROW) + .multiply(1.5f, DamageTypes.TRIDENT) + .multiply(2.5f, DamageTypes.MOB_ATTACK) + .multiply(2f, DamageTypes.MOB_ATTACK_NO_AGGRO) + .multiply(1.5f, DamageTypes.MOB_PROJECTILE) + .multiply(12.5f, DamageTypes.LAVA) + .multiply(6f, DamageTypes.EXPLOSION) + .multiply(6f, DamageTypes.PLAYER_EXPLOSION) + .multiply(2.4f, ModDamageTypes.CUSTOM_EXPLOSION) + .multiply(2f, ModDamageTypes.PROJECTILE_BOOM) + .multiply(0.75f, ModDamageTypes.MINE) + .multiply(1.5f, ModDamageTypes.CANNON_FIRE) + .multiply(0.25f, ModTags.DamageTypes.PROJECTILE) + .multiply(0.85f, ModTags.DamageTypes.PROJECTILE_ABSOLUTE) + .multiply(10f, ModDamageTypes.VEHICLE_STRIKE) .reduce(7); } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mk42Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mk42Entity.java index e3be72551..6fd489845 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mk42Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mk42Entity.java @@ -178,21 +178,22 @@ public class Mk42Entity extends VehicleEntity implements GeoEntity, CannonEntity @Override public DamageModifier getDamageModifier() { return super.getDamageModifier() - .multiply(0.1f, DamageTypes.ARROW) - .multiply(0.1f, DamageTypes.TRIDENT) - .multiply(0.3f, DamageTypes.MOB_ATTACK) - .multiply(0.15f, DamageTypes.MOB_ATTACK_NO_AGGRO) - .multiply(0.15f, DamageTypes.MOB_PROJECTILE) - .multiply(0.1f, DamageTypes.PLAYER_ATTACK) - .multiply(2.5f, DamageTypes.LAVA) - .multiply(0.4f, ModDamageTypes.CUSTOM_EXPLOSION) - .multiply(0.4f, ModDamageTypes.PROJECTILE_BOOM) - .multiply(0.14f, ModDamageTypes.MINE) - .multiply(0.14f, ModDamageTypes.LUNGE_MINE) - .multiply(0.3f, ModDamageTypes.CANNON_FIRE) - .multiply(0.02f, ModTags.DamageTypes.PROJECTILE) - .multiply(0.14f, ModTags.DamageTypes.PROJECTILE_ABSOLUTE) - .multiply(1.7f, ModDamageTypes.VEHICLE_STRIKE) + .multiply(0.2f) + .multiply(1.5f, DamageTypes.ARROW) + .multiply(1.5f, DamageTypes.TRIDENT) + .multiply(2.5f, DamageTypes.MOB_ATTACK) + .multiply(2f, DamageTypes.MOB_ATTACK_NO_AGGRO) + .multiply(1.5f, DamageTypes.MOB_PROJECTILE) + .multiply(12.5f, DamageTypes.LAVA) + .multiply(6f, DamageTypes.EXPLOSION) + .multiply(6f, DamageTypes.PLAYER_EXPLOSION) + .multiply(2.4f, ModDamageTypes.CUSTOM_EXPLOSION) + .multiply(2f, ModDamageTypes.PROJECTILE_BOOM) + .multiply(0.75f, ModDamageTypes.MINE) + .multiply(1.5f, ModDamageTypes.CANNON_FIRE) + .multiply(0.25f, ModTags.DamageTypes.PROJECTILE) + .multiply(0.85f, ModTags.DamageTypes.PROJECTILE_ABSOLUTE) + .multiply(10f, ModDamageTypes.VEHICLE_STRIKE) .reduce(8); } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mle1934Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mle1934Entity.java index b6994a3f1..a17e6a634 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mle1934Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Mle1934Entity.java @@ -191,21 +191,22 @@ public class Mle1934Entity extends VehicleEntity implements GeoEntity, CannonEnt @Override public DamageModifier getDamageModifier() { return super.getDamageModifier() - .multiply(0.1f, DamageTypes.ARROW) - .multiply(0.1f, DamageTypes.TRIDENT) - .multiply(0.3f, DamageTypes.MOB_ATTACK) - .multiply(0.15f, DamageTypes.MOB_ATTACK_NO_AGGRO) - .multiply(0.15f, DamageTypes.MOB_PROJECTILE) - .multiply(0.1f, DamageTypes.PLAYER_ATTACK) - .multiply(2.5f, DamageTypes.LAVA) - .multiply(0.4f, ModDamageTypes.CUSTOM_EXPLOSION) - .multiply(0.4f, ModDamageTypes.PROJECTILE_BOOM) - .multiply(0.14f, ModDamageTypes.MINE) - .multiply(0.14f, ModDamageTypes.LUNGE_MINE) - .multiply(0.3f, ModDamageTypes.CANNON_FIRE) - .multiply(0.02f, ModTags.DamageTypes.PROJECTILE) - .multiply(0.14f, ModTags.DamageTypes.PROJECTILE_ABSOLUTE) - .multiply(1.7f, ModDamageTypes.VEHICLE_STRIKE) + .multiply(0.2f) + .multiply(1.5f, DamageTypes.ARROW) + .multiply(1.5f, DamageTypes.TRIDENT) + .multiply(2.5f, DamageTypes.MOB_ATTACK) + .multiply(2f, DamageTypes.MOB_ATTACK_NO_AGGRO) + .multiply(1.5f, DamageTypes.MOB_PROJECTILE) + .multiply(12.5f, DamageTypes.LAVA) + .multiply(6f, DamageTypes.EXPLOSION) + .multiply(6f, DamageTypes.PLAYER_EXPLOSION) + .multiply(2.4f, ModDamageTypes.CUSTOM_EXPLOSION) + .multiply(2f, ModDamageTypes.PROJECTILE_BOOM) + .multiply(0.75f, ModDamageTypes.MINE) + .multiply(1.5f, ModDamageTypes.CANNON_FIRE) + .multiply(0.25f, ModTags.DamageTypes.PROJECTILE) + .multiply(0.85f, ModTags.DamageTypes.PROJECTILE_ABSOLUTE) + .multiply(10f, ModDamageTypes.VEHICLE_STRIKE) .reduce(8); } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/SpeedboatEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/SpeedboatEntity.java index ec1778437..e0851a571 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/SpeedboatEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/SpeedboatEntity.java @@ -106,23 +106,19 @@ public class SpeedboatEntity extends ContainerMobileVehicleEntity implements Geo @Override public DamageModifier getDamageModifier() { return super.getDamageModifier() - .multiply(0.1f, DamageTypes.ARROW) - .multiply(0.2f, DamageTypes.TRIDENT) - .multiply(0.2f, DamageTypes.MOB_ATTACK) - .multiply(0.2f, DamageTypes.MOB_ATTACK_NO_AGGRO) - .multiply(0.2f, DamageTypes.MOB_PROJECTILE) - .multiply(0.2f, DamageTypes.PLAYER_ATTACK) - .multiply(2f, DamageTypes.LAVA) - .multiply(2f, DamageTypes.EXPLOSION) - .multiply(2f, DamageTypes.PLAYER_EXPLOSION) - .multiply(0.5f, ModDamageTypes.CUSTOM_EXPLOSION) - .multiply(0.5f, ModDamageTypes.PROJECTILE_BOOM) - .multiply(0.5f, ModDamageTypes.MINE) - .multiply(0.5f, ModDamageTypes.LUNGE_MINE) - .multiply(0.6f, ModDamageTypes.CANNON_FIRE) - .multiply(0.08f, ModTags.DamageTypes.PROJECTILE) - .multiply(0.5f, ModTags.DamageTypes.PROJECTILE_ABSOLUTE) - .multiply(5f, ModDamageTypes.VEHICLE_STRIKE) + .multiply(0.5f) + .multiply(0.2f, DamageTypes.ARROW) + .multiply(0.4f, DamageTypes.TRIDENT) + .multiply(0.4f, DamageTypes.MOB_ATTACK) + .multiply(0.4f, DamageTypes.MOB_ATTACK_NO_AGGRO) + .multiply(0.4f, DamageTypes.MOB_PROJECTILE) + .multiply(0.4f, DamageTypes.PLAYER_ATTACK) + .multiply(4, DamageTypes.LAVA) + .multiply(4, DamageTypes.EXPLOSION) + .multiply(4, DamageTypes.PLAYER_EXPLOSION) + .multiply(0.8f, ModDamageTypes.CANNON_FIRE) + .multiply(0.16f, ModTags.DamageTypes.PROJECTILE) + .multiply(10, ModDamageTypes.VEHICLE_STRIKE) .reduce(2); } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Yx100Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Yx100Entity.java index bb87d6104..a252bace6 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Yx100Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Yx100Entity.java @@ -169,13 +169,14 @@ public class Yx100Entity extends ContainerMobileVehicleEntity implements GeoEnti .immuneTo(DamageTypes.PLAYER_ATTACK) .immuneTo(ModTags.DamageTypes.PROJECTILE) .immuneTo(ModDamageTypes.VEHICLE_STRIKE) - .multiply(0.4f, DamageTypes.EXPLOSION) - .multiply(0.15f, ModDamageTypes.CUSTOM_EXPLOSION) - .multiply(0.15f, ModDamageTypes.PROJECTILE_BOOM) - .multiply(0.1f, ModDamageTypes.MINE) - .multiply(0.1f, ModDamageTypes.LUNGE_MINE) - .multiply(0.19f, ModDamageTypes.CANNON_FIRE) - .multiply(0.03f, ModTags.DamageTypes.PROJECTILE_ABSOLUTE) + .multiply(0.2f) + .multiply(2f, DamageTypes.EXPLOSION) + .multiply(0.75f, ModDamageTypes.CUSTOM_EXPLOSION) + .multiply(0.75f, ModDamageTypes.PROJECTILE_BOOM) + .multiply(0.5f, ModDamageTypes.MINE) + .multiply(0.5f, ModDamageTypes.LUNGE_MINE) + .multiply(0.95f, ModDamageTypes.CANNON_FIRE) + .multiply(0.15f, ModTags.DamageTypes.PROJECTILE_ABSOLUTE) .reduce(9); }