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

T2s in tech / Bugfixes

Browse Source
This commit is contained in:
Anuken
2022-03-10 15:46:07 -05:00
parent d566440e77
commit 061a845901
9 changed files with 46 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/ai/types/CommandAI.java
View File

@@ -168,7 +168,7 @@ public class CommandAI extends AIController{
@Override @Override
public Teamc findTarget(float x, float y, float range, boolean air, boolean ground){ public Teamc findTarget(float x, float y, float range, boolean air, boolean ground){
return attackTarget == null || !attackTarget.within(x, y, range + (attackTarget instanceof Sized s ? s.hitSize()/2f : 0f)) ? super.findTarget(x, y, range, air, ground) : attackTarget; return attackTarget == null || !attackTarget.within(x, y, range + 3f + (attackTarget instanceof Sized s ? s.hitSize()/2f : 0f)) ? super.findTarget(x, y, range, air, ground) : attackTarget;
} }
@Override @Override

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

@@ -3670,7 +3670,7 @@ public class Blocks{
shootShake = 1f; shootShake = 1f;
ammoPerShot = 5; ammoPerShot = 5;
draw = new DrawTurret("reinforced-"); drawer = new DrawTurret("reinforced-");
shootY = -2; shootY = -2;
outlineColor = Pal.darkOutline; outlineColor = Pal.darkOutline;
size = 3; size = 3;
@@ -3693,7 +3693,7 @@ public class Blocks{
//TODO requirements //TODO requirements
requirements(Category.turret, with(Items.tungsten, 150, Items.silicon, 200, Items.oxide, 40, Items.beryllium, 400)); requirements(Category.turret, with(Items.tungsten, 150, Items.silicon, 200, Items.oxide, 40, Items.beryllium, 400));
draw = new DrawTurret("reinforced-"){{ drawer = new DrawTurret("reinforced-"){{
Color heatc = Color.valueOf("fa2859"); Color heatc = Color.valueOf("fa2859");
heatColor = heatc; heatColor = heatc;
@@ -3811,7 +3811,7 @@ public class Blocks{
coolant = consume(new ConsumeLiquid(Liquids.water, 30f / 60f)); coolant = consume(new ConsumeLiquid(Liquids.water, 30f / 60f));
coolantMultiplier = 1.5f; coolantMultiplier = 1.5f;
draw = new DrawTurret("reinforced-"){{ drawer = new DrawTurret("reinforced-"){{
parts.addAll( parts.addAll(
new RegionPart("-barrel"){{ new RegionPart("-barrel"){{
progress = PartProgress.reload.curve(Interp.pow2In); progress = PartProgress.reload.curve(Interp.pow2In);
@@ -3878,7 +3878,7 @@ public class Blocks{
coolant = consume(new ConsumeLiquid(Liquids.water, 30f / 60f)); coolant = consume(new ConsumeLiquid(Liquids.water, 30f / 60f));
draw = new DrawTurret("reinforced-"){{ drawer = new DrawTurret("reinforced-"){{
parts.add(new RegionPart("-side"){{ parts.add(new RegionPart("-side"){{
mirror = true; mirror = true;
under = true; under = true;

42
core/src/mindustry/content/ErekirTechTree.java
View File

@@ -265,29 +265,41 @@ public class ErekirTechTree{
}); });
}); });
node(fabricator, () -> { node(fabricator, Seq.with(new Research(siliconArcFurnace), new Research(plasmaBore), new Research(turbineCondenser)), () -> {
node(UnitTypes.stell, Seq.with(new Research(siliconArcFurnace), new Research(plasmaBore), new Research(turbineCondenser)), () -> { node(UnitTypes.stell, () -> {
}); });
node(tankAssembler, Seq.with(new OnSector(four), new Research(constructor), new Research(atmosphericConcentrator)), () -> { node(tankReconstructor, () -> {
node(UnitTypes.vanquish, () -> { node(UnitTypes.locus);
node(UnitTypes.conquer, Seq.with(tmpNever), () -> {
}); node(shipReconstructor, () -> {
}); node(UnitTypes.avert);
node(shipAssembler, Seq.with(new OnSector(five)), () -> { node(mechReconstructor, () -> {
node(UnitTypes.quell, () -> { node(UnitTypes.latum);
node(UnitTypes.disrupt, Seq.with(tmpNever), () -> {
}); node(tankAssembler, Seq.with(new OnSector(four), new Research(constructor), new Research(atmosphericConcentrator)), () -> {
}); node(UnitTypes.vanquish, () -> {
node(UnitTypes.conquer, Seq.with(tmpNever), () -> {
node(mechAssembler, Seq.with(tmpNever), () -> { });
node(UnitTypes.bulwark, () -> { });
node(UnitTypes.krepost, Seq.with(tmpNever), () -> {
node(shipAssembler, Seq.with(new OnSector(five)), () -> {
node(UnitTypes.quell, () -> {
node(UnitTypes.disrupt, Seq.with(tmpNever), () -> {
});
});
node(mechAssembler, Seq.with(tmpNever), () -> {
node(UnitTypes.bulwark, () -> {
node(UnitTypes.krepost, Seq.with(tmpNever), () -> {
});
});
});
}); });
}); });
}); });

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

@@ -687,8 +687,6 @@ public class UnitTypes{
armor = 5f; armor = 5f;
ammoType = new PowerAmmoType(1000); ammoType = new PowerAmmoType(1000);
buildSpeed = 0.75f;
visualElevation = 0.3f; visualElevation = 0.3f;
groundLayer = Layer.legUnit; groundLayer = Layer.legUnit;
@@ -757,7 +755,6 @@ public class UnitTypes{
rippleScale = 2f; rippleScale = 2f;
legSpeed = 0.2f; legSpeed = 0.2f;
ammoType = new PowerAmmoType(2000); ammoType = new PowerAmmoType(2000);
buildSpeed = 1f;
legSplashDamage = 32; legSplashDamage = 32;
legSplashRange = 30; legSplashRange = 30;
@@ -861,7 +858,6 @@ public class UnitTypes{
rippleScale = 3f; rippleScale = 3f;
legSpeed = 0.19f; legSpeed = 0.19f;
ammoType = new ItemAmmoType(Items.graphite, 8); ammoType = new ItemAmmoType(Items.graphite, 8);
buildSpeed = 1f;
legSplashDamage = 80; legSplashDamage = 80;
legSplashRange = 60; legSplashRange = 60;
@@ -1840,7 +1836,6 @@ public class UnitTypes{
rotateShooting = false; rotateShooting = false;
range = 100f; range = 100f;
ammoType = new PowerAmmoType(900); ammoType = new PowerAmmoType(900);
armor = 3f; armor = 3f;
buildSpeed = 1.5f; buildSpeed = 1.5f;
@@ -2512,6 +2507,7 @@ public class UnitTypes{
rotate = true; rotate = true;
rotateSpeed = 1.4f; rotateSpeed = 1.4f;
mirror = false; mirror = false;
shootCone = 2f;
x = 0f; x = 0f;
y = 0f; y = 0f;
heatColor = Color.valueOf("f9350f"); heatColor = Color.valueOf("f9350f");

1
core/src/mindustry/entities/bullet/RailBulletType.java
View File

@@ -28,6 +28,7 @@ public class RailBulletType extends BulletType{
hitEffect = Fx.none; hitEffect = Fx.none;
despawnEffect = Fx.none; despawnEffect = Fx.none;
collides = false; collides = false;
keepVelocity = false;
lifetime = 1f; lifetime = 1f;
} }

2
core/src/mindustry/graphics/FogRenderer.java
View File

@@ -114,7 +114,7 @@ public final class FogRenderer{
Draw.color(state.rules.dynamicColor); Draw.color(state.rules.dynamicColor);
Draw.fbo(dynamicFog.getTexture(), world.width(), world.height(), tilesize); Draw.fbo(dynamicFog.getTexture(), world.width(), world.height(), tilesize);
//TODO ai check? //TODO ai check?
if(state.rules.staticFog && !player.team().isAI()){ if(state.rules.staticFog){
//TODO why does this require a half-tile offset while dynamic does not //TODO why does this require a half-tile offset while dynamic does not
Draw.color(state.rules.staticColor); Draw.color(state.rules.staticColor);
Draw.fbo(staticFog.getTexture(), world.width(), world.height(), tilesize, tilesize/2f); Draw.fbo(staticFog.getTexture(), world.width(), world.height(), tilesize, tilesize/2f);

10
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@@ -88,7 +88,7 @@ public class Turret extends ReloadTurret{
public Sortf unitSort = UnitSorts.closest; public Sortf unitSort = UnitSorts.closest;
public Boolf<Unit> unitFilter = u -> true; public Boolf<Unit> unitFilter = u -> true;
public DrawBlock draw = new DrawTurret(); public DrawBlock drawer = new DrawTurret();
public Turret(String name){ public Turret(String name){
super(name); super(name);
@@ -139,17 +139,17 @@ public class Turret extends ReloadTurret{
public void load(){ public void load(){
super.load(); super.load();
draw.load(this); drawer.load(this);
} }
@Override @Override
public TextureRegion[] icons(){ public TextureRegion[] icons(){
return draw.finalIcons(this); return drawer.finalIcons(this);
} }
@Override @Override
public void getRegionsToOutline(Seq<TextureRegion> out){ public void getRegionsToOutline(Seq<TextureRegion> out){
draw.getRegionsToOutline(this, out); drawer.getRegionsToOutline(this, out);
} }
public static abstract class AmmoEntry{ public static abstract class AmmoEntry{
@@ -295,7 +295,7 @@ public class Turret extends ReloadTurret{
@Override @Override
public void draw(){ public void draw(){
draw.draw(this); drawer.draw(this);
} }
@Override @Override

10
core/src/mindustry/world/blocks/production/Pump.java
View File

@@ -19,7 +19,7 @@ public class Pump extends LiquidBlock{
public float pumpAmount = 0.2f; public float pumpAmount = 0.2f;
/** Interval in-between item consumptions, if applicable. */ /** Interval in-between item consumptions, if applicable. */
public float consumeTime = 60f * 5f; public float consumeTime = 60f * 5f;
public DrawBlock draw = new DrawMulti(new DrawDefault(), new DrawPumpLiquid()); public DrawBlock drawer = new DrawMulti(new DrawDefault(), new DrawPumpLiquid());
public Pump(String name){ public Pump(String name){
super(name); super(name);
@@ -68,12 +68,12 @@ public class Pump extends LiquidBlock{
@Override @Override
public void load(){ public void load(){
super.load(); super.load();
draw.load(this); drawer.load(this);
} }
@Override @Override
public TextureRegion[] icons(){ public TextureRegion[] icons(){
return draw.finalIcons(this); return drawer.finalIcons(this);
} }
@Override @Override
@@ -110,13 +110,13 @@ public class Pump extends LiquidBlock{
@Override @Override
public void draw(){ public void draw(){
draw.draw(this); drawer.draw(this);
} }
@Override @Override
public void drawLight(){ public void drawLight(){
super.drawLight(); super.drawLight();
draw.drawLight(this); drawer.drawLight(this);
} }
@Override @Override

2
gradle.properties
View File

@@ -24,4 +24,4 @@ android.useAndroidX=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000 org.gradle.internal.http.connectionTimeout=100000
archash=16a80926a6 archash=60704334ff