From 2734b0ed922610a60a663443a8d3c6abef38340b Mon Sep 17 00:00:00 2001 From: Vaern Date: Sun, 6 Feb 2022 17:31:02 -0800 Subject: [PATCH] MKU + Final Zirnox Balancing --- src/main/java/com/hbm/handler/EntityEffectHandler.java | 9 +++++++-- src/main/java/com/hbm/handler/HazmatRegistry.java | 4 ++-- src/main/java/com/hbm/items/ModItems.java | 2 +- .../hbm/tileentity/machine/TileEntityReactorZirnox.java | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/hbm/handler/EntityEffectHandler.java b/src/main/java/com/hbm/handler/EntityEffectHandler.java index 3cbe9da1f..20d3f2686 100644 --- a/src/main/java/com/hbm/handler/EntityEffectHandler.java +++ b/src/main/java/com/hbm/handler/EntityEffectHandler.java @@ -16,7 +16,10 @@ import com.hbm.packet.AuxParticlePacketNT; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.ExtPropPacket; import com.hbm.saveddata.AuxSavedData; +import com.hbm.util.ArmorRegistry; +import com.hbm.util.ArmorUtil; import com.hbm.util.ContaminationUtil; +import com.hbm.util.ArmorRegistry.HazardClass; import com.hbm.util.ContaminationUtil.ContaminationType; import com.hbm.util.ContaminationUtil.HazardType; @@ -243,7 +246,8 @@ public class EntityEffectHandler { } else { if(stack.hasTagCompound() && stack.stackTagCompound.getBoolean("ntmContagion")) { - HbmLivingProps.setContagion(player, 3 * hour); + if(!ArmorUtil.checkForHaz2(player) || !ArmorRegistry.hasProtection(player, 3, HazardClass.BACTERIA)) //liable to change to hazmat 1 at bob's pleasure + HbmLivingProps.setContagion(player, 3 * hour); } } } @@ -264,7 +268,8 @@ public class EntityEffectHandler { if(ent instanceof EntityLivingBase) { EntityLivingBase living = (EntityLivingBase) ent; if(HbmLivingProps.getContagion(living) <= 0) { - HbmLivingProps.setContagion(living, 3 * hour); + if(!ArmorUtil.checkForHaz2(living) || !ArmorRegistry.hasProtection(living, 3, HazardClass.BACTERIA)) //liable to change to hazmat 1 at bob's pleasure + HbmLivingProps.setContagion(living, 3 * hour); } } diff --git a/src/main/java/com/hbm/handler/HazmatRegistry.java b/src/main/java/com/hbm/handler/HazmatRegistry.java index 539fd4966..ecd466adb 100644 --- a/src/main/java/com/hbm/handler/HazmatRegistry.java +++ b/src/main/java/com/hbm/handler/HazmatRegistry.java @@ -37,7 +37,7 @@ public class HazmatRegistry { double hazRed = 1.0D; // 90% double hazGray = 2D; // 99% double paa = 1.7D; // 97% - double liquidator = 2D; // 99% + double liquidator = 2.4D; // 99.6% double t45 = 1D; // 90% double ajr = 1.3D; // 95% @@ -48,7 +48,7 @@ public class HazmatRegistry { double security = 0.825D; // 85% double star = 1D; // 90% double cmb = 1.3D; // 95% - double schrab = 2.3D; // 99.5% + double schrab = 3D; // 99.9% double euph = 10D; // <100% HazmatRegistry.registerHazmat(ModItems.hazmat_helmet, hazYellow * helmet); diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 42a596e7b..1c1cc6fb2 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -3501,7 +3501,7 @@ public class ModItems { rod_quad = (ItemEnumMulti) new ItemBreedingRod().setUnlocalizedName("rod_quad").setContainerItem(ModItems.rod_quad_empty).setCreativeTab(MainRegistry.controlTab); rod_zirnox_empty = new Item().setUnlocalizedName("rod_zirnox_empty").setMaxStackSize(64).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_zirnox_empty"); - rod_zirnox_natural_uranium_fuel = new ItemZirnoxRod(120000, 35).setUnlocalizedName("rod_zirnox_natural_uranium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_zirnox_empty).setTextureName(RefStrings.MODID + ":rod_zirnox_natural_uranium_fuel"); + rod_zirnox_natural_uranium_fuel = new ItemZirnoxRod(120000, 30).setUnlocalizedName("rod_zirnox_natural_uranium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_zirnox_empty).setTextureName(RefStrings.MODID + ":rod_zirnox_natural_uranium_fuel"); rod_zirnox_uranium_fuel = new ItemZirnoxRod(100000, 50).setUnlocalizedName("rod_zirnox_uranium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setContainerItem(ModItems.rod_zirnox_empty).setTextureName(RefStrings.MODID + ":rod_zirnox_uranium_fuel"); rod_zirnox_th232 = new ItemZirnoxBreedingRod(20000, 0).setUnlocalizedName("rod_zirnox_th232").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_zirnox_th232"); rod_zirnox_thorium_fuel = new ItemZirnoxRod(120000, 30).setUnlocalizedName("rod_zirnox_thorium_fuel").setMaxStackSize(1).setCreativeTab(MainRegistry.controlTab).setTextureName(RefStrings.MODID + ":rod_zirnox_thorium_fuel"); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java index 98761ea9b..9ecc55bfc 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java @@ -237,7 +237,7 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF // function of SHS produced per tick // heat - 10256/100000 * pressure / 50,000 * 25 * 5 (should get rid of any rounding errors) if(this.heat > 10256) { - int Water = (int)((((float)heat - 10256F) / (float)maxHeat) * Math.min(((float)carbonDioxide.getFill() / 14000F), 1.5F) * 25F * 5F); + int Water = (int)((((float)heat - 10256F) / (float)maxHeat) * Math.min(((float)carbonDioxide.getFill() / 14000F), 1F) * 25F * 5F); int Steam = Water * 1; water.setFill(water.getFill() - Water);