From 7f7cbf343e72ecbd3d52d7bf063c577bfc96f2d0 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sat, 28 Jun 2014 22:44:00 +0800 Subject: [PATCH] Fall damage now negated when dark steel boots are powered. --- resources/assets/enderio/lang/en_US.lang | 3 ++ src/main/java/crazypants/enderio/Config.java | 7 ++- .../item/darksteel/DarkSteelController.java | 50 ++++++++++++------- .../item/darksteel/ItemDarkSteelArmor.java | 4 ++ 4 files changed, 45 insertions(+), 19 deletions(-) diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 63062bf9..bd0df49d 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -329,6 +329,9 @@ enderio.item.darkSteel_sword.tooltip.line3=+1 Damage when Powered enderio.item.darkSteel_armor.tooltip.line1=Diamond level protection enderio.item.darkSteel_armor.tooltip.line2=when powered +enderio.item.darkSteel_boots.tooltip.line1=Fall damage negated +enderio.item.darkSteel_boots.tooltip.line2=when powered + enderio.darksteel.upgrade.empowered_one.name=Empowered enderio.darksteel.upgrade.empowered_one.tooltip.detailed.line1=Power: $P enderio.darksteel.upgrade.empowered_one.tooltip.detailed.line2=Half durability damage absorbed diff --git a/src/main/java/crazypants/enderio/Config.java b/src/main/java/crazypants/enderio/Config.java index 198ac0e6..0858c213 100644 --- a/src/main/java/crazypants/enderio/Config.java +++ b/src/main/java/crazypants/enderio/Config.java @@ -91,6 +91,7 @@ public final class Config { public static int darkSteelSprintPowerCost = darkSteelWalkPowerCost * 4; public static boolean darkSteelDrainPowerFromInventory = false; public static int darkSteelBootsJumpPowerCost = 250; + public static int darkSteelFallDistanceCost = 100; public static float darkSteelSwordWitherSkullChance = 0.05f; public static float darkSteelSwordWitherSkullLootingModifier = 0.167f / 3f; //at looting 3, have a 1 in 6 chance of getting a skull @@ -167,7 +168,8 @@ public final class Config { public static int poweredSpawnerMaxPlayerDistance = 0; public static boolean poweredSpawnerUseVanillaSpawChecks = false; public static double brokenSpawnerDropChance = 1; - public static int powerSpawnerAddSpawnerCost = 30; + public static int powerSpawnerAddSpawnerCost = 30; + public static void load(FMLPreInitializationEvent event) { @@ -374,6 +376,9 @@ public final class Config { darkSteelBootsJumpPowerCost = config.get("Dark Steel", "darkSteelBootsJumpPowerCost", darkSteelBootsJumpPowerCost, "Base amount of power used per jump (RF) dark steel boots. The second jump in a 'double jump' uses 2x this etc").getInt(darkSteelBootsJumpPowerCost); + darkSteelFallDistanceCost = config.get("Dark Steel", "darkSteelFallDistanceCost", darkSteelFallDistanceCost, + "Amount of power used (RF) per block height of fall distance damage negated.").getInt(darkSteelFallDistanceCost); + darkSteelGliderCost = config.get("Dark Steel", "darkSteelGliderCost", darkSteelGliderCost, "Number of levels required for the 'Glider' upgrade.").getInt(darkSteelGliderCost); darkSteelGliderHorizontalSpeed = config.get("Dark Steel", "darkSteelGliderHorizontalSpeed", darkSteelGliderHorizontalSpeed, diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java index a33fdd53..c9516dfe 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java @@ -49,11 +49,11 @@ public class DarkSteelController { private int jumpCount; private int ticksSinceLastJump; //private boolean isGlideActive = false; - private Map glideActiveMap = new HashMap(); + private Map glideActiveMap = new HashMap(); private DarkSteelController() { PacketHandler.INSTANCE.registerMessage(PacketDarkSteelPowerPacket.class, PacketDarkSteelPowerPacket.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketGlideState.class, PacketGlideState.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage(PacketGlideState.class, PacketGlideState.class, PacketHandler.nextID(), Side.SERVER); } public void setGlideActive(EntityPlayer player, boolean isGlideActive) { @@ -61,7 +61,7 @@ public class DarkSteelController { glideActiveMap.put(player.getGameProfile().getName(), isGlideActive); } } - + public boolean isGlideActive(EntityPlayer player) { Boolean isActive = glideActiveMap.get(player.getGameProfile().getName()); if(isActive == null) { @@ -76,7 +76,7 @@ public class DarkSteelController { //TODO: I am doing this at Phase.START and Phase.END //boots step height - updateStepHeight(player); + updateStepHeightAndFallDistance(player); //leggings updateSpeed(player); @@ -84,7 +84,7 @@ public class DarkSteelController { //sword updateSword(player); - if(event.phase == Phase.END) { + if(event.phase == Phase.END) { updateGlide(player); } @@ -94,14 +94,14 @@ public class DarkSteelController { if(!isGlideActive(player) || !isGliderUpgradeEquipped(player)) { return; } - + if(!player.onGround && player.motionY < 0 && !player.isSneaking()) { - + double horizontalSpeed = Config.darkSteelGliderHorizontalSpeed; - double verticalSpeed = Config.darkSteelGliderVerticalSpeed; + double verticalSpeed = Config.darkSteelGliderVerticalSpeed; if(player.isSprinting()) { - verticalSpeed = Config.darkSteelGliderVerticalSpeedSprinting; - } + verticalSpeed = Config.darkSteelGliderVerticalSpeedSprinting; + } Vector3d look = Util.getLookVecEio(player); Vector3d side = new Vector3d(); @@ -115,12 +115,12 @@ public class DarkSteelController { VecmathUtil.computePlaneEquation(playerPos, b, c, plane); double dist = Math.abs(VecmathUtil.distanceFromPointToPlane(plane, new Vector3d(player.posX, player.posY, player.posZ))); double minDist = 0.15; - if(dist < minDist) { - double dropRate = (minDist * 10) - (dist * 10); - verticalSpeed = verticalSpeed + (verticalSpeed * dropRate * 8); - horizontalSpeed -= (0.02 * dropRate); + if(dist < minDist) { + double dropRate = (minDist * 10) - (dist * 10); + verticalSpeed = verticalSpeed + (verticalSpeed * dropRate * 8); + horizontalSpeed -= (0.02 * dropRate); } - + double x = Math.cos(Math.toRadians(player.rotationYawHead + 90)) * horizontalSpeed; double z = Math.sin(Math.toRadians(player.rotationYawHead + 90)) @@ -144,7 +144,7 @@ public class DarkSteelController { } return true; } - + private void updateSword(EntityPlayer player) { if(ItemDarkSteelSword.isEquipped(player)) { IAttributeInstance attackInst = player.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.attackDamage); @@ -183,8 +183,21 @@ public class DarkSteelController { } } - private void updateStepHeight(EntityPlayer player) { + private void updateStepHeightAndFallDistance(EntityPlayer player) { ItemStack boots = player.getEquipmentInSlot(1); + + if(boots != null && boots.getItem() == EnderIO.itemDarkSteelBoots) { + int costedDistance = (int) player.fallDistance; + if(costedDistance > 0) { + int energyCost = costedDistance * Config.darkSteelFallDistanceCost; + int totalEnergy = getPlayerEnergy(player, EnderIO.itemDarkSteelBoots); + if(totalEnergy > 0 && totalEnergy >= energyCost) { + usePlayerEnergy(player, EnderIO.itemDarkSteelBoots, energyCost); + player.fallDistance -= costedDistance; + } + } + } + JumpUpgrade jumpUpgrade = JumpUpgrade.loadFromItem(boots); if(jumpUpgrade != null && boots != null && boots.getItem() == EnderIO.itemDarkSteelBoots) { player.stepHeight = 1.0023F; @@ -214,6 +227,7 @@ public class DarkSteelController { ItemStack stack = player.inventory.armorInventory[3 - armor.armorType]; if(stack != null) { armor.extractEnergy(stack, remaining, false); + player.inventory.markDirty(); } } } @@ -255,7 +269,7 @@ public class DarkSteelController { if(!wasJumping) { jumpCount = 0; } - ticksSinceLastJump++; + ticksSinceLastJump++; } } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java index feab0009..721460c8 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java @@ -149,6 +149,10 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte if(EnergyUpgrade.itemHasAnyPowerUpgrade(itemstack)) { list.add(EnumChatFormatting.WHITE + Lang.localize("item.darkSteel_armor.tooltip.line1")); list.add(EnumChatFormatting.WHITE + Lang.localize("item.darkSteel_armor.tooltip.line2")); + if(itemstack.getItem() == EnderIO.itemDarkSteelBoots) { + list.add(EnumChatFormatting.WHITE + Lang.localize("item.darkSteel_boots.tooltip.line1")); + list.add(EnumChatFormatting.WHITE + Lang.localize("item.darkSteel_boots.tooltip.line2")); + } } DarkSteelRecipeManager.instance.addAdvancedTooltipEntries(itemstack, entityplayer, list, flag); }