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

More branch merging

Browse Source
This commit is contained in:
Anuken
2021-10-14 20:58:03 -04:00
parent ad1c75d050
commit 6b59c1cd83
108 changed files with 1018 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/src/mindustry/content/Blocks.java
View File

@@ -35,7 +35,7 @@ public class Blocks implements ContentList{
public static Block
//environment
air, spawn, cliff, deepwater, water, taintedWater, deepTaintedWater, tar, slag, cryofluid, stone, craters, charr, sand, darksand, dirt, mud, ice, snow, darksandTaintedWater, space,
air, spawn, cliff, deepwater, water, taintedWater, deepTaintedWater, tar, slag, cryofluid, stone, craters, charr, sand, darksand, dirt, mud, ice, snow, darksandTaintedWater, space, empty,
dacite,
stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster,
iceSnow, sandWater, darksandWater, duneWall, sandWall, moss, sporeMoss, shale, shaleWall, shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, grass, salt,
@@ -435,18 +435,6 @@ public class Blocks implements ContentList{
basalt.asFloor().decoration = hotrock.asFloor().decoration = darksand.asFloor().decoration = magmarock.asFloor().decoration = this;
}};
moss = new Floor("moss"){{
variants = 3;
attributes.set(Attribute.spores, 0.15f);
wall = sporePine;
}};
sporeMoss = new Floor("spore-moss"){{
variants = 3;
attributes.set(Attribute.spores, 0.3f);
wall = sporeWall;
}};
metalFloor = new Floor("metal-floor", 0);
metalFloorDamaged = new Floor("metal-floor-damaged", 3);
@@ -2105,14 +2093,15 @@ public class Blocks implements ContentList{
}};
constructor = new Constructor("constructor"){{
requirements(Category.units, with(Items.thorium, 100));
requirements(Category.units, with(Items.silicon, 50, Items.thorium, 70, Items.graphite, 50));
hasPower = true;
consumes.power(2f);
size = 3;
}};
//yes this block is pretty much useless
largeConstructor = new Constructor("large-constructor"){{
requirements(Category.units, with(Items.thorium, 100));
requirements(Category.units, with(Items.silicon, 100, Items.thorium, 150, Items.graphite, 50, Items.phaseFabric, 40));
hasPower = true;
consumes.power(2f);
maxBlockSize = 4;
@@ -2121,20 +2110,20 @@ public class Blocks implements ContentList{
}};
payloadLoader = new PayloadLoader("payload-loader"){{
requirements(Category.units, with(Items.thorium, 100));
requirements(Category.units, with(Items.graphite, 50, Items.silicon, 50, Items.copper, 100));
hasPower = true;
consumes.power(2f);
size = 3;
}};
payloadUnloader = new PayloadUnloader("payload-unloader"){{
requirements(Category.units, with(Items.thorium, 100));
requirements(Category.units, with(Items.graphite, 50, Items.silicon, 50, Items.copper, 100));
hasPower = true;
consumes.power(2f);
size = 3;
}};
//TODO deprecated
//deprecated, will be removed.
blockForge = constructor;
blockLoader = payloadLoader;
blockUnloader = payloadUnloader;

8
core/src/mindustry/content/Planets.java
View File

@@ -14,7 +14,7 @@ public class Planets implements ContentList{
@Override
public void load(){
sun = new Planet("sun", null, 0, 2){{
sun = new Planet("sun", null, 4){{
bloom = true;
accessible = false;
@@ -31,9 +31,13 @@ public class Planets implements ContentList{
);
}};
serpulo = new Planet("serpulo", sun, 3, 1){{
serpulo = new Planet("serpulo", sun, 1, 3){{
generator = new SerpuloPlanetGenerator();
meshLoader = () -> new HexMesh(this, 6);
cloudMeshLoader = () -> new MultiMesh(
new HexSkyMesh(this, 11, 0.15f, 0.13f, 5, new Color().set(Pal.spore).mul(0.9f).a(0.75f), 2, 0.45f, 0.9f, 0.38f),
new HexSkyMesh(this, 1, 0.6f, 0.16f, 5, Color.white.cpy().lerp(Pal.spore, 0.55f).a(0.75f), 2, 0.45f, 1f, 0.41f)
);
atmosphereColor = Color.valueOf("3c1b8f");
atmosphereRadIn = 0.02f;
atmosphereRadOut = 0.3f;

35
core/src/mindustry/content/UnitTypes.java
View File

@@ -157,13 +157,13 @@ public class UnitTypes implements ContentList{
rotateSpeed = 2.1f;
health = 9000;
armor = 10f;
canDrown = false;
mechFrontSway = 1f;
ammoType = new ItemAmmoType(Items.thorium);
mechStepParticles = true;
mechStepShake = 0.15f;
singleTarget = true;
drownTimeMultiplier = 4f;
weapons.add(
new Weapon("scepter-weapon"){{
@@ -221,7 +221,7 @@ public class UnitTypes implements ContentList{
armor = 14f;
mechStepParticles = true;
mechStepShake = 0.75f;
canDrown = false;
drownTimeMultiplier = 6f;
mechFrontSway = 1.9f;
mechSideSway = 0.6f;
ammoType = new ItemAmmoType(Items.thorium);
@@ -414,13 +414,13 @@ public class UnitTypes implements ContentList{
hitSize = 24f;
rotateSpeed = 1.8f;
canDrown = false;
mechFrontSway = 1f;
buildSpeed = 3f;
mechStepParticles = true;
mechStepShake = 0.15f;
ammoType = new PowerAmmoType(2500);
drownTimeMultiplier = 4f;
speed = 0.44f;
boostMultiplier = 2.4f;
@@ -501,6 +501,7 @@ public class UnitTypes implements ContentList{
armor = 9f;
landShake = 1.5f;
rotateSpeed = 1.5f;
drownTimeMultiplier = 6f;
commandLimit = 8;
@@ -511,7 +512,6 @@ public class UnitTypes implements ContentList{
legTrns = 0.58f;
hovering = true;
visualElevation = 0.2f;
allowLegStep = true;
ammoType = new PowerAmmoType(4000);
groundLayer = Layer.legUnit;
@@ -602,7 +602,7 @@ public class UnitTypes implements ContentList{
}};
atrax = new UnitType("atrax"){{
speed = 0.54f;
speed = 0.57f;
drag = 0.4f;
hitSize = 13f;
rotateSpeed = 3f;
@@ -618,7 +618,6 @@ public class UnitTypes implements ContentList{
armor = 3f;
ammoType = new ItemAmmoType(Items.coal);
allowLegStep = true;
visualElevation = 0.2f;
groundLayer = Layer.legUnit - 1f;
@@ -632,8 +631,8 @@ public class UnitTypes implements ContentList{
shootSound = Sounds.flame;
bullet = new LiquidBulletType(Liquids.slag){{
damage = 11;
speed = 2.4f;
damage = 13;
speed = 2.5f;
drag = 0.009f;
shootEffect = Fx.shootSmall;
lifetime = 57f;
@@ -643,11 +642,11 @@ public class UnitTypes implements ContentList{
}};
spiroct = new UnitType("spiroct"){{
speed = 0.48f;
speed = 0.52f;
drag = 0.4f;
hitSize = 15f;
rotateSpeed = 3f;
health = 910;
health = 940;
immunities = ObjectSet.with(StatusEffects.burning, StatusEffects.melting);
legCount = 6;
legLength = 13f;
@@ -660,7 +659,6 @@ public class UnitTypes implements ContentList{
buildSpeed = 0.75f;
allowLegStep = true;
visualElevation = 0.3f;
groundLayer = Layer.legUnit;
@@ -678,7 +676,7 @@ public class UnitTypes implements ContentList{
bullet = new SapBulletType(){{
sapStrength = 0.5f;
length = 75f;
damage = 20;
damage = 23;
shootEffect = Fx.shootSmall;
hitColor = color = Color.valueOf("bf92f9");
despawnEffect = Fx.none;
@@ -698,7 +696,7 @@ public class UnitTypes implements ContentList{
bullet = new SapBulletType(){{
sapStrength = 0.8f;
length = 40f;
damage = 16;
damage = 18;
shootEffect = Fx.shootSmall;
hitColor = color = Color.valueOf("bf92f9");
despawnEffect = Fx.none;
@@ -711,7 +709,7 @@ public class UnitTypes implements ContentList{
arkyid = new UnitType("arkyid"){{
drag = 0.1f;
speed = 0.6f;
speed = 0.62f;
hitSize = 23f;
health = 8000;
armor = 6f;
@@ -733,16 +731,16 @@ public class UnitTypes implements ContentList{
legSplashDamage = 32;
legSplashRange = 30;
drownTimeMultiplier = 2f;
hovering = true;
allowLegStep = true;
visualElevation = 0.65f;
groundLayer = Layer.legUnit;
BulletType sapper = new SapBulletType(){{
sapStrength = 0.85f;
length = 55f;
damage = 37;
damage = 40;
shootEffect = Fx.shootSmall;
hitColor = color = Color.valueOf("bf92f9");
despawnEffect = Fx.none;
@@ -820,6 +818,7 @@ public class UnitTypes implements ContentList{
lightRadius = 140f;
rotateSpeed = 1.9f;
drownTimeMultiplier = 3f;
legCount = 8;
legMoveSpace = 0.8f;
@@ -828,7 +827,6 @@ public class UnitTypes implements ContentList{
legExtension = -20;
legBaseOffset = 8f;
landShake = 1f;
legSpeed = 0.1f;
legLengthScl = 0.93f;
rippleScale = 3f;
legSpeed = 0.19f;
@@ -839,7 +837,6 @@ public class UnitTypes implements ContentList{
legSplashRange = 60;
hovering = true;
allowLegStep = true;
visualElevation = 0.95f;
groundLayer = Layer.legUnit;
@@ -2287,6 +2284,7 @@ public class UnitTypes implements ContentList{
defaultController = BuilderAI::new;
isCounted = false;
lowAltitude = true;
flying = true;
mineSpeed = 6.5f;
mineTier = 1;
@@ -2366,6 +2364,7 @@ public class UnitTypes implements ContentList{
defaultController = BuilderAI::new;
isCounted = false;
lowAltitude = true;
flying = true;
mineSpeed = 8f;
mineTier = 2;