simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-04-19 18:46:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #106 from meet-mrmaker/master

Browse Source 
Removed gather_slow. Fixes #10
This commit is contained in:
Simon Fortier 2018-01-04 17:17:10 -05:00 committed by GitHub
commit 811a443a4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotDrill.java
View File

@ -18,8 +18,7 @@ public class CubotDrill extends CpuHardware {
public static final int DEFAULT_ADDRESS = 5;
private static final int DRILL_POLL = 1;
private static final int DRILL_GATHER_SLOW = 2;
private static final int DRILL_GATHER_FAST = 3;
private static final int DRILL_GATHER = 2; // simplified gather
private Cubot cubot;
@ -40,7 +39,7 @@ public class CubotDrill extends CpuHardware {
getCpu().getRegisterSet().getRegister("B").setValue(0);
} else if (a == DRILL_GATHER_SLOW || a == DRILL_GATHER_FAST) {
} else if (a == DRILL_GATHER) {
if (cubot.spendEnergy(1400)) {
if (cubot.getCurrentAction() == Action.IDLE) {