mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-20 04:09:43 +00:00
modified power use defaults for travel anchor and armor.
This commit is contained in:
1 parent
37ddfe47f6
commit
8bedb1d424
5 files changed
+30
-25
No files matched your search
@@ -67,9 +67,9 @@ public final class Config {
|
||||
public static int travelAnchorMaxDistance = 48;
|
||||
|
||||
public static int travelStaffMaxDistance = 96;
|
||||
public static float travelStaffPowerPerBlock = 10;
|
||||
public static int travelStaffMaxStoredPower = 25000;
|
||||
public static int travelStaffMaxPowerIo = 500;
|
||||
public static float travelStaffPowerPerBlockRF = 250;
|
||||
public static int travelStaffMaxStoredPowerRF = 250000;
|
||||
public static int travelStaffMaxPowerIoRF = 1250;
|
||||
public static int travelStaffMaxBlinkDistance = 8;
|
||||
public static int travelStaffBlinkPauseTicks = 10;
|
||||
|
||||
@@ -81,7 +81,7 @@ public final class Config {
|
||||
public static int enderIoRange = 8;
|
||||
public static boolean enderIoMeAccessEnabled = true;
|
||||
|
||||
public static int darkSteelPowerStorage = 100000;
|
||||
public static int darkSteelPowerStorage = 250000;
|
||||
|
||||
public static double darkSteelLeggingWalkModifier = 0.3;
|
||||
public static double darkSteelLeggingSprintModifier = 0.5;
|
||||
@@ -89,21 +89,21 @@ public final class Config {
|
||||
|
||||
public static int darkSteelWalkPowerCost = darkSteelPowerStorage / 3000;
|
||||
public static int darkSteelSprintPowerCost = darkSteelWalkPowerCost * 4;
|
||||
public static boolean darkSteelDrainPowerFromInventory = true;
|
||||
public static int darkSteelBootsJumpPowerCost = 100;
|
||||
public static boolean darkSteelDrainPowerFromInventory = false;
|
||||
public static int darkSteelBootsJumpPowerCost = 250;
|
||||
|
||||
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
|
||||
public static float darkSteelSwordSkullChance = 0.2f;
|
||||
public static float darkSteelSwordSkullLootingModifier = 0.15f;
|
||||
public static float vanillaSwordSkullLootingModifier = 0.1f;
|
||||
public static int darkSteelSwordPowerUsePerHit = 250;
|
||||
public static int darkSteelSwordPowerUsePerHit = 750;
|
||||
public static double darkSteelSwordEnderPearlDropChance = 1;
|
||||
public static double darkSteelSwordEnderPearlDropChancePerLooting = 0.2;
|
||||
|
||||
public static int darkSteelPickPowerUseObsidian = 2500;
|
||||
public static int darkSteelPickPowerUseObsidian = 10000;
|
||||
public static int darkSteelPickEffeciencyObsidian = 50;
|
||||
public static int darkSteelPickPowerUsePerDamagePoint = 250;
|
||||
public static int darkSteelPickPowerUsePerDamagePoint = 750;
|
||||
public static float darkSteelPickEffeciencyBoostWhenPowered = 2;
|
||||
|
||||
public static int hootchPowerPerCycle = 6;
|
||||
@@ -224,14 +224,14 @@ public final class Config {
|
||||
|
||||
travelStaffMaxDistance = config.get("Settings", "travelStaffMaxDistance", travelStaffMaxDistance,
|
||||
"Maximum number of blocks that can be traveled using the Staff of the Traveling.").getInt(travelStaffMaxDistance);
|
||||
travelStaffPowerPerBlock = (float) config.get("Settings", "travelStaffPowerPerBlock", travelStaffPowerPerBlock,
|
||||
"Number of MJ required per block travelled using the Staff of the Traveling.").getDouble(travelStaffPowerPerBlock);
|
||||
travelStaffPowerPerBlockRF = (float) config.get("Settings", "travelStaffPowerPerBlockRF", travelStaffPowerPerBlockRF,
|
||||
"Number of MJ required per block travelled using the Staff of the Traveling.").getDouble(travelStaffPowerPerBlockRF);
|
||||
|
||||
travelStaffMaxStoredPower = config.get("Settings", "travelStaffMaxStoredPower", travelStaffMaxStoredPower,
|
||||
"Maximum number of MJ that can be stored using in the Staff of the Traveling.").getInt(travelStaffMaxStoredPower);
|
||||
travelStaffMaxStoredPowerRF = config.get("Settings", "travelStaffMaxStoredPowerRF", travelStaffMaxStoredPowerRF,
|
||||
"Maximum number of MJ that can be stored using in the Staff of the Traveling.").getInt(travelStaffMaxStoredPowerRF);
|
||||
|
||||
travelStaffMaxPowerIo = config.get("Settings", "travelStaffMaxPowerIo", travelStaffMaxPowerIo,
|
||||
"Maximum number of MJ that the Staff of the Traveling can be charged per tick.").getInt(travelStaffMaxPowerIo);
|
||||
travelStaffMaxPowerIoRF = config.get("Settings", "travelStaffMaxPowerIoRF", travelStaffMaxPowerIoRF,
|
||||
"Maximum number of MJ that the Staff of the Traveling can be charged per tick.").getInt(travelStaffMaxPowerIoRF);
|
||||
|
||||
travelStaffMaxBlinkDistance = config.get("Settings", "travelStaffMaxBlinkDistance", travelStaffMaxBlinkDistance,
|
||||
"Max number of blocks teleported when shift clicking the staff.").getInt(travelStaffMaxBlinkDistance);
|
||||
|
||||
@@ -51,6 +51,10 @@ public class PowerDisplayUtil {
|
||||
FLOAT_NF.setMaximumFractionDigits(1);
|
||||
}
|
||||
|
||||
public static String formatPower(PowerType type, double amount) {
|
||||
return INT_NF.format(currentPowerType.toDisplayValue(type.fromDisplayValue(amount)));
|
||||
}
|
||||
|
||||
public static String formatPower(double powerMJ) {
|
||||
return INT_NF.format(currentPowerType.toDisplayValue(powerMJ));
|
||||
}
|
||||
|
||||
@@ -20,6 +20,7 @@ import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.EnderIOTab;
|
||||
import crazypants.enderio.ModObject;
|
||||
import crazypants.enderio.machine.power.PowerDisplayUtil;
|
||||
import crazypants.enderio.machine.power.PowerDisplayUtil.PowerType;
|
||||
import crazypants.enderio.teleport.packet.PacketOpenAuthGui;
|
||||
import crazypants.util.BlockCoord;
|
||||
import crazypants.util.Util;
|
||||
@@ -43,7 +44,7 @@ public class ItemTravelStaff extends ItemEnergyContainer implements IEnergyConta
|
||||
}
|
||||
|
||||
protected ItemTravelStaff() {
|
||||
super(Config.travelStaffMaxStoredPower * 10, Config.travelStaffMaxPowerIo * 10, 0);
|
||||
super(Config.travelStaffMaxStoredPowerRF, Config.travelStaffMaxPowerIoRF, 0);
|
||||
setCreativeTab(EnderIOTab.tabEnderIO);
|
||||
setUnlocalizedName(ModObject.itemTravelStaff.name());
|
||||
setMaxDamage(16);
|
||||
@@ -119,8 +120,8 @@ public class ItemTravelStaff extends ItemEnergyContainer implements IEnergyConta
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
|
||||
super.addInformation(itemStack, par2EntityPlayer, list, par4);
|
||||
String str = PowerDisplayUtil.formatPower(getEnergyStored(itemStack)) + "/"
|
||||
+ PowerDisplayUtil.formatPower(getMaxEnergyStored(itemStack)) + " " + PowerDisplayUtil.abrevation();
|
||||
String str = PowerDisplayUtil.formatPower(PowerType.RF, getEnergyStored(itemStack)) + "/"
|
||||
+ PowerDisplayUtil.formatPower(PowerType.RF, getMaxEnergyStored(itemStack)) + " " + PowerDisplayUtil.abrevation();
|
||||
list.add(str);
|
||||
}
|
||||
|
||||
@@ -156,7 +157,7 @@ public class ItemTravelStaff extends ItemEnergyContainer implements IEnergyConta
|
||||
}
|
||||
|
||||
public void setFull(ItemStack container) {
|
||||
setEnergy(container, Config.travelStaffMaxStoredPower * 10);
|
||||
setEnergy(container, Config.travelStaffMaxStoredPowerRF);
|
||||
}
|
||||
|
||||
private void updateDamage(ItemStack stack) {
|
||||
|
||||
@@ -5,8 +5,8 @@ import crazypants.enderio.Config;
|
||||
public enum TravelSource {
|
||||
|
||||
BLOCK(0, Config.travelAnchorMaxDistance),
|
||||
STAFF(Config.travelStaffPowerPerBlock * 10, Config.travelStaffMaxDistance),
|
||||
STAFF_BLINK(Config.travelStaffPowerPerBlock * 10, Config.travelStaffMaxBlinkDistance);
|
||||
STAFF(Config.travelStaffPowerPerBlockRF, Config.travelStaffMaxDistance),
|
||||
STAFF_BLINK(Config.travelStaffPowerPerBlockRF, Config.travelStaffMaxBlinkDistance);
|
||||
|
||||
public static int getMaxDistance() {
|
||||
return STAFF.maxDistanceTravelledSq;
|
||||
|
||||
@@ -18,9 +18,9 @@ public class PacketConfigSync implements IPacketEio {
|
||||
dos.writeBoolean(Config.travelStaffBlinkThroughClearBlocksEnabled);
|
||||
dos.writeInt(Config.travelStaffBlinkPauseTicks);
|
||||
dos.writeInt(Config.travelStaffMaxDistance);
|
||||
dos.writeInt(Config.travelStaffMaxPowerIo);
|
||||
dos.writeInt(Config.travelStaffMaxPowerIoRF);
|
||||
dos.writeInt(Config.travelStaffMaxBlinkDistance);
|
||||
dos.writeFloat(Config.travelStaffPowerPerBlock);
|
||||
dos.writeFloat(Config.travelStaffPowerPerBlockRF);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -33,9 +33,9 @@ public class PacketConfigSync implements IPacketEio {
|
||||
Config.travelStaffBlinkThroughClearBlocksEnabled = data.readBoolean();
|
||||
Config.travelStaffBlinkPauseTicks = data.readInt();
|
||||
Config.travelStaffMaxDistance = data.readInt();
|
||||
Config.travelStaffMaxPowerIo = data.readInt();
|
||||
Config.travelStaffMaxPowerIoRF = data.readInt();
|
||||
Config.travelStaffMaxBlinkDistance = data.readInt();
|
||||
Config.travelStaffPowerPerBlock = data.readFloat();
|
||||
Config.travelStaffPowerPerBlockRF = data.readFloat();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user