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

Payload loader/unloader 3x3 support

Browse Source
This commit is contained in:
Anuken
2022-01-02 14:24:06 -05:00
parent eef1d68d4c
commit 38cb7aa41d
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/ui/dialogs/PlanetDialog.java
View File

@@ -451,6 +451,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
boolean selectable(Planet planet){ boolean selectable(Planet planet){
//TODO what if any sector is selectable? //TODO what if any sector is selectable?
//TODO launch criteria - which planets can be launched to? Where should this be defined? Should planets even be selectable?
if(mode == planetLaunch) return launchSector != null && planet != launchSector.planet; if(mode == planetLaunch) return launchSector != null && planet != launchSector.planet;
return planet == state.planet || (planet.alwaysUnlocked && planet.isLandable()) || planet.sectors.contains(Sector::hasBase); return planet == state.planet || (planet.alwaysUnlocked && planet.isLandable()) || planet.sectors.contains(Sector::hasBase);
} }

14
core/src/mindustry/world/blocks/campaign/Accelerator.java
View File

@@ -109,15 +109,11 @@ public class Accelerator extends Block{
if(!state.isCampaign() || !consValid()) return; if(!state.isCampaign() || !consValid()) return;
//TODO implement ui.planet.showPlanetLaunch(state.rules.sector, sector -> {
if(true){ //TODO cutscene, etc...
ui.showInfo("@indev.campaign"); consume();
}else{ });
ui.planet.showPlanetLaunch(state.rules.sector, sector -> {
//TODO cutscene, etc...
consume();
});
}
Events.fire(Trigger.acceleratorUse); Events.fire(Trigger.acceleratorUse);
} }

8
core/src/mindustry/world/blocks/payloads/PayloadLoader.java
View File

@@ -18,7 +18,7 @@ public class PayloadLoader extends PayloadBlock{
public float loadTime = 2f; public float loadTime = 2f;
public int itemsLoaded = 8; public int itemsLoaded = 8;
public float liquidsLoaded = 40f; public float liquidsLoaded = 40f;
public int maxBlockSize = 2; public int maxBlockSize = 3;
public PayloadLoader(String name){ public PayloadLoader(String name){
super(name); super(name);
@@ -102,11 +102,11 @@ public class PayloadLoader extends PayloadBlock{
Draw.rect(outRegion, x, y, rotdeg()); Draw.rect(outRegion, x, y, rotdeg());
//drawn below payload so 3x3 blocks don't look even even weirder
Draw.rect(topRegion, x, y);
Draw.z(Layer.blockOver); Draw.z(Layer.blockOver);
drawPayload(); drawPayload();
Draw.z(Layer.blockOver + 0.1f);
Draw.rect(topRegion, x, y);
} }
@Override @Override