Bugfixes
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.7 KiB |
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 244 B After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 243 B After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 231 B After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 637 B After Width: | Height: | Size: 4.8 KiB |
|
Before Width: | Height: | Size: 261 B After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 243 B After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 4.0 KiB After Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 224 B After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 226 B After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 232 B After Width: | Height: | Size: 5.4 KiB |
|
Before Width: | Height: | Size: 246 B After Width: | Height: | Size: 5.8 KiB |
|
Before Width: | Height: | Size: 259 B After Width: | Height: | Size: 6.1 KiB |
|
Before Width: | Height: | Size: 5.0 KiB After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 709 B After Width: | Height: | Size: 709 B |
|
Before Width: | Height: | Size: 1.0 MiB After Width: | Height: | Size: 1.0 MiB |
|
Before Width: | Height: | Size: 254 KiB After Width: | Height: | Size: 254 KiB |
|
Before Width: | Height: | Size: 277 KiB After Width: | Height: | Size: 276 KiB |
|
Before Width: | Height: | Size: 53 KiB After Width: | Height: | Size: 53 KiB |
@@ -1308,7 +1308,7 @@ public class Blocks implements ContentList{
|
|||||||
inaccuracy = 17f;
|
inaccuracy = 17f;
|
||||||
shootCone = 35f;
|
shootCone = 35f;
|
||||||
|
|
||||||
health = 260 * size * size;
|
health = 200 * size * size;
|
||||||
}};
|
}};
|
||||||
|
|
||||||
scorch = new ItemTurret("scorch"){{
|
scorch = new ItemTurret("scorch"){{
|
||||||
@@ -1444,7 +1444,7 @@ public class Blocks implements ContentList{
|
|||||||
burstSpacing = 3f;
|
burstSpacing = 3f;
|
||||||
shots = 4;
|
shots = 4;
|
||||||
ammoUseEffect = Fx.shellEjectBig;
|
ammoUseEffect = Fx.shellEjectBig;
|
||||||
health = 360;
|
health = 240 * size * size;;
|
||||||
}};
|
}};
|
||||||
|
|
||||||
fuse = new ItemTurret("fuse"){{
|
fuse = new ItemTurret("fuse"){{
|
||||||
@@ -1521,7 +1521,7 @@ public class Blocks implements ContentList{
|
|||||||
shootShake = 2f;
|
shootShake = 2f;
|
||||||
range = 290f;
|
range = 290f;
|
||||||
|
|
||||||
health = 550;
|
health = 130 * size * size;
|
||||||
}};
|
}};
|
||||||
|
|
||||||
cyclone = new ItemTurret("cyclone"){{
|
cyclone = new ItemTurret("cyclone"){{
|
||||||
|
|||||||
@@ -213,8 +213,6 @@ public class MenuRenderer implements Disposable{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//Draw.rect("error", world.width() * tilesize/2f, world.height() * tilesize/2f, 100f, 100f);
|
|
||||||
|
|
||||||
cacheWall = batch.endCache();
|
cacheWall = batch.endCache();
|
||||||
|
|
||||||
Core.batch = prev;
|
Core.batch = prev;
|
||||||
@@ -281,15 +279,15 @@ public class MenuRenderer implements Disposable{
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void flyers(PositionConsumer cons){
|
private void flyers(PositionConsumer cons){
|
||||||
float tw = width * tilesize * 2;
|
float tw = width * tilesize * 2.5f;
|
||||||
float th = height * tilesize * 2;
|
float th = height * tilesize * 1.5f;
|
||||||
float range = 500f;
|
float range = 500f;
|
||||||
float offset = -600f;
|
float offset = -600f;
|
||||||
|
|
||||||
for(int i = 0; i < flyers; i++){
|
for(int i = 0; i < flyers; i++){
|
||||||
Tmp.v1.trns(flyerRot, time * (2.5f + flyerType.speed));
|
Tmp.v1.trns(flyerRot, time * (2f + flyerType.speed));
|
||||||
|
|
||||||
cons.accept((Mathf.randomSeedRange(i, range) + Tmp.v1.x + Mathf.absin(time + Mathf.randomSeedRange(i + 2, 500), 10f, 3.4f) + offset) % tw,
|
cons.accept((Mathf.randomSeedRange(i, range) + Tmp.v1.x + Mathf.absin(time + Mathf.randomSeedRange(i + 2, 500), 10f, 3.4f) + offset) % (tw + Mathf.randomSeed(i + 5, 0, 500)),
|
||||||
(Mathf.randomSeedRange(i + 1, range) + Tmp.v1.y + Mathf.absin(time + Mathf.randomSeedRange(i + 3, 500), 10f, 3.4f) + offset) % th);
|
(Mathf.randomSeedRange(i + 1, range) + Tmp.v1.y + Mathf.absin(time + Mathf.randomSeedRange(i + 3, 500), 10f, 3.4f) + offset) % th);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,13 +14,21 @@ public class MapPlayDialog extends FloatingDialog{
|
|||||||
CustomRulesDialog dialog = new CustomRulesDialog();
|
CustomRulesDialog dialog = new CustomRulesDialog();
|
||||||
Rules rules;
|
Rules rules;
|
||||||
Gamemode selectedGamemode = Gamemode.survival;
|
Gamemode selectedGamemode = Gamemode.survival;
|
||||||
|
Map lastMap;
|
||||||
|
|
||||||
public MapPlayDialog(){
|
public MapPlayDialog(){
|
||||||
super("");
|
super("");
|
||||||
setFillParent(false);
|
setFillParent(false);
|
||||||
|
|
||||||
|
onResize(() -> {
|
||||||
|
if(lastMap != null){
|
||||||
|
show(lastMap);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public void show(Map map){
|
public void show(Map map){
|
||||||
|
this.lastMap = map;
|
||||||
title.setText(map.name());
|
title.setText(map.name());
|
||||||
cont.clearChildren();
|
cont.clearChildren();
|
||||||
|
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ public class BlockInventoryFragment extends Fragment{
|
|||||||
@Override
|
@Override
|
||||||
public void build(Group parent){
|
public void build(Group parent){
|
||||||
table = new Table();
|
table = new Table();
|
||||||
|
table.setName("inventory");
|
||||||
table.setTransform(true);
|
table.setTransform(true);
|
||||||
parent.setTransform(true);
|
parent.setTransform(true);
|
||||||
parent.addChild(table);
|
parent.addChild(table);
|
||||||
@@ -69,10 +70,11 @@ public class BlockInventoryFragment extends Fragment{
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void hide(){
|
public void hide(){
|
||||||
table.actions(Actions.scaleTo(0f, 1f, 0.06f, Interpolation.pow3Out), Actions.visible(false), Actions.run(() -> {
|
table.actions(Actions.scaleTo(0f, 1f, 0.06f, Interpolation.pow3Out), Actions.run(() -> {
|
||||||
table.clear();
|
table.clearChildren();
|
||||||
|
table.clearListeners();
|
||||||
table.update(null);
|
table.update(null);
|
||||||
}));
|
}), Actions.visible(false));
|
||||||
table.touchable(Touchable.disabled);
|
table.touchable(Touchable.disabled);
|
||||||
tile = null;
|
tile = null;
|
||||||
}
|
}
|
||||||
@@ -82,9 +84,11 @@ public class BlockInventoryFragment extends Fragment{
|
|||||||
IntSet container = new IntSet();
|
IntSet container = new IntSet();
|
||||||
|
|
||||||
table.clearChildren();
|
table.clearChildren();
|
||||||
|
table.clearActions();
|
||||||
table.background("inventory");
|
table.background("inventory");
|
||||||
table.touchable(Touchable.enabled);
|
table.touchable(Touchable.enabled);
|
||||||
table.update(() -> {
|
table.update(() -> {
|
||||||
|
|
||||||
if(state.is(State.menu) || tile == null || tile.entity == null || !tile.block().isAccessible() || tile.entity.items.total() == 0){
|
if(state.is(State.menu) || tile == null || tile.entity == null || !tile.block().isAccessible() || tile.entity.items.total() == 0){
|
||||||
hide();
|
hide();
|
||||||
}else{
|
}else{
|
||||||
@@ -170,9 +174,13 @@ public class BlockInventoryFragment extends Fragment{
|
|||||||
|
|
||||||
updateTablePosition();
|
updateTablePosition();
|
||||||
|
|
||||||
|
table.visible(true);
|
||||||
|
|
||||||
if(actions){
|
if(actions){
|
||||||
table.actions(Actions.scaleTo(0f, 1f), Actions.visible(true),
|
table.setScale(0f, 1f);
|
||||||
Actions.scaleTo(1f, 1f, 0.07f, Interpolation.pow3Out));
|
table.actions(Actions.scaleTo(1f, 1f, 0.07f, Interpolation.pow3Out));
|
||||||
|
}else{
|
||||||
|
table.setScale(1f, 1f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -146,7 +146,7 @@ public class MenuFragment extends Fragment{
|
|||||||
new Buttoni("$play", "icon-play-2",
|
new Buttoni("$play", "icon-play-2",
|
||||||
new Buttoni("$campaign", "icon-play-2", ui.deploy::show),
|
new Buttoni("$campaign", "icon-play-2", ui.deploy::show),
|
||||||
new Buttoni("$joingame", "icon-add", ui.join::show),
|
new Buttoni("$joingame", "icon-add", ui.join::show),
|
||||||
new Buttoni("$customgame", "icon-terrain", ui.custom::show),
|
new Buttoni("$customgame", "icon-editor", ui.custom::show),
|
||||||
new Buttoni("$loadgame", "icon-load", ui.load::show)
|
new Buttoni("$loadgame", "icon-load", ui.load::show)
|
||||||
),
|
),
|
||||||
new Buttoni("$editor", "icon-editor", ui.maps::show),
|
new Buttoni("$editor", "icon-editor", ui.maps::show),
|
||||||
|
|||||||