mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
these changes are like 2 days old and i forgot what i even did
This commit is contained in:
Bob
parent
c529f034bf
commit
bc3a3ef2a2
@ -3,6 +3,12 @@
|
||||
* And this is why we can't ever have anything nice
|
||||
* Rebalanced glyphids
|
||||
* We'll see how it goes
|
||||
* Did some spring cleaning
|
||||
* Removed cloud residue (looked horrible, allowed for weird dupes and made no sense overall)
|
||||
* Removed bottle cap blocks (took up a ton of block IDs and nobody used those anyway)
|
||||
* Removed the config option for silos (the option no longer works anyway since the new silos use the structure component system)
|
||||
* Removed a few other minor things that won't be mentioned because nobody's gonna even notice their absence anyway
|
||||
* Retextured the laser detonator to look more like the old detonator, but keeping the 3D model
|
||||
|
||||
## Fixed
|
||||
* WarTec should now be compatible again
|
||||
|
||||
@ -278,15 +278,6 @@ public class ModBlocks {
|
||||
public static Block block_daffergon;
|
||||
public static Block block_verticium;
|
||||
|
||||
public static Block block_cap_nuka;
|
||||
public static Block block_cap_quantum;
|
||||
public static Block block_cap_rad;
|
||||
public static Block block_cap_sparkle;
|
||||
public static Block block_cap_korl;
|
||||
public static Block block_cap_fritz;
|
||||
public static Block block_cap_sunset;
|
||||
public static Block block_cap_star;
|
||||
|
||||
public static Block deco_titanium;
|
||||
public static Block deco_red_copper;
|
||||
public static Block deco_tungsten;
|
||||
@ -1185,7 +1176,6 @@ public class ModBlocks {
|
||||
public static Block crystal_hardened;
|
||||
public static Block crystal_pulsar;
|
||||
public static Block taint;
|
||||
public static Block residue;
|
||||
|
||||
public static Block vent_chlorine;
|
||||
public static Block vent_cloud;
|
||||
@ -1518,15 +1508,6 @@ public class ModBlocks {
|
||||
block_unobtainium = new BlockBeaconable(Material.iron).setBlockName("block_unobtainium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_unobtainium");
|
||||
block_daffergon = new BlockBeaconable(Material.iron).setBlockName("block_daffergon").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_daffergon");
|
||||
block_verticium = new BlockBeaconable(Material.iron).setBlockName("block_verticium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_verticium");
|
||||
|
||||
block_cap_nuka = new BlockCap(Material.iron, RefStrings.MODID + ":block_cap_nuka_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_nuka").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_nuka");
|
||||
block_cap_quantum = new BlockCap(Material.iron, RefStrings.MODID + ":block_cap_quantum_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_quantum").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_quantum");
|
||||
block_cap_rad = new BlockCap(Material.iron, RefStrings.MODID + ":block_cap_rad_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_rad").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_rad");
|
||||
block_cap_sparkle = new BlockCap(Material.iron, RefStrings.MODID + ":block_cap_sparkle_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_sparkle").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_sparkle");
|
||||
block_cap_korl = new BlockCap(Material.iron, RefStrings.MODID + ":block_cap_korl_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_korl").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_korl");
|
||||
block_cap_fritz = new BlockCap(Material.iron, RefStrings.MODID + ":block_cap_fritz_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_fritz").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_fritz");
|
||||
block_cap_sunset = new BlockCap(Material.iron, RefStrings.MODID + ":block_cap_sunset_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_sunset").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_sunset");
|
||||
block_cap_star = new BlockCap(Material.iron, RefStrings.MODID + ":block_cap_star_top").setStepSound(Block.soundTypeMetal).setBlockName("block_cap_star").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":block_cap_star");
|
||||
|
||||
deco_titanium = new BlockOre(Material.iron).noFortune().setBlockName("deco_titanium").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":deco_titanium");
|
||||
deco_red_copper = new BlockDecoCT(Material.iron).noFortune().setBlockName("deco_red_copper").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":deco_red_copper");
|
||||
@ -2369,7 +2350,6 @@ public class ModBlocks {
|
||||
crystal_hardened = new BlockGeneric(Material.iron).setBlockName("crystal_hardened").setHardness(15.0F).setResistance(Float.POSITIVE_INFINITY).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":crystal_hardened");
|
||||
crystal_pulsar = new CrystalPulsar(Material.iron).setBlockName("crystal_pulsar").setHardness(15.0F).setResistance(Float.POSITIVE_INFINITY).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":crystal_pulsar");
|
||||
taint = new BlockTaint(Material.iron).setBlockName("taint").setHardness(15.0F).setResistance(10.0F).setCreativeTab(null);
|
||||
residue = new BlockCloudResidue(Material.iron).setBlockName("residue").setHardness(0.5F).setResistance(0.5F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":residue");
|
||||
|
||||
vent_chlorine = new BlockVent(Material.iron).setBlockName("vent_chlorine").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":vent_chlorine");
|
||||
vent_cloud = new BlockVent(Material.iron).setBlockName("vent_cloud").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":vent_cloud");
|
||||
@ -2721,16 +2701,6 @@ public class ModBlocks {
|
||||
GameRegistry.registerBlock(block_c4, block_c4.getUnlocalizedName());
|
||||
GameRegistry.registerBlock(block_smore, block_smore.getUnlocalizedName());
|
||||
GameRegistry.registerBlock(block_slag, block_slag.getUnlocalizedName());
|
||||
|
||||
//Bottlecap Blocks
|
||||
GameRegistry.registerBlock(block_cap_nuka, block_cap_nuka.getUnlocalizedName());
|
||||
GameRegistry.registerBlock(block_cap_quantum, block_cap_quantum.getUnlocalizedName());
|
||||
GameRegistry.registerBlock(block_cap_rad, block_cap_rad.getUnlocalizedName());
|
||||
GameRegistry.registerBlock(block_cap_sparkle, block_cap_sparkle.getUnlocalizedName());
|
||||
GameRegistry.registerBlock(block_cap_korl, block_cap_korl.getUnlocalizedName());
|
||||
GameRegistry.registerBlock(block_cap_fritz, block_cap_fritz.getUnlocalizedName());
|
||||
GameRegistry.registerBlock(block_cap_sunset, block_cap_sunset.getUnlocalizedName());
|
||||
GameRegistry.registerBlock(block_cap_star, block_cap_star.getUnlocalizedName());
|
||||
|
||||
//Deco Blocks
|
||||
GameRegistry.registerBlock(deco_titanium, deco_titanium.getUnlocalizedName());
|
||||
@ -3625,7 +3595,6 @@ public class ModBlocks {
|
||||
GameRegistry.registerBlock(crystal_hardened, crystal_hardened.getUnlocalizedName());
|
||||
GameRegistry.registerBlock(crystal_pulsar, crystal_pulsar.getUnlocalizedName());
|
||||
GameRegistry.registerBlock(taint, ItemTaintBlock.class, taint.getUnlocalizedName());
|
||||
GameRegistry.registerBlock(residue, residue.getUnlocalizedName());
|
||||
GameRegistry.registerBlock(cheater_virus, cheater_virus.getUnlocalizedName());
|
||||
GameRegistry.registerBlock(cheater_virus_seed, cheater_virus_seed.getUnlocalizedName());
|
||||
GameRegistry.registerBlock(ntm_dirt, ntm_dirt.getUnlocalizedName());
|
||||
|
||||
@ -1,90 +0,0 @@
|
||||
package com.hbm.blocks.bomb;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
import com.hbm.blocks.ModBlocks;
|
||||
import com.hbm.items.ModItems;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.MapColor;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
public class BlockCloudResidue extends Block {
|
||||
|
||||
public BlockCloudResidue(Material p_i45386_1_) {
|
||||
super(p_i45386_1_);
|
||||
}
|
||||
|
||||
public static int func_150032_b(int p_150032_0_)
|
||||
{
|
||||
return func_150031_c(p_150032_0_);
|
||||
}
|
||||
|
||||
public static int func_150031_c(int p_150031_0_)
|
||||
{
|
||||
return p_150031_0_ & 15;
|
||||
}
|
||||
|
||||
public MapColor getMapColor(int p_149728_1_)
|
||||
{
|
||||
return MapColor.redColor;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRenderType(){
|
||||
return ModBlocks.taint.getRenderType();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
|
||||
{
|
||||
return p_149650_2_.nextInt(25) == 0 ? ModItems.powder_cloud : null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isOpaqueCube() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean renderAsNormalBlock() {
|
||||
return false;
|
||||
}
|
||||
|
||||
public void onNeighborBlockChange(World world, int x, int y, int z, Block b)
|
||||
{
|
||||
if(!hasPosNeightbour(world, x, y, z) && !world.isRemote)
|
||||
world.setBlockToAir(x, y, z);
|
||||
}
|
||||
|
||||
public static boolean hasPosNeightbour(World world, int x, int y, int z) {
|
||||
Block b0 = world.getBlock(x + 1, y, z);
|
||||
Block b1 = world.getBlock(x, y + 1, z);
|
||||
Block b2 = world.getBlock(x, y, z + 1);
|
||||
Block b3 = world.getBlock(x - 1, y, z);
|
||||
Block b4 = world.getBlock(x, y - 1, z);
|
||||
Block b5 = world.getBlock(x, y, z - 1);
|
||||
boolean b = (b0.renderAsNormalBlock() && b0.getMaterial().isOpaque()) ||
|
||||
(b1.renderAsNormalBlock() && b1.getMaterial().isOpaque()) ||
|
||||
(b2.renderAsNormalBlock() && b2.getMaterial().isOpaque()) ||
|
||||
(b3.renderAsNormalBlock() && b3.getMaterial().isOpaque()) ||
|
||||
(b4.renderAsNormalBlock() && b4.getMaterial().isOpaque()) ||
|
||||
(b5.renderAsNormalBlock() && b5.getMaterial().isOpaque());
|
||||
return b;
|
||||
}
|
||||
|
||||
@Override
|
||||
public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public AxisAlignedBB getSelectedBoundingBoxFromPool(World par1World, int par2, int par3, int par4)
|
||||
{
|
||||
return AxisAlignedBB.getBoundingBox(par2, par3, par4, par2, par3, par4);
|
||||
}
|
||||
}
|
||||
@ -3,7 +3,6 @@ package com.hbm.blocks.bomb;
|
||||
import java.util.Random;
|
||||
|
||||
import com.hbm.blocks.BlockDummyable;
|
||||
import com.hbm.blocks.ModBlocks;
|
||||
import com.hbm.interfaces.IBomb;
|
||||
import com.hbm.tileentity.bomb.TileEntityLaunchPadRusted;
|
||||
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
package com.hbm.blocks.generic;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
import com.hbm.blocks.ModBlocks;
|
||||
import com.hbm.blocks.machine.BlockPillar;
|
||||
import com.hbm.items.ModItems;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
public class BlockCap extends BlockPillar {
|
||||
|
||||
public BlockCap(Material mat, String tex) {
|
||||
super(mat, tex);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getItemDropped(int i, Random rand, int j) {
|
||||
|
||||
if(this == ModBlocks.block_cap_nuka)
|
||||
return ModItems.cap_nuka;
|
||||
if(this == ModBlocks.block_cap_quantum)
|
||||
return ModItems.cap_quantum;
|
||||
if(this == ModBlocks.block_cap_sparkle)
|
||||
return ModItems.cap_sparkle;
|
||||
if(this == ModBlocks.block_cap_rad)
|
||||
return ModItems.cap_rad;
|
||||
if(this == ModBlocks.block_cap_korl)
|
||||
return ModItems.cap_korl;
|
||||
if(this == ModBlocks.block_cap_fritz)
|
||||
return ModItems.cap_fritz;
|
||||
if(this == ModBlocks.block_cap_sunset)
|
||||
return ModItems.cap_sunset;
|
||||
if(this == ModBlocks.block_cap_star)
|
||||
return ModItems.cap_star;
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int quantityDropped(Random rand) {
|
||||
return 128;
|
||||
}
|
||||
}
|
||||
@ -6,8 +6,6 @@ import java.util.Map;
|
||||
import java.util.Random;
|
||||
|
||||
import com.hbm.main.MainRegistry;
|
||||
import com.hbm.world.gen.component.Component;
|
||||
import com.hbm.world.gen.component.SiloComponent;
|
||||
|
||||
import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
|
||||
import net.minecraft.block.Block;
|
||||
@ -20,7 +18,6 @@ import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.util.Vec3;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.gen.structure.StructureBoundingBox;
|
||||
|
||||
public class TestEventTester extends Block {
|
||||
|
||||
|
||||
@ -84,7 +84,6 @@ public class WorldConfig {
|
||||
public static int dungeonStructure = 64;
|
||||
public static int relayStructure = 500;
|
||||
public static int satelliteStructure = 500;
|
||||
public static int siloStructure = 1000;
|
||||
public static int factoryStructure = 1000;
|
||||
public static int dudStructure = 500;
|
||||
public static int spaceshipStructure = 1000;
|
||||
@ -206,7 +205,6 @@ public class WorldConfig {
|
||||
dungeonStructure = CommonConfig.createConfigInt(config, CATEGORY_DUNGEON, "4.04_dungeonSpawn", "Spawn library dungeon on every nTH chunk", 64);
|
||||
relayStructure = CommonConfig.createConfigInt(config, CATEGORY_DUNGEON, "4.05_relaySpawn", "Spawn relay on every nTH chunk", 500);
|
||||
satelliteStructure = CommonConfig.createConfigInt(config, CATEGORY_DUNGEON, "4.06_satelliteSpawn", "Spawn satellite dish on every nTH chunk", 500);
|
||||
siloStructure = CommonConfig.createConfigInt(config, CATEGORY_DUNGEON, "4.08_siloSpawn", "Spawn missile silo on every nTH chunk", 1000);
|
||||
factoryStructure = CommonConfig.createConfigInt(config, CATEGORY_DUNGEON, "4.09_factorySpawn", "Spawn factory on every nTH chunk", 1000);
|
||||
dudStructure = CommonConfig.createConfigInt(config, CATEGORY_DUNGEON, "4.10_dudSpawn", "Spawn dud on every nTH chunk", 500);
|
||||
spaceshipStructure = CommonConfig.createConfigInt(config, CATEGORY_DUNGEON, "4.11_spaceshipSpawn", "Spawn spaceship on every nTH chunk", 1000);
|
||||
@ -250,7 +248,6 @@ public class WorldConfig {
|
||||
dungeonStructure = CommonConfig.setDefZero(dungeonStructure, 1000);
|
||||
relayStructure = CommonConfig.setDefZero(relayStructure, 1000);
|
||||
satelliteStructure = CommonConfig.setDefZero(satelliteStructure, 1000);
|
||||
siloStructure = CommonConfig.setDefZero(siloStructure, 1000);
|
||||
factoryStructure = CommonConfig.setDefZero(factoryStructure, 1000);
|
||||
dudStructure = CommonConfig.setDefZero(dudStructure, 1000);
|
||||
spaceshipStructure = CommonConfig.setDefZero(spaceshipStructure, 1000);
|
||||
|
||||
@ -75,7 +75,6 @@ public class ConsumableRecipes {
|
||||
CraftingManager.addShapelessAuto(new ItemStack(ModItems.mucho_mango, 1), new Object[] { Items.potionitem, Items.sugar, Items.sugar, KEY_ORANGE });
|
||||
|
||||
//Canteens
|
||||
CraftingManager.addRecipeAuto(new ItemStack(ModItems.canteen_13, 1), new Object[] { "O", "P", 'O', Items.potionitem, 'P', STEEL.plate() });
|
||||
CraftingManager.addRecipeAuto(new ItemStack(ModItems.canteen_vodka, 1), new Object[] { "O", "P", 'O', Items.potato, 'P', STEEL.plate() });
|
||||
CraftingManager.addRecipeAuto(new ItemStack(ModItems.canteen_fab, 1), new Object[] { "VMV", "MVM", "VMV", 'V', ModItems.canteen_vodka, 'M', ModItems.powder_magic });
|
||||
|
||||
|
||||
@ -150,7 +150,6 @@ public class WeaponRecipes {
|
||||
CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_calamity, 1), new Object[] { " PI", "BBM", " PI", 'P', IRON.plate(), 'B', ModItems.pipes_steel, 'M', ModItems.mechanism_rifle_1, 'I', STEEL.ingot() });
|
||||
CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_m2, 1), new Object[] { " PI", "BBM", " PI", 'P', STEEL.plate(), 'B', ModItems.pipes_steel, 'M', ModItems.mechanism_rifle_2, 'I', STEEL.ingot() });
|
||||
CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_minigun, 1), new Object[] { "PIB", "PCM", "PIB", 'P', ModItems.pipes_steel, 'B', STEEL.block(), 'I', ANY_PLASTIC.ingot(), 'C', ModItems.mechanism_rifle_2, 'M', ModItems.motor });
|
||||
CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_avenger, 1), new Object[] { "PIB", "PCM", "PIB", 'P', ModItems.pipes_steel, 'B', BE.block(), 'I', DESH.ingot(), 'C', ModItems.mechanism_rifle_2, 'M', ModItems.motor });
|
||||
CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_lacunae, 1), new Object[] { "TIT", "ILI", "PRP", 'T', ModItems.syringe_taint, 'I', STAR.ingot(), 'L', ModItems.gun_minigun, 'P', ModItems.pellet_rtg, 'R', ModBlocks.machine_rtg_grey });
|
||||
CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_mymy, 1), new Object[] { "PP ", " WP", 'P', ANY_RUBBER.ingot(), 'W', ModItems.wire_aluminium });
|
||||
//CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_darter, 1), new Object[] { "SST", " P", 'S', STEEL.plate(), 'T', ModItems.gas_empty, 'P', ANY_PLASTIC.ingot() });
|
||||
|
||||
@ -335,6 +335,15 @@ public class EntityGlyphid extends EntityMob {
|
||||
|
||||
/** Provides a direct entrypoint from outside to access the superclass' implementation because otherwise we end up wwith infinite recursion */
|
||||
public boolean attackSuperclass(DamageSource source, float amount) {
|
||||
|
||||
NBTTagCompound data = new NBTTagCompound();
|
||||
data.setString("type", "debug");
|
||||
data.setInteger("color", 0x0000ff);
|
||||
data.setFloat("scale", 2.5F);
|
||||
data.setString("text", "" + (int) amount);
|
||||
PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, posX, posY + 2, posZ), new TargetPoint(dimension, posX, posY + 2, posZ, 50));
|
||||
|
||||
|
||||
return super.attackEntityFrom(source, amount);
|
||||
}
|
||||
|
||||
|
||||
@ -2,7 +2,6 @@ package com.hbm.entity.mob.glyphid;
|
||||
|
||||
import com.hbm.lib.ModDamageSource;
|
||||
import com.hbm.potion.HbmPotion;
|
||||
import com.hbm.util.BobMathUtil;
|
||||
|
||||
import net.minecraft.util.DamageSource;
|
||||
|
||||
@ -12,7 +11,7 @@ public abstract class GlyphidStats {
|
||||
public static GlyphidStats GLYPHID_STATS_NT = new GlyphidStatsNT();
|
||||
|
||||
public static GlyphidStats getStats() {
|
||||
return GLYPHID_STATS_70K;
|
||||
return GLYPHID_STATS_NT;
|
||||
}
|
||||
|
||||
protected StatBundle statsGrunt;
|
||||
@ -127,7 +126,7 @@ public abstract class GlyphidStats {
|
||||
public boolean handleAttack(EntityGlyphid glyphid, DamageSource source, float amount) {
|
||||
|
||||
// Completely immune to acid from other glyphids
|
||||
if(ModDamageSource.s_acid.equals(source.getDamageType()) && source.getSourceOfDamage() instanceof EntityGlyphid) return false;
|
||||
if((source == ModDamageSource.acid || ModDamageSource.s_acid.equals(source.getDamageType())) && source.getSourceOfDamage() instanceof EntityGlyphid) return false;
|
||||
|
||||
// If damage is armor piercing or nuclear damage, don't apply any armor calculation
|
||||
if(isNuclearDamage(source) || source.isDamageAbsolute() || source.isUnblockable()) {
|
||||
@ -140,13 +139,13 @@ public abstract class GlyphidStats {
|
||||
if(source.isFireDamage()) {
|
||||
float dmg = Math.min(amount, 5F);
|
||||
if(amount > 5) dmg += (amount - 5F) * 0.1F;
|
||||
return glyphid.attackSuperclass(source, amount);
|
||||
return glyphid.attackSuperclass(source, dmg);
|
||||
// This ensures that afterburn and flamethrowers remain effective wihin reason
|
||||
}
|
||||
|
||||
// If damage is explosive, reduce by 25% then ignore armor
|
||||
if(source.isExplosion()) {
|
||||
amount *= 0.75F;
|
||||
amount *= 0.5F;
|
||||
return glyphid.attackSuperclass(source, amount);
|
||||
// This ensures that explosions remain mostly effective
|
||||
}
|
||||
@ -161,10 +160,10 @@ public abstract class GlyphidStats {
|
||||
amount *= 0.5F;
|
||||
}
|
||||
|
||||
amount = glyphid.calculateDamage((float) BobMathUtil.squirt(amount * 50));
|
||||
amount = glyphid.calculateDamage((float) Math.min(amount, Math.sqrt(amount) * 50D / 7D));
|
||||
// This ensures that higher numbers have a diminishing effect
|
||||
}
|
||||
|
||||
|
||||
return glyphid.attackSuperclass(source, amount);
|
||||
}
|
||||
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
package com.hbm.entity.particle;
|
||||
|
||||
import com.hbm.blocks.ModBlocks;
|
||||
import com.hbm.blocks.bomb.BlockCloudResidue;
|
||||
import com.hbm.explosion.ExplosionChaos;
|
||||
|
||||
import net.minecraft.util.MathHelper;
|
||||
@ -79,10 +77,6 @@ public class EntityCloudFX extends EntityModFX {
|
||||
|
||||
if(!worldObj.isRemote && rand.nextInt(5) != 0) {
|
||||
this.setDead();
|
||||
|
||||
if(BlockCloudResidue.hasPosNeightbour(worldObj, (int) (posX - motionX/subdivisions), (int) (posY - motionY/subdivisions), (int) (posZ - motionZ/subdivisions)) && worldObj.getBlock((int) (posX - motionX/subdivisions), (int) (posY - motionY/subdivisions), (int) (posZ - motionZ/subdivisions)).isReplaceable(worldObj, (int) (posX - motionX/subdivisions), (int) (posY - motionY/subdivisions), (int) (posZ - motionZ/subdivisions))) {
|
||||
worldObj.setBlock((int) (posX - motionX/subdivisions), (int) (posY - motionY/subdivisions), (int) (posZ - motionZ/subdivisions), ModBlocks.residue);
|
||||
}
|
||||
}
|
||||
|
||||
this.posX -= this.motionX/subdivisions;
|
||||
|
||||
@ -285,8 +285,6 @@ public class BobmazonOfferFactory {
|
||||
ModItems.ammo_5mm.stackFromEnum(64, Ammo5mm.STAR),
|
||||
ModItems.ammo_5mm.stackFromEnum(64, Ammo5mm.STAR)
|
||||
).setStackDisplayName("Frenchman's Reward"), Requirement.HIDDEN, 32));
|
||||
|
||||
special.add(new Offer(new ItemStack(ModItems.gun_detonator, 1), Requirement.HIDDEN, 32));
|
||||
}
|
||||
|
||||
public static List<Offer> getOffers(ItemStack stack) {
|
||||
|
||||
@ -956,15 +956,6 @@ public class AssemblerRecipes extends SerializableRecipe {
|
||||
new ComparableStack(ModItems.powder_nitan_mix, 18),
|
||||
}, 600);
|
||||
|
||||
makeRecipe(new ComparableStack(ModBlocks.block_cap_nuka, 1), new AStack[] { new ComparableStack(ModItems.cap_nuka, 128) }, 10);
|
||||
makeRecipe(new ComparableStack(ModBlocks.block_cap_quantum, 1), new AStack[] { new ComparableStack(ModItems.cap_quantum, 128) }, 10);
|
||||
makeRecipe(new ComparableStack(ModBlocks.block_cap_sparkle, 1), new AStack[] { new ComparableStack(ModItems.cap_sparkle, 128) }, 10);
|
||||
makeRecipe(new ComparableStack(ModBlocks.block_cap_rad, 1), new AStack[] { new ComparableStack(ModItems.cap_rad, 128) }, 10);
|
||||
makeRecipe(new ComparableStack(ModBlocks.block_cap_korl, 1), new AStack[] { new ComparableStack(ModItems.cap_korl, 128) }, 10);
|
||||
makeRecipe(new ComparableStack(ModBlocks.block_cap_fritz, 1), new AStack[] { new ComparableStack(ModItems.cap_fritz, 128) }, 10);
|
||||
makeRecipe(new ComparableStack(ModBlocks.block_cap_sunset, 1), new AStack[] { new ComparableStack(ModItems.cap_sunset, 128) }, 10);
|
||||
makeRecipe(new ComparableStack(ModBlocks.block_cap_star, 1), new AStack[] { new ComparableStack(ModItems.cap_star, 128) }, 10);
|
||||
|
||||
if(!GeneralConfig.enable528) {
|
||||
makeRecipe(new ComparableStack(ModBlocks.machine_hephaestus, 1), new AStack[] { new ComparableStack(ModItems.pipes_steel, 1), !exp ? new OreDictStack(STEEL.ingot(), 24) : new OreDictStack(STEEL.heavyComp(), 2), !exp ? new OreDictStack(CU.plate(), 24) : new OreDictStack(CU.heavyComp(), 2), new OreDictStack(NB.ingot(), 4), new OreDictStack(RUBBER.ingot(), 12), new ComparableStack(ModBlocks.glass_quartz, 16) }, 150);
|
||||
makeRecipe(new ComparableStack(ModBlocks.machine_radgen, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 8), new OreDictStack(STEEL.plate(), 32), new ComparableStack(ModItems.coil_magnetized_tungsten, 6), new ComparableStack(ModItems.wire_magnetized_tungsten, 24), new ComparableStack(ModItems.circuit_gold, 4), new ComparableStack(ModItems.reactor_core, 3), new OreDictStack(STAR.ingot(), 1), new OreDictStack("dyeRed", 1), }, 400, ModItems.journal_pip);
|
||||
|
||||
@ -290,12 +290,6 @@ public class CentrifugeRecipes extends SerializableRecipe {
|
||||
new ItemStack(ModItems.nuclear_waste, 2) });
|
||||
}
|
||||
|
||||
recipes.put(new ComparableStack(ModItems.powder_cloud), new ItemStack[] {
|
||||
new ItemStack(ModItems.powder_copper, 1),
|
||||
new ItemStack(ModItems.sulfur, 1),
|
||||
new ItemStack(ModItems.dust, 1),
|
||||
new ItemStack(ModItems.dust, 1) });
|
||||
|
||||
recipes.put(new OreDictStack(COAL.ore()), new ItemStack[] {
|
||||
new ItemStack(ModItems.powder_coal, 2),
|
||||
new ItemStack(ModItems.powder_coal, 2),
|
||||
|
||||
@ -540,7 +540,6 @@ public class ModItems {
|
||||
public static Item powder_spark_mix;
|
||||
public static Item powder_yellowcake;
|
||||
public static Item powder_magic;
|
||||
public static Item powder_cloud;
|
||||
public static Item powder_balefire;
|
||||
public static Item powder_sawdust;
|
||||
public static Item powder_flux;
|
||||
@ -1570,7 +1569,6 @@ public class ModItems {
|
||||
public static Item gun_ar15;
|
||||
public static Item gun_calamity;
|
||||
public static Item gun_minigun;
|
||||
public static Item gun_avenger;
|
||||
public static Item gun_lacunae;
|
||||
public static Item gun_folly;
|
||||
public static Item gun_fatman;
|
||||
@ -1640,7 +1638,6 @@ public class ModItems {
|
||||
public static Item gun_vortex;
|
||||
public static Item gun_waluigi;
|
||||
public static Item gun_darter;
|
||||
public static Item gun_detonator;
|
||||
public static Item gun_glass_cannon;
|
||||
public static Item gun_m2;
|
||||
public static Item gun_lunatic_marksman;
|
||||
@ -1741,7 +1738,6 @@ public class ModItems {
|
||||
public static Item med_ptsd;
|
||||
public static Item med_schizophrenia;
|
||||
|
||||
public static Item canteen_13;
|
||||
public static Item canteen_vodka;
|
||||
public static Item canteen_fab;
|
||||
|
||||
@ -2965,7 +2961,6 @@ public class ModItems {
|
||||
powder_meteorite_tiny = new Item().setUnlocalizedName("powder_meteorite_tiny").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_meteorite_tiny");
|
||||
powder_yellowcake = new Item().setUnlocalizedName("powder_yellowcake").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_yellowcake");
|
||||
powder_magic = new Item().setUnlocalizedName("powder_magic").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_magic");
|
||||
powder_cloud = new Item().setUnlocalizedName("powder_cloud").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_cloud");
|
||||
powder_balefire = new Item().setUnlocalizedName("powder_balefire").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_balefire");
|
||||
powder_sawdust = new Item().setUnlocalizedName("powder_sawdust").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_sawdust");
|
||||
powder_flux = new Item().setUnlocalizedName("powder_flux").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_flux");
|
||||
@ -4196,7 +4191,6 @@ public class ModItems {
|
||||
gun_ar15 = new ItemGunBase(Gun50BMGFactory.getAR15Config(), Gun50BMGFactory.getAR15BurstConfig()).setUnlocalizedName("gun_ar15").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_ar15");
|
||||
gun_calamity = new ItemGunBase(Gun762mmFactory.getCalamityConfig()).setUnlocalizedName("gun_calamity").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_calamity");
|
||||
gun_minigun = new ItemGunLacunae(Gun5mmFactory.get53Config()).setUnlocalizedName("gun_minigun").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_minigun");
|
||||
gun_avenger = new ItemGunLacunae(Gun5mmFactory.get57Config()).setUnlocalizedName("gun_avenger").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_avenger");
|
||||
gun_lacunae = new ItemGunLacunae(Gun5mmFactory.getLacunaeConfig()).setUnlocalizedName("gun_lacunae").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_lacunae");
|
||||
gun_folly = new GunFolly().setUnlocalizedName("gun_folly").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_folly");
|
||||
gun_fatman = new ItemGunBase(GunFatmanFactory.getFatmanConfig()).setUnlocalizedName("gun_fatman").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_fatman");
|
||||
@ -4265,7 +4259,6 @@ public class ModItems {
|
||||
gun_super_shotgun = new ItemCustomLore().setUnlocalizedName("gun_super_shotgun").setMaxStackSize(1).setFull3D().setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_super_shotgun");
|
||||
gun_moist_nugget = new ItemNugget(3, false).setUnlocalizedName("gun_moist_nugget").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_moist_nugget");
|
||||
gun_darter = new ItemGunDart(GunDartFactory.getDarterConfig()).setFull3D().setUnlocalizedName("gun_darter").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_darter");
|
||||
gun_detonator = new ItemGunDetonator(GunDetonatorFactory.getDetonatorConfig()).setFull3D().setUnlocalizedName("gun_detonator").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_darter");
|
||||
gun_glass_cannon = new ItemEnergyGunBase(GunPoweredFactory.getGlassCannonConfig()).setFull3D().setUnlocalizedName("gun_glass_cannon").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_darter");
|
||||
gun_m2 = new ItemGunBase(Gun50BMGFactory.getM2Config()).setFull3D().setUnlocalizedName("gun_m2").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_darter");
|
||||
gun_lunatic_marksman = new ItemGunBase(Gun50BMGFactory.getLunaticMarksman()).setFull3D().setUnlocalizedName("gun_lunatic_marksman").setCreativeTab(MainRegistry.weaponTab);
|
||||
@ -4350,7 +4343,6 @@ public class ModItems {
|
||||
twinkie = new ItemLemon(3, 0.25F, false).setUnlocalizedName("twinkie").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":twinkie");
|
||||
static_sandwich = new ItemLemon(6, 1F, false).setUnlocalizedName("static_sandwich").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":static_sandwich");
|
||||
pudding = new ItemLemon(6, 1F, false).setUnlocalizedName("pudding").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pudding");
|
||||
canteen_13 = new ItemCanteen(1 * 60).setUnlocalizedName("canteen_13").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canteen_13");
|
||||
canteen_vodka = new ItemCanteen(3 * 60).setUnlocalizedName("canteen_vodka").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canteen_vodka");
|
||||
canteen_fab = new ItemCanteen(2 * 60).setUnlocalizedName("canteen_fab").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":canteen_fab");
|
||||
pancake = new ItemPancake(20, 20, false).setUnlocalizedName("pancake").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":pancake");
|
||||
@ -5889,7 +5881,6 @@ public class ModItems {
|
||||
GameRegistry.registerItem(powder_boron_tiny, powder_boron_tiny.getUnlocalizedName());
|
||||
GameRegistry.registerItem(powder_asbestos, powder_asbestos.getUnlocalizedName());
|
||||
GameRegistry.registerItem(powder_magic, powder_magic.getUnlocalizedName());
|
||||
GameRegistry.registerItem(powder_cloud, powder_cloud.getUnlocalizedName());
|
||||
GameRegistry.registerItem(powder_sawdust, powder_sawdust.getUnlocalizedName());
|
||||
GameRegistry.registerItem(powder_flux, powder_flux.getUnlocalizedName());
|
||||
GameRegistry.registerItem(powder_fertilizer, powder_fertilizer.getUnlocalizedName());
|
||||
@ -7103,7 +7094,6 @@ public class ModItems {
|
||||
GameRegistry.registerItem(gun_calamity, gun_calamity.getUnlocalizedName());
|
||||
GameRegistry.registerItem(gun_m2, gun_m2.getUnlocalizedName());
|
||||
GameRegistry.registerItem(gun_minigun, gun_minigun.getUnlocalizedName());
|
||||
GameRegistry.registerItem(gun_avenger, gun_avenger.getUnlocalizedName());
|
||||
GameRegistry.registerItem(gun_lacunae, gun_lacunae.getUnlocalizedName());
|
||||
GameRegistry.registerItem(gun_folly, gun_folly.getUnlocalizedName());
|
||||
GameRegistry.registerItem(gun_b92, gun_b92.getUnlocalizedName());
|
||||
@ -7166,7 +7156,6 @@ public class ModItems {
|
||||
GameRegistry.registerItem(gun_super_shotgun, gun_super_shotgun.getUnlocalizedName());
|
||||
GameRegistry.registerItem(gun_moist_nugget, gun_moist_nugget.getUnlocalizedName());
|
||||
GameRegistry.registerItem(gun_darter, gun_darter.getUnlocalizedName());
|
||||
GameRegistry.registerItem(gun_detonator, gun_detonator.getUnlocalizedName());
|
||||
GameRegistry.registerItem(crucible, crucible.getUnlocalizedName());
|
||||
GameRegistry.registerItem(gun_glass_cannon, gun_glass_cannon.getUnlocalizedName());
|
||||
GameRegistry.registerItem(gun_lunatic_marksman, gun_lunatic_marksman.getUnlocalizedName());
|
||||
@ -7493,7 +7482,6 @@ public class ModItems {
|
||||
GameRegistry.registerItem(egg_glyphid, egg_glyphid.getUnlocalizedName());
|
||||
GameRegistry.registerItem(med_ipecac, med_ipecac.getUnlocalizedName());
|
||||
GameRegistry.registerItem(med_ptsd, med_ptsd.getUnlocalizedName());
|
||||
GameRegistry.registerItem(canteen_13, canteen_13.getUnlocalizedName());
|
||||
GameRegistry.registerItem(canteen_vodka, canteen_vodka.getUnlocalizedName());
|
||||
GameRegistry.registerItem(canteen_fab, canteen_fab.getUnlocalizedName());
|
||||
GameRegistry.registerItem(mucho_mango, mucho_mango.getUnlocalizedName());
|
||||
|
||||
@ -35,9 +35,6 @@ public class ItemCanteen extends Item {
|
||||
public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player) {
|
||||
stack.setItemDamage(stack.getMaxDamage());
|
||||
|
||||
if (this == ModItems.canteen_13) {
|
||||
player.heal(5F);
|
||||
}
|
||||
if (this == ModItems.canteen_vodka) {
|
||||
player.addPotionEffect(new PotionEffect(Potion.confusion.id, 10 * 20, 0));
|
||||
player.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 30 * 20, 2));
|
||||
@ -77,17 +74,6 @@ public class ItemCanteen extends Item {
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_)
|
||||
{
|
||||
if(this == ModItems.canteen_13)
|
||||
{
|
||||
list.add("Cooldown: 1 minute");
|
||||
list.add("Restores 2.5 hearts");
|
||||
list.add("");
|
||||
|
||||
if(MainRegistry.polaroidID == 11)
|
||||
list.add("You sip a sip from your trusty Vault 13 SIPPP");
|
||||
else
|
||||
list.add("You take a sip from your trusty Vault 13 canteen.");
|
||||
}
|
||||
if(this == ModItems.canteen_vodka)
|
||||
{
|
||||
list.add("Cooldown: 3 minutes");
|
||||
|
||||
@ -2,14 +2,12 @@ package com.hbm.items.tool;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.hbm.entity.effect.EntityNukeTorex;
|
||||
import com.hbm.lib.Library;
|
||||
import com.hbm.world.dungeon.Silo;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
|
||||
@ -1,149 +0,0 @@
|
||||
package com.hbm.items.weapon;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import com.google.common.collect.Multimap;
|
||||
import com.hbm.entity.projectile.EntityBullet;
|
||||
import com.hbm.interfaces.IHoldableWeapon;
|
||||
import com.hbm.items.ModItems;
|
||||
import com.hbm.main.MainRegistry;
|
||||
import com.hbm.render.util.RenderScreenOverlay.Crosshair;
|
||||
|
||||
import net.minecraft.enchantment.Enchantment;
|
||||
import net.minecraft.enchantment.EnchantmentHelper;
|
||||
import net.minecraft.entity.SharedMonsterAttributes;
|
||||
import net.minecraft.entity.ai.attributes.AttributeModifier;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.EnumAction;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.event.entity.player.ArrowNockEvent;
|
||||
|
||||
public class GunLacunae extends Item implements IHoldableWeapon {
|
||||
|
||||
Random rand = new Random();
|
||||
|
||||
public GunLacunae()
|
||||
{
|
||||
this.maxStackSize = 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumAction getItemUseAction(ItemStack par1ItemStack) {
|
||||
return EnumAction.none;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMaxItemUseDuration(ItemStack p_77626_1_) {
|
||||
return 72000;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack onItemRightClick(ItemStack p_77659_1_, World world, EntityPlayer player) {
|
||||
new ArrowNockEvent(player, p_77659_1_);
|
||||
{
|
||||
player.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
|
||||
}
|
||||
|
||||
world.playSoundAtEntity(player, "hbm:weapon.lacunaeSpinup", 1.0F, 1.0F);
|
||||
|
||||
return p_77659_1_;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onUsingTick(ItemStack stack, EntityPlayer player, int count)
|
||||
{
|
||||
World world = player.worldObj;
|
||||
|
||||
boolean flag = player.capabilities.isCreativeMode
|
||||
|| EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0;
|
||||
|
||||
if ((player.capabilities.isCreativeMode || player.inventory.hasItem(ModItems.ammo_5mm)) && count % 1 == 0 && this.getMaxItemUseDuration(stack) - count > 15) {
|
||||
|
||||
world.playSoundAtEntity(player, "hbm:weapon.lacunaeShoot", 1.0F, 1.0F);
|
||||
|
||||
for(int i = 0; i < 3; i++) {
|
||||
|
||||
if((player.capabilities.isCreativeMode || player.inventory.hasItem(ModItems.ammo_5mm))) {
|
||||
EntityBullet entityarrow = new EntityBullet(world, player, 3.0F);
|
||||
entityarrow.setDamage(5);
|
||||
|
||||
if(!flag)
|
||||
player.inventory.consumeInventoryItem(ModItems.ammo_5mm);
|
||||
|
||||
if (!world.isRemote) {
|
||||
world.spawnEntityInWorld(entityarrow);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPlayerStoppedUsing(ItemStack p_77615_1_, World world, EntityPlayer player, int p_77615_4_) {
|
||||
int j = this.getMaxItemUseDuration(p_77615_1_) - p_77615_4_;
|
||||
|
||||
if(j > 10)
|
||||
world.playSoundAtEntity(player, "hbm:weapon.lacunaeSpindown", 1.0F, 1.0F);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getItemEnchantability() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) {
|
||||
|
||||
if(this == ModItems.gun_minigun)
|
||||
list.add("The perfect gift for the man who has everything.");
|
||||
if(this == ModItems.gun_avenger)
|
||||
list.add("Interloper! No quarter shall be shown hither, fiend!");
|
||||
|
||||
if(this == ModItems.gun_lacunae) {
|
||||
list.add("Whoa, wait, what's that sound? Do you hear that?");
|
||||
list.add("I think that's silence! That's the sound people make");
|
||||
list.add("when everyone trying to kill me is dead!");
|
||||
list.add("And I have a minigun!");
|
||||
}
|
||||
|
||||
list.add("");
|
||||
list.add("Ammo: 5mm Round");
|
||||
list.add("Damage: 5");
|
||||
}
|
||||
|
||||
public String getItemStackDisplayName(ItemStack stack)
|
||||
{
|
||||
|
||||
if(this == ModItems.gun_lacunae && MainRegistry.polaroidID == 11)
|
||||
return "CZ97 Lacunae";
|
||||
|
||||
return super.getItemStackDisplayName(stack);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Multimap getItemAttributeModifiers() {
|
||||
Multimap multimap = super.getItemAttributeModifiers();
|
||||
multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(),
|
||||
new AttributeModifier(field_111210_e, "Weapon modifier", 6, 0));
|
||||
|
||||
if(this == ModItems.gun_minigun)
|
||||
multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(),
|
||||
new AttributeModifier(field_111210_e, "Weapon modifier", -0.3, 1));
|
||||
if(this == ModItems.gun_avenger)
|
||||
multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(),
|
||||
new AttributeModifier(field_111210_e, "Weapon modifier", -0.4, 1));
|
||||
if(this == ModItems.gun_lacunae)
|
||||
multimap.put(SharedMonsterAttributes.movementSpeed.getAttributeUnlocalizedName(),
|
||||
new AttributeModifier(field_111210_e, "Weapon modifier", -0.2, 1));
|
||||
|
||||
return multimap;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Crosshair getCrosshair() {
|
||||
return Crosshair.L_CIRCLE;
|
||||
}
|
||||
}
|
||||
@ -402,7 +402,6 @@ public class HbmChestContents {
|
||||
weighted(ModItems.flame_conspiracy, 0, 1, 3, 5),
|
||||
weighted(ModItems.flame_politics, 0, 1, 3, 5),
|
||||
weighted(ModItems.cigarette, 0, 1, 8, 5),
|
||||
weighted(ModItems.canteen_13, 0, 1, 1, 2),
|
||||
weighted(ModItems.armor_polish, 0, 1, 1, 3),
|
||||
weighted(ModItems.gun_kit_1, 0, 1, 1, 3),
|
||||
weighted(ModItems.rag, 0, 1, 3, 5),
|
||||
|
||||
@ -540,7 +540,6 @@ public class ClientProxy extends ServerProxy {
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_uzi_saturnite_silencer, new ItemRenderUZI());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_calamity, new ItemRenderWeaponFFMG42());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_minigun, new ItemRenderOverkill());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_avenger, new ItemRenderOverkill());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_lacunae, new ItemRenderOverkill());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_folly, new ItemRenderOverkill());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_hk69, new ItemRenderWeaponObj());
|
||||
@ -558,7 +557,6 @@ public class ClientProxy extends ServerProxy {
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_bolter_digamma, new ItemRenderWeaponBolter());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_fireext, new ItemRenderFireExt());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_ar15, new ItemRenderWeaponAR15());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_detonator, new ItemRenderDetonatorLaser());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.detonator_laser, new ItemRenderDetonatorLaser());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_remington, new ItemRenderWeaponRemington());
|
||||
MinecraftForgeClient.registerItemRenderer(ModItems.gun_spas12, new ItemRenderWeaponSpas12());
|
||||
|
||||
@ -249,7 +249,7 @@ public class CraftingManager {
|
||||
|
||||
addRecipeAuto(new ItemStack(ModItems.wrench, 1), new Object[] { " S ", " IS", "I ", 'S', STEEL.ingot(), 'I', IRON.ingot() });
|
||||
addRecipeAuto(new ItemStack(ModItems.wrench_flipped, 1), new Object[] { "S", "D", "W", 'S', Items.iron_sword, 'D', ModItems.ducttape, 'W', ModItems.wrench });
|
||||
addRecipeAuto(new ItemStack(ModItems.memespoon, 1), new Object[] { "CGC", "PSP", "IAI", 'C', ModItems.powder_cloud, 'G', TH232.block(), 'P', ModItems.photo_panel, 'S', ModItems.steel_shovel, 'I', ModItems.plate_polymer, 'A', "ingotAustralium" });
|
||||
addRecipeAuto(new ItemStack(ModItems.memespoon, 1), new Object[] { "CGC", "PSP", "IAI", 'C', ModItems.powder_yellowcake, 'G', TH232.block(), 'P', ModItems.photo_panel, 'S', ModItems.steel_shovel, 'I', ModItems.plate_polymer, 'A', "ingotAustralium" });
|
||||
addShapelessAuto(new ItemStack(ModItems.cbt_device, 1), new Object[] { STEEL.bolt(), ModItems.wrench });
|
||||
|
||||
addShapelessAuto(new ItemStack(ModItems.toothpicks, 3), new Object[] { KEY_STICK, KEY_STICK, KEY_STICK });
|
||||
@ -471,7 +471,7 @@ public class CraftingManager {
|
||||
addRecipeAuto(new ItemStack(ModBlocks.barbed_wire_poison, 8), new Object[] { "BBB", "BIB", "BBB", 'B', ModBlocks.barbed_wire, 'I', ModItems.powder_poison });
|
||||
addRecipeAuto(new ItemStack(ModBlocks.barbed_wire_acid, 8), new Object[] { "BBB", "BIB", "BBB", 'B', ModBlocks.barbed_wire, 'I', new ItemStack(ModItems.fluid_tank_full, 1, Fluids.ACID.getID()) });
|
||||
addRecipeAuto(new ItemStack(ModBlocks.barbed_wire_wither, 8), new Object[] { "BBB", "BIB", "BBB", 'B', ModBlocks.barbed_wire, 'I', new ItemStack(Items.skull, 1, 1) });
|
||||
addRecipeAuto(new ItemStack(ModBlocks.barbed_wire_ultradeath, 4), new Object[] { "BCB", "CIC", "BCB", 'B', ModBlocks.barbed_wire, 'C', ModItems.powder_cloud, 'I', ModItems.nuclear_waste });
|
||||
addRecipeAuto(new ItemStack(ModBlocks.barbed_wire_ultradeath, 4), new Object[] { "BCB", "CIC", "BCB", 'B', ModBlocks.barbed_wire, 'C', ModItems.powder_yellowcake, 'I', ModItems.nuclear_waste });
|
||||
|
||||
addRecipeAuto(new ItemStack(Item.getItemFromBlock(ModBlocks.tape_recorder), 4), new Object[] { "TST", "SSS", 'T', W.ingot(), 'S', STEEL.ingot() });
|
||||
addRecipeAuto(new ItemStack(Item.getItemFromBlock(ModBlocks.steel_poles), 16), new Object[] { "S S", "SSS", "S S", 'S', STEEL.ingot() });
|
||||
|
||||
@ -66,6 +66,7 @@ import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping;
|
||||
import cpw.mods.fml.common.network.NetworkRegistry;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockDispenser;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.dispenser.BehaviorDefaultDispenseItem;
|
||||
@ -1223,6 +1224,19 @@ public class MainRegistry {
|
||||
ignoreMappings.add("hbm:item.warhead_thermo_endo");
|
||||
ignoreMappings.add("hbm:item.warhead_thermo_exo");
|
||||
ignoreMappings.add("hbm:item.gun_dampfmaschine");
|
||||
ignoreMappings.add("hbm:item.canteen_13");
|
||||
ignoreMappings.add("hbm:tile.residue");
|
||||
ignoreMappings.add("hbm:item.powder_cloud");
|
||||
ignoreMappings.add("hbm:item.gun_detonator");
|
||||
ignoreMappings.add("hbm:item.gun_avenger");
|
||||
ignoreMappings.add("hbm:tile.block_cap_nuka");
|
||||
ignoreMappings.add("hbm:tile.block_cap_quantum");
|
||||
ignoreMappings.add("hbm:tile.block_cap_rad");
|
||||
ignoreMappings.add("hbm:tile.block_cap_sparkle");
|
||||
ignoreMappings.add("hbm:tile.block_cap_korl");
|
||||
ignoreMappings.add("hbm:tile.block_cap_fritz");
|
||||
ignoreMappings.add("hbm:tile.block_cap_sunset");
|
||||
ignoreMappings.add("hbm:tile.block_cap_star");
|
||||
|
||||
/// REMAP ///
|
||||
remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses);
|
||||
|
||||
@ -104,8 +104,6 @@ public class ItemRenderOverkill implements IItemRenderer {
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPipRed.png"));
|
||||
if(item.getItem() == ModItems.gun_minigun)
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelLacunae.png"));
|
||||
if(item.getItem() == ModItems.gun_avenger)
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelLacunaeAvenger.png"));
|
||||
if(item.getItem() == ModItems.gun_lacunae)
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelLacunaeReal.png"));
|
||||
if(item.getItem() == ModItems.gun_folly)
|
||||
@ -134,8 +132,7 @@ public class ItemRenderOverkill implements IItemRenderer {
|
||||
}
|
||||
|
||||
if(item.getItem() == ModItems.gun_lacunae ||
|
||||
item.getItem() == ModItems.gun_minigun ||
|
||||
item.getItem() == ModItems.gun_avenger) {
|
||||
item.getItem() == ModItems.gun_minigun) {
|
||||
GL11.glRotatef(-15.0F, 0.0F, 0.0F, 1.0F);
|
||||
GL11.glRotatef(180, 0, 1, 0);
|
||||
GL11.glTranslatef(0.5F, 0.3F, -0.2F);
|
||||
@ -169,8 +166,7 @@ public class ItemRenderOverkill implements IItemRenderer {
|
||||
pip.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
|
||||
|
||||
if(item.getItem() == ModItems.gun_lacunae ||
|
||||
item.getItem() == ModItems.gun_minigun ||
|
||||
item.getItem() == ModItems.gun_avenger)
|
||||
item.getItem() == ModItems.gun_minigun)
|
||||
lacunae.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, ItemGunBase.readNBT(item, "rot"));
|
||||
|
||||
if(item.getItem() == ModItems.gun_folly) {
|
||||
@ -210,8 +206,6 @@ public class ItemRenderOverkill implements IItemRenderer {
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPipRed.png"));
|
||||
if(item.getItem() == ModItems.gun_minigun)
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelLacunae.png"));
|
||||
if(item.getItem() == ModItems.gun_avenger)
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelLacunaeAvenger.png"));
|
||||
if(item.getItem() == ModItems.gun_lacunae)
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelLacunaeReal.png"));
|
||||
if(item.getItem() == ModItems.gun_folly)
|
||||
@ -243,8 +237,7 @@ public class ItemRenderOverkill implements IItemRenderer {
|
||||
GL11.glTranslatef(0.7F, 0.3F, 0.0F);
|
||||
}
|
||||
if(item.getItem() == ModItems.gun_lacunae ||
|
||||
item.getItem() == ModItems.gun_minigun ||
|
||||
item.getItem() == ModItems.gun_avenger) {
|
||||
item.getItem() == ModItems.gun_minigun) {
|
||||
GL11.glRotatef(5.0F, 0.0F, 0.0F, 1.0F);
|
||||
GL11.glRotatef(185, 0, 1, 0);
|
||||
GL11.glTranslatef(0.5F, 0.6F, 0.2F);
|
||||
@ -275,8 +268,7 @@ public class ItemRenderOverkill implements IItemRenderer {
|
||||
pip.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
|
||||
|
||||
if(item.getItem() == ModItems.gun_lacunae ||
|
||||
item.getItem() == ModItems.gun_minigun ||
|
||||
item.getItem() == ModItems.gun_avenger)
|
||||
item.getItem() == ModItems.gun_minigun)
|
||||
lacunae.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, f);
|
||||
|
||||
if(item.getItem() == ModItems.gun_folly) {
|
||||
@ -315,8 +307,6 @@ public class ItemRenderOverkill implements IItemRenderer {
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelPipRed.png"));
|
||||
if(item.getItem() == ModItems.gun_minigun)
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelLacunae.png"));
|
||||
if(item.getItem() == ModItems.gun_avenger)
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelLacunaeAvenger.png"));
|
||||
if(item.getItem() == ModItems.gun_lacunae)
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(RefStrings.MODID +":textures/models/ModelLacunaeReal.png"));
|
||||
if(item.getItem() == ModItems.gun_folly)
|
||||
@ -336,8 +326,7 @@ public class ItemRenderOverkill implements IItemRenderer {
|
||||
GL11.glScalef(0.75F, 0.75F, 0.75F);
|
||||
}
|
||||
if(item.getItem() == ModItems.gun_lacunae ||
|
||||
item.getItem() == ModItems.gun_minigun ||
|
||||
item.getItem() == ModItems.gun_avenger) {
|
||||
item.getItem() == ModItems.gun_minigun) {
|
||||
GL11.glTranslatef(0, -1, 0);
|
||||
GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F);
|
||||
}
|
||||
@ -364,8 +353,7 @@ public class ItemRenderOverkill implements IItemRenderer {
|
||||
pip.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F);
|
||||
|
||||
if(item.getItem() == ModItems.gun_lacunae ||
|
||||
item.getItem() == ModItems.gun_minigun ||
|
||||
item.getItem() == ModItems.gun_avenger)
|
||||
item.getItem() == ModItems.gun_minigun)
|
||||
lacunae.render((Entity)data[1], 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F, f);
|
||||
|
||||
if(item.getItem() == ModItems.gun_folly) {
|
||||
|
||||
@ -5,7 +5,6 @@ import java.io.IOException;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.google.gson.stream.JsonWriter;
|
||||
import com.hbm.blocks.BlockDummyable;
|
||||
import com.hbm.config.GeneralConfig;
|
||||
import com.hbm.interfaces.IFluidAcceptor;
|
||||
import com.hbm.inventory.container.ContainerIGenerator;
|
||||
import com.hbm.inventory.fluid.FluidType;
|
||||
@ -13,13 +12,10 @@ import com.hbm.inventory.fluid.Fluids;
|
||||
import com.hbm.inventory.fluid.tank.FluidTank;
|
||||
import com.hbm.inventory.fluid.trait.FT_Flammable;
|
||||
import com.hbm.inventory.gui.GUIIGenerator;
|
||||
import com.hbm.items.ModItems;
|
||||
import com.hbm.lib.Library;
|
||||
import com.hbm.tileentity.IConfigurableMachine;
|
||||
import com.hbm.tileentity.IGUIProvider;
|
||||
import com.hbm.tileentity.TileEntityMachineBase;
|
||||
import com.hbm.util.CompatEnergyControl;
|
||||
import com.hbm.util.RTGUtil;
|
||||
import com.hbm.util.fauxpointtwelve.DirPos;
|
||||
|
||||
import api.hbm.energy.IEnergyGenerator;
|
||||
@ -29,7 +25,6 @@ import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.inventory.Container;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
@ -1893,7 +1893,7 @@ item.grenade_aschrab.name=Werfbare Antischrabidiumzelle
|
||||
item.grenade_black_hole.name=Schwarzes-Loch-Granate
|
||||
item.grenade_breach.name=Durchbruchgranate
|
||||
item.grenade_burst.name=Gräbergranate
|
||||
item.grenade_cloud.name=Gefäß voll Wolke
|
||||
item.grenade_cloud.name=Gefäß voll ätzenden Dämpfen
|
||||
item.grenade_cluster.name=Cluster-Bombe
|
||||
item.grenade_electric.name=Blitzbombe
|
||||
item.grenade_fire.name=Brandsplittergranate
|
||||
@ -2022,7 +2022,7 @@ item.gun_revolver_nightmare.name=Nightmare-Revolver (Original)
|
||||
item.gun_revolver_nightmare2.name=Nightmare-Revolver (Dunkel)
|
||||
item.gun_revolver_nightmare2_ammo.name=Laserschrot
|
||||
item.gun_revolver_nightmare_ammo.name=Nightmare-Kugel
|
||||
item.gun_revolver_nopip.name=Novac
|
||||
item.gun_revolver_nopip.name=Schwerer Revolver
|
||||
item.gun_revolver_nopip_ammo.name=.44 Magnumpatrone (LEGACY)
|
||||
item.gun_revolver_pip.name=Lil' Pipsqueak
|
||||
item.gun_revolver_pip_ammo.name=Verdorbene Patrone (LEGACY)
|
||||
@ -2288,7 +2288,7 @@ item.mechanism_revolver_2.name=Fortgeschrittener Revolvermechanismus
|
||||
item.mechanism_rifle_1.name=Gewehmechanismus
|
||||
item.mechanism_rifle_2.name=Fortgeschrittener Gewehmechanismus
|
||||
item.mechanism_special.name=High-Tech Waffenmechanismus
|
||||
item.med_bag.name=Ärztetasche
|
||||
item.med_bag.name=Erste Hilfe Kit
|
||||
item.med_ipecac.name=Ipecac-Sirup
|
||||
item.med_ptsd.name=PTBS-Medikament
|
||||
item.med_schiziphrenia.name=Schizophrenie-Medikament
|
||||
@ -3565,7 +3565,7 @@ tile.barbed_wire.name=Stacheldraht
|
||||
tile.barbed_wire_acid.name=Ätzender Stacheldraht
|
||||
tile.barbed_wire_fire.name=Flammender Stacheldraht
|
||||
tile.barbed_wire_poison.name=Vergifteter Stacheldraht
|
||||
tile.barbed_wire_ultradeath.name=Wolken-Stacheldraht
|
||||
tile.barbed_wire_ultradeath.name=Strahlen-Stacheldraht
|
||||
tile.barbed_wire_wither.name=Withernder Stacheldraht
|
||||
tile.barrel_antimatter.name=Magnetischer Antimaterie-Behälter
|
||||
tile.barrel_corroded.name=Verrostetes Fass
|
||||
|
||||
@ -2618,7 +2618,7 @@ item.grenade_black_hole.name=Black Hole Grenade
|
||||
item.grenade_breach.name=Breaching Grenade
|
||||
item.grenade_burst.name=Digger Grenade
|
||||
item.grenate_cats.name=Grenade of Cats
|
||||
item.grenade_cloud.name=Jar of Cloud
|
||||
item.grenade_cloud.name=Jar of Corrosive Fumes
|
||||
item.grenade_cluster.name=Cluster Bomb
|
||||
item.grenade_electric.name=Lightning Bomb
|
||||
item.grenade_fire.name=Flame Frag Grenade
|
||||
@ -2752,7 +2752,7 @@ item.gun_revolver_nightmare.name=Nightmare Revolver (Original)
|
||||
item.gun_revolver_nightmare2.name=Nightmare Revolver (Dark)
|
||||
item.gun_revolver_nightmare2_ammo.name=Laser Buckshot
|
||||
item.gun_revolver_nightmare_ammo.name=Nightmare Bullet
|
||||
item.gun_revolver_nopip.name=Novac
|
||||
item.gun_revolver_nopip.name=Heavy Revolver
|
||||
item.gun_revolver_nopip_ammo.name=.44 Magnum Bullet (LEGACY)
|
||||
item.gun_revolver_pip.name=Lil' Pipsqueak
|
||||
item.gun_revolver_pip_ammo.name=Tainted Bullet (LEGACY)
|
||||
@ -3039,7 +3039,7 @@ item.mechanism_revolver_2.name=Advanced Revolver Mechanism
|
||||
item.mechanism_rifle_1.name=Rifle Mechanism
|
||||
item.mechanism_rifle_2.name=Advanced Rifle Mechanism
|
||||
item.mechanism_special.name=High-Tech Weapon Mechanism
|
||||
item.med_bag.name=Doctor's Bag
|
||||
item.med_bag.name=First Aid Kit
|
||||
item.med_ipecac.name=Ipecac Syrup
|
||||
item.med_ptsd.name=PTSD Medication
|
||||
item.med_schiziphrenia.name=Schizophrenia Medication
|
||||
@ -4530,7 +4530,7 @@ tile.barbed_wire.name=Barbed Wire
|
||||
tile.barbed_wire_acid.name=Caustic Barbed Wire
|
||||
tile.barbed_wire_fire.name=Flaming Barbed Wire
|
||||
tile.barbed_wire_poison.name=Poisoned Barbed Wire
|
||||
tile.barbed_wire_ultradeath.name=Cloud Barbed Wire
|
||||
tile.barbed_wire_ultradeath.name=Radioactive Barbed Wire
|
||||
tile.barbed_wire_wither.name=Withered Barbed Wire
|
||||
tile.barrel_antimatter.name=Magnetic Antimatter Container
|
||||
tile.barrel_corroded.name=Corroded Barrel
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 68 KiB After Width: | Height: | Size: 51 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 2.6 KiB |
Loading…
x
Reference in New Issue
Block a user