More fixes:

- Fixed a few oversights from my shield revamp commit. - Signposts are now correctly race-locked.
DaloLorn · Feb 8, 2025 · 756505e · 756505e
1 parent 8fa7d0d
commit 756505e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/Rising Stars/data/orbitals/special/MiniBeacon.txt b/Rising Stars/data/orbitals/special/MiniBeacon.txt
@@ -38,6 +38,7 @@ Module: MiniBeacon
 	RepeatEmpireAttribute(BeaconLaborUpgrades, AddLaborEmpireAttribute(FactoryLaborMod))
 
 	SetSystemFlag(JumpdriveSafety)
+	RequireTrait(Extragalactic)
 
 	GlobalTradeNode()
 	GiveTrade()

diff --git a/Rising Stars/scripts/definitions/ABEM_version.as b/Rising Stars/scripts/definitions/ABEM_version.as
@@ -2,7 +2,7 @@ import version;
 import CP_version;
 
 // ABEMMOD's last revision was 724.
-const string MOD_REVISION = "1410";
+const string MOD_REVISION = "1411";
 const array<string> VERSIONS = {
 	"v2.0.3",
 	"OpenSR v1.0.0",

diff --git a/Rising Stars/scripts/server/ABEMCombat.as b/Rising Stars/scripts/server/ABEMCombat.as
@@ -614,9 +614,9 @@ DamageEventStatus ABEMShieldDamage(DamageEvent& evt, vec2u& position, vec2d& end
 }
 
 double hasShield(const Effector& eff, const Object& obj, const Object& target) {
-	if(obj.isShip)
+	if(target.isShip)
 		return cast<Ship>(target).Shield > 0.0 ? 1.0 : 0.0;
-	if(obj.isOrbital)
+	if(target.isOrbital)
 		return cast<Orbital>(target).shield > 0.0 ? 1.0 : 0.0;
 	return 0.0;
 }
diff --git a/Rising Stars/scripts/server/objects/Orbital.as b/Rising Stars/scripts/server/objects/Orbital.as
@@ -630,7 +630,7 @@ tidy class OrbitalScript {
 		return v;
 	}
 
-	double get_shield(Orbital& orb) {
+	double get_shield(const Orbital& orb) {
 		double v = Shield;
 		Empire@ owner = orb.owner;
 		if(owner !is null)