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

Out of atlas space / GL30 progress

Browse Source
This commit is contained in:
Anuken
2020-06-10 12:55:01 -04:00
parent a51a8d7473
commit 2b1bd90dfa
21 changed files with 4919 additions and 4680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1762,7 +1762,7 @@ public class Blocks implements ContentList{
size = 3;
consumes.power(3f);
consumes.items(ItemStack.with(Items.silicon, 30, Items.graphite, 30));
consumes.items(ItemStack.with(Items.silicon, 40, Items.graphite, 30));
itemCapacity = 30;
constructTime = 60f * 5f;
@@ -1780,7 +1780,7 @@ public class Blocks implements ContentList{
size = 5;
consumes.power(6f);
consumes.items(ItemStack.with(Items.silicon, 60, Items.titanium, 60));
consumes.items(ItemStack.with(Items.silicon, 120, Items.titanium, 80));
itemCapacity = 80;
constructTime = 60f * 15f;
@@ -1796,11 +1796,12 @@ public class Blocks implements ContentList{
requirements(Category.units, ItemStack.with(Items.copper, 50, Items.lead, 120, Items.silicon, 230));
size = 7;
consumes.power(6f);
consumes.items(ItemStack.with(Items.silicon, 60, Items.titanium, 60));
itemCapacity = 80;
consumes.power(12f);
consumes.items(ItemStack.with(Items.silicon, 200, Items.titanium, 200, Items.surgealloy, 200));
consumes.liquid(Liquids.cryofluid, 1f);
itemCapacity = 300;
constructTime = 60f * 15f;
constructTime = 60f * 60f;
upgrades = new UnitType[][]{
};
@@ -1810,11 +1811,12 @@ public class Blocks implements ContentList{
requirements(Category.units, ItemStack.with(Items.copper, 50, Items.lead, 120, Items.silicon, 230));
size = 9;
consumes.power(6f);
consumes.items(ItemStack.with(Items.silicon, 60, Items.titanium, 60));
itemCapacity = 80;
consumes.power(25f);
consumes.items(ItemStack.with(Items.silicon, 300, Items.plastanium, 300, Items.surgealloy, 300, Items.phasefabric, 250));
consumes.liquid(Liquids.cryofluid, 3f);
itemCapacity = 400;
constructTime = 60f * 15f;
constructTime = 60f * 60f * 3;
upgrades = new UnitType[][]{
};

3
core/src/mindustry/entities/comp/LegsComp.java
View File

@@ -63,6 +63,9 @@ abstract class LegsComp implements Posc, Rotc, Hitboxc, Flyingc, Unitc, Elevatio
Vec2 baseOffset = Tmp.v5.trns(dstRot, type.legBaseOffset).add(x, y);
Leg l = legs[i];
l.joint.sub(baseOffset).limit(type.maxStretch * legLength/2f).add(baseOffset);
l.base.sub(baseOffset).limit(type.maxStretch * legLength).add(baseOffset);
float stageF = (totalLength + i*type.legPairOffset) / moveSpace;
int stage = (int)stageF;
int group = stage % div;

2
core/src/mindustry/type/UnitType.java
View File

@@ -47,7 +47,7 @@ public class UnitType extends UnlockableContent{
//TODO document
public int legCount = 4, legGroupSize = 2;
public float legLength = 10f, legSpeed = 0.1f, legTrns = 1f, legBaseOffset = 0f, legMoveSpace = 1f, legExtension = 0, legPairOffset = 0, legLengthScl = 1f, kinematicScl = 1f;
public float legLength = 10f, legSpeed = 0.1f, legTrns = 1f, legBaseOffset = 0f, legMoveSpace = 1f, legExtension = 0, legPairOffset = 0, legLengthScl = 1f, kinematicScl = 1f, maxStretch = 1.75f;
public float legSplashDamage = 0f, legSplashRange = 5;
public boolean flipBackLegs = true;