Skip to content

Commit

Permalink
Atomic Disassembler config (#5573)
Browse files Browse the repository at this point in the history
* Initial work making ItemAtomicDisassembler more readable

* Continue cleaning atomic disassembler code

* Add config values for the Atomic Disassembler. Better behaviour now when it comes to attacking at low power

* Inline method

* lower camel case the config fields

* simplify mode incrementing

* add max storage config for AD

* Fix scaling past max energy
  • Loading branch information
pupnewfster committed Jul 20, 2019
1 parent c5fbabe commit 9e26fea
Show file tree
Hide file tree
Showing 2 changed files with 170 additions and 145 deletions.
16 changes: 15 additions & 1 deletion src/main/java/mekanism/common/config/GeneralConfig.java
Expand Up @@ -106,9 +106,23 @@ public class GeneralConfig extends BaseConfig {
public final DoubleOption ENERGY_PER_REDSTONE = new DoubleOption(this, "general", "EnergyPerRedstone", 10000D,
"How much energy (Joules) a piece of redstone gives in machines.");

public final IntOption DISASSEMBLER_USAGE = new IntOption(this, "general", "DisassemblerEnergyUsage", 10,
public final IntOption disassemblerEnergyUsage = new IntOption(this, "general", "DisassemblerEnergyUsage", 10,
"Base Energy (Joules) usage of the Atomic Disassembler. (Gets multiplied by speed factor)");

public final IntOption disassemblerEnergyUsageHoe = new IntOption(this, "general", "DisassemblerEnergyUsageHoe", 10,
"Cost in Joules of using the Atomic Disassembler as a hoe.");

public final IntOption disassemblerEnergyUsageWeapon = new IntOption(this, "general", "DisassemblerEnergyUsageWeapon", 2000,
"Cost in Joules of using the Atomic Disassembler as a weapon.");

public final IntOption disassemblerDamageMin = new IntOption(this, "general", "DisassemblerDamageMin", 4,
"The amount of damage the Atomic Disassembler does when it is out of power. (Value is in number of half hearts)");

public final IntOption disassemblerDamageMax = new IntOption(this, "general", "DisassemblerDamageMax", 20,
"The amount of damage the Atomic Disassembler does when it has at least DisassemblerEnergyUsageWeapon power stored. (Value is in number of half hearts)");

public final DoubleOption disassemblerBatteryCapacity = new DoubleOption(this, "general", "DisassemblerBatteryCapacity", 1000000, "Maximum amount (joules) of energy the Atomic Disassembler can contain", 0, Double.MAX_VALUE).setRequiresGameRestart(true);

public final IntOption VOICE_PORT = new IntOption(this, "general", "VoicePort", 36123,
"TCP port for the Voice server to listen on.", 1, 65535);

Expand Down

0 comments on commit 9e26fea

Please sign in to comment.