mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-06 07:30:35 +07:00
Code Issues Packages Projects Releases Wiki Activity

Many bugfixes for multiplayer, QoL, balancing, new difficulties

Browse Source
This commit is contained in:
Anuken 2018-01-11 13:46:32 -05:00
parent d6bc6bf88c
commit 804758b179
33 changed files with 172 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.anuke.mindustry"
android:versionCode="50"
android:versionName="3.3b2" >
android:versionCode="51"
android:versionName="3.3b3" >
<uses-permission android:name="com.android.vending.BILLING" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

2
core/assets/bundles/bundle.properties
View File

@ -189,6 +189,8 @@ text.health=health
setting.difficulty.easy=easy
setting.difficulty.normal=normal
setting.difficulty.hard=hard
setting.difficulty.insane=insane
setting.difficulty.purge=purge
setting.difficulty.name=Difficulty
setting.screenshake.name=Screen Shake
setting.smoothcam.name=Smooth Camera

2
core/src/io/anuke/mindustry/ai/Pathfind.java
View File

@ -7,7 +7,7 @@ import com.badlogic.gdx.math.Vector2;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.entities.enemies.Enemy;
import io.anuke.mindustry.entities.enemies.EnemyType;
import io.anuke.mindustry.world.SpawnPoint;
import io.anuke.mindustry.game.SpawnPoint;
import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.UCore;
import io.anuke.ucore.core.Timers;

26
core/src/io/anuke/mindustry/core/Control.java
View File

@ -12,6 +12,10 @@ import io.anuke.mindustry.entities.*;
import io.anuke.mindustry.entities.effect.Shield;
import io.anuke.mindustry.entities.enemies.Enemy;
import io.anuke.mindustry.entities.enemies.EnemyTypes;
import io.anuke.mindustry.game.Difficulty;
import io.anuke.mindustry.game.EnemySpawn;
import io.anuke.mindustry.game.SpawnPoint;
import io.anuke.mindustry.game.WaveCreator;
import io.anuke.mindustry.graphics.Fx;
import io.anuke.mindustry.input.AndroidInput;
import io.anuke.mindustry.input.DesktopInput;
@ -53,16 +57,16 @@ public class Control extends Module{
public final EntityGroup<Bullet> bulletGroup = Entities.addGroup(Bullet.class);
public final EntityGroup<Shield> shieldGroup = Entities.addGroup(Shield.class);
Array<EnemySpawn> spawns;
Array<io.anuke.mindustry.game.EnemySpawn> spawns;
int wave = 1;
int lastUpdated = -1;
float wavetime;
float extrawavetime;
int enemies = 0;
GameMode mode = GameMode.waves;
io.anuke.mindustry.game.GameMode mode = io.anuke.mindustry.game.GameMode.waves;
Tile core;
Array<SpawnPoint> spawnpoints = new Array<>();
Array<io.anuke.mindustry.game.SpawnPoint> spawnpoints = new Array<>();
boolean shouldUpdateItems = false;
boolean wasPaused = false;
@ -275,7 +279,7 @@ public class Control extends Module{
return core;
}
public Array<SpawnPoint> getSpawnPoints(){
public Array<io.anuke.mindustry.game.SpawnPoint> getSpawnPoints(){
return spawnpoints;
}
@ -288,7 +292,7 @@ public class Control extends Module{
}
public void addSpawnPoint(Tile tile){
SpawnPoint point = new SpawnPoint();
io.anuke.mindustry.game.SpawnPoint point = new SpawnPoint();
point.start = tile;
spawnpoints.add(point);
}
@ -306,11 +310,11 @@ public class Control extends Module{
Timers.run(18, ()-> ui.loadfrag.hide());
}
public GameMode getMode(){
public io.anuke.mindustry.game.GameMode getMode(){
return mode;
}
public void setMode(GameMode mode){
public void setMode(io.anuke.mindustry.game.GameMode mode){
this.mode = mode;
}
@ -411,9 +415,11 @@ public class Control extends Module{
}
float waveSpacing(){
int scale = Settings.getInt("difficulty");
float out = (scale == 0 ? 2f : scale == 1f ? 1f : 0.5f);
return wavespace*out;
return wavespace*getDifficulty().timeScaling;
}
public Difficulty getDifficulty(){
return Difficulty.values()[Settings.getInt("difficulty")];
}
public boolean isHighScore(){

29
core/src/io/anuke/mindustry/core/NetClient.java
View File

@ -2,6 +2,7 @@ package io.anuke.mindustry.core;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.utils.IntSet;
import com.badlogic.gdx.utils.TimeUtils;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.GameState.State;
@ -39,12 +40,14 @@ public class NetClient extends Module {
boolean connecting = false;
boolean gotEntities = false, gotData = false;
boolean kicked = false;
IntSet requests = new IntSet();
float playerSyncTime = 2;
float dataTimeout = 60*10;
public NetClient(){
Net.handle(Connect.class, packet -> {
requests.clear();
connecting = true;
gotEntities = false;
gotData = false;
@ -110,6 +113,10 @@ public class NetClient extends Module {
}
}
for(int i = 0; i < data.enemies.length; i ++){
Net.handleClientReceived(data.enemies[i]);
}
for(int i = 0; i < data.weapons.length; i ++){
Vars.control.addWeapon((Weapon) Upgrade.getByID(data.weapons[i]));
}
@ -129,7 +136,7 @@ public class NetClient extends Module {
for(int i = 0; i < packet.ids.length; i ++){
int id = packet.ids[i];
if(id != Vars.player.id){
Entity entity = null;
Entity entity;
if(i >= packet.enemyStart){
entity = Vars.control.enemyGroup.getByID(id);
}else {
@ -140,6 +147,13 @@ public class NetClient extends Module {
if(sync == null){
Gdx.app.error("Mindustry", "Unknown entity ID: " + id + " " + (i >= packet.enemyStart ? "(enemy)" : "(player)"));
if(!requests.contains(id)){
Gdx.app.error("Mindustry", "Sending entity request: " + id);
requests.add(id);
EntityRequestPacket req = new EntityRequestPacket();
req.id = id;
Net.send(req, SendMode.tcp);
}
continue;
}
@ -175,6 +189,7 @@ public class NetClient extends Module {
});
Net.handle(EnemySpawnPacket.class, spawn -> {
requests.remove(spawn.id);
Gdx.app.postRunnable(() -> {
Enemy enemy = new Enemy(EnemyType.getByID(spawn.type));
enemy.set(spawn.x, spawn.y);
@ -259,7 +274,12 @@ public class NetClient extends Module {
}
});
Net.handle(Player.class, Player::add);
Net.handle(Player.class, player -> {
requests.remove(player.id);
player.getInterpolator().last.set(player.x, player.y);
player.getInterpolator().target.set(player.x, player.y);
player.add();
});
Net.handle(ChatPacket.class, packet -> Gdx.app.postRunnable(() -> Vars.ui.chatfrag.addMessage(packet.text, Vars.netClient.colorizeName(packet.id, packet.name))));
@ -303,6 +323,11 @@ public class NetClient extends Module {
}
}
public void disconnectQuietly(){
kicked = true;
Net.disconnect();
}
public String colorizeName(int id, String name){
return name == null ? null : "[#" + colorArray[id % colorArray.length].toString().toUpperCase() + "]" + name;
}

41
core/src/io/anuke/mindustry/core/NetServer.java
View File

@ -61,6 +61,8 @@ public class NetServer extends Module{
player.name = packet.name;
player.isAndroid = packet.android;
player.set(Vars.control.core.worldx(), Vars.control.core.worldy() - Vars.tilesize*2);
player.getInterpolator().last.set(player.x, player.y);
player.getInterpolator().target.set(player.x, player.y);
player.add();
connections.put(id, player);
@ -73,6 +75,20 @@ public class NetServer extends Module{
dp.playerWeapons[i] = dp.players[i].weaponLeft.id;
}
dp.enemies = new EnemySpawnPacket[Vars.control.enemyGroup.amount()];
for(int i = 0; i < Vars.control.enemyGroup.amount(); i ++){
Enemy enemy = Vars.control.enemyGroup.all().get(i);
EnemySpawnPacket e = new EnemySpawnPacket();
e.x = enemy.x;
e.y = enemy.y;
e.id = enemy.id;
e.tier = (byte)enemy.tier;
e.lane = (byte)enemy.lane;
e.type = enemy.type.id;
dp.enemies[i] = e;
}
UCore.log("Sending entities: " + Arrays.toString(dp.players));
Net.sendExcept(id, player, SendMode.tcp);
@ -102,6 +118,7 @@ public class NetServer extends Module{
Net.handleServer(PositionPacket.class, pos -> {
Player player = connections.get(Net.getLastConnection());
UCore.log("Recieving data: " + Arrays.toString(pos.data), "Player pos: " +player.x, player.y);
player.getInterpolator().type.read(player, pos.data);
});
@ -187,6 +204,30 @@ public class NetServer extends Module{
Net.sendExcept(Net.getLastConnection(), packet, SendMode.tcp);
});
Net.handleServer(EntityRequestPacket.class, packet -> {
int id = packet.id;
int dest = Net.getLastConnection();
Gdx.app.postRunnable(() -> {
if(Vars.control.playerGroup.getByID(id) != null){
Net.sendTo(dest, Vars.control.playerGroup.getByID(id), SendMode.tcp);
Gdx.app.error("Mindustry", "Replying to entity request: player, " + id);
}else if (Vars.control.enemyGroup.getByID(id) != null){
Enemy enemy = Vars.control.enemyGroup.getByID(id);
EnemySpawnPacket e = new EnemySpawnPacket();
e.x = enemy.x;
e.y = enemy.y;
e.id = enemy.id;
e.tier = (byte)enemy.tier;
e.lane = (byte)enemy.lane;
e.type = enemy.type.id;
Net.sendTo(dest, e, SendMode.tcp);
Gdx.app.error("Mindustry", "Replying to entity request: enemy, " + id);
}else{
Gdx.app.error("Mindustry", "Entity request target not found!");
}
});
});
}
public void sendMessage(String message){

2
core/src/io/anuke/mindustry/core/Renderer.java
View File

@ -19,7 +19,7 @@ import io.anuke.mindustry.graphics.Shaders;
import io.anuke.mindustry.input.InputHandler;
import io.anuke.mindustry.input.PlaceMode;
import io.anuke.mindustry.ui.fragments.ToolFragment;
import io.anuke.mindustry.world.SpawnPoint;
import io.anuke.mindustry.game.SpawnPoint;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.Blocks;
import io.anuke.mindustry.world.blocks.ProductionBlocks;

6
core/src/io/anuke/mindustry/core/World.java
View File

@ -1,5 +1,6 @@
package io.anuke.mindustry.core;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.math.GridPoint2;
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Vector2;
@ -24,7 +25,8 @@ import io.anuke.ucore.modules.Module;
import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.Tmp;
import static io.anuke.mindustry.Vars.*;
import static io.anuke.mindustry.Vars.control;
import static io.anuke.mindustry.Vars.tilesize;
public class World extends Module{
private int seed;
@ -108,7 +110,7 @@ public class World extends Module{
public Tile tile(int x, int y){
if(tiles == null){
ui.showError("$text.error.crashmessage");
Gdx.app.postRunnable(() -> Vars.ui.showError("$text.error.crashmessage"));
GameState.set(State.menu);
return null;
}

5
core/src/io/anuke/mindustry/entities/Player.java
View File

@ -125,10 +125,13 @@ public class Player extends DestructibleEntity implements Syncable{
float speed = dashing ? Player.dashSpeed : Player.speed;
if(health < maxhealth && Timers.get(this, "regen", 50))
if(health < maxhealth && Timers.get(this, "regen", 20))
health ++;
health = Mathf.clamp(health, -1, maxhealth);
Tile tile = world.tileWorld(x, y);
if(tile != null && tile.floor().liquid && tile.block() == Blocks.air){
damage(health+1); //drown
}

28
core/src/io/anuke/mindustry/game/Difficulty.java Normal file
View File

@ -0,0 +1,28 @@
package io.anuke.mindustry.game;
import io.anuke.ucore.util.Bundles;
public enum Difficulty {
easy(4f, 2f),
normal(2f, 1f),
hard(1.5f, 0.5f),
insane(0.5f, 0.25f),
purge(0.4f, 0.01f);
/**The scaling of how many waves it takes for one more enemy of a type to appear.
* For example: with enemeyScaling = 2 and the default scaling being 2, it would take 4 waves for
* an enemy spawn to go from 1->2 enemies.*/
public final float enemyScaling;
/**Multiplier of the time between waves.*/
public final float timeScaling;
Difficulty(float enemyScaling, float timeScaling){
this.enemyScaling = enemyScaling;
this.timeScaling = timeScaling;
}
@Override
public String toString() {
return Bundles.get("setting.difficulty." + name());
}
}

9
core/src/io/anuke/mindustry/entities/EnemySpawn.java → core/src/io/anuke/mindustry/game/EnemySpawn.java
View File

@ -1,13 +1,10 @@
package io.anuke.mindustry.entities;
package io.anuke.mindustry.game;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.entities.enemies.EnemyType;
import io.anuke.ucore.core.Settings;
import io.anuke.ucore.util.Mathf;
public class EnemySpawn{
/**Scaling multiplier for each difficulty. Easy, normal, hard.*/
private static float[] scalings = {4f, 2.5f, 1.5f};
/**The enemy type spawned*/
public final EnemyType type;
/**When this spawns should end*/
@ -37,7 +34,7 @@ public class EnemySpawn{
if(wave < after || wave > before || (wave - after) % spacing != 0){
return 0;
}
float scaling = this.scaling * scalings[(Settings.getInt("difficulty"))];
float scaling = this.scaling * Vars.control.getDifficulty().enemyScaling;
return Math.min(amount-1 + Math.max((int)((wave / spacing) / scaling), 1) - (tier(wave, lane)-1) * tierscaleback, max);
}

2
core/src/io/anuke/mindustry/world/GameMode.java → core/src/io/anuke/mindustry/game/GameMode.java
View File

@ -1,4 +1,4 @@
package io.anuke.mindustry.world;
package io.anuke.mindustry.game;
import io.anuke.ucore.util.Bundles;

3
core/src/io/anuke/mindustry/world/SpawnPoint.java → core/src/io/anuke/mindustry/game/SpawnPoint.java
View File

@ -1,9 +1,10 @@
package io.anuke.mindustry.world;
package io.anuke.mindustry.game;
import com.badlogic.gdx.ai.pfa.PathFinder;
import com.badlogic.gdx.ai.pfa.PathFinderRequest;
import io.anuke.mindustry.ai.SmoothGraphPath;
import io.anuke.mindustry.world.Tile;
public class SpawnPoint{
public Tile start;

3
core/src/io/anuke/mindustry/entities/WaveCreator.java → core/src/io/anuke/mindustry/game/WaveCreator.java
View File

@ -1,4 +1,4 @@
package io.anuke.mindustry.entities;
package io.anuke.mindustry.game;
import com.badlogic.gdx.utils.Array;
import io.anuke.mindustry.entities.enemies.EnemyTypes;
@ -6,6 +6,7 @@ import io.anuke.mindustry.entities.enemies.EnemyTypes;
public class WaveCreator{
public static Array<EnemySpawn> getSpawns(){
return Array.with(
new EnemySpawn(EnemyTypes.standard){{
scaling = 1;

2
core/src/io/anuke/mindustry/graphics/BlockRenderer.java
View File

@ -14,10 +14,10 @@ import com.badlogic.gdx.utils.Array;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.GameState;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.game.SpawnPoint;
import io.anuke.mindustry.world.*;
import io.anuke.mindustry.world.blocks.Blocks;
import io.anuke.mindustry.world.blocks.types.StaticBlock;
import io.anuke.ucore.UCore;
import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Draw;
import io.anuke.ucore.core.Graphics;

10
core/src/io/anuke/mindustry/input/InputHandler.java
View File

@ -13,7 +13,7 @@ import io.anuke.mindustry.resource.ItemStack;
import io.anuke.mindustry.resource.Recipe;
import io.anuke.mindustry.resource.Recipes;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.SpawnPoint;
import io.anuke.mindustry.game.SpawnPoint;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.Blocks;
import io.anuke.mindustry.world.blocks.ProductionBlocks;
@ -109,9 +109,11 @@ public abstract class InputHandler extends InputAdapter{
}
}
for(Player player : Vars.control.playerGroup.all()){
if(!player.isAndroid && Tmp.r2.overlaps(player.hitbox.getRect(player.x, player.y))){
return false;
if(type.solid || type.solidifes) {
for (Player player : Vars.control.playerGroup.all()) {
if (!player.isAndroid && Tmp.r2.overlaps(player.hitbox.getRect(player.x, player.y))) {
return false;
}
}
}

2
core/src/io/anuke/mindustry/io/BundleGen.java
View File

@ -9,7 +9,7 @@ import io.anuke.mindustry.core.Tutorial.Stage;
import io.anuke.mindustry.resource.Item;
import io.anuke.mindustry.resource.Liquid;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.GameMode;
import io.anuke.mindustry.game.GameMode;
import io.anuke.mindustry.world.Map;
import io.anuke.ucore.core.Inputs.DeviceType;
import io.anuke.ucore.core.KeyBinds;

2
core/src/io/anuke/mindustry/io/NetworkIO.java
View File

@ -8,7 +8,7 @@ import io.anuke.mindustry.entities.enemies.Enemy;
import io.anuke.mindustry.entities.enemies.EnemyType;
import io.anuke.mindustry.resource.Weapon;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.GameMode;
import io.anuke.mindustry.game.GameMode;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.Blocks;
import io.anuke.mindustry.world.blocks.types.BlockPart;

2
core/src/io/anuke/mindustry/io/SaveMeta.java
View File

@ -2,7 +2,7 @@ package io.anuke.mindustry.io;
import io.anuke.mindustry.Mindustry;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.world.GameMode;
import io.anuke.mindustry.game.GameMode;
import io.anuke.mindustry.world.Map;
import java.util.Date;

2
core/src/io/anuke/mindustry/io/Saves.java
View File

@ -6,7 +6,7 @@ import com.badlogic.gdx.utils.async.AsyncExecutor;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.GameState;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.world.GameMode;
import io.anuke.mindustry.game.GameMode;
import io.anuke.mindustry.world.Map;
import io.anuke.ucore.core.Settings;
import io.anuke.ucore.core.Timers;

2
core/src/io/anuke/mindustry/io/versions/Save12.java
View File

@ -10,7 +10,7 @@ import io.anuke.mindustry.resource.Item;
import io.anuke.mindustry.resource.Upgrade;
import io.anuke.mindustry.resource.Weapon;
import io.anuke.mindustry.world.BlockLoader;
import io.anuke.mindustry.world.GameMode;
import io.anuke.mindustry.game.GameMode;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.Blocks;
import io.anuke.ucore.core.Core;

1
core/src/io/anuke/mindustry/io/versions/Save13.java
View File

@ -5,6 +5,7 @@ import com.badlogic.gdx.utils.TimeUtils;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.entities.enemies.Enemy;
import io.anuke.mindustry.entities.enemies.EnemyType;
import io.anuke.mindustry.game.GameMode;
import io.anuke.mindustry.io.SaveFileVersion;
import io.anuke.mindustry.resource.Item;
import io.anuke.mindustry.resource.Upgrade;

2
core/src/io/anuke/mindustry/io/versions/Save14.java
View File

@ -11,7 +11,7 @@ import io.anuke.mindustry.resource.Item;
import io.anuke.mindustry.resource.Upgrade;
import io.anuke.mindustry.resource.Weapon;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.GameMode;
import io.anuke.mindustry.game.GameMode;
import io.anuke.mindustry.world.Generator;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.Blocks;

5
core/src/io/anuke/mindustry/net/Packets.java
View File

@ -21,6 +21,7 @@ public class Packets {
public static class EntityDataPacket{
public Player[] players;
public EnemySpawnPacket[] enemies;
public byte[] playerWeapons;
public int playerid;
public byte[] weapons;
@ -135,4 +136,8 @@ public class Packets {
public int position;
public byte data;
}
public static class EntityRequestPacket{
public int id;
}
}

2
core/src/io/anuke/mindustry/net/Registrator.java
View File

@ -38,6 +38,7 @@ public class Registrator {
WeaponSwitchPacket.class,
BlockTapPacket.class,
BlockConfigPacket.class,
EntityRequestPacket.class,
Class.class,
byte[].class,
@ -49,6 +50,7 @@ public class Registrator {
Player[].class,
Array.class,
Vector2.class,
EnemySpawnPacket[].class,
Entity.class,
Player.class,

2
core/src/io/anuke/mindustry/ui/dialogs/LevelDialog.java
View File

@ -3,7 +3,7 @@ package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.world.GameMode;
import io.anuke.mindustry.game.GameMode;
import io.anuke.mindustry.world.Map;
import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Settings;

4
core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java
View File

@ -67,7 +67,7 @@ public class PausedDialog extends FloatingDialog{
content().addButton("$text.quit", () -> {
ui.showConfirm("$text.confirm", "$text.quit.confirm", () -> {
if(Net.active() && Net.client()) Net.disconnect();
if(Net.active() && Net.client()) Vars.netClient.disconnectQuietly();
runSave();
hide();
GameState.set(State.menu);
@ -110,7 +110,7 @@ public class PausedDialog extends FloatingDialog{
new imagebutton("icon-quit", isize, () -> {
Vars.ui.showConfirm("$text.confirm", "$text.quit.confirm", () -> {
if(Net.active() && Net.client()) Net.disconnect();
if(Net.active() && Net.client()) Vars.netClient.disconnectQuietly();
runSave();
hide();
GameState.set(State.menu);

3
core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@ -7,6 +7,7 @@ import com.badlogic.gdx.utils.Align;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.GameState;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.game.Difficulty;
import io.anuke.mindustry.net.Net;
import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Settings;
@ -106,7 +107,7 @@ public class SettingsMenuDialog extends SettingsDialog{
void addSettings(){
sound.volumePrefs();
game.sliderPref("difficulty", 1, 0, 2, i -> Bundles.get("setting.difficulty." + (i == 0 ? "easy" : i == 1 ? "normal" : "hard")));
game.sliderPref("difficulty", 1, 0, Difficulty.values().length-1, i -> Difficulty.values()[i].toString());
game.screenshakePref();
game.checkPref("smoothcam", true);
game.checkPref("effects", true);

7
core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java
View File

@ -28,7 +28,7 @@ public class ChatFragment extends Table implements Fragment{
private final static int messagesShown = 10;
private final static int maxLength = 150;
private Array<ChatMessage> messages = new Array<>();
private float fadetime;
private float fadetime, lastfade;
private boolean chatOpen = false;
private TextField chatfield;
private Label fieldlabel = new Label(">");
@ -157,12 +157,13 @@ public class ChatFragment extends Table implements Fragment{
scene.setKeyboardFocus(chatfield);
chatfield.fireClick();
chatOpen = !chatOpen;
lastfade = fadetime;
fadetime = messagesShown + 1;
}else if(chatOpen){
scene.setKeyboardFocus(null);
chatOpen = !chatOpen;
fadetime = lastfade;
sendMessage();
fadetime = messagesShown + 1;
}
}
@ -180,7 +181,7 @@ public class ChatFragment extends Table implements Fragment{
messages.insert(0, new ChatMessage(message, sender));
fadetime += 1f;
fadetime = Math.min(fadetime, messagesShown) + 2f;
fadetime = Math.min(fadetime, messagesShown) + 1f;
}
private static class ChatMessage{

4
core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java
View File

@ -35,8 +35,8 @@ public class ProductionBlocks{
inputs = new Item[]{Item.titanium, Item.steel};
fuel = Item.coal;
result = Item.dirium;
burnDuration = 80f;
craftTime = 40f;
burnDuration = 40f;
craftTime = 20f;
}
},

3
core/src/io/anuke/mindustry/world/blocks/types/BlockPart.java
View File

@ -23,7 +23,8 @@ public class BlockPart extends Block implements PowerAcceptor, LiquidAcceptor{
@Override
public boolean isSolidFor(Tile tile){
return tile.getLinked() == null
|| (tile.getLinked().solid() || tile.getLinked().block().isSolidFor(tile.getLinked()));
|| (tile.getLinked().block() instanceof BlockPart || tile.getLinked().solid()
|| tile.getLinked().block().isSolidFor(tile.getLinked()));
}
@Override

4
core/src/io/anuke/mindustry/world/blocks/types/defense/ShieldBlock.java
View File

@ -17,14 +17,14 @@ import io.anuke.ucore.util.Strings;
public class ShieldBlock extends PowerBlock{
public float shieldRadius = 40f;
public float powerDrain = 0.005f;
public float powerPerDamage = 0.07f;
public float powerPerDamage = 0.06f;
public float maxRadius = 40f;
public float radiusScale = 300f;
public ShieldBlock(String name) {
super(name);
voltage = powerDrain;
powerCapacity = 40f;
powerCapacity = 80f;
}
@Override

4
core/src/io/anuke/mindustry/world/blocks/types/production/Smelter.java
View File

@ -25,8 +25,8 @@ public class Smelter extends Block{
protected Item fuel;
protected Item result;
protected float craftTime = 30f; //time to craft one item, so max 2 items per second by default
protected float burnDuration = 60f; //by default, the fuel will burn 60 frames, so that's 2 items/fuel at most
protected float craftTime = 15f; //time to craft one item, so max 4 items per second by default
protected float burnDuration = 45f; //by default, the fuel will burn 45 frames, so that's 4 items/fuel at most
protected Effect craftEffect = Fx.smelt, burnEffect = Fx.fuelburn;
protected int capacity = 20;