mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-21 20:52:42 +00:00
#1257 Add per-level absorption ratios on dark steel items
This commit is contained in:
1 parent
dc079ecbe9
commit
1f9d73a28a
7 files changed
+43
-25
No files matched your search
@@ -136,7 +136,7 @@ public final class Config {
|
||||
public static int enderIoRange = 8;
|
||||
public static boolean enderIoMeAccessEnabled = true;
|
||||
|
||||
public static double darkSteelPowerDamgeAbsorptionRatio = 0.75;
|
||||
public static double[] darkSteelPowerDamgeAbsorptionRatios = {0.5, 0.6, 0.75, 0.95};
|
||||
public static int darkSteelPowerStorageBase = 100000;
|
||||
public static int darkSteelPowerStorageLevelOne = 150000;
|
||||
public static int darkSteelPowerStorageLevelTwo = 250000;
|
||||
@@ -620,8 +620,10 @@ public final class Config {
|
||||
+ "better quality rendering but can result in frame stutters when switching to/from a wrench.")
|
||||
.getBoolean(updateLightingWhenHidingFacades);
|
||||
|
||||
darkSteelPowerDamgeAbsorptionRatio= config.get(sectionDarkSteel.name, "darkSteelPowerDamgeAbsorptionRatio", darkSteelPowerDamgeAbsorptionRatio,
|
||||
"Amount of durabilty damage absorbed when items are powered. 1=100% so items take no durablity damage when powered.").getDouble(darkSteelPowerDamgeAbsorptionRatio);
|
||||
darkSteelPowerDamgeAbsorptionRatios = config
|
||||
.get(sectionDarkSteel.name, "darkSteelPowerDamgeAbsorptionRatios", darkSteelPowerDamgeAbsorptionRatios,
|
||||
"A list of the amount of durabilty damage absorbed when items are powered. In order of upgrade level. 1=100% so items take no durablity damage when powered.")
|
||||
.getDoubleList();
|
||||
darkSteelPowerStorageBase = config.get(sectionDarkSteel.name, "darkSteelPowerStorageBase", darkSteelPowerStorageBase,
|
||||
"Base amount of power stored by dark steel items.").getInt(darkSteelPowerStorageBase);
|
||||
darkSteelPowerStorageLevelOne = config.get(sectionDarkSteel.name, "darkSteelPowerStorageLevelOne", darkSteelPowerStorageLevelOne,
|
||||
|
||||
@@ -199,7 +199,7 @@ public class EnergyUpgrade extends AbstractUpgrade {
|
||||
super.addDetailedEntries(itemstack, entityplayer, list, flag);
|
||||
int endIndex = list.size();
|
||||
int cap = capacity;
|
||||
String percDamage = (int)Math.round(Config.darkSteelPowerDamgeAbsorptionRatio * 100) + "";
|
||||
String percDamage = (int)Math.round(getAbsorptionRatio(itemstack) * 100) + "";
|
||||
String capString = PowerDisplayUtil.formatPower(cap) + " " + PowerDisplayUtil.abrevation();
|
||||
for(int i=startIndex;i<endIndex;i++) {
|
||||
String str = (String)list.get(i);
|
||||
@@ -218,11 +218,23 @@ public class EnergyUpgrade extends AbstractUpgrade {
|
||||
upgradeRoot.setInteger(KEY_MAX_OUT, maxOutRF);
|
||||
}
|
||||
|
||||
public boolean isAbsorbDamageWithPower() {
|
||||
boolean res= RANDOM.nextFloat() < Config.darkSteelPowerDamgeAbsorptionRatio;
|
||||
public boolean isAbsorbDamageWithPower(ItemStack stack) {
|
||||
boolean res= RANDOM.nextFloat() < getAbsorptionRatio(stack);
|
||||
return res;
|
||||
}
|
||||
|
||||
private double getAbsorptionRatio(ItemStack stack) {
|
||||
AbstractUpgrade upgrade = loadFromItem(stack);
|
||||
int index = 0;
|
||||
if (upgrade.unlocName.equals(EMPOWERED_TWO.unlocName)) {
|
||||
index = 1;
|
||||
} else if (upgrade.unlocName.equals(EMPOWERED_THREE.unlocName)) {
|
||||
index = 2;
|
||||
} else if (upgrade.unlocName.equals(EMPOWERED_FOUR.unlocName)) {
|
||||
index = 3;
|
||||
}
|
||||
return Config.darkSteelPowerDamgeAbsorptionRatios[index];
|
||||
}
|
||||
|
||||
public int getEnergy() {
|
||||
return energy;
|
||||
|
||||
@@ -216,7 +216,7 @@ public class ItemDarkSteelArmor extends ItemArmor implements IEnergyContainerIte
|
||||
public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) {
|
||||
|
||||
EnergyUpgrade eu = EnergyUpgrade.loadFromItem(stack);
|
||||
if(eu != null && eu.isAbsorbDamageWithPower() && eu.getEnergy() > 0) {
|
||||
if(eu != null && eu.isAbsorbDamageWithPower(stack) && eu.getEnergy() > 0) {
|
||||
eu.extractEnergy(damage * powerPerDamagePoint, false);
|
||||
|
||||
} else {
|
||||
|
||||
@@ -194,21 +194,21 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I
|
||||
return ItemDarkSteelPickaxe.doRightClickItemPlace(player, world, x, y, z, side, par8, par9, par10);
|
||||
}
|
||||
|
||||
private void applyDamage(EntityLivingBase entity, ItemStack item, int damage, boolean isMultiharvest) {
|
||||
private void applyDamage(EntityLivingBase entity, ItemStack stack, int damage, boolean isMultiharvest) {
|
||||
|
||||
EnergyUpgrade eu = EnergyUpgrade.loadFromItem(item);
|
||||
if(eu != null && eu.isAbsorbDamageWithPower() && eu.getEnergy() > 0) {
|
||||
EnergyUpgrade eu = EnergyUpgrade.loadFromItem(stack);
|
||||
if(eu != null && eu.isAbsorbDamageWithPower(stack) && eu.getEnergy() > 0) {
|
||||
int powerUse = isMultiharvest ? Config.darkSteelAxePowerUsePerDamagePointMultiHarvest : Config.darkSteelAxePowerUsePerDamagePoint;
|
||||
eu.extractEnergy(damage * powerUse, false);
|
||||
} else {
|
||||
damage = item.getItemDamage() + damage;
|
||||
damage = stack.getItemDamage() + damage;
|
||||
if(damage >= getMaxDamage()) {
|
||||
item.stackSize = 0;
|
||||
stack.stackSize = 0;
|
||||
}
|
||||
item.setItemDamage(damage);
|
||||
stack.setItemDamage(damage);
|
||||
}
|
||||
if(eu != null) {
|
||||
eu.writeToItem(item);
|
||||
eu.writeToItem(stack);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -159,21 +159,21 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine
|
||||
return true;
|
||||
}
|
||||
|
||||
private void applyDamage(EntityLivingBase entity, ItemStack item, int damage) {
|
||||
private void applyDamage(EntityLivingBase entity, ItemStack stack, int damage) {
|
||||
|
||||
EnergyUpgrade eu = EnergyUpgrade.loadFromItem(item);
|
||||
if(eu != null && eu.isAbsorbDamageWithPower() && eu.getEnergy() > 0) {
|
||||
EnergyUpgrade eu = EnergyUpgrade.loadFromItem(stack);
|
||||
if(eu != null && eu.isAbsorbDamageWithPower(stack) && eu.getEnergy() > 0) {
|
||||
eu.extractEnergy(damage * Config.darkSteelPickPowerUsePerDamagePoint, false);
|
||||
|
||||
} else {
|
||||
damage = item.getItemDamage() + damage;
|
||||
damage = stack.getItemDamage() + damage;
|
||||
if(damage >= getMaxDamage()) {
|
||||
item.stackSize = 0;
|
||||
stack.stackSize = 0;
|
||||
}
|
||||
item.setItemDamage(damage);
|
||||
stack.setItemDamage(damage);
|
||||
}
|
||||
if(eu != null) {
|
||||
eu.writeToItem(item);
|
||||
eu.writeToItem(stack);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -209,7 +209,7 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase entity, EntityLivingBase playerEntity) {
|
||||
public boolean hitEntity(ItemStack stack, EntityLivingBase entity, EntityLivingBase playerEntity) {
|
||||
|
||||
if(playerEntity instanceof EntityPlayer) {
|
||||
|
||||
@@ -217,12 +217,12 @@ public class ItemDarkSteelSword extends ItemSword implements IEnergyContainerIte
|
||||
ItemStack sword = player.getCurrentEquippedItem();
|
||||
|
||||
//Durability damage
|
||||
EnergyUpgrade eu = EnergyUpgrade.loadFromItem(par1ItemStack);
|
||||
if(eu != null && eu.isAbsorbDamageWithPower() && eu.getEnergy() > 0) {
|
||||
EnergyUpgrade eu = EnergyUpgrade.loadFromItem(stack);
|
||||
if(eu != null && eu.isAbsorbDamageWithPower(stack) && eu.getEnergy() > 0) {
|
||||
eu.extractEnergy(powerPerDamagePoint, false);
|
||||
|
||||
} else {
|
||||
super.hitEntity(par1ItemStack, entity, playerEntity);
|
||||
super.hitEntity(stack, entity, playerEntity);
|
||||
}
|
||||
|
||||
//sword hit
|
||||
|
||||
Reference in new issue
Block a user