Reverted power node build time multiplier / No mono global selection
This commit is contained in:
@@ -2311,7 +2311,6 @@ public class Blocks{
|
||||
requirements(Category.power, with(Items.copper, 2, Items.lead, 6));
|
||||
maxNodes = 10;
|
||||
laserRange = 6;
|
||||
buildCostMultiplier = 2.5f;
|
||||
}};
|
||||
|
||||
powerNodeLarge = new PowerNode("power-node-large"){{
|
||||
|
||||
@@ -1267,6 +1267,7 @@ public class UnitTypes{
|
||||
engineOffset = 5.7f;
|
||||
range = 50f;
|
||||
isEnemy = false;
|
||||
controlSelectGlobal = false;
|
||||
|
||||
ammoType = new PowerAmmoType(500);
|
||||
|
||||
|
||||
@@ -306,10 +306,10 @@ public class DesktopInput extends InputHandler{
|
||||
commandBuildings.clear();
|
||||
if(input.keyDown(Binding.selectAcrossScreen)){
|
||||
camera.bounds(Tmp.r1);
|
||||
selectedUnits.set(selectedCommandUnits(Tmp.r1.x, Tmp.r1.y, Tmp.r1.width, Tmp.r1.height));
|
||||
selectedUnits.set(selectedCommandUnits(Tmp.r1.x, Tmp.r1.y, Tmp.r1.width, Tmp.r1.height).removeAll(u -> !u.type.controlSelectGlobal));
|
||||
}else {
|
||||
for(var unit : player.team().data().units){
|
||||
if(unit.isCommandable()){
|
||||
if(unit.isCommandable() && unit.type.controlSelectGlobal){
|
||||
selectedUnits.add(unit);
|
||||
}
|
||||
}
|
||||
@@ -325,7 +325,7 @@ public class DesktopInput extends InputHandler{
|
||||
selectedUnits.set(selectedCommandUnits(Tmp.r1.x, Tmp.r1.y, Tmp.r1.width, Tmp.r1.height, u -> u instanceof Payloadc));
|
||||
}else {
|
||||
for(var unit : player.team().data().units){
|
||||
if(unit.isCommandable() && unit instanceof Payloadc){
|
||||
if(unit.isCommandable() && unit instanceof Payloadc){
|
||||
selectedUnits.add(unit);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -178,6 +178,8 @@ public class UnitType extends UnlockableContent implements Senseable{
|
||||
logicControllable = true,
|
||||
/** if false, players cannot control this unit */
|
||||
playerControllable = true,
|
||||
/** If true, the unit can be selected with the global selection hotkey (shift+g). */
|
||||
controlSelectGlobal = true,
|
||||
/** if false, this unit cannot be moved into payloads */
|
||||
allowedInPayloads = true,
|
||||
/** if false, this unit cannot be hit by bullets or explosions*/
|
||||
|
||||
Reference in New Issue
Block a user