xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #429 from Vaern/master

Browse Source 
MKU & Final ZIRNOX Balancing
This commit is contained in:
HbmMods 2022-02-07 08:13:28 +01:00 committed by GitHub
commit 1541eedd37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/hbm/handler/EntityEffectHandler.java
View File

@ -16,7 +16,10 @@ import com.hbm.packet.AuxParticlePacketNT;
import com.hbm.packet.PacketDispatcher; import com.hbm.packet.PacketDispatcher;
import com.hbm.packet.ExtPropPacket; import com.hbm.packet.ExtPropPacket;
import com.hbm.saveddata.AuxSavedData; import com.hbm.saveddata.AuxSavedData;
import com.hbm.util.ArmorRegistry;
import com.hbm.util.ArmorUtil;
import com.hbm.util.ContaminationUtil; import com.hbm.util.ContaminationUtil;
import com.hbm.util.ArmorRegistry.HazardClass;
import com.hbm.util.ContaminationUtil.ContaminationType; import com.hbm.util.ContaminationUtil.ContaminationType;
import com.hbm.util.ContaminationUtil.HazardType; import com.hbm.util.ContaminationUtil.HazardType;
@ -243,7 +246,8 @@ public class EntityEffectHandler {
} else { } else {
if(stack.hasTagCompound() && stack.stackTagCompound.getBoolean("ntmContagion")) { 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) { if(ent instanceof EntityLivingBase) {
EntityLivingBase living = (EntityLivingBase) ent; EntityLivingBase living = (EntityLivingBase) ent;
if(HbmLivingProps.getContagion(living) <= 0) { 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);
} }
} }

4
src/main/java/com/hbm/handler/HazmatRegistry.java
View File

@ -37,7 +37,7 @@ public class HazmatRegistry {
double hazRed = 1.0D; // 90% double hazRed = 1.0D; // 90%
double hazGray = 2D; // 99% double hazGray = 2D; // 99%
double paa = 1.7D; // 97% double paa = 1.7D; // 97%
double liquidator = 2D; // 99% double liquidator = 2.4D; // 99.6%
double t45 = 1D; // 90% double t45 = 1D; // 90%
double ajr = 1.3D; // 95% double ajr = 1.3D; // 95%
@ -48,7 +48,7 @@ public class HazmatRegistry {
double security = 0.825D; // 85% double security = 0.825D; // 85%
double star = 1D; // 90% double star = 1D; // 90%
double cmb = 1.3D; // 95% double cmb = 1.3D; // 95%
double schrab = 2.3D; // 99.5% double schrab = 3D; // 99.9%
double euph = 10D; // <100% double euph = 10D; // <100%
HazmatRegistry.registerHazmat(ModItems.hazmat_helmet, hazYellow * helmet); HazmatRegistry.registerHazmat(ModItems.hazmat_helmet, hazYellow * helmet);

2
src/main/java/com/hbm/items/ModItems.java
View File

@ -3501,7 +3501,7 @@ public class ModItems {
rod_quad = (ItemEnumMulti) new ItemBreedingRod().setUnlocalizedName("rod_quad").setContainerItem(ModItems.rod_quad_empty).setCreativeTab(MainRegistry.controlTab); 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_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_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_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"); 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");

2
src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java
View File

@ -237,7 +237,7 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF
// function of SHS produced per tick // function of SHS produced per tick
// heat - 10256/100000 * pressure / 50,000 * 25 * 5 (should get rid of any rounding errors) // heat - 10256/100000 * pressure / 50,000 * 25 * 5 (should get rid of any rounding errors)
if(this.heat > 10256) { 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; int Steam = Water * 1;
water.setFill(water.getFill() - Water); water.setFill(water.getFill() - Water);