mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-20 09:17:19 +07:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Anuken 2022-04-28 12:21:19 -04:00
parent ee23886666
commit e92e307431
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/content/Blocks.java
View File

@ -1591,7 +1591,7 @@ public class Blocks{
requirements(Category.defense, with(Items.beryllium, 6)); requirements(Category.defense, with(Items.beryllium, 6));
health = 130 * wallHealthMultiplier; health = 130 * wallHealthMultiplier;
armor = 2f; armor = 2f;
buildCostMultiplier = 6.5f; buildCostMultiplier = 8f;
}}; }};
berylliumWallLarge = new Wall("beryllium-wall-large"){{ berylliumWallLarge = new Wall("beryllium-wall-large"){{
@ -1606,7 +1606,7 @@ public class Blocks{
requirements(Category.defense, with(Items.tungsten, 6)); requirements(Category.defense, with(Items.tungsten, 6));
health = 180 * wallHealthMultiplier; health = 180 * wallHealthMultiplier;
armor = 14f; armor = 14f;
buildCostMultiplier = 6.5f; buildCostMultiplier = 8f;
}}; }};
tungstenWallLarge = new Wall("tungsten-wall-large"){{ tungstenWallLarge = new Wall("tungsten-wall-large"){{

10
core/src/mindustry/core/Logic.java
View File

@ -343,7 +343,10 @@ public class Logic implements ApplicationListener{
} }
} }
if(!net.client() && first.complete()){ boolean completed = false;
//multiple objectives can be updated in the same frame
while(!net.client() && first != null && first.complete()){
state.rules.objectives.remove(0); state.rules.objectives.remove(0);
first.completed(); first.completed();
//apply flags. //apply flags.
@ -359,6 +362,11 @@ public class Logic implements ApplicationListener{
} }
} }
first = state.rules.objectives.first();
completed = true;
}
if(completed){
//TODO call packet for this? //TODO call packet for this?
if(net.server()){ if(net.server()){
Call.setRules(state.rules); Call.setRules(state.rules);

2
core/src/mindustry/game/Team.java
View File

@ -31,7 +31,7 @@ public class Team implements Comparable<Team>{
derelict = new Team(0, "derelict", Color.valueOf("4d4e58")), derelict = new Team(0, "derelict", Color.valueOf("4d4e58")),
sharded = new Team(1, "sharded", Pal.accent.cpy(), Color.valueOf("ffd37f"), Color.valueOf("eab678"), Color.valueOf("d4816b")), sharded = new Team(1, "sharded", Pal.accent.cpy(), Color.valueOf("ffd37f"), Color.valueOf("eab678"), Color.valueOf("d4816b")),
crux = new Team(2, "crux", Color.valueOf("f25555"), Color.valueOf("fc8e6c"), Color.valueOf("f25555"), Color.valueOf("a04553")), crux = new Team(2, "crux", Color.valueOf("f25555"), Color.valueOf("fc8e6c"), Color.valueOf("f25555"), Color.valueOf("a04553")),
malis = new Team(3, "malis", Color.valueOf("995bb0"), Color.valueOf("f08dd5"), Color.valueOf("995bb0"), Color.valueOf("312c63")), malis = new Team(3, "malis", Color.valueOf("a27ce5"), Color.valueOf("484988"), Color.valueOf("665c9f"), Color.valueOf("bf92f9")),
green = new Team(4, "green", Color.valueOf("54d67d"), Color.valueOf("96f58c"), Color.valueOf("54d67d"), Color.valueOf("28785c")), green = new Team(4, "green", Color.valueOf("54d67d"), Color.valueOf("96f58c"), Color.valueOf("54d67d"), Color.valueOf("28785c")),
blue = new Team(5, "blue", Color.valueOf("6c87fd"), Color.valueOf("85caf9"), Color.valueOf("6c87fd"), Color.valueOf("3b3392")); blue = new Team(5, "blue", Color.valueOf("6c87fd"), Color.valueOf("85caf9"), Color.valueOf("6c87fd"), Color.valueOf("3b3392"));