Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rule selection fixes

Browse Source
This commit is contained in:
Anuken
2020-10-12 15:59:22 -04:00
parent fde1881fd5
commit 06877b457e
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/maps/Map.java
View File

@@ -98,7 +98,9 @@ public class Map implements Comparable<Map>, Publishable{
public Rules rules(Rules base){ public Rules rules(Rules base){
try{ try{
Rules result = JsonIO.read(Rules.class, base, tags.get("rules", "{}")); //this replacement is a MASSIVE hack but it fixes some incorrect overwriting of team-specific rules.
//may need to be tweaked later
Rules result = JsonIO.read(Rules.class, base, tags.get("rules", "{}").replace("teams:{2:{infiniteAmmo:true}},", ""));
if(result.spawns.isEmpty()) result.spawns = Vars.defaultWaves.get(); if(result.spawns.isEmpty()) result.spawns = Vars.defaultWaves.get();
return result; return result;
}catch(Exception e){ }catch(Exception e){

16
core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java
View File

@@ -145,7 +145,7 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
float constraint = 1.3f; float constraint = 1.3f;
float radius = width / 2f / Mathf.sqrt3; float radius = width / 2f / Mathf.sqrt3;
int rooms = rand.random(2, 5); int rooms = rand.random(2, 5);
Seq<Room> array = new Seq<>(); Seq<Room> roomseq = new Seq<>();
for(int i = 0; i < rooms; i++){ for(int i = 0; i < rooms; i++){
Tmp.v1.trns(rand.random(360f), rand.random(radius / constraint)); Tmp.v1.trns(rand.random(360f), rand.random(radius / constraint));
@@ -153,7 +153,7 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
float ry = (height/2f + Tmp.v1.y); float ry = (height/2f + Tmp.v1.y);
float maxrad = radius - Tmp.v1.len(); float maxrad = radius - Tmp.v1.len();
float rrad = Math.min(rand.random(9f, maxrad / 2f), 30f); float rrad = Math.min(rand.random(9f, maxrad / 2f), 30f);
array.add(new Room((int)rx, (int)ry, (int)rrad)); roomseq.add(new Room((int)rx, (int)ry, (int)rrad));
} }
//check positions on the map to place the player spawn. this needs to be in the corner of the map //check positions on the map to place the player spawn. this needs to be in the corner of the map
@@ -182,13 +182,13 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
} }
if(waterTiles <= 4 || (i + angleStep >= 360)){ if(waterTiles <= 4 || (i + angleStep >= 360)){
array.add(spawn = new Room(cx, cy, rand.random(8, 15))); roomseq.add(spawn = new Room(cx, cy, rand.random(8, 15)));
for(int j = 0; j < enemySpawns; j++){ for(int j = 0; j < enemySpawns; j++){
float enemyOffset = rand.range(60f); float enemyOffset = rand.range(60f);
Tmp.v1.set(cx - width/2, cy - height/2).rotate(180f + enemyOffset).add(width/2, height/2); Tmp.v1.set(cx - width/2, cy - height/2).rotate(180f + enemyOffset).add(width/2, height/2);
Room espawn = new Room((int)Tmp.v1.x, (int)Tmp.v1.y, rand.random(8, 15)); Room espawn = new Room((int)Tmp.v1.x, (int)Tmp.v1.y, rand.random(8, 15));
array.add(espawn); roomseq.add(espawn);
enemies.add(espawn); enemies.add(espawn);
} }
@@ -196,16 +196,16 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
} }
} }
for(Room room : array){ for(Room room : roomseq){
erase(room.x, room.y, room.radius); erase(room.x, room.y, room.radius);
} }
int connections = rand.random(Math.max(rooms - 1, 1), rooms + 3); int connections = rand.random(Math.max(rooms - 1, 1), rooms + 3);
for(int i = 0; i < connections; i++){ for(int i = 0; i < connections; i++){
array.random(rand).connect(array.random(rand)); roomseq.random(rand).connect(roomseq.random(rand));
} }
for(Room room : array){ for(Room room : roomseq){
spawn.connect(room); spawn.connect(room);
} }
@@ -269,7 +269,7 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{
//tar //tar
if(floor == Blocks.darksand){ if(floor == Blocks.darksand){
if(Math.abs(0.5f - noise(x - 40, y, 2, 0.7, 80)) > 0.25f && if(Math.abs(0.5f - noise(x - 40, y, 2, 0.7, 80)) > 0.25f &&
Math.abs(0.5f - noise(x, y + sector.id*10, 1, 1, 60)) > 0.41f && !(enemies.contains(r -> Mathf.within(x, y, r.x, r.y, 15)))){ Math.abs(0.5f - noise(x, y + sector.id*10, 1, 1, 60)) > 0.41f && !(roomseq.contains(r -> Mathf.within(x, y, r.x, r.y, 15)))){
floor = Blocks.tar; floor = Blocks.tar;
ore = Blocks.air; ore = Blocks.air;
} }

4
core/src/mindustry/ui/dialogs/CustomRulesDialog.java
View File

@@ -24,8 +24,8 @@ import static arc.util.Time.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
public class CustomRulesDialog extends BaseDialog{ public class CustomRulesDialog extends BaseDialog{
private Table main;
Rules rules; Rules rules;
private Table main;
private Prov<Rules> resetter; private Prov<Rules> resetter;
private LoadoutDialog loadoutDialog; private LoadoutDialog loadoutDialog;
private BaseDialog banDialog; private BaseDialog banDialog;
@@ -166,7 +166,7 @@ public class CustomRulesDialog extends BaseDialog{
title("@rules.title.enemy"); title("@rules.title.enemy");
check("@rules.attack", b -> rules.attackMode = b, () -> rules.attackMode); check("@rules.attack", b -> rules.attackMode = b, () -> rules.attackMode);
check("@rules.buildai", b -> rules.waveTeam.rules().ai = b, () -> rules.waveTeam.rules().ai); check("@rules.buildai", b -> rules.teams.get(rules.waveTeam).ai = rules.teams.get(rules.waveTeam).infiniteResources = b, () -> rules.teams.get(rules.waveTeam).ai);
number("@rules.enemycorebuildradius", f -> rules.enemyCoreBuildRadius = f * tilesize, () -> Math.min(rules.enemyCoreBuildRadius / tilesize, 200)); number("@rules.enemycorebuildradius", f -> rules.enemyCoreBuildRadius = f * tilesize, () -> Math.min(rules.enemyCoreBuildRadius / tilesize, 200));
title("@rules.title.environment"); title("@rules.title.environment");