Compare commits

..

2 Commits
v129 ... v129.1

Author SHA1 Message Date
Anuken
4734261097 Fixed unit building not starting when some resources are missing 2021-07-28 18:08:17 -04:00
Anuken
78f55765c1 Clear fallback sprite for core thrusters 2021-07-28 17:49:01 -04:00
4 changed files with 8 additions and 4 deletions

View File

@@ -341,7 +341,11 @@ project(":core"){
} }
} }
def changelogs = file("../fastlane/metadata/android/en-US/changelogs/") def changelogs = file("../fastlane/metadata/android/en-US/changelogs/")
try{
new File(changelogs, androidVersion + ".txt").text = (result) new File(changelogs, androidVersion + ".txt").text = (result)
}catch(Exception e){
e.printStackTrace()
}
} }
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 B

View File

@@ -96,7 +96,7 @@ abstract class BuilderComp implements Posc, Statusc, Teamc, Rotc{
if(!(tile.build instanceof ConstructBuild cb)){ if(!(tile.build instanceof ConstructBuild cb)){
if(!current.initialized && !current.breaking && Build.validPlace(current.block, team, current.x, current.y, current.rotation)){ if(!current.initialized && !current.breaking && Build.validPlace(current.block, team, current.x, current.y, current.rotation)){
boolean hasAll = infinite || current.isRotation(team) || !Structs.contains(current.block.requirements, i -> core != null && !core.items.has(i.item, Mathf.round(i.amount * state.rules.buildCostMultiplier))); boolean hasAll = infinite || current.isRotation(team) || !Structs.contains(current.block.requirements, i -> core != null && !core.items.has(i.item, Math.min(Mathf.round(i.amount * state.rules.buildCostMultiplier), 1)));
if(hasAll){ if(hasAll){
Call.beginPlace(self(), current.block, team, current.x, current.y, current.rotation); Call.beginPlace(self(), current.block, team, current.x, current.y, current.rotation);

View File

@@ -29,8 +29,8 @@ public class CoreBlock extends StorageBlock{
//hacky way to pass item modules between methods //hacky way to pass item modules between methods
private static ItemModule nextItems; private static ItemModule nextItems;
public @Load("@-thruster1") TextureRegion thruster1; //top right public @Load(value = "@-thruster1", fallback = "clear-effect") TextureRegion thruster1; //top right
public @Load("@-thruster2") TextureRegion thruster2; //bot left public @Load(value = "@-thruster2", fallback = "clear-effect") TextureRegion thruster2; //bot left
public float thrusterLength = 14f/4f; public float thrusterLength = 14f/4f;
public UnitType unitType = UnitTypes.alpha; public UnitType unitType = UnitTypes.alpha;