Merge pull request #141 from EnvyDragon/garrison-tip

Garrison Strength tip for Enemy Intelligence

Maps/ArchipelagoCampaign/NCO/ap_enemy_intelligence.SC2Map/MapScript.galaxy

@@ -3261,6 +3261,7 @@ bool gt_StartGame01QGarrisonSpots_Func (bool testConds, bool runActions) {
     TriggerEnable(gt_S1FirstInfestationSightedQ, true);
     Wait(2.0, c_timeReal);
     TriggerExecute(gt_TipReadyQ, true, false);
+    HelpPanelAddTip(PlayerGroupAll(), libNtve_gf_FormatTipTitle(StringExternal("Param/Value/81401377"), libNtve_ge_TipType_MissionStrategy), StringExternal("Param/Value/C48F5857"), StringExternal("Param/Value/95F81049"), "AP\\Assets\\Textures\\AP_icon.dds");
     Wait(390.0, c_timeGame);
     TriggerExecute(gt_S1BonusObjectiveRevealQ, true, false);
     return true;

Maps/ArchipelagoCampaign/NCO/ap_enemy_intelligence.SC2Map/Preload.xml

@@ -7,6 +7,7 @@
 <Asset path="localizeddata\sounds\vo\briefing_nova03_reigel_002.ogg" Type="Sound"/>
 <Asset path="localizeddata\sounds\vo\briefing_nova03_reigel_008.ogg" Type="Sound"/>
 <Asset path="localizeddata\sounds\vo\briefing_nova03_nova_001.ogg" Type="Sound"/>
+<Asset path="ap\assets\textures\ap_icon.dds" Type="Image"/>
 <Asset path="localizeddata\sounds\vo\briefing_nova03_nova_007.ogg" Type="Sound"/>
 <Actor id="SYSTEM_ActorConfig"/>
 <Actor id="LightOmniGreenLarge"/>

Maps/ArchipelagoCampaign/NCO/ap_enemy_intelligence.SC2Map/Triggers

@@ -18101,6 +18101,7 @@
         <Action Type="FunctionCall" Id="1619B931"/>
         <Action Type="FunctionCall" Id="45E42D6D"/>
         <Action Type="FunctionCall" Id="823D4D41"/>
+        <Action Type="FunctionCall" Id="A016BFF7"/>
         <Action Type="FunctionCall" Id="02498C2F"/>
         <Action Type="FunctionCall" Id="C912DF5E"/>
     </Element>
@@ -18918,6 +18919,52 @@
         <ValueType Type="trigger"/>
         <ValueElement Type="Trigger" Id="48D177A4"/>
     </Element>
+    <Element Type="FunctionCall" Id="A016BFF7">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="D2D484F9"/>
+        <Parameter Type="Param" Id="01B48199"/>
+        <Parameter Type="Param" Id="CBCD969D"/>
+        <Parameter Type="Param" Id="95F81049"/>
+        <Parameter Type="Param" Id="515B26A9"/>
+        <Parameter Type="Param" Id="C48F5857"/>
+    </Element>
+    <Element Type="Param" Id="01B48199">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="F18C4206"/>
+        <FunctionCall Type="FunctionCall" Id="802517B9"/>
+    </Element>
+    <Element Type="FunctionCall" Id="802517B9">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000192"/>
+    </Element>
+    <Element Type="Param" Id="CBCD969D">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="5139F668"/>
+        <FunctionCall Type="FunctionCall" Id="AD55AF60"/>
+    </Element>
+    <Element Type="FunctionCall" Id="AD55AF60">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="F38744BA"/>
+        <Parameter Type="Param" Id="6BA75FDD"/>
+        <Parameter Type="Param" Id="81401377"/>
+    </Element>
+    <Element Type="Param" Id="6BA75FDD">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="F36D6615"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="B2FDEF3B"/>
+    </Element>
+    <Element Type="Param" Id="81401377">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="7047AD72"/>
+        <ValueType Type="text"/>
+    </Element>
+    <Element Type="Param" Id="95F81049">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="D8E2230C"/>
+        <ValueType Type="text"/>
+    </Element>
+    <Element Type="Param" Id="515B26A9">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="834FFEDF"/>
+        <Value>AP\Assets\Textures\AP_icon.dds</Value>
+        <ValueType Type="filepath"/>
+        <ValueTypeInfo Value="5"/>
+    </Element>
+    <Element Type="Param" Id="C48F5857">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="422A520B"/>
+        <ValueType Type="text"/>
+    </Element>
     <Element Type="FunctionCall" Id="02498C2F">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000242"/>
         <Parameter Type="Param" Id="93C01042"/>

Maps/ArchipelagoCampaign/NCO/ap_enemy_intelligence.SC2Map/enUS.SC2Data/LocalizedData/GameStrings.txt

@@ -41,10 +41,12 @@ Param/Value/535F30F8=Garrison Strength
 Param/Value/56DE48DF=Zerg Flyers Incoming
 Param/Value/61C02604=Garrison Strength
 Param/Value/7DA8CF3C=Enemy Zerg Hive
+Param/Value/81401377=Garrison Strength
 Param/Value/83B2C689=Zerg Flyers
 Param/Value/83CC929A=Enemy Zerg Hive
 Param/Value/925F6196=Nova Start
 Param/Value/93C80E73=Downed Forces Recovered
+Param/Value/95F81049=NEW MECHANIC: Garrison Strength
 Param/Value/983D6990=Enemy Zerg Hive
 Param/Value/9AE4F875=Communication Terminal
 Param/Value/9B173852=5 Days
@@ -56,6 +58,7 @@ Param/Value/B15823BF=Garrison Strength
 Param/Value/B5607704=Downed Forces
 Param/Value/BB612C74=Maximum Supply Reached
 Param/Value/C3B88F9D=This unit can be used as a garrison if landed. Provides 2 garrison strength.
+Param/Value/C48F5857=Rather than having prescribed units to place into this mission's structures, certain units have a "garrison strength" value. You need to fill each garrison with a total of 6 strength. Units without a garrison strength cannot be garrisoned.<n/>Marine/War Pig - 1<n/>Reaper/Death Head - 1<n/>Ghost/Spectre - 1<n/>Hellion - 1<n/>Marauder/Hammer Securities - 2<n/>Goliath/Spartan Company - 2<n/>Diamondback - 2<n/>Warhound - 2<n/>Viking/Hel's Angel/Brynhild (Assault Mode) - 2
 Param/Value/C4EBD9A3=Infestation Pustule Sighted
 Param/Value/C798C786=Zerg Are Everywhere!
 Param/Value/C831499C=Infestation Pustule Destroyed

Mods/ArchipelagoPlayer.SC2Mod/3rdpartyLicenses/Archipelago_Logo.LICENSE

@@ -0,0 +1 @@
+This work © 2022 by Krista Corkos and Christopher Wilson is licensed under Attribution-NonCommercial 4.0 International. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc/4.0/

README.md

@@ -8,6 +8,7 @@ This repo contains the required StarCraft2 map and mod data for Archipelago
     They're licensed by their terms.
 - This mod contains some assets and code from SC2plusSCBW mod. See their license.
 - This mod contains some assets created by Enoki and Subsourian. See their licenses.
+- This mod uses the Archipelago logo created by Krista Corkos and Christopher Wilson. See their license.
 - All third-party licenses are under [Mods/ArchipelagoPlayer.SC2Mod/3rdpartyLicenses/](Mods/ArchipelagoPlayer.SC2Mod/3rdpartyLicenses/)
 - Otherwise, MIT license shall apply, see [LICENSE](LICENSE)