mirror of
https://github.com/Anuken/Mindustry.git
synced 2024-09-21 13:28:12 +03:00
Various bugfixes
This commit is contained in:
parent
4e3204bc6d
commit
91552a3a2b
@ -21,11 +21,11 @@ public class CraftingBlocks extends BlockList implements ContentList{
|
||||
health = 70;
|
||||
result = Items.carbide;
|
||||
craftTime = 45f;
|
||||
burnDuration = 45f;
|
||||
burnDuration = 46f;
|
||||
useFlux = true;
|
||||
|
||||
consumes.items(new ItemStack[]{new ItemStack(Items.tungsten, 3)});
|
||||
consumes.item(Items.coal);
|
||||
consumes.item(Items.coal).optional(true);
|
||||
}};
|
||||
|
||||
arcsmelter = new PowerSmelter("arc-smelter"){{
|
||||
|
@ -144,7 +144,7 @@ public class MinimapRenderer implements Disposable{
|
||||
|
||||
private int colorFor(Tile tile){
|
||||
tile = tile.target();
|
||||
return ColorMapper.colorFor(tile.floor(), tile.block(), tile.getTeam(), tile.getElevation());
|
||||
return ColorMapper.colorFor(tile.floor(), tile.block(), tile.getTeam(), tile.getElevation(), tile.getCliffs());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -182,7 +182,7 @@ public class Sectors{
|
||||
|
||||
GenResult result = world.generator().generateTile(sector.x, sector.y, toX, toY, false);
|
||||
|
||||
int color = ColorMapper.colorFor(result.floor, result.wall, Team.none, result.elevation);
|
||||
int color = ColorMapper.colorFor(result.floor, result.wall, Team.none, result.elevation, (byte)0);
|
||||
pixmap.drawPixel(x, pixmap.getHeight() - 1 - y, color);
|
||||
}
|
||||
}
|
||||
|
@ -22,7 +22,7 @@ import static io.anuke.mindustry.Vars.world;
|
||||
public class Packets{
|
||||
|
||||
public enum KickReason{
|
||||
kick, invalidPassword, clientOutdated, serverOutdated, banned, gameover(true), recentKick, nameInUse, idInUse, fastShoot, nameEmpty, customClient;
|
||||
kick, invalidPassword, clientOutdated, serverOutdated, banned, gameover(true), recentKick, nameInUse, idInUse, fastShoot, nameEmpty, customClient, sectorComplete(true);
|
||||
public final boolean quiet;
|
||||
|
||||
KickReason(){
|
||||
|
@ -82,7 +82,7 @@ public class GenViewDialog extends FloatingDialog{
|
||||
for(int i = 0; i < sectorSize; i++){
|
||||
for(int j = 0; j < sectorSize; j++){
|
||||
world.generator().generateTile(result, wx, wy, i, j, true, null);
|
||||
pixmap.drawPixel(i, sectorSize - 1 - j, ColorMapper.colorFor(result.floor, result.wall, Team.none, result.elevation));
|
||||
pixmap.drawPixel(i, sectorSize - 1 - j, ColorMapper.colorFor(result.floor, result.wall, Team.none, result.elevation, (byte)0));
|
||||
}
|
||||
}
|
||||
Gdx.app.postRunnable(() -> map.put(wx, wy, new Texture(pixmap)));
|
||||
|
@ -7,6 +7,7 @@ import com.badlogic.gdx.utils.ObjectIntMap;
|
||||
import io.anuke.mindustry.game.Content;
|
||||
import io.anuke.mindustry.game.Team;
|
||||
import io.anuke.mindustry.type.ContentList;
|
||||
import io.anuke.ucore.util.Mathf;
|
||||
|
||||
public class ColorMapper implements ContentList{
|
||||
private static IntMap<Block> blockMap = new IntMap<>();
|
||||
@ -21,7 +22,7 @@ public class ColorMapper implements ContentList{
|
||||
return colorMap.get(block, 0);
|
||||
}
|
||||
|
||||
public static int colorFor(Block floor, Block wall, Team team, int elevation){
|
||||
public static int colorFor(Block floor, Block wall, Team team, int elevation, byte cliffs){
|
||||
if(wall.synthetic()){
|
||||
return team.intColor;
|
||||
}
|
||||
@ -33,6 +34,9 @@ public class ColorMapper implements ContentList{
|
||||
tmpColor.set(color);
|
||||
float maxMult = 1f/Math.max(Math.max(tmpColor.r, tmpColor.g), tmpColor.b) ;
|
||||
float mul = Math.min(1.1f + elevation / 4f, maxMult);
|
||||
if((cliffs & Mathf.pow2(6)) != 0){
|
||||
mul -= 0.5f;
|
||||
}
|
||||
tmpColor.mul(mul, mul, mul, 1f);
|
||||
color = Color.rgba8888(tmpColor);
|
||||
}
|
||||
|
@ -305,7 +305,7 @@ public class Conveyor extends Block{
|
||||
@Override
|
||||
public synchronized int acceptStack(Item item, int amount, Tile tile, Unit source){
|
||||
ConveyorEntity entity = tile.entity();
|
||||
return (int)(entity.minitem / itemSpace);
|
||||
return Math.min((int)(entity.minitem / itemSpace), amount);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -38,7 +38,7 @@ import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
public class UnitPad extends Block{
|
||||
protected float gracePeriodMultiplier = 16f;
|
||||
protected float gracePeriodMultiplier = 19f;
|
||||
protected float speedupTime = 60f * 60f * 19;
|
||||
protected float maxSpeedup = 7f;
|
||||
|
||||
|
@ -19,6 +19,7 @@
|
||||
</resources>
|
||||
<forceLinkClasses>
|
||||
<pattern>io.anuke.ucore.scene.**</pattern>
|
||||
<pattern>io.anuke.mindustry.gen.Call</pattern>
|
||||
<pattern>io.anuke.mindustry.net.**</pattern>
|
||||
<pattern>com.android.okhttp.HttpHandler</pattern>
|
||||
<pattern>com.android.okhttp.HttpsHandler</pattern>
|
||||
|
@ -41,7 +41,8 @@ public class ServerControl extends Module{
|
||||
Settings.defaultList(
|
||||
"shufflemode", "normal",
|
||||
"bans", "",
|
||||
"admins", ""
|
||||
"admins", "",
|
||||
"sectorid", 0
|
||||
);
|
||||
|
||||
mode = ShuffleMode.valueOf(Settings.getString("shufflemode"));
|
||||
|
Loading…
Reference in New Issue
Block a user