rebalanced pile, added fibrosis treatment

This commit is contained in:
Vaern 2021-10-04 20:24:10 -07:00
parent 78cef1a099
commit 599e688598
9 changed files with 26 additions and 6 deletions

View File

@ -116,6 +116,7 @@ public class ConsumableRecipes {
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.siox, 8), new Object[] { "dustCoal", "dustAsbestos", ModItems.nugget_bismuth })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.siox, 8), new Object[] { "dustCoal", "dustAsbestos", ModItems.nugget_bismuth }));
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.xanax, 1), new Object[] { ModItems.powder_coal, ModItems.niter, ModItems.powder_bromine }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.xanax, 1), new Object[] { ModItems.powder_coal, ModItems.niter, ModItems.powder_bromine });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.fmn, 1), new Object[] { ModItems.powder_coal, ModItems.powder_polonium, ModItems.powder_strontium }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.fmn, 1), new Object[] { ModItems.powder_coal, ModItems.powder_polonium, ModItems.powder_strontium });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.pirfenidone, 1), new Object[] {ModItems.powder_coal, ModItems.niter, ModItems.nugget_bismuth });
GameRegistry.addShapelessRecipe(new ItemStack(ModItems.five_htp, 1), new Object[] { ModItems.powder_coal, ModItems.powder_euphemium, ModItems.canteen_fab }); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.five_htp, 1), new Object[] { ModItems.powder_coal, ModItems.powder_euphemium, ModItems.canteen_fab });
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.cigarette, 16), new Object[] { "ingotAsbestos", ModItems.oil_tar, "nuggetPolonium210" })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.cigarette, 16), new Object[] { "ingotAsbestos", ModItems.oil_tar, "nuggetPolonium210" }));

View File

@ -460,16 +460,22 @@ public class AnvilRecipes {
constructionRecipes.add(new AnvilConstructionRecipe( constructionRecipes.add(new AnvilConstructionRecipe(
new ComparableStack(ModItems.pile_rod_uranium), new ComparableStack(ModItems.pile_rod_uranium),
new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.billet_uranium, 3)), new AnvilOutput(new ItemStack(ModItems.plate_iron, 2))}).setTier(3)); new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.billet_uranium, 3)), new AnvilOutput(new ItemStack(ModItems.plate_iron, 2))}).setTier(2));
if (GeneralConfig.enable528) {
constructionRecipes.add(new AnvilConstructionRecipe( constructionRecipes.add(new AnvilConstructionRecipe(
new ComparableStack(ModItems.pile_rod_plutonium), new ComparableStack(ModItems.pile_rod_plutonium),
new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.billet_plutonium, 3)), new AnvilOutput(new ItemStack(ModItems.plate_iron, 2))}).setTier(3)); new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.billet_pu_mix, 2)),new AnvilOutput(new ItemStack(ModItems.nuclear_waste_tiny, 6)),new AnvilOutput(new ItemStack(ModItems.plate_iron, 1))}).setTier(2));
} else {
constructionRecipes.add(new AnvilConstructionRecipe(
new ComparableStack(ModItems.pile_rod_plutonium),
new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.billet_pu_mix, 3)), new AnvilOutput(new ItemStack(ModItems.plate_iron, 2))}).setTier(2));
}
constructionRecipes.add(new AnvilConstructionRecipe( constructionRecipes.add(new AnvilConstructionRecipe(
new ComparableStack(ModItems.pile_rod_source), new ComparableStack(ModItems.pile_rod_source),
new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.billet_ra226be, 3)), new AnvilOutput(new ItemStack(ModItems.plate_iron, 2))}).setTier(3)); new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.billet_ra226be, 3)), new AnvilOutput(new ItemStack(ModItems.plate_iron, 2))}).setTier(2));
constructionRecipes.add(new AnvilConstructionRecipe( constructionRecipes.add(new AnvilConstructionRecipe(
new ComparableStack(ModItems.pile_rod_boron), new ComparableStack(ModItems.pile_rod_boron),
new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_boron, 2)), new AnvilOutput(new ItemStack(Items.stick, 2))}).setTier(3)); new AnvilOutput[] {new AnvilOutput(new ItemStack(ModItems.ingot_boron, 2)), new AnvilOutput(new ItemStack(Items.stick, 2))}).setTier(2));
} }
public static void pullFromAssembler(ComparableStack result, int tier) { public static void pullFromAssembler(ComparableStack result, int tier) {

View File

@ -823,6 +823,7 @@ public class ModItems {
public static Item siox; public static Item siox;
public static Item xanax; public static Item xanax;
public static Item fmn; public static Item fmn;
public static Item pirfenidone;
public static Item five_htp; public static Item five_htp;
public static Item med_bag; public static Item med_bag;
public static Item pill_iodine; public static Item pill_iodine;
@ -3181,6 +3182,7 @@ public class ModItems {
siox = new ItemPill(0).setUnlocalizedName("siox").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":siox"); siox = new ItemPill(0).setUnlocalizedName("siox").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":siox");
xanax = new ItemPill(0).setUnlocalizedName("xanax").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":xanax_2"); xanax = new ItemPill(0).setUnlocalizedName("xanax").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":xanax_2");
fmn = new ItemPill(0).setUnlocalizedName("fmn").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":tablet"); fmn = new ItemPill(0).setUnlocalizedName("fmn").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":tablet");
pirfenidone = new ItemPill(0).setUnlocalizedName("pirfenidone").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pirfenidone");
five_htp = new ItemPill(0).setUnlocalizedName("five_htp").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":5htp"); five_htp = new ItemPill(0).setUnlocalizedName("five_htp").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":5htp");
pill_iodine = new ItemPill(0).setUnlocalizedName("pill_iodine").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pill_iodine"); pill_iodine = new ItemPill(0).setUnlocalizedName("pill_iodine").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pill_iodine");
plan_c = new ItemPill(0).setUnlocalizedName("plan_c").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":plan_c"); plan_c = new ItemPill(0).setUnlocalizedName("plan_c").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":plan_c");
@ -7272,6 +7274,7 @@ public class ModItems {
GameRegistry.registerItem(pill_iodine, pill_iodine.getUnlocalizedName()); GameRegistry.registerItem(pill_iodine, pill_iodine.getUnlocalizedName());
GameRegistry.registerItem(xanax, xanax.getUnlocalizedName()); GameRegistry.registerItem(xanax, xanax.getUnlocalizedName());
GameRegistry.registerItem(fmn, fmn.getUnlocalizedName()); GameRegistry.registerItem(fmn, fmn.getUnlocalizedName());
GameRegistry.registerItem(pirfenidone, pirfenidone.getUnlocalizedName());
GameRegistry.registerItem(five_htp, five_htp.getUnlocalizedName()); GameRegistry.registerItem(five_htp, five_htp.getUnlocalizedName());
GameRegistry.registerItem(plan_c, plan_c.getUnlocalizedName()); GameRegistry.registerItem(plan_c, plan_c.getUnlocalizedName());
GameRegistry.registerItem(stealth_boy, stealth_boy.getUnlocalizedName()); GameRegistry.registerItem(stealth_boy, stealth_boy.getUnlocalizedName());

View File

@ -67,6 +67,11 @@ public class ItemPill extends ItemFood {
HbmLivingProps.setDigamma(player, Math.min(digamma, 2F)); HbmLivingProps.setDigamma(player, Math.min(digamma, 2F));
player.addPotionEffect(new PotionEffect(Potion.blindness.id, 60, 0)); player.addPotionEffect(new PotionEffect(Potion.blindness.id, 60, 0));
} }
if(this == ModItems.pirfenidone) {
float fibrosis = HbmLivingProps.getFibrosis(player);
HbmLivingProps.setFibrosis(player, (int) Math.min(fibrosis, 37800));
}
if(this == ModItems.five_htp) { if(this == ModItems.five_htp) {
HbmLivingProps.setDigamma(player, 0); HbmLivingProps.setDigamma(player, 0);
@ -95,6 +100,9 @@ public class ItemPill extends ItemFood {
if(this == ModItems.fmn) { if(this == ModItems.fmn) {
list.add("Removes all DRX above 2,000mDRX"); list.add("Removes all DRX above 2,000mDRX");
} }
if(this == ModItems.pirfenidone) {
list.add("Removes all Pulmonary Fibrosis over 35%");
}
if(this == ModItems.five_htp) { if(this == ModItems.five_htp) {
list.add("Removes all DRX, Stability for 10 minutes"); list.add("Removes all DRX, Stability for 10 minutes");
} }

View File

@ -53,7 +53,7 @@ public abstract class TileEntityPileBase extends TileEntity {
if(te instanceof IPileNeutronReceiver) { if(te instanceof IPileNeutronReceiver) {
//this part throttles neutron efficiency for reactions that are way too close, efficiency reaches 100% after 2.5 meters //this part throttles neutron efficiency for reactions that are way too close, efficiency reaches 100% after 2.5 meters
float mult = Math.min((float)range / 2.5F, 1F); float mult = Math.min((float)range / 1.5F, 1F);
int n = (int)(flux * mult); int n = (int)(flux * mult);
IPileNeutronReceiver rec = (IPileNeutronReceiver) te; IPileNeutronReceiver rec = (IPileNeutronReceiver) te;

View File

@ -13,7 +13,7 @@ public class TileEntityPileFuel extends TileEntityPileBase implements IPileNeutr
public int neutrons; public int neutrons;
public int lastNeutrons; public int lastNeutrons;
public int progress; public int progress;
public static final int maxProgress = 100000; public static final int maxProgress = 75000;
@Override @Override
public void updateEntity() { public void updateEntity() {

View File

@ -1469,6 +1469,7 @@ item.radaway.name=RadAway
item.radaway_strong.name=Strong RadAway item.radaway_strong.name=Strong RadAway
item.radaway_flush.name=Elite RadAway item.radaway_flush.name=Elite RadAway
item.radx.name=Rad-X item.radx.name=Rad-X
item.pirfenidone.name=Pirfenidone
item.pill_iodine.name=Iodine Pill item.pill_iodine.name=Iodine Pill
item.plan_c.name=Plan C item.plan_c.name=Plan C
item.med_ipecac.name=Ipecac Syrup item.med_ipecac.name=Ipecac Syrup

View File

@ -2025,6 +2025,7 @@ item.pill_iodine.name=Iodine Pill
item.pin.name=Bobby Pin item.pin.name=Bobby Pin
item.pipes_steel.name=Steel Pipes item.pipes_steel.name=Steel Pipes
item.pipes_steel.desc=Uncrafting was omitted due to tax evasion. item.pipes_steel.desc=Uncrafting was omitted due to tax evasion.
item.pirfenidone.name=Pirfenidone
item.piston_selenium.name=Radial Engine Piston item.piston_selenium.name=Radial Engine Piston
item.plan_c.name=Plan C item.plan_c.name=Plan C
item.plate_advanced_alloy.name=Advanced Alloy Plate item.plate_advanced_alloy.name=Advanced Alloy Plate

Binary file not shown.

After

Width:  |  Height:  |  Size: 747 B