drew/FoC-GameManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases 1 Wiki Activity

Fix land mode spectator

Browse Source
This commit is contained in:
Drew C
2026-03-25 21:56:30 -05:00
parent 68449e1a78
commit 2412e451ca
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Data/Scripts/Miscellaneous/GameManager/Constants.lua
View File

@@ -41,7 +41,7 @@ function DefineFactions()
RebelFaction.DisplayName = "Rebellion" RebelFaction.DisplayName = "Rebellion"
RebelFaction.Color = ColorStruct:New(1, 0, 0, 1) RebelFaction.Color = ColorStruct:New(1, 0, 0, 1)
RebelFaction.Icon = "I_ICON_SPECTATOR_REBEL.TGA" RebelFaction.Icon = "I_ICON_SPECTATOR_REBEL.TGA"
RebelFaction.LandStartUnitName = "Rebel_Infantry_Squad" RebelFaction.LandStartUnitName = "Rebel_Trooper_Team"
RebelFaction.SpaceStartUnitName = "Rebel_X-Wing_Squadron" RebelFaction.SpaceStartUnitName = "Rebel_X-Wing_Squadron"
factions[RebelFaction.Name] = RebelFaction factions[RebelFaction.Name] = RebelFaction
@@ -52,7 +52,7 @@ function DefineFactions()
EmpireFaction.DisplayName = "Empire" EmpireFaction.DisplayName = "Empire"
EmpireFaction.Color = ColorStruct:New(0, 1, 1, 1) EmpireFaction.Color = ColorStruct:New(0, 1, 1, 1)
EmpireFaction.Icon = "I_ICON_SPECTATOR_EMPIRE.TGA" EmpireFaction.Icon = "I_ICON_SPECTATOR_EMPIRE.TGA"
EmpireFaction.LandStartUnitName = "Imperial_Stormtrooper_Squad" EmpireFaction.LandStartUnitName = "Stormtrooper_Team"
EmpireFaction.SpaceStartUnitName = "TIE_Interceptor_Squadron_Container" EmpireFaction.SpaceStartUnitName = "TIE_Interceptor_Squadron_Container"
factions[EmpireFaction.Name] = EmpireFaction factions[EmpireFaction.Name] = EmpireFaction
@@ -63,7 +63,7 @@ function DefineFactions()
UnderworldFaction.DisplayName = "Zann Consortium" UnderworldFaction.DisplayName = "Zann Consortium"
UnderworldFaction.Color = ColorStruct:New(1, 1, 0, 1) UnderworldFaction.Color = ColorStruct:New(1, 1, 0, 1)
UnderworldFaction.Icon = "I_ICON_SPECTATOR_UNDERWORLD.TGA" UnderworldFaction.Icon = "I_ICON_SPECTATOR_UNDERWORLD.TGA"
UnderworldFaction.LandStartUnitName = "Underworld_Merc_Squad" UnderworldFaction.LandStartUnitName = "Underworld_Merc_Team"
UnderworldFaction.SpaceStartUnitName = "StarViper_Team" UnderworldFaction.SpaceStartUnitName = "StarViper_Team"
factions[UnderworldFaction.Name] = UnderworldFaction factions[UnderworldFaction.Name] = UnderworldFaction
@@ -73,7 +73,7 @@ function DefineFactions()
HuttFaction.DisplayName = "Hutt Cartel" HuttFaction.DisplayName = "Hutt Cartel"
HuttFaction.Color = ColorStruct:New(1, 0, 1, 1) HuttFaction.Color = ColorStruct:New(1, 0, 1, 1)
HuttFaction.Icon = "I_ICON_SPECTATOR_HUTTS.TGA" HuttFaction.Icon = "I_ICON_SPECTATOR_HUTTS.TGA"
HuttFaction.LandStartUnitName = "Hutt_Soldier_Squad" HuttFaction.LandStartUnitName = "Hutt_Soldier_Team"
HuttFaction.SpaceStartUnitName = "V_Wing_Squadron_Container" HuttFaction.SpaceStartUnitName = "V_Wing_Squadron_Container"
factions[HuttFaction.Name] = HuttFaction factions[HuttFaction.Name] = HuttFaction
@@ -83,7 +83,7 @@ function DefineFactions()
PirateFaction.DisplayName = "Pirates" PirateFaction.DisplayName = "Pirates"
PirateFaction.Color = ColorStruct:New(0, 1, 0, 1) PirateFaction.Color = ColorStruct:New(0, 1, 0, 1)
PirateFaction.Icon = "I_ICON_SPECTATOR_PIRATES.TGA" PirateFaction.Icon = "I_ICON_SPECTATOR_PIRATES.TGA"
PirateFaction.LandStartUnitName = "Pirate_Soldier_Squad" PirateFaction.LandStartUnitName = "Pirate_Trooper_Team"
PirateFaction.SpaceStartUnitName = "Pirate_Fighter_Squadron" PirateFaction.SpaceStartUnitName = "Pirate_Fighter_Squadron"
factions[PirateFaction.Name] = PirateFaction factions[PirateFaction.Name] = PirateFaction
@@ -128,3 +128,6 @@ UI_PlanetaryPop = "text_planetary_pop"
---GUI Component to enable/disable tactical credits. ---GUI Component to enable/disable tactical credits.
UI_CreditsTactical = "text_credits_tactical" UI_CreditsTactical = "text_credits_tactical"
---GUI Component to enable/disable tactical tech.
UI_TechTactical = "text_tactical_tech"

2
Data/Scripts/Miscellaneous/GameManager/GUIManager.lua
View File

@@ -27,6 +27,7 @@ function GUIManager:InitSkirmish(isSpectator)
GUI_Component_Visibility(UI_PlanetaryPop, false) GUI_Component_Visibility(UI_PlanetaryPop, false)
GUI_Component_Visibility(UI_CreditsTactical, false) GUI_Component_Visibility(UI_CreditsTactical, false)
GUI_Component_Visibility(UI_TechTactical, false)
end end
end end
@@ -57,6 +58,7 @@ function GUIManager:Reset()
GUI_Component_Visibility(UI_PlanetaryPop, true) GUI_Component_Visibility(UI_PlanetaryPop, true)
GUI_Component_Visibility(UI_CreditsTactical, true) GUI_Component_Visibility(UI_CreditsTactical, true)
GUI_Component_Visibility(UI_TechTactical, true)
end end
---Services Game Time display. ---Services Game Time display.

2
Data/Scripts/Miscellaneous/GameScoring.lua
View File

@@ -163,6 +163,8 @@ function Game_Mode_Starting_Event(mode, map)
LocalPlayer = Find_Player("local") LocalPlayer = Find_Player("local")
DebugMessage("Local Player: %s (%d)", LocalPlayer.Get_Name(), LocalPlayer.Get_ID())
if StringCompare(mode, "Galactic") then if StringCompare(mode, "Galactic") then
-- Galactic Campaign -- Galactic Campaign
Init_Galactic() Init_Galactic()