mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-22 04:28:27 +07:00
Code Issues Packages Projects Releases Wiki Activity

Wave unit pads

Browse Source
This commit is contained in:
Anuken 2018-09-12 10:28:45 -04:00
parent 2ee87ad078
commit 2ae65acc28
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/io/anuke/mindustry/content/Recipes.java
View File

@ -156,14 +156,14 @@ public class Recipes implements ContentList{
new Recipe(units, UnitBlocks.dronePad, new ItemStack(Items.copper, 70), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 130)); new Recipe(units, UnitBlocks.dronePad, new ItemStack(Items.copper, 70), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 130));
new Recipe(units, UnitBlocks.fabricatorPad, new ItemStack(Items.densealloy, 90), new ItemStack(Items.thorium, 80), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 210)); new Recipe(units, UnitBlocks.fabricatorPad, new ItemStack(Items.densealloy, 90), new ItemStack(Items.thorium, 80), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 210));
new Recipe(units, UnitBlocks.daggerPad, new ItemStack(Items.lead, 90), new ItemStack(Items.silicon, 70)).setPad(); new Recipe(units, UnitBlocks.daggerPad, new ItemStack(Items.lead, 90), new ItemStack(Items.silicon, 70));
new Recipe(units, UnitBlocks.titanPad, new ItemStack(Items.thorium, 90), new ItemStack(Items.lead, 140), new ItemStack(Items.silicon, 90)).setPad(); new Recipe(units, UnitBlocks.titanPad, new ItemStack(Items.thorium, 90), new ItemStack(Items.lead, 140), new ItemStack(Items.silicon, 90));
new Recipe(units, UnitBlocks.interceptorPad, new ItemStack(Items.titanium, 60), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 90)).setPad(); new Recipe(units, UnitBlocks.interceptorPad, new ItemStack(Items.titanium, 60), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 90));
new Recipe(units, UnitBlocks.monsoonPad, new ItemStack(Items.plastanium, 80), new ItemStack(Items.titanium, 100), new ItemStack(Items.lead, 130), new ItemStack(Items.silicon, 220)).setPad(); new Recipe(units, UnitBlocks.monsoonPad, new ItemStack(Items.plastanium, 80), new ItemStack(Items.titanium, 100), new ItemStack(Items.lead, 130), new ItemStack(Items.silicon, 220));
new Recipe(units, UnitBlocks.repairPoint, new ItemStack(Items.lead, 30), new ItemStack(Items.copper, 30), new ItemStack(Items.silicon, 30)); new Recipe(units, UnitBlocks.repairPoint, new ItemStack(Items.lead, 30), new ItemStack(Items.copper, 30), new ItemStack(Items.silicon, 30));
new Recipe(units, UnitBlocks.commandCenter, new ItemStack(Items.lead, 100), new ItemStack(Items.densealloy, 100), new ItemStack(Items.silicon, 200)).setPad(); new Recipe(units, UnitBlocks.commandCenter, new ItemStack(Items.lead, 100), new ItemStack(Items.densealloy, 100), new ItemStack(Items.silicon, 200));
//LIQUIDS //LIQUIDS
new Recipe(liquid, LiquidBlocks.conduit, new ItemStack(Items.lead, 1)).setDependencies(CraftingBlocks.smelter); new Recipe(liquid, LiquidBlocks.conduit, new ItemStack(Items.lead, 1)).setDependencies(CraftingBlocks.smelter);

10
core/src/io/anuke/mindustry/entities/units/FlyingUnit.java
View File

@ -80,6 +80,11 @@ public abstract class FlyingUnit extends BaseUnit implements CarryTrait{
} }
} }
}, },
patrol = new UnitState(){
public void update(){
//TODO
}
},
retreat = new UnitState(){ retreat = new UnitState(){
public void entered(){ public void entered(){
target = null; target = null;
@ -107,8 +112,9 @@ public abstract class FlyingUnit extends BaseUnit implements CarryTrait{
@Override @Override
public void onCommand(UnitCommand command){ public void onCommand(UnitCommand command){
state.set(command == UnitCommand.retreat ? retreat : state.set(command == UnitCommand.retreat ? retreat :
(command == UnitCommand.attack ? attack : (command == UnitCommand.attack ? attack :
(null))); (command == UnitCommand.patrol ? patrol :
(null))));
} }
@Override @Override

8
core/src/io/anuke/mindustry/entities/units/GroundUnit.java
View File

@ -76,6 +76,11 @@ public abstract class GroundUnit extends BaseUnit{
} }
} }
}, },
patrol = new UnitState(){
public void update(){
//TODO
}
},
retreat = new UnitState(){ retreat = new UnitState(){
public void entered(){ public void entered(){
target = null; target = null;
@ -94,7 +99,8 @@ public abstract class GroundUnit extends BaseUnit{
public void onCommand(UnitCommand command){ public void onCommand(UnitCommand command){
state.set(command == UnitCommand.retreat ? retreat : state.set(command == UnitCommand.retreat ? retreat :
(command == UnitCommand.attack ? attack : (command == UnitCommand.attack ? attack :
(null))); (command == UnitCommand.patrol ? patrol :
(null))));
} }
@Override @Override