Sector icons rescaled / Anti-air turrets no longer trigger place range check
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 701 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 652 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 759 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 660 B |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 695 B |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 529 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 676 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 676 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 616 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 702 B |
|
Before Width: | Height: | Size: 983 B After Width: | Height: | Size: 497 B |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 774 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 672 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 626 B |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 714 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 629 B |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 848 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 661 B |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 732 B |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 831 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 633 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 597 B |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 808 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 611 B |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 842 B |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 750 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 711 B |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 675 B |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 774 B |
@@ -20,6 +20,7 @@ public class BaseTurret extends Block{
|
|||||||
public float placeOverlapMargin = 8 * 7f;
|
public float placeOverlapMargin = 8 * 7f;
|
||||||
public float rotateSpeed = 5;
|
public float rotateSpeed = 5;
|
||||||
public float fogRadiusMultiplier = 1f;
|
public float fogRadiusMultiplier = 1f;
|
||||||
|
public boolean disableOverlapCheck = false;
|
||||||
|
|
||||||
/** Effect displayed when coolant is used. */
|
/** Effect displayed when coolant is used. */
|
||||||
public Effect coolEffect = Fx.fuelburn;
|
public Effect coolEffect = Fx.fuelburn;
|
||||||
@@ -57,7 +58,9 @@ public class BaseTurret extends Block{
|
|||||||
if(!hasConsumer(coolant)) consume(coolant);
|
if(!hasConsumer(coolant)) consume(coolant);
|
||||||
}
|
}
|
||||||
|
|
||||||
placeOverlapRange = Math.max(placeOverlapRange, range + placeOverlapMargin);
|
if(!disableOverlapCheck){
|
||||||
|
placeOverlapRange = Math.max(placeOverlapRange, range + placeOverlapMargin);
|
||||||
|
}
|
||||||
fogRadius = Math.max(Mathf.round(range / tilesize * fogRadiusMultiplier), fogRadius);
|
fogRadius = Math.max(Mathf.round(range / tilesize * fogRadiusMultiplier), fogRadius);
|
||||||
super.init();
|
super.init();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -196,6 +196,10 @@ public class Turret extends ReloadTurret{
|
|||||||
if(cooldownTime < 0f) cooldownTime = reload;
|
if(cooldownTime < 0f) cooldownTime = reload;
|
||||||
if(newTargetInterval <= 0f) newTargetInterval = targetInterval;
|
if(newTargetInterval <= 0f) newTargetInterval = targetInterval;
|
||||||
|
|
||||||
|
if(!targetGround){
|
||||||
|
disableOverlapCheck = true;
|
||||||
|
}
|
||||||
|
|
||||||
super.init();
|
super.init();
|
||||||
trackingRange = Math.max(range, trackingRange);
|
trackingRange = Math.max(range, trackingRange);
|
||||||
}
|
}
|
||||||
|
|||||||