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

Added "Launching From" info

Browse Source
This commit is contained in:
Anuken 2020-11-18 20:05:45 -05:00
parent 8692639e62
commit 72d5a8a768
5 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/effects/launch-arrow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 213 B

1
core/assets/bundles/bundle.properties
View File

@ -505,6 +505,7 @@ loadout = Loadout
resources = Resources resources = Resources
bannedblocks = Banned Blocks bannedblocks = Banned Blocks
addall = Add All addall = Add All
launch.from = Launching From: [accent]{0}
launch.destination = Destination: {0} launch.destination = Destination: {0}
configure.invalid = Amount must be a number between 0 and {0}. configure.invalid = Amount must be a number between 0 and {0}.
zone.unlocked = [lightgray]{0} unlocked. zone.unlocked = [lightgray]{0} unlocked.

3
core/src/mindustry/game/SectorInfo.java
View File

@ -43,6 +43,8 @@ public class SectorInfo{
public boolean waves = true; public boolean waves = true;
/** Whether attack mode is enabled here. */ /** Whether attack mode is enabled here. */
public boolean attack = false; public boolean attack = false;
/** Whether this sector has any enemy spawns. */
public boolean hasSpawns = true;
/** Wave # from state */ /** Wave # from state */
public int wave = 1, winWave = -1; public int wave = 1, winWave = -1;
/** Waves this sector can survive if under attack. Based on wave in info. <0 means uncalculated. */ /** Waves this sector can survive if under attack. Based on wave in info. <0 means uncalculated. */
@ -168,6 +170,7 @@ public class SectorInfo{
secondsPassed = 0; secondsPassed = 0;
wavesPassed = 0; wavesPassed = 0;
damage = 0; damage = 0;
hasSpawns = spawner.countSpawns() > 0;
if(state.rules.sector != null){ if(state.rules.sector != null){
state.rules.sector.saveInfo(); state.rules.sector.saveInfo();

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

@ -206,7 +206,7 @@ public class Universe{
} }
//queue random invasions //queue random invasions
if(!sector.isAttacked() && turn > invasionGracePeriod){ if(!sector.isAttacked() && turn > invasionGracePeriod && sector.info.hasSpawns){
//invasion chance depends on # of nearby bases //invasion chance depends on # of nearby bases
if(Mathf.chance(baseInvasionChance * sector.near().count(Sector::hasEnemyBase))){ if(Mathf.chance(baseInvasionChance * sector.near().count(Sector::hasEnemyBase))){
int waveMax = Math.max(sector.info.winWave, sector.isBeingPlayed() ? state.wave : sector.info.wave + sector.info.wavesPassed) + Mathf.random(2, 5) * 5; int waveMax = Math.max(sector.info.winWave, sector.isBeingPlayed() ? state.wave : sector.info.wave + sector.info.wavesPassed) + Mathf.random(2, 5) * 5;

2
core/src/mindustry/ui/dialogs/LaunchLoadoutDialog.java
View File

@ -103,6 +103,8 @@ public class LaunchLoadoutDialog extends BaseDialog{
ButtonGroup<Button> group = new ButtonGroup<>(); ButtonGroup<Button> group = new ButtonGroup<>();
selected = universe.getLoadout(core); selected = universe.getLoadout(core);
cont.add(Core.bundle.format("launch.from", sector.name())).row();
cont.pane(t -> { cont.pane(t -> {
int i = 0; int i = 0;