diff --git a/assets/hbm/textures/items/assembly_nopip.png b/assets/hbm/textures/items/assembly_nopip.png index 63eeb3320..8345a3758 100644 Binary files a/assets/hbm/textures/items/assembly_nopip.png and b/assets/hbm/textures/items/assembly_nopip.png differ diff --git a/assets/hbm/textures/items/assembly_pip.png b/assets/hbm/textures/items/assembly_pip.png index ddebb268a..18f2e48ce 100644 Binary files a/assets/hbm/textures/items/assembly_pip.png and b/assets/hbm/textures/items/assembly_pip.png differ diff --git a/assets/hbm/textures/items/assembly_smg.png b/assets/hbm/textures/items/assembly_smg.png index 40a59dd8c..aea5e8e32 100644 Binary files a/assets/hbm/textures/items/assembly_smg.png and b/assets/hbm/textures/items/assembly_smg.png differ diff --git a/assets/hbm/textures/items/cordite.png b/assets/hbm/textures/items/cordite.png new file mode 100644 index 000000000..d7518590a Binary files /dev/null and b/assets/hbm/textures/items/cordite.png differ diff --git a/assets/hbm/textures/items/gun_bolt_action_ammo.png b/assets/hbm/textures/items/gun_bolt_action_ammo.png index 28a7dd962..02934aa44 100644 Binary files a/assets/hbm/textures/items/gun_bolt_action_ammo.png and b/assets/hbm/textures/items/gun_bolt_action_ammo.png differ diff --git a/assets/hbm/textures/items/gun_bolt_action_ammo_alt.png b/assets/hbm/textures/items/gun_bolt_action_ammo_alt.png new file mode 100644 index 000000000..28a7dd962 Binary files /dev/null and b/assets/hbm/textures/items/gun_bolt_action_ammo_alt.png differ diff --git a/assets/hbm/textures/items/gun_folly_ammo.png b/assets/hbm/textures/items/gun_folly_ammo.png deleted file mode 100644 index 47c65ad3d..000000000 Binary files a/assets/hbm/textures/items/gun_folly_ammo.png and /dev/null differ diff --git a/assets/hbm/textures/items/gun_folly_ammo_du.png b/assets/hbm/textures/items/gun_folly_ammo_du.png new file mode 100644 index 000000000..34e22d6af Binary files /dev/null and b/assets/hbm/textures/items/gun_folly_ammo_du.png differ diff --git a/assets/hbm/textures/items/gun_folly_ammo_nuclear.png b/assets/hbm/textures/items/gun_folly_ammo_nuclear.png new file mode 100644 index 000000000..6c18843d8 Binary files /dev/null and b/assets/hbm/textures/items/gun_folly_ammo_nuclear.png differ diff --git a/assets/hbm/textures/items/gun_folly_ammo_taint.png b/assets/hbm/textures/items/gun_folly_ammo_taint.png new file mode 100644 index 000000000..aa7e1cee2 Binary files /dev/null and b/assets/hbm/textures/items/gun_folly_ammo_taint.png differ diff --git a/assets/hbm/textures/items/gun_jack_ammo.png b/assets/hbm/textures/items/gun_jack_ammo.png index 58f0210de..44fdb897e 100644 Binary files a/assets/hbm/textures/items/gun_jack_ammo.png and b/assets/hbm/textures/items/gun_jack_ammo.png differ diff --git a/assets/hbm/textures/items/gun_jack_ammo_alt.png b/assets/hbm/textures/items/gun_jack_ammo_alt.png new file mode 100644 index 000000000..58f0210de Binary files /dev/null and b/assets/hbm/textures/items/gun_jack_ammo_alt.png differ diff --git a/assets/hbm/textures/items/gun_lever_action_ammo.png b/assets/hbm/textures/items/gun_lever_action_ammo.png index 56afc548b..114d8367f 100644 Binary files a/assets/hbm/textures/items/gun_lever_action_ammo.png and b/assets/hbm/textures/items/gun_lever_action_ammo.png differ diff --git a/assets/hbm/textures/items/gun_lever_action_ammo_alt.png b/assets/hbm/textures/items/gun_lever_action_ammo_alt.png new file mode 100644 index 000000000..56afc548b Binary files /dev/null and b/assets/hbm/textures/items/gun_lever_action_ammo_alt.png differ diff --git a/assets/hbm/textures/items/gun_mp40_ammo.png b/assets/hbm/textures/items/gun_mp40_ammo.png index 6c4ae2d18..593603884 100644 Binary files a/assets/hbm/textures/items/gun_mp40_ammo.png and b/assets/hbm/textures/items/gun_mp40_ammo.png differ diff --git a/assets/hbm/textures/items/gun_mp40_ammo_alt.png b/assets/hbm/textures/items/gun_mp40_ammo_alt.png new file mode 100644 index 000000000..6c4ae2d18 Binary files /dev/null and b/assets/hbm/textures/items/gun_mp40_ammo_alt.png differ diff --git a/assets/hbm/textures/items/gun_revolver_nightmare2_ammo.png b/assets/hbm/textures/items/gun_revolver_nightmare2_ammo.png index 11909366b..aeeb95c93 100644 Binary files a/assets/hbm/textures/items/gun_revolver_nightmare2_ammo.png and b/assets/hbm/textures/items/gun_revolver_nightmare2_ammo.png differ diff --git a/assets/hbm/textures/items/gun_revolver_nightmare2_ammo_alt.png b/assets/hbm/textures/items/gun_revolver_nightmare2_ammo_alt.png new file mode 100644 index 000000000..11909366b Binary files /dev/null and b/assets/hbm/textures/items/gun_revolver_nightmare2_ammo_alt.png differ diff --git a/assets/hbm/textures/items/gun_uboinik_ammo.png b/assets/hbm/textures/items/gun_uboinik_ammo.png index 085ae1ba4..5f3e67b68 100644 Binary files a/assets/hbm/textures/items/gun_uboinik_ammo.png and b/assets/hbm/textures/items/gun_uboinik_ammo.png differ diff --git a/assets/hbm/textures/items/gun_uboinik_ammo_alt.png b/assets/hbm/textures/items/gun_uboinik_ammo_alt.png new file mode 100644 index 000000000..085ae1ba4 Binary files /dev/null and b/assets/hbm/textures/items/gun_uboinik_ammo_alt.png differ diff --git a/assets/hbm/textures/items/wand.png b/assets/hbm/textures/items/wand.png index 101d7a866..d6d69b2a3 100644 Binary files a/assets/hbm/textures/items/wand.png and b/assets/hbm/textures/items/wand.png differ diff --git a/assets/hbm/textures/items/wand_alt.png b/assets/hbm/textures/items/wand_alt.png new file mode 100644 index 000000000..101d7a866 Binary files /dev/null and b/assets/hbm/textures/items/wand_alt.png differ diff --git a/assets/hbm/textures/items/wand_d.png b/assets/hbm/textures/items/wand_d.png index 3524021be..cafaaa186 100644 Binary files a/assets/hbm/textures/items/wand_d.png and b/assets/hbm/textures/items/wand_d.png differ diff --git a/assets/hbm/textures/items/wand_d_alt.png b/assets/hbm/textures/items/wand_d_alt.png new file mode 100644 index 000000000..3524021be Binary files /dev/null and b/assets/hbm/textures/items/wand_d_alt.png differ diff --git a/assets/hbm/textures/items/wand_s.png b/assets/hbm/textures/items/wand_s.png index 749e4431f..eea9b96a5 100644 Binary files a/assets/hbm/textures/items/wand_s.png and b/assets/hbm/textures/items/wand_s.png differ diff --git a/assets/hbm/textures/items/wand_s_alt.png b/assets/hbm/textures/items/wand_s_alt.png new file mode 100644 index 000000000..749e4431f Binary files /dev/null and b/assets/hbm/textures/items/wand_s_alt.png differ diff --git a/com/hbm/handler/BulletConfiguration.java b/com/hbm/handler/BulletConfiguration.java index 7637aaea2..4018dfa08 100644 --- a/com/hbm/handler/BulletConfiguration.java +++ b/com/hbm/handler/BulletConfiguration.java @@ -10,6 +10,9 @@ public class BulletConfiguration { //damage bounds public float dmgMin; public float dmgMax; + + //acceleration torwards neg Y + public double gravity; //whether the projectile should be able to bounce off of blocks public boolean doesRicochet; @@ -20,5 +23,20 @@ public class BulletConfiguration { public boolean doesPenetrate; //whether or not the bullet should break glass public boolean doesBreakGlass; + + //bullet effects + public int incendiary; + public int poison; + public int wither; + public int emp; + public int stun; + public int explosive; + public int rainbow; + public int nuke; + public boolean boxcar; + public boolean destroysBlocks; + + //appearance for rendering + public int style; } diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 4a31db0c3..6b07b7140 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -728,6 +728,7 @@ public class ModItems { public static Item powder_ice; public static Item powder_poison; public static Item powder_thermite; + public static Item cordite; public static Item pellet_gas; public static Item magnetron; public static Item pellet_buckshot; @@ -820,6 +821,9 @@ public class ModItems { public static Item gun_avenger; public static Item gun_lacunae; public static Item gun_lacunae_ammo; + public static Item gun_folly_ammo_taint; + public static Item gun_folly_ammo_nuclear; + public static Item gun_folly_ammo_du; public static Item gun_fatman; public static Item gun_proto; public static Item gun_fatman_ammo; @@ -2115,6 +2119,7 @@ public class ModItems { powder_ice = new ItemCustomLore().setUnlocalizedName("powder_ice").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_ice"); powder_poison = new ItemCustomLore().setUnlocalizedName("powder_poison").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_poison"); powder_thermite = new ItemCustomLore().setUnlocalizedName("powder_thermite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_thermite"); + cordite = new Item().setUnlocalizedName("cordite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":cordite"); pellet_gas = new ItemCustomLore().setUnlocalizedName("pellet_gas").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":pellet_gas"); magnetron = new ItemCustomLore().setUnlocalizedName("magnetron").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":magnetron_alt"); pellet_buckshot = new Item().setUnlocalizedName("pellet_buckshot").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":pellets_lead"); @@ -2200,6 +2205,9 @@ public class ModItems { gun_minigun = new GunLacunae().setUnlocalizedName("gun_minigun").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_minigun"); gun_avenger = new GunLacunae().setUnlocalizedName("gun_avenger").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_avenger"); gun_lacunae = new GunLacunae().setUnlocalizedName("gun_lacunae").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_lacunae"); + gun_folly_ammo_taint = new ItemCustomLore().setUnlocalizedName("gun_folly_ammo_taint").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_folly_ammo_taint"); + gun_folly_ammo_nuclear = new ItemCustomLore().setUnlocalizedName("gun_folly_ammo_nuclear").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_folly_ammo_nuclear"); + gun_folly_ammo_du = new ItemCustomLore().setUnlocalizedName("gun_folly_ammo_du").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_folly_ammo_du"); gun_fatman_ammo = new Item().setUnlocalizedName("gun_fatman_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_fatman_ammo"); gun_fatman = new GunFatman().setMaxDamage(2500).setUnlocalizedName("gun_fatman").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_fatman"); gun_proto = new GunProtoMirv().setMaxDamage(2500).setUnlocalizedName("gun_proto").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_fatman"); @@ -3009,6 +3017,7 @@ public class ModItems { GameRegistry.registerItem(powder_poison, powder_poison.getUnlocalizedName()); GameRegistry.registerItem(powder_thermite, powder_thermite.getUnlocalizedName()); GameRegistry.registerItem(powder_power, powder_power.getUnlocalizedName()); + GameRegistry.registerItem(cordite, cordite.getUnlocalizedName()); //Fragments GameRegistry.registerItem(fragment_neodymium, fragment_neodymium.getUnlocalizedName()); @@ -3807,6 +3816,9 @@ public class ModItems { GameRegistry.registerItem(gun_revolver_nopip_ammo, gun_revolver_nopip_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_calamity_ammo, gun_calamity_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_lacunae_ammo, gun_lacunae_ammo.getUnlocalizedName()); + GameRegistry.registerItem(gun_folly_ammo_taint, gun_folly_ammo_taint.getUnlocalizedName()); + GameRegistry.registerItem(gun_folly_ammo_nuclear, gun_folly_ammo_nuclear.getUnlocalizedName()); + GameRegistry.registerItem(gun_folly_ammo_du, gun_folly_ammo_du.getUnlocalizedName()); GameRegistry.registerItem(gun_b92_ammo, gun_b92_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_rpg_ammo, gun_rpg_ammo.getUnlocalizedName()); GameRegistry.registerItem(gun_stinger_ammo, gun_stinger_ammo.getUnlocalizedName()); diff --git a/com/hbm/packet/AuxButtonPacket.java b/com/hbm/packet/AuxButtonPacket.java index d722ee67d..41358b54d 100644 --- a/com/hbm/packet/AuxButtonPacket.java +++ b/com/hbm/packet/AuxButtonPacket.java @@ -182,29 +182,29 @@ public class AuxButtonPacket implements IMessage { } } } + } + + if (te instanceof TileEntityMachineReactorLarge) { + TileEntityMachineReactorLarge reactor = (TileEntityMachineReactorLarge)te; - if (te instanceof TileEntityMachineReactorLarge) { - TileEntityMachineReactorLarge reactor = (TileEntityMachineReactorLarge)te; + if(m.id == 0) + reactor.rods = m.value; + + if(m.id == 1) { + FluidType type = FluidType.STEAM; + int fill = reactor.tanks[2].getFill(); - if(m.id == 0) - reactor.rods = m.value; - - if(m.id == 1) { - FluidType type = FluidType.STEAM; - int fill = reactor.tanks[2].getFill(); - - switch(m.value) { - case 0: type = FluidType.HOTSTEAM; fill = (int)Math.floor(fill / 10D); break; - case 1: type = FluidType.SUPERHOTSTEAM; fill = (int)Math.floor(fill / 10D); break; - case 2: type = FluidType.STEAM; fill = (int)Math.floor(fill * 100); break; - } - - if(fill > reactor.tanks[2].getMaxFill()) - fill = reactor.tanks[2].getMaxFill(); - - reactor.tanks[2].setTankType(type); - reactor.tanks[2].setFill(fill); + switch(m.value) { + case 0: type = FluidType.HOTSTEAM; fill = (int)Math.floor(fill / 10D); break; + case 1: type = FluidType.SUPERHOTSTEAM; fill = (int)Math.floor(fill / 10D); break; + case 2: type = FluidType.STEAM; fill = (int)Math.floor(fill * 100); break; } + + if(fill > reactor.tanks[2].getMaxFill()) + fill = reactor.tanks[2].getMaxFill(); + + reactor.tanks[2].setTankType(type); + reactor.tanks[2].setFill(fill); } }