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

Logic locate fix

Browse Source
This commit is contained in:
Anuken
2020-10-23 20:38:33 -04:00
parent 117f002545
commit 7e323f1ebf
5 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1655,6 +1655,8 @@ public class Blocks implements ContentList{
length = brange;
damage = 105f;
ammoMultiplier = 5f;
toColor = Pal.thoriumPink;
shootEffect = smokeEffect = Fx.thoriumShoot;
}},
Items.titanium, new ShrapnelBulletType(){{
length = brange;
@@ -2034,7 +2036,7 @@ public class Blocks implements ContentList{
}};
microProcessor = new LogicBlock("micro-processor"){{
requirements(Category.logic, with(Items.copper, 80, Items.lead, 50, Items.silicon, 50));
requirements(Category.logic, with(Items.copper, 80, Items.lead, 50, Items.silicon, 30));
instructionsPerTick = 2;
@@ -2042,7 +2044,7 @@ public class Blocks implements ContentList{
}};
logicProcessor = new LogicBlock("logic-processor"){{
requirements(Category.logic, with(Items.lead, 320, Items.silicon, 100, Items.graphite, 60, Items.thorium, 50));
requirements(Category.logic, with(Items.lead, 320, Items.silicon, 60, Items.graphite, 60, Items.thorium, 50));
instructionsPerTick = 8;
@@ -2052,7 +2054,7 @@ public class Blocks implements ContentList{
}};
hyperProcessor = new LogicBlock("hyper-processor"){{
requirements(Category.logic, with(Items.lead, 450, Items.silicon, 150, Items.thorium, 75, Items.surgeAlloy, 50));
requirements(Category.logic, with(Items.lead, 450, Items.silicon, 130, Items.thorium, 75, Items.surgeAlloy, 50));
consumes.liquid(Liquids.cryofluid, 0.08f);
hasLiquids = true;

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

@@ -1217,7 +1217,15 @@ public class Fx{
randLenVectors(e.id, 7, 25f * e.finpow(), e.rotation, 50f, (x, y) -> {
lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fin() * 5f + 2f);
});
}),
thoriumShoot = new Effect(12f, e -> {
color(Color.white, Pal.thoriumPink, e.fin());
stroke(e.fout() * 1.2f + 0.5f);
randLenVectors(e.id, 7, 25f * e.finpow(), e.rotation, 50f, (x, y) -> {
lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fin() * 5f + 2f);
});
}),
reactorsmoke = new Effect(17, e -> {

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

@@ -1200,7 +1200,7 @@ public class UnitTypes implements ContentList{
mineTier = 3;
health = 500;
armor = 5f;
speed = 2.3f;
speed = 2.4f;
accel = 0.06f;
drag = 0.017f;
lowAltitude = true;

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

@@ -5,6 +5,8 @@ import arc.graphics.*;
public class Pal{
public static Color
thoriumPink = Color.valueOf("f9a3c7"),
items = Color.valueOf("2ea756"),
command = Color.valueOf("eab678"),

3
core/src/mindustry/logic/LExecutor.java
View File

@@ -272,8 +272,9 @@ public class LExecutor{
cache.found = false;
exec.setnum(outFound, 0);
}
exec.setobj(outFound, res != null && res.build != null && res.build.team == exec.team ? res.build : null);
exec.setobj(outBuild, res != null && res.build != null && res.build.team == exec.team ? res.build : null);
}else{
exec.setobj(outBuild, null);
exec.setbool(outFound, cache.found);
exec.setnum(outX, cache.x);
exec.setnum(outY, cache.y);