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

Fixed #7801

Browse Source
This commit is contained in:
Anuken 2022-11-02 08:37:11 -04:00
parent 3e6c54069d
commit 74839a7f8d
5 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/content/Liquids.java
View File

@ -73,7 +73,6 @@ public class Liquids{
hidden = true;
}};
//TODO reactivity, etc
ozone = new Liquid("ozone", Color.valueOf("fc81dd")){{
gas = true;
barColor = Color.valueOf("d699f0");
@ -81,7 +80,6 @@ public class Liquids{
flammability = 1f;
}};
//TODO combustion
hydrogen = new Liquid("hydrogen", Color.valueOf("9eabf7")){{
gas = true;
flammability = 1f;

1
core/src/mindustry/game/EventType.java
View File

@ -16,6 +16,7 @@ public class EventType{
//events that occur very often
public enum Trigger{
shock,
openConsole,
blastFreeze,
impactPower,
blastGenerator,

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

@ -205,9 +205,7 @@ public class Saves{
}
public void save(){
long time = totalPlaytime;
long prev = totalPlaytime;
totalPlaytime = time;
SaveIO.save(file);
meta = SaveIO.getMeta(file);

6
core/src/mindustry/service/GameService.java
View File

@ -117,6 +117,8 @@ public class GameService{
captureAllSectors.complete();
}
Events.run(Trigger.openConsole, () -> openConsole.complete());
Events.run(Trigger.unitCommandAttack, () -> {
if(campaign()){
issueAttackCommand.complete();
@ -534,10 +536,6 @@ public class GameService{
}
}
}
if(ui.consolefrag.shown()){
openConsole.complete();
}
}
private void save(){

2
core/src/mindustry/ui/fragments/ConsoleFragment.java
View File

@ -12,6 +12,7 @@ import arc.scene.ui.TextField.*;
import arc.scene.ui.layout.*;
import arc.struct.*;
import arc.util.*;
import mindustry.game.EventType.*;
import mindustry.input.*;
import mindustry.ui.*;
@ -175,6 +176,7 @@ public class ConsoleFragment extends Table{
public void toggle(){
if(!open){
Events.fire(Trigger.openConsole);
scene.setKeyboardFocus(chatfield);
open = !open;
if(mobile){