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

Balancing / Bugfixes / Decreased build duration slightly

Browse Source
This commit is contained in:
Anuken
2019-03-28 14:38:00 -04:00
parent fd190c7770
commit e6a24b8ba1
9 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites_replacement/blocks/environment/pine.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

5
core/assets/shaders/fog.fragment
View File

@ -8,8 +8,7 @@ uniform sampler2D u_texture;
varying vec4 v_color;
varying vec2 v_texCoord;
void main() {
void main(){
vec4 color = texture2D(u_texture, v_texCoord.xy);
color = vec4(0.0, 0.0, 0.0, 1.0 - color.r);
gl_FragColor = color;
gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0 - color.r);
}

2
core/src/io/anuke/mindustry/content/Blocks.java
View File

@ -599,7 +599,7 @@ public class Blocks implements ContentList{
//endregion
//region defense
int wallHealthMultiplier = 3;
int wallHealthMultiplier = 4;
scrapWall = new Wall("scrap-wall"){{
health = 60 * wallHealthMultiplier;

18
core/src/io/anuke/mindustry/content/Items.java
View File

@ -14,24 +14,24 @@ public class Items implements ContentList{
copper = new Item("copper", Color.valueOf("d99d73")){{
type = ItemType.material;
hardness = 1;
cost = 0.6f;
cost = 0.5f;
alwaysUnlocked = true;
}};
lead = new Item("lead", Color.valueOf("8c7fa9")){{
type = ItemType.material;
hardness = 1;
cost = 0.9f;
cost = 0.7f;
}};
metaglass = new Item("metaglass", Color.valueOf("ebeef5")){{
type = ItemType.material;
cost = 2f;
cost = 1.5f;
}};
graphite = new Item("graphite", Color.valueOf("b2c6d2")){{
type = ItemType.material;
cost = 1.3f;
cost = 1f;
}};
coal = new Item("coal", Color.valueOf("272727")){{
@ -43,7 +43,7 @@ public class Items implements ContentList{
titanium = new Item("titanium", Color.valueOf("8da1e3")){{
type = ItemType.material;
hardness = 3;
cost = 1.1f;
cost = 1f;
}};
thorium = new Item("thorium", Color.valueOf("f9a3c7")){{
@ -51,7 +51,7 @@ public class Items implements ContentList{
explosiveness = 0.2f;
hardness = 4;
radioactivity = 1f;
cost = 1.4f;
cost = 1.1f;
}};
scrap = new Item("scrap", Color.valueOf("777777")){{
@ -60,19 +60,19 @@ public class Items implements ContentList{
silicon = new Item("silicon", Color.valueOf("53565c")){{
type = ItemType.material;
cost = 0.9f;
cost = 0.8f;
}};
plastanium = new Item("plastanium", Color.valueOf("cbd97f")){{
type = ItemType.material;
flammability = 0.2f;
explosiveness = 0.2f;
cost = 1.6f;
cost = 1.3f;
}};
phasefabric = new Item("phase-fabric", Color.valueOf("f4ba6e")){{
type = ItemType.material;
cost = 1.5f;
cost = 1.3f;
radioactivity = 0.6f;
}};

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

@ -307,7 +307,7 @@ public class Renderer implements ApplicationListener{
public void clampScale(){
float s = io.anuke.arc.scene.ui.layout.Unit.dp.scl(1f);
targetscale = Mathf.clamp(targetscale, s * 1.5f, Math.round(s * 5));
targetscale = Mathf.clamp(targetscale, s * 1.5f, Math.round(s * 6));
}
}

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

@ -23,7 +23,7 @@ import static io.anuke.mindustry.Vars.*;
public class BlockRenderer{
private final static int initialRequests = 32 * 32;
private final static int expandr = 9;
private final static Color shadowColor = new Color(0, 0, 0, 0.7f);
private final static Color shadowColor = new Color(0, 0, 0, 0.71f);
public final FloorRenderer floor = new FloorRenderer();

2
core/src/io/anuke/mindustry/input/MobileInput.java
View File

@ -727,7 +727,7 @@ public class MobileInput extends InputHandler implements GestureListener{
public boolean zoom(float initialDistance, float distance){
if(lastDistance == -1) lastDistance = initialDistance;
float amount = (Mathf.sign(distance > lastDistance) * 0.07f) * Time.delta();
float amount = (Mathf.sign(distance > lastDistance) * 0.04f) * Time.delta();
renderer.scaleCamera(io.anuke.arc.scene.ui.layout.Unit.dp.scl(amount));
lastDistance = distance;
return true;

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

@ -10,7 +10,6 @@ import io.anuke.arc.scene.ui.TextButton;
import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.scene.ui.layout.Unit;
import io.anuke.arc.util.Align;
import io.anuke.arc.util.Structs;
import io.anuke.mindustry.content.Zones;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.game.Saves.SaveSlot;
@ -178,7 +177,7 @@ public class DeployDialog extends FloatingDialog{
this.height /= 2f;
nodes.add(this);
arr.selectFrom(content.zones(), other -> Structs.find(other.zoneRequirements, f -> f.zone == zone) != null);
arr.selectFrom(content.zones(), other -> other.zoneRequirements.length > 0 && other.zoneRequirements[0].zone == zone);
children = new ZoneNode[arr.size];
for(int i = 0; i < children.length; i++){

6
core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
View File

@ -287,7 +287,7 @@ public class BuildBlock extends Block{
this.previous = previous;
this.accumulator = new float[block.buildRequirements.length];
this.totalAccumulator = new float[block.buildRequirements.length];
this.buildCost = block.buildCost;
this.buildCost = block.buildCost * state.rules.buildCostMultiplier;
}
public void setDeconstruct(Block previous){
@ -297,7 +297,7 @@ public class BuildBlock extends Block{
this.block = previous;
this.accumulator = new float[previous.buildRequirements.length];
this.totalAccumulator = new float[previous.buildRequirements.length];
this.buildCost = previous.buildCost;
this.buildCost = previous.buildCost * state.rules.buildCostMultiplier;
}else{
this.buildCost = 20f; //default no-requirement build cost is 20
}
@ -340,7 +340,7 @@ public class BuildBlock extends Block{
if(rid != -1) block = content.block(rid);
if(block != null){
buildCost = block.buildCost;
buildCost = block.buildCost * state.rules.buildCostMultiplier;
}else{
buildCost = 20f;
}