slightly less of a mess
This commit is contained in:
@@ -175,8 +175,8 @@ custom = Custom
|
|||||||
builtin = Built-In
|
builtin = Built-In
|
||||||
map.delete.confirm = Are you sure you want to delete this map? This action cannot be undone!
|
map.delete.confirm = Are you sure you want to delete this map? This action cannot be undone!
|
||||||
map.random = [accent]Random Map
|
map.random = [accent]Random Map
|
||||||
map.nospawn = This map does not have any cores for the player to spawn in! Add a[ROYAL] blue[] core to this map in the editor.
|
map.nospawn = This map does not have any cores for the player to spawn in! Add a[accent] orange[] core to this map in the editor.
|
||||||
map.nospawn.pvp = This map does not have any enemy cores for player to spawn into! Add[SCARLET] non-blue[] cores to this map in the editor.
|
map.nospawn.pvp = This map does not have any enemy cores for player to spawn into! Add[SCARLET] non-orange[] cores to this map in the editor.
|
||||||
map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
|
map.nospawn.attack = This map does not have any enemy cores for player to attack! Add[SCARLET] red[] cores to this map in the editor.
|
||||||
map.invalid = Error loading map: corrupted or invalid map file.
|
map.invalid = Error loading map: corrupted or invalid map file.
|
||||||
editor.brush = Brush
|
editor.brush = Brush
|
||||||
@@ -967,7 +967,7 @@ block.junction.description = Acts as a bridge for two crossing conveyor belts. U
|
|||||||
block.bridge-conveyor.description = Advanced item transport block. Allows transporting items over up to 3 tiles of any terrain or building.
|
block.bridge-conveyor.description = Advanced item transport block. Allows transporting items over up to 3 tiles of any terrain or building.
|
||||||
block.phase-conveyor.description = Advanced item transport block. Uses power to teleport items to a connected phase conveyor over several tiles.
|
block.phase-conveyor.description = Advanced item transport block. Uses power to teleport items to a connected phase conveyor over several tiles.
|
||||||
block.sorter.description = Sorts items. If an item matches the selection, it is allowed to pass. Otherwise, the item is outputted to the left and right.
|
block.sorter.description = Sorts items. If an item matches the selection, it is allowed to pass. Otherwise, the item is outputted to the left and right.
|
||||||
block.router.description = Accepts items, then outputs them to up to 3 other directions equally. Useful for splitting the materials from one source to multiple targets.\n[scarlet]Never[] use next to production inputs, as they will get clogged by output.
|
block.router.description = Accepts items, then outputs them to up to 3 other directions equally. Useful for splitting the materials from one source to multiple targets.\n\n[scarlet]Never use next to production inputs, as they will get clogged by output.[]
|
||||||
block.distributor.description = An advanced router. Splits items to up to 7 other directions equally.
|
block.distributor.description = An advanced router. Splits items to up to 7 other directions equally.
|
||||||
block.overflow-gate.description = A combination splitter and router. Only outputs to the left and right if the front path is blocked.
|
block.overflow-gate.description = A combination splitter and router. Only outputs to the left and right if the front path is blocked.
|
||||||
block.mass-driver.description = The ultimate item transport block. Collects several items and then shoots them to another mass driver over a long range. Requires power to operate.
|
block.mass-driver.description = The ultimate item transport block. Collects several items and then shoots them to another mass driver over a long range. Requires power to operate.
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ public class Tutorial{
|
|||||||
|
|
||||||
/** Resets tutorial state. */
|
/** Resets tutorial state. */
|
||||||
public void reset(){
|
public void reset(){
|
||||||
stage = TutorialStage.values()[6];
|
stage = TutorialStage.values()[4];
|
||||||
stage.begin();
|
stage.begin();
|
||||||
blocksPlaced.clear();
|
blocksPlaced.clear();
|
||||||
events.clear();
|
events.clear();
|
||||||
@@ -246,11 +246,12 @@ public class Tutorial{
|
|||||||
float angle = Angles.angle(Core.graphics.getWidth()/2f, Core.graphics.getHeight()/2f, Tmp.v1.x + element.getWidth()/2f, Tmp.v1.y + element.getHeight()/2f);
|
float angle = Angles.angle(Core.graphics.getWidth()/2f, Core.graphics.getHeight()/2f, Tmp.v1.x + element.getWidth()/2f, Tmp.v1.y + element.getHeight()/2f);
|
||||||
Tmp.v2.trns(angle + 180f, size*1.4f);
|
Tmp.v2.trns(angle + 180f, size*1.4f);
|
||||||
float fs = UnitScl.dp.scl(40f);
|
float fs = UnitScl.dp.scl(40f);
|
||||||
float fs2 = UnitScl.dp.scl(50f);
|
float fs2 = UnitScl.dp.scl(56f);
|
||||||
|
|
||||||
Draw.color(Pal.gray);
|
Draw.color(Pal.gray);
|
||||||
Drawf.tri(Tmp.v1.x + element.getWidth()/2f + Tmp.v2.x, Tmp.v1.y + element.getHeight()/2f + Tmp.v2.y, fs2, fs2, angle);
|
Drawf.tri(Tmp.v1.x + element.getWidth()/2f + Tmp.v2.x, Tmp.v1.y + element.getHeight()/2f + Tmp.v2.y, fs2, fs2, angle);
|
||||||
Draw.color(Pal.place);
|
Draw.color(Pal.place);
|
||||||
|
Tmp.v2.setLength(Tmp.v2.len() - UnitScl.dp.scl(4));
|
||||||
Drawf.tri(Tmp.v1.x + element.getWidth()/2f + Tmp.v2.x, Tmp.v1.y + element.getHeight()/2f + Tmp.v2.y, fs, fs, angle);
|
Drawf.tri(Tmp.v1.x + element.getWidth()/2f + Tmp.v2.x, Tmp.v1.y + element.getHeight()/2f + Tmp.v2.y, fs, fs, angle);
|
||||||
Draw.reset();
|
Draw.reset();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -249,7 +249,7 @@ public class HudFragment extends Fragment{
|
|||||||
});
|
});
|
||||||
|
|
||||||
//minimap
|
//minimap
|
||||||
parent.fill(t -> t.top().right().add(new Minimap()).visible(() -> Core.settings.getBool("minimap")));
|
parent.fill(t -> t.top().right().add(new Minimap()).visible(() -> Core.settings.getBool("minimap") && !state.rules.tutorial));
|
||||||
|
|
||||||
//spawner warning
|
//spawner warning
|
||||||
parent.fill(t -> {
|
parent.fill(t -> {
|
||||||
@@ -314,8 +314,14 @@ public class HudFragment extends Fragment{
|
|||||||
|
|
||||||
//tutorial text
|
//tutorial text
|
||||||
parent.fill(t -> {
|
parent.fill(t -> {
|
||||||
t.top().visible(() -> state.rules.tutorial);
|
Runnable resize = () -> {
|
||||||
t.table("button-trans", f -> f.labelWrap(() -> control.tutorial.stage.text()).width(500f).pad(3f));
|
t.clearChildren();
|
||||||
|
t.top().right().visible(() -> state.rules.tutorial);
|
||||||
|
t.table("button-trans", f -> f.labelWrap(() -> control.tutorial.stage.text()).width(!Core.graphics.isPortrait() ? 450f : 180f).pad(3f));
|
||||||
|
};
|
||||||
|
|
||||||
|
resize.run();
|
||||||
|
Events.on(ResizeEvent.class, e -> resize.run());
|
||||||
});
|
});
|
||||||
|
|
||||||
//paused table
|
//paused table
|
||||||
@@ -444,7 +450,7 @@ public class HudFragment extends Fragment{
|
|||||||
lastUnlockLayout.clearChildren();
|
lastUnlockLayout.clearChildren();
|
||||||
lastUnlockLayout.defaults().size(size).pad(2);
|
lastUnlockLayout.defaults().size(size).pad(2);
|
||||||
|
|
||||||
for(int i = 0; i < esize && i <= cap; i++){
|
for(int i = 0; i < esize; i++){
|
||||||
lastUnlockLayout.add(elements.get(i));
|
lastUnlockLayout.add(elements.get(i));
|
||||||
|
|
||||||
if(i % col == col - 1){
|
if(i % col == col - 1){
|
||||||
|
|||||||
Reference in New Issue
Block a user