From 8c26a0b08d8327d6db14718754ff1b44e476acd2 Mon Sep 17 00:00:00 2001 From: Maya Date: Wed, 16 Feb 2022 22:13:33 +0100 Subject: Fix Amped Hardpoint on Homestead (#174) * Adds Missing Entity Data to Homestead * Fix Homestead in Script * Encapsulated getting Hardpointgroup in function * fixing respawning on amped hardpoint --- .../mod/scripts/vscripts/gamemodes/_hardpoints.gnut | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_hardpoints.gnut') diff --git a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_hardpoints.gnut b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_hardpoints.gnut index 8331a81a4..260168d08 100644 --- a/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_hardpoints.gnut +++ b/Northstar.CustomServers/mod/scripts/vscripts/gamemodes/_hardpoints.gnut @@ -15,13 +15,13 @@ void function Hardpoints_Init() } float function CapturePoint_GetStartProgress( entity hardpoint ) -{ - return GetGlobalNetFloat( "objective" + hardpoint.kv.hardpointGroup + "Progress" ) +{ + return GetGlobalNetFloat( "objective" + GetHardpointGroup(hardpoint) + "Progress" ) } int function CapturePoint_GetCappingTeam( entity hardpoint ) -{ - return GetGlobalNetInt( "objective" + hardpoint.kv.hardpointGroup + "CappingTeam" ) +{ + return GetGlobalNetInt( "objective" + GetHardpointGroup(hardpoint) + "CappingTeam" ) } int function CapturePoint_GetOwningTeam( entity hardpoint ) @@ -30,6 +30,15 @@ int function CapturePoint_GetOwningTeam( entity hardpoint ) } float function CapturePoint_GetGoalProgress( entity hardpoint ) +{ + + return GetGlobalNetFloat( "objective" + GetHardpointGroup(hardpoint) + "Progress" ) +} + +string function GetHardpointGroup(entity hardpoint) //Hardpoint Entity B on Homestead is missing the Hardpoint Group KeyValue { - return GetGlobalNetFloat( "objective" + hardpoint.kv.hardpointGroup + "Progress" ) + if((GetMapName()=="mp_homestead")&&(!hardpoint.HasKey("hardpointGroup"))) + return "B" + + return string(hardpoint.kv.hardpointGroup) } \ No newline at end of file -- cgit v1.2.3