swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-01-15 23:04:31 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #390 from RezecNoble/master

Browse Source 
GCW Space Battle Fix
This commit is contained in:
Heron
2024-10-08 20:42:06 -05:00
committed by GitHub
parent d8d5eb776a 18baed6b0f
commit 9b45b3ebd2
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sku.0/sys.server/compiled/game/script/systems/gcw/space/battle_spawner.java
View File

@@ -81,9 +81,9 @@ public class battle_spawner extends script.base_class {
public float customPveBattleModifier = DEFAULT_PVE_TOKEN_MULTIPLIER;
public float customPvpBattleModifier = DEFAULT_PVP_TOKEN_MULTIPLIER;
public float customPvePointModifier = DEFAULT_PVE_POINT_MULTIPLIER;
public float customPvpPointModifier = DEFAULT_PVE_POINT_MULTIPLIER;
public float customPvpPointModifier = DEFAULT_PVP_POINT_MULTIPLIER;
public float customWinTokenModifier = DEFAULT_WIN_TOKEN_MULTIPLIER;
public float customLossTokenModifier = DEFAULT_WIN_TOKEN_MULTIPLIER;
public float customLossTokenModifier = DEFAULT_LOSS_TOKEN_MULTIPLIER;
public float customWinPointModifier = DEFAULT_WIN_POINT_MULTIPLIER;
public float customLossPointModifier = DEFAULT_LOSS_POINT_MULTIPLIER;
public int pobPlayerCeiling = DEFAULT_POB_PLAYER_CEILING;
@@ -127,6 +127,20 @@ public class battle_spawner extends script.base_class {
if(battleIsActive(self)) return SCRIPT_CONTINUE;
location spaceLocation = getLocation(self);
// double check and despawn old ships
obj_id old_attackingShip = getObjIdObjVar(self, "attackingShip");
obj_id old_defendingShip = getObjIdObjVar(self, "defendingShip");
if(isValidId(old_attackingShip))
{
detachAllScripts(old_attackingShip);
destroyObjectHyperspace(old_attackingShip);
}
if(isValidId(old_defendingShip))
{
detachAllScripts(old_defendingShip);
destroyObjectHyperspace(old_defendingShip);
}
spaceLog( "In startSpaceGCWBattle... beginning battle creation.");
obj_id controller = params.getObjId("controller");
removeObjVar(controller, "space_gcw." + spaceLocation.area + ".nextBattleStart");
@@ -708,6 +722,12 @@ public class battle_spawner extends script.base_class {
detachAllScripts(attackingShip);
destroyObjectHyperspace(attackingShip);
}
if(isValidId(defendingShip)){
detachAllScripts(defendingShip);
spaceLog( "In cleanup... despawning defending capital ship...");
destroyObjectHyperspace(defendingShip);
}
// set obj vars on controller for next battle
obj_id controller = params.getObjId("controller");