Logic locate fix
This commit is contained in:
@@ -1655,6 +1655,8 @@ public class Blocks implements ContentList{
|
|||||||
length = brange;
|
length = brange;
|
||||||
damage = 105f;
|
damage = 105f;
|
||||||
ammoMultiplier = 5f;
|
ammoMultiplier = 5f;
|
||||||
|
toColor = Pal.thoriumPink;
|
||||||
|
shootEffect = smokeEffect = Fx.thoriumShoot;
|
||||||
}},
|
}},
|
||||||
Items.titanium, new ShrapnelBulletType(){{
|
Items.titanium, new ShrapnelBulletType(){{
|
||||||
length = brange;
|
length = brange;
|
||||||
@@ -2034,7 +2036,7 @@ public class Blocks implements ContentList{
|
|||||||
}};
|
}};
|
||||||
|
|
||||||
microProcessor = new LogicBlock("micro-processor"){{
|
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;
|
instructionsPerTick = 2;
|
||||||
|
|
||||||
@@ -2042,7 +2044,7 @@ public class Blocks implements ContentList{
|
|||||||
}};
|
}};
|
||||||
|
|
||||||
logicProcessor = new LogicBlock("logic-processor"){{
|
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;
|
instructionsPerTick = 8;
|
||||||
|
|
||||||
@@ -2052,7 +2054,7 @@ public class Blocks implements ContentList{
|
|||||||
}};
|
}};
|
||||||
|
|
||||||
hyperProcessor = new LogicBlock("hyper-processor"){{
|
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);
|
consumes.liquid(Liquids.cryofluid, 0.08f);
|
||||||
hasLiquids = true;
|
hasLiquids = true;
|
||||||
|
|||||||
@@ -1217,7 +1217,15 @@ public class Fx{
|
|||||||
randLenVectors(e.id, 7, 25f * e.finpow(), e.rotation, 50f, (x, y) -> {
|
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);
|
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 -> {
|
reactorsmoke = new Effect(17, e -> {
|
||||||
|
|||||||
@@ -1200,7 +1200,7 @@ public class UnitTypes implements ContentList{
|
|||||||
mineTier = 3;
|
mineTier = 3;
|
||||||
health = 500;
|
health = 500;
|
||||||
armor = 5f;
|
armor = 5f;
|
||||||
speed = 2.3f;
|
speed = 2.4f;
|
||||||
accel = 0.06f;
|
accel = 0.06f;
|
||||||
drag = 0.017f;
|
drag = 0.017f;
|
||||||
lowAltitude = true;
|
lowAltitude = true;
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ import arc.graphics.*;
|
|||||||
public class Pal{
|
public class Pal{
|
||||||
public static Color
|
public static Color
|
||||||
|
|
||||||
|
thoriumPink = Color.valueOf("f9a3c7"),
|
||||||
|
|
||||||
items = Color.valueOf("2ea756"),
|
items = Color.valueOf("2ea756"),
|
||||||
command = Color.valueOf("eab678"),
|
command = Color.valueOf("eab678"),
|
||||||
|
|
||||||
|
|||||||
@@ -272,8 +272,9 @@ public class LExecutor{
|
|||||||
cache.found = false;
|
cache.found = false;
|
||||||
exec.setnum(outFound, 0);
|
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{
|
}else{
|
||||||
|
exec.setobj(outBuild, null);
|
||||||
exec.setbool(outFound, cache.found);
|
exec.setbool(outFound, cache.found);
|
||||||
exec.setnum(outX, cache.x);
|
exec.setnum(outX, cache.x);
|
||||||
exec.setnum(outY, cache.y);
|
exec.setnum(outY, cache.y);
|
||||||
|
|||||||
Reference in New Issue
Block a user