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

Rand rename

Browse Source
This commit is contained in:
Anuken
2020-08-04 09:10:22 -04:00
parent 7ecd8b3169
commit b268e8ca58
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,12 +36,12 @@ public class Team implements Comparable<Team>{
blue = new Team(5, "blue", Color.royal.cpy()); blue = new Team(5, "blue", Color.royal.cpy());
static{ static{
Mathf.random.setSeed(8); Mathf.rand.setSeed(8);
//create the whole 256 placeholder teams //create the whole 256 placeholder teams
for(int i = 6; i < all.length; i++){ for(int i = 6; i < all.length; i++){
new Team(i, "team#" + i, Color.HSVtoRGB(360f * Mathf.random(), 100f * Mathf.random(0.6f, 1f), 100f * Mathf.random(0.8f, 1f), 1f)); new Team(i, "team#" + i, Color.HSVtoRGB(360f * Mathf.random(), 100f * Mathf.random(0.6f, 1f), 100f * Mathf.random(0.8f, 1f), 1f));
} }
Mathf.random.setSeed(new Rand().nextLong()); Mathf.rand.setSeed(new Rand().nextLong());
} }
public static Team get(int id){ public static Team get(int id){

2
core/src/mindustry/maps/generators/BaseGenerator.java
View File

@@ -36,7 +36,7 @@ public class BaseGenerator{
//don't generate bases when there are no loaded schematics //don't generate bases when there are no loaded schematics
if(bases.cores.isEmpty()) return; if(bases.cores.isEmpty()) return;
Mathf.random.setSeed(sector.id); Mathf.rand.setSeed(sector.id);
for(Block block : content.blocks()){ for(Block block : content.blocks()){
if(block instanceof OreBlock && block.asFloor().itemDrop != null){ if(block instanceof OreBlock && block.asFloor().itemDrop != null){

4
core/src/mindustry/world/blocks/environment/Floor.java
View File

@@ -148,7 +148,7 @@ public class Floor extends Block{
@Override @Override
public void drawBase(Tile tile){ public void drawBase(Tile tile){
Mathf.random.setSeed(tile.pos()); Mathf.rand.setSeed(tile.pos());
Draw.rect(variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))], tile.worldx(), tile.worldy()); Draw.rect(variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))], tile.worldx(), tile.worldy());
@@ -170,7 +170,7 @@ public class Floor extends Block{
} }
public void drawNonLayer(Tile tile){ public void drawNonLayer(Tile tile){
Mathf.random.setSeed(tile.pos()); Mathf.rand.setSeed(tile.pos());
drawEdges(tile, true); drawEdges(tile, true);
} }