Less messy respawning / Standard starter mech / Bugfixes

This commit is contained in:
Anuken
2019-04-28 10:34:53 -04:00
parent ad13c83f93
commit 4c17b56e28
25 changed files with 2310 additions and 2352 deletions

View File

@@ -77,7 +77,7 @@ public class Blocks implements ContentList{
fortressFactory, repairPoint,
//upgrades
alphaDartPad, deltaPad, tauPad, omegaPad, javelinPad, tridentPad, glaivePad;
dartPad, deltaPad, tauPad, omegaPad, javelinPad, tridentPad, glaivePad;
@Override
public void load(){
@@ -1647,9 +1647,9 @@ public class Blocks implements ContentList{
//endregion
//region upgrades
alphaDartPad = new MechPad("alpha-dart-mech-pad"){{
dartPad = new MechPad("dart-mech-pad"){{
requirements(Category.upgrade, ItemStack.with(Items.lead, 200, Items.graphite, 100, Items.copper, 150));
mech = Mechs.alpha;
mech = Mechs.dart;
size = 2;
consumes.powerBuffered(50f);
}};

View File

@@ -730,7 +730,7 @@ public class Bullets implements ContentList{
explode = new BombBulletType(2f, 3f, "clear"){
{
hitEffect = Fx.pulverize;
lifetime = 23f;
lifetime = 30f;
speed = 1f;
splashDamageRadius = 50f;
splashDamage = 28f;

View File

@@ -20,8 +20,7 @@ import io.anuke.mindustry.type.Weapon;
public class Mechs implements ContentList{
public static Mech alpha, delta, tau, omega, dart, javelin, trident, glaive;
/** These are not new mechs, just re-assignments for convenience. */
public static Mech starterDesktop, starterMobile;
public static Mech starter;
@Override
public void load(){
@@ -33,7 +32,7 @@ public class Mechs implements ContentList{
mineSpeed = 1.5f;
mass = 1.2f;
speed = 0.5f;
boostSpeed = 0.85f;
boostSpeed = 0.95f;
buildPower = 1.2f;
engineColor = Color.valueOf("ffd37f");
health = 300f;
@@ -225,7 +224,7 @@ public class Mechs implements ContentList{
{
drillPower = 1;
mineSpeed = 0.9f;
speed = 0.4f;
speed = 0.45f;
drag = 0.1f;
health = 180f;
weaponOffsetX = -1;
@@ -366,7 +365,6 @@ public class Mechs implements ContentList{
}
};
starterDesktop = alpha;
starterMobile = dart;
starter = alpha;
}
}

View File

@@ -250,7 +250,7 @@ public class TechTree implements ContentList{
node(phantomFactory);
});
node(alphaDartPad, () -> {
node(dartPad, () -> {
node(deltaPad, () -> {
node(javelinPad, () -> {