Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
Conflicts: core/src/mindustry/content/UnitTypes.java
This commit is contained in:
Anuken
@@ -1342,12 +1342,14 @@ public class Blocks implements ContentList{
|
||||
battery = new Battery("battery"){{
|
||||
requirements(Category.power, with(Items.copper, 5, Items.lead, 20));
|
||||
consumes.powerBuffered(4000f);
|
||||
baseExplosiveness = 1f;
|
||||
}};
|
||||
|
||||
batteryLarge = new Battery("battery-large"){{
|
||||
requirements(Category.power, with(Items.titanium, 20, Items.lead, 40, Items.silicon, 20));
|
||||
size = 3;
|
||||
consumes.powerBuffered(50000f);
|
||||
baseExplosiveness = 5f;
|
||||
}};
|
||||
|
||||
combustionGenerator = new BurnerGenerator("combustion-generator"){{
|
||||
@@ -2091,7 +2093,7 @@ public class Blocks implements ContentList{
|
||||
requirements(Category.units, with(Items.copper, 50, Items.lead, 120, Items.silicon, 80));
|
||||
plans = Seq.with(
|
||||
new UnitPlan(UnitTypes.dagger, 60f * 15, with(Items.silicon, 10, Items.lead, 10)),
|
||||
new UnitPlan(UnitTypes.crawler, 60f * 12, with(Items.silicon, 10, Items.coal, 20)),
|
||||
new UnitPlan(UnitTypes.crawler, 60f * 10, with(Items.silicon, 8, Items.coal, 10)),
|
||||
new UnitPlan(UnitTypes.nova, 60f * 40, with(Items.silicon, 30, Items.lead, 20, Items.titanium, 20))
|
||||
);
|
||||
size = 3;
|
||||
|
||||
@@ -158,7 +158,7 @@ public class UnitTypes implements ContentList{
|
||||
}};
|
||||
|
||||
scepter = new UnitType("scepter"){{
|
||||
speed = 0.35f;
|
||||
speed = 0.36f;
|
||||
hitSize = 22f;
|
||||
rotateSpeed = 2.1f;
|
||||
health = 9000;
|
||||
@@ -186,7 +186,7 @@ public class UnitTypes implements ContentList{
|
||||
inaccuracy = 3f;
|
||||
shotDelay = 4f;
|
||||
|
||||
bullet = new BasicBulletType(7f, 45){{
|
||||
bullet = new BasicBulletType(7f, 50){{
|
||||
width = 11f;
|
||||
height = 20f;
|
||||
lifetime = 25f;
|
||||
@@ -195,7 +195,7 @@ public class UnitTypes implements ContentList{
|
||||
lightningLength = 6;
|
||||
lightningColor = Pal.surge;
|
||||
//standard bullet damage is far too much for lightning
|
||||
lightningDamage = 19;
|
||||
lightningDamage = 20;
|
||||
}};
|
||||
}},
|
||||
|
||||
@@ -244,7 +244,7 @@ public class UnitTypes implements ContentList{
|
||||
ejectEffect = Fx.casing4;
|
||||
shootSound = Sounds.bang;
|
||||
|
||||
bullet = new BasicBulletType(13f, 65){{
|
||||
bullet = new BasicBulletType(13f, 70){{
|
||||
pierce = true;
|
||||
pierceCap = 10;
|
||||
width = 14f;
|
||||
@@ -419,7 +419,7 @@ public class UnitTypes implements ContentList{
|
||||
vela = new UnitType("vela"){{
|
||||
hitSize = 24f;
|
||||
|
||||
rotateSpeed = 1.7f;
|
||||
rotateSpeed = 1.8f;
|
||||
mechFrontSway = 1f;
|
||||
buildSpeed = 3f;
|
||||
|
||||
@@ -429,7 +429,7 @@ public class UnitTypes implements ContentList{
|
||||
drownTimeMultiplier = 4f;
|
||||
|
||||
speed = 0.44f;
|
||||
boostMultiplier = 2.2f;
|
||||
boostMultiplier = 2.4f;
|
||||
engineOffset = 12f;
|
||||
engineSize = 6f;
|
||||
lowAltitude = true;
|
||||
@@ -442,6 +442,7 @@ public class UnitTypes implements ContentList{
|
||||
immunities = ObjectSet.with(StatusEffects.burning);
|
||||
|
||||
commandLimit = 8;
|
||||
singleTarget = true;
|
||||
|
||||
weapons.add(new Weapon("vela-weapon"){{
|
||||
mirror = false;
|
||||
@@ -485,6 +486,18 @@ public class UnitTypes implements ContentList{
|
||||
shootStatus = StatusEffects.slow;
|
||||
shootStatusDuration = bullet.lifetime + firstShotDelay;
|
||||
}});
|
||||
|
||||
weapons.add(new RepairBeamWeapon("repair-beam-weapon-center-large"){{
|
||||
x = 44 / 4f;
|
||||
y = -30f / 4f;
|
||||
shootY = 6f;
|
||||
beamWidth = 0.8f;
|
||||
repairSpeed = 1.4f;
|
||||
|
||||
bullet = new BulletType(){{
|
||||
maxRange = 120f;
|
||||
}};
|
||||
}});
|
||||
}};
|
||||
|
||||
corvus = new UnitType("corvus"){{
|
||||
@@ -1059,7 +1072,7 @@ public class UnitTypes implements ContentList{
|
||||
rotateSpeed = 1.9f;
|
||||
flying = true;
|
||||
lowAltitude = true;
|
||||
health = 7000;
|
||||
health = 7200;
|
||||
armor = 9f;
|
||||
engineOffset = 21;
|
||||
engineSize = 5.3f;
|
||||
@@ -1067,13 +1080,13 @@ public class UnitTypes implements ContentList{
|
||||
targetFlags = new BlockFlag[]{BlockFlag.generator, BlockFlag.core, null};
|
||||
ammoType = new ItemAmmoType(Items.thorium);
|
||||
|
||||
BulletType missiles = new MissileBulletType(2.7f, 14){{
|
||||
BulletType missiles = new MissileBulletType(2.7f, 18){{
|
||||
width = 8f;
|
||||
height = 8f;
|
||||
shrinkY = 0f;
|
||||
drag = -0.01f;
|
||||
splashDamageRadius = 20f;
|
||||
splashDamage = 34f;
|
||||
splashDamage = 37f;
|
||||
ammoMultiplier = 4f;
|
||||
lifetime = 50f;
|
||||
hitEffect = Fx.blastExplosion;
|
||||
@@ -1128,13 +1141,13 @@ public class UnitTypes implements ContentList{
|
||||
}};
|
||||
|
||||
eclipse = new UnitType("eclipse"){{
|
||||
speed = 0.52f;
|
||||
speed = 0.54f;
|
||||
accel = 0.04f;
|
||||
drag = 0.04f;
|
||||
rotateSpeed = 1f;
|
||||
flying = true;
|
||||
lowAltitude = true;
|
||||
health = 21000;
|
||||
health = 22000;
|
||||
engineOffset = 38;
|
||||
engineSize = 7.3f;
|
||||
hitSize = 58f;
|
||||
@@ -1143,10 +1156,10 @@ public class UnitTypes implements ContentList{
|
||||
targetFlags = new BlockFlag[]{BlockFlag.reactor, BlockFlag.battery, BlockFlag.core, null};
|
||||
ammoType = new ItemAmmoType(Items.thorium);
|
||||
|
||||
BulletType fragBullet = new FlakBulletType(4f, 5){{
|
||||
BulletType fragBullet = new FlakBulletType(4f, 15){{
|
||||
shootEffect = Fx.shootBig;
|
||||
ammoMultiplier = 4f;
|
||||
splashDamage = 60f;
|
||||
splashDamage = 65f;
|
||||
splashDamageRadius = 25f;
|
||||
collidesGround = true;
|
||||
lifetime = 47f;
|
||||
@@ -1169,7 +1182,7 @@ public class UnitTypes implements ContentList{
|
||||
rotate = true;
|
||||
|
||||
bullet = new LaserBulletType(){{
|
||||
damage = 110f;
|
||||
damage = 115f;
|
||||
sideAngle = 20f;
|
||||
sideWidth = 1.5f;
|
||||
sideLength = 80f;
|
||||
@@ -1338,7 +1351,7 @@ public class UnitTypes implements ContentList{
|
||||
quad = new UnitType("quad"){{
|
||||
armor = 8f;
|
||||
health = 6000;
|
||||
speed = 1.3f;
|
||||
speed = 1.2f;
|
||||
rotateSpeed = 2f;
|
||||
accel = 0.05f;
|
||||
drag = 0.017f;
|
||||
@@ -1447,7 +1460,7 @@ public class UnitTypes implements ContentList{
|
||||
armor = 2f;
|
||||
|
||||
weapons.add(new Weapon("mount-weapon"){{
|
||||
reload = 12f;
|
||||
reload = 13f;
|
||||
x = 4f;
|
||||
shootY = 4f;
|
||||
y = 1.5f;
|
||||
@@ -1458,7 +1471,7 @@ public class UnitTypes implements ContentList{
|
||||
|
||||
weapons.add(new Weapon("missiles-mount"){{
|
||||
mirror = false;
|
||||
reload = 23f;
|
||||
reload = 25f;
|
||||
x = 0f;
|
||||
y = -5f;
|
||||
rotate = true;
|
||||
@@ -1570,15 +1583,14 @@ public class UnitTypes implements ContentList{
|
||||
ejectEffect = Fx.casing3;
|
||||
shootSound = Sounds.artillery;
|
||||
|
||||
bullet = new ArtilleryBulletType(3.2f, 12){{
|
||||
bullet = new ArtilleryBulletType(3.2f, 15){{
|
||||
trailMult = 0.8f;
|
||||
hitEffect = Fx.massiveExplosion;
|
||||
knockback = 1.5f;
|
||||
lifetime = 80f;
|
||||
lifetime = 84f;
|
||||
height = 15.5f;
|
||||
width = 15f;
|
||||
collidesTiles = false;
|
||||
ammoMultiplier = 4f;
|
||||
splashDamageRadius = 40f;
|
||||
splashDamage = 70f;
|
||||
backColor = Pal.missileYellowBack;
|
||||
|
||||
Reference in New Issue
Block a user