Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented flying for desktop, new ship bodies

Browse Source
This commit is contained in:
Anuken
2018-06-19 15:38:09 -04:00
parent 23f3f68767
commit 3c3147d665
13 changed files with 157 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/src/io/anuke/mindustry/content/Mechs.java
View File

@@ -7,7 +7,7 @@ import io.anuke.mindustry.type.Mech;
import io.anuke.mindustry.type.Upgrade;
public class Mechs implements ContentList {
public static Mech alpha, delta, tau, omega, standardShip;
public static Mech alpha, delta, tau, omega, dart, trident, javelin, halberd;
/**These are not new mechs, just re-assignments for convenience.*/
public static Mech starterDesktop, starterMobile;
@@ -39,14 +39,36 @@ public class Mechs implements ContentList {
maxSpeed = 1.0f;
}};
standardShip = new Mech("standard-ship", true){{
dart = new Mech("dart-ship", true){{
drillPower = -1;
speed = 0.4f;
maxSpeed = 3f;
drag = 0.1f;
}};
trident = new Mech("trident-ship", true){{
drillPower = 1;
speed = 0.4f;
maxSpeed = 3f;
drag = 0.1f;
}};
javelin = new Mech("javelin-ship", true){{
drillPower = -1;
speed = 0.4f;
maxSpeed = 3f;
drag = 0.1f;
}};
halberd = new Mech("halberd-ship", true){{
drillPower = 2;
speed = 0.4f;
maxSpeed = 3f;
drag = 0.1f;
}};
starterDesktop = alpha;
starterMobile = standardShip;
starterMobile = dart;
}
@Override

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

@@ -131,6 +131,10 @@ public class Recipes implements ContentList{
new Recipe(units, UpgradeBlocks.deltaFactory, new ItemStack(Items.iron, 1));
new Recipe(units, UpgradeBlocks.tauFactory, new ItemStack(Items.iron, 1));
new Recipe(units, UpgradeBlocks.tridentFactory, new ItemStack(Items.iron, 1));
new Recipe(units, UpgradeBlocks.javelinFactory, new ItemStack(Items.iron, 1));
new Recipe(units, UpgradeBlocks.halberdFactory, new ItemStack(Items.iron, 1));
new Recipe(units, DebugBlocks.itemSource, new ItemStack(Items.steel, 10)).setDebug();
new Recipe(units, DebugBlocks.itemVoid, new ItemStack(Items.steel, 10)).setDebug();
new Recipe(units, DebugBlocks.liquidSource, new ItemStack(Items.steel, 10)).setDebug();

17
core/src/io/anuke/mindustry/content/blocks/UpgradeBlocks.java
View File

@@ -5,7 +5,7 @@ import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.blocks.production.MechFactory;
public class UpgradeBlocks extends BlockList {
public static Block deltaFactory, tauFactory, omegaFactory;
public static Block deltaFactory, tauFactory, omegaFactory, tridentFactory, javelinFactory, halberdFactory;
@Override
public void load() {
@@ -23,5 +23,20 @@ public class UpgradeBlocks extends BlockList {
mech = Mechs.omega;
size = 3;
}};
tridentFactory = new MechFactory("trident-ship-factory"){{
mech = Mechs.trident;
size = 2;
}};
javelinFactory = new MechFactory("javelin-ship-factory"){{
mech = Mechs.javelin;
size = 2;
}};
halberdFactory = new MechFactory("halberd-ship-factory"){{
mech = Mechs.halberd;
size = 3;
}};
}
}