Merge branch 'master' into healbullets-bullets

This commit is contained in:
genNAowl
2020-10-05 16:04:29 -07:00
committed by GitHub
43 changed files with 735 additions and 224 deletions

View File

@@ -266,7 +266,6 @@ public class UnitTypes implements ContentList{
//region ground support
nova = new UnitType("nova"){{
itemCapacity = 60;
canBoost = true;
boostMultiplier = 1.5f;
speed = 0.55f;
@@ -293,7 +292,6 @@ public class UnitTypes implements ContentList{
}};
pulsar = new UnitType("pulsar"){{
itemCapacity = 60;
canBoost = true;
boostMultiplier = 1.5f;
speed = 0.65f;
@@ -340,7 +338,6 @@ public class UnitTypes implements ContentList{
mineTier = 1;
hitSize = 12f;
boostMultiplier = 2f;
itemCapacity = 80;
health = 650f;
buildSpeed = 1.7f;
canBoost = true;
@@ -397,7 +394,7 @@ public class UnitTypes implements ContentList{
engineSize = 6f;
lowAltitude = true;
health = 6500f;
health = 7000f;
armor = 7f;
canBoost = true;
landShake = 4f;
@@ -445,7 +442,6 @@ public class UnitTypes implements ContentList{
corvus = new UnitType("corvus"){{
mineTier = 1;
hitSize = 29f;
itemCapacity = 80;
health = 18000f;
buildSpeed = 1.7f;
armor = 9f;
@@ -545,7 +541,6 @@ public class UnitTypes implements ContentList{
}};
atrax = new UnitType("atrax"){{
itemCapacity = 80;
speed = 0.5f;
drag = 0.4f;
hitSize = 10f;
@@ -1134,7 +1129,6 @@ public class UnitTypes implements ContentList{
health = 100;
engineSize = 1.8f;
engineOffset = 5.7f;
itemCapacity = 30;
range = 50f;
isCounted = false;
@@ -1153,7 +1147,6 @@ public class UnitTypes implements ContentList{
rotateSpeed = 15f;
accel = 0.1f;
range = 70f;
itemCapacity = 70;
health = 400;
buildSpeed = 0.5f;
engineOffset = 6.5f;