mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-25 15:18:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

Renamed Calls -> Call

Browse Source
This commit is contained in:
Anuken
2019-12-26 23:00:26 -05:00
parent d6d6dc29dc
commit 98f8a1732e
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/assets/scripts/base.js
View File

@ -16,4 +16,5 @@ const boolp = method => new Boolp(){get: method}
const cons = method => new Cons(){get: method} const cons = method => new Cons(){get: method}
const prov = method => new Prov(){get: method} const prov = method => new Prov(){get: method}
const newEffect = (lifetime, renderer) => new Effects.Effect(lifetime, new Effects.EffectRenderer({render: renderer})) const newEffect = (lifetime, renderer) => new Effects.Effect(lifetime, new Effects.EffectRenderer({render: renderer}))
const Calls = Packages.io.anuke.mindustry.gen.Call Call = Packages.io.anuke.mindustry.gen.Call
const Calls = Call //backwards compat

3
core/assets/scripts/global.js
View File

@ -18,7 +18,8 @@ const boolp = method => new Boolp(){get: method}
const cons = method => new Cons(){get: method} const cons = method => new Cons(){get: method}
const prov = method => new Prov(){get: method} const prov = method => new Prov(){get: method}
const newEffect = (lifetime, renderer) => new Effects.Effect(lifetime, new Effects.EffectRenderer({render: renderer})) const newEffect = (lifetime, renderer) => new Effects.Effect(lifetime, new Effects.EffectRenderer({render: renderer}))
const Calls = Packages.io.anuke.mindustry.gen.Call Call = Packages.io.anuke.mindustry.gen.Call
const Calls = Call //backwards compat
importPackage(Packages.arc) importPackage(Packages.arc)
importPackage(Packages.arc.func) importPackage(Packages.arc.func)
importPackage(Packages.arc.graphics) importPackage(Packages.arc.graphics)

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

@ -2,6 +2,7 @@ package mindustry.game;
import arc.*; import arc.*;
import arc.graphics.*; import arc.graphics.*;
import arc.math.*;
import arc.struct.*; import arc.struct.*;
import arc.util.*; import arc.util.*;
import mindustry.game.Teams.*; import mindustry.game.Teams.*;
@ -29,10 +30,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(7);
//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 * (float)(i) / all.length * 10, 100f * 0.8f, 100f * 0.8f, 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 RandomXS128().nextLong());
} }
public static Team get(int id){ public static Team get(int id){

2
core/src/mindustry/mod/ClassAccess.java
View File

File diff suppressed because one or more lines are too long