Fix issues with Rebels Rest (#431)

FAForever · Apr 20, 2024 · 0e01c4f · 0e01c4f
1 parent ba9c7e3
commit 0e01c4f
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 18 deletions.
diff --git a/...est/FAF_Coop_Operation_Rebel's_Rest.scmap → ...Rest/FAF_Coop_Operation_Rebels_Rest.scmap b/...est/FAF_Coop_Operation_Rebel's_Rest.scmap → ...Rest/FAF_Coop_Operation_Rebels_Rest.scmap
diff --git a/...peration_Rebel's_Rest_CustomFunctions.lua → ...Operation_Rebels_Rest_CustomFunctions.lua b/...peration_Rebel's_Rest_CustomFunctions.lua → ...Operation_Rebels_Rest_CustomFunctions.lua
diff --git a/...Coop_Operation_Rebel's_Rest_operation.lua → ..._Coop_Operation_Rebels_Rest_operation.lua b/...Coop_Operation_Rebel's_Rest_operation.lua → ..._Coop_Operation_Rebels_Rest_operation.lua
@@ -1,8 +1,8 @@
-local OpStrings = import('/maps/FAF_Coop_Operation_Rebel\'s_Rest/FAF_Coop_Operation_Rebel\'s_Rest_strings.lua')
+local OpStrings = import('/maps/FAF_Coop_Operation_Rebels_Rest/FAF_Coop_Operation_Rebels_Rest_strings.lua')
 
 operationData = 
 {
-    key = 'OperationRebel\'sRest',
+    key = 'OperationRebelsRest',
     feedbackURL = 'https://discord.gg/ayzAVr9JUV',
 	opDebriefingSuccess = OpStrings.Debriefing_Win,
     opDebriefingFailure = OpStrings.Debriefing_Lose,

diff --git a/.../FAF_Coop_Operation_Rebel's_Rest_save.lua → ...t/FAF_Coop_Operation_Rebels_Rest_save.lua b/.../FAF_Coop_Operation_Rebel's_Rest_save.lua → ...t/FAF_Coop_Operation_Rebels_Rest_save.lua
diff --git a/..._Coop_Operation_Rebel's_Rest_scenario.lua → ...F_Coop_Operation_Rebels_Rest_scenario.lua b/..._Coop_Operation_Rebel's_Rest_scenario.lua → ...F_Coop_Operation_Rebels_Rest_scenario.lua
@@ -1,14 +1,14 @@
 version = 3
 ScenarioInfo = {
-    name = "Coalition Mission 4: Operation Rebel's Rest",
-    description = 'We  have another situation developing on a Prison world deep in UEF space. Two UEF commanders have gone rogue in support of the late Commander Fletcher. They need to be stopped before they unleash the criminal population of Rebel\'s rest.',
+    name = "Coalition Mission 4: Operation Rebels Rest",
+    description = 'We  have another situation developing on a Prison world deep in UEF space. Two UEF commanders have gone rogue in support of the late Commander Fletcher. They need to be stopped before they unleash the crimmal population of Rebels rest.',
     type = 'campaign_coop',
     starts = true,
     preview = '',
     size = {1024, 1024},
-    map = "/maps/FAF_Coop_Operation_Rebel's_Rest/FAF_Coop_Operation_Rebel's_Rest.scmap",
-    save = "/maps/FAF_Coop_Operation_Rebel's_Rest/FAF_Coop_Operation_Rebel's_Rest_save.lua",
-    script = "/maps/FAF_Coop_Operation_Rebel's_Rest/FAF_Coop_Operation_Rebel's_Rest_script.lua",
+    map = "/maps/FAF_Coop_Operation_Rebels_Rest/FAF_Coop_Operation_Rebels_Rest.scmap",
+    save = "/maps/FAF_Coop_Operation_Rebels_Rest/FAF_Coop_Operation_Rebels_Rest_save.lua",
+    script = "/maps/FAF_Coop_Operation_Rebels_Rest/FAF_Coop_Operation_Rebels_Rest_script.lua",
     norushradius = 0.000000,
     map_version = 1,
     Configurations = {

diff --git a/...AF_Coop_Operation_Rebel's_Rest_script.lua → ...FAF_Coop_Operation_Rebels_Rest_script.lua b/...AF_Coop_Operation_Rebel's_Rest_script.lua → ...FAF_Coop_Operation_Rebels_Rest_script.lua
@@ -11,16 +11,16 @@ local ScenarioFramework = import('/lua/ScenarioFramework.lua')
 local ScenarioPlatoonAI = import('/lua/ScenarioPlatoonAI.lua')
 local ScenarioUtils = import('/lua/sim/ScenarioUtilities.lua')
 local Utilities = import('/lua/Utilities.lua')
-local CustomFunctions = import('/maps/FAF_Coop_Operation_Rebel\'s_Rest/FAF_Coop_Operation_Rebel\'s_Rest_CustomFunctions.lua')
+local CustomFunctions = import('/maps/FAF_Coop_Operation_Rebels_Rest/FAF_Coop_Operation_Rebels_Rest_CustomFunctions.lua')
 local AIBuildStructures = import('/lua/ai/aibuildstructures.lua') 
-local P0UEFAI = import('/maps/FAF_Coop_Operation_Rebel\'s_Rest/UEFaiP0.lua')
-local P1UEFAI = import('/maps/FAF_Coop_Operation_Rebel\'s_Rest/UEFaiP1.lua')
-local P2UEFAI = import('/maps/FAF_Coop_Operation_Rebel\'s_Rest/UEFaiP2.lua')
-local P3UEFAI = import('/maps/FAF_Coop_Operation_Rebel\'s_Rest/UEFaiP3.lua')
-local OpStrings = import('/maps/FAF_Coop_Operation_Rebel\'s_Rest/FAF_Coop_Operation_Rebel\'s_Rest_strings.lua') 
+local P0UEFAI = import('/maps/FAF_Coop_Operation_Rebels_Rest/UEFaiP0.lua')
+local P1UEFAI = import('/maps/FAF_Coop_Operation_Rebels_Rest/UEFaiP1.lua')
+local P2UEFAI = import('/maps/FAF_Coop_Operation_Rebels_Rest/UEFaiP2.lua')
+local P3UEFAI = import('/maps/FAF_Coop_Operation_Rebels_Rest/UEFaiP3.lua')
+local OpStrings = import('/maps/FAF_Coop_Operation_Rebels_Rest/FAF_Coop_Operation_Rebels_Rest_strings.lua') 
 local TauntManager = import('/lua/TauntManager.lua')
 
-local UEFTM = TauntManager.CreateTauntManager('UEF1TM', '/maps/FAF_Coop_Operation_Rebel\'s_Rest/FAF_Coop_Operation_Rebel\'s_Rest_strings.lua')
+local UEFTM = TauntManager.CreateTauntManager('UEF1TM', '/maps/FAF_Coop_Operation_Rebels_Rest/FAF_Coop_Operation_Rebels_Rest_strings.lua')
 
 local Difficulty = ScenarioInfo.Options.Difficulty
 
@@ -187,7 +187,7 @@ function IntroP0()
 
     quantity = {18, 14, 10}
     for _, player in ScenarioInfo.HumanPlayers do
-        ScenarioFramework.CreateAreaTrigger(Offmapattacks0P0, 'AREA_1', categories.ALLUNITS - categories.TECH1, true, false, ArmyBrains[player], quantity[Difficulty])
+        ScenarioFramework.CreateAreaTrigger(OffmapattacksP0, 'AREA_1', categories.ALLUNITS - categories.TECH1, true, false, ArmyBrains[player], quantity[Difficulty])
     end
     quantity = {55, 45, 35}
     for _, player in ScenarioInfo.HumanPlayers do

diff --git a/...F_Coop_Operation_Rebel's_Rest_strings.lua → ...AF_Coop_Operation_Rebels_Rest_strings.lua b/...F_Coop_Operation_Rebel's_Rest_strings.lua → ...AF_Coop_Operation_Rebels_Rest_strings.lua
diff --git a/FAF_Coop_Operation_Rebel's_Rest/UEFaiP0.lua → FAF_Coop_Operation_Rebels_Rest/UEFaiP0.lua b/FAF_Coop_Operation_Rebel's_Rest/UEFaiP0.lua → FAF_Coop_Operation_Rebels_Rest/UEFaiP0.lua
diff --git a/FAF_Coop_Operation_Rebel's_Rest/UEFaiP1.lua → FAF_Coop_Operation_Rebels_Rest/UEFaiP1.lua b/FAF_Coop_Operation_Rebel's_Rest/UEFaiP1.lua → FAF_Coop_Operation_Rebels_Rest/UEFaiP1.lua
@@ -3,7 +3,7 @@ local SPAIFileName = '/lua/scenarioplatoonai.lua'
 local ScenarioFramework = import('/lua/ScenarioFramework.lua')
 local ScenarioPlatoonAI = import('/lua/ScenarioPlatoonAI.lua')
 local ScenarioUtils = import('/lua/sim/ScenarioUtilities.lua')
-local CustomFunctions = '/maps/FAF_Coop_Operation_Rebel\'s_Rest/FAF_Coop_Operation_Rebel\'s_Rest_CustomFunctions.lua'
+local CustomFunctions = '/maps/FAF_Coop_Operation_Rebels_Rest/FAF_Coop_Operation_Rebels_Rest_CustomFunctions.lua'
 
 local Player1 = 1
 local UEF1 = 2

diff --git a/FAF_Coop_Operation_Rebel's_Rest/UEFaiP2.lua → FAF_Coop_Operation_Rebels_Rest/UEFaiP2.lua b/FAF_Coop_Operation_Rebel's_Rest/UEFaiP2.lua → FAF_Coop_Operation_Rebels_Rest/UEFaiP2.lua
@@ -3,7 +3,7 @@ local SPAIFileName = '/lua/scenarioplatoonai.lua'
 local ScenarioFramework = import('/lua/ScenarioFramework.lua')
 local ScenarioPlatoonAI = import('/lua/ScenarioPlatoonAI.lua')
 local ScenarioUtils = import('/lua/sim/ScenarioUtilities.lua')
-local CustomFunctions = '/maps/FAF_Coop_Operation_Rebel\'s_Rest/FAF_Coop_Operation_Rebel\'s_Rest_CustomFunctions.lua'
+local CustomFunctions = '/maps/FAF_Coop_Operation_Rebels_Rest/FAF_Coop_Operation_Rebels_Rest_CustomFunctions.lua'
 
 local Player1 = 1
 local UEF1 = 2

diff --git a/FAF_Coop_Operation_Rebel's_Rest/UEFaiP3.lua → FAF_Coop_Operation_Rebels_Rest/UEFaiP3.lua b/FAF_Coop_Operation_Rebel's_Rest/UEFaiP3.lua → FAF_Coop_Operation_Rebels_Rest/UEFaiP3.lua
@@ -3,7 +3,7 @@ local SPAIFileName = '/lua/scenarioplatoonai.lua'
 local ScenarioFramework = import('/lua/ScenarioFramework.lua')
 local ScenarioPlatoonAI = import('/lua/ScenarioPlatoonAI.lua')
 local ScenarioUtils = import('/lua/sim/ScenarioUtilities.lua')
-local CustomFunctions = '/maps/FAF_Coop_Operation_Rebel\'s_Rest/FAF_Coop_Operation_Rebel\'s_Rest_CustomFunctions.lua'
+local CustomFunctions = '/maps/FAF_Coop_Operation_Rebels_Rest/FAF_Coop_Operation_Rebels_Rest_CustomFunctions.lua'
 
 local Player1 = 1
 local UEF1 = 2