Merge pull request #342 from EnvyDragon/rab-lat

lab rat raceswap polish
Ziktofel · Dec 15, 2024 · a95d607 · a95d607
2 parents c6071a4 + f0dbfe1
commit a95d607
Show file tree

Hide file tree

Showing 13 changed files with 3,204 additions and 665 deletions.
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_lab_rat.SC2Map/Base.SC2Data/Cutscenes/Index.version b/Maps/ArchipelagoCampaign/HotS/ap_lab_rat.SC2Map/Base.SC2Data/Cutscenes/Index.version
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_lab_rat.SC2Map/Base.SC2Data/GameData/ConversationData.xml b/Maps/ArchipelagoCampaign/HotS/ap_lab_rat.SC2Map/Base.SC2Data/GameData/ConversationData.xml
@@ -1,22 +1,19 @@
-<?xml version="1.0" encoding="us-ascii"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Catalog>
     <CConversation id="Genericphrases">
-        <Lines index="1">
-            <Id value="Line00002"/>
-            <Text value="Conversation/Genericphrases/Line00002"/>
-            <FacialBlend value="100"/>
-            <Sound value="zMission_Lab01_DropShipAdjutant_168"/>
-            <OverlapPrevious value="400"/>
-            <AnimProps value="Talk"/>
-            <AnimBlendIn value="750"/>
-            <AnimBlendOut value="750"/>
-            <LookAtAttach value="Head"/>
-            <Objects index="Speaker" value="CharAdjutant"/>
-            <Objects index="Listener" value=""/>
+        <Lines index="1" Sound="zMission_Lab01_DropShipAdjutant_168">
             <Objects index="Camera" value=""/>
-            <Variations index="Speaker" value="AdjutantPortrait"/>
-            <Variations index="Listener" value=""/>
-            <Variations index="Camera" value=""/>
         </Lines>
     </CConversation>
+    <CConversation id="zMission_Lab01">
+        <Groups index="22">
+            <Conditions index="0" removed="1"/>
+        </Groups>
+    </CConversation>
+    <CConversation id="zMission_Lab02">
+        <Lines index="31" FacialAnim="Surprise" Sound="zMission_Space02_Kerrigan_096"/>
+        <Groups index="9">
+            <Conditions index="0" removed="1"/>
+        </Groups>
+    </CConversation>
 </Catalog>
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_lab_rat.SC2Map/Base.SC2Data/GameData/SoundData.xml b/Maps/ArchipelagoCampaign/HotS/ap_lab_rat.SC2Map/Base.SC2Data/GameData/SoundData.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="us-ascii"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Catalog>
     <CSound id="Alert_ZergBuildError">
         <AssetArray index="0" File="LocalizedData\Sounds\VO\zMission_Lab01_DropShipAdjutant_169.ogg"/>
@@ -7,7 +7,7 @@
         <AssetArray index="0" File="LocalizedData\Sounds\VO\zMission_Lab01_DropShipAdjutant_166.ogg"/>
     </CSound>
     <CSound id="SCV_CantBuildAlert">
-        <AssetArray index="0" File="LocalizedData\Sounds\VO\zMission_Lab01_DropShipAdjutant_169.ogg" FacialAnim="SCV_CantBuild00"/>
+        <AssetArray index="0" File="LocalizedData\Sounds\VO\zMission_Lab01_DropShipAdjutant_169.ogg"/>
         <AssetArray index="1">
             <File value=""/>
             <Pitch value="1.000000,1.000000"/>
@@ -24,44 +24,48 @@
         </AssetArray>
     </CSound>
     <CSound id="e_cmdCantBuildLocationInvalid">
-        <AssetArray index="0" File="LocalizedData\Sounds\VO\zMission_Lab01_DropShipAdjutant_169.ogg" FacialAnim="SCV_CantBuild00"/>
+        <AssetArray index="0" File="LocalizedData\Sounds\VO\zMission_Lab01_DropShipAdjutant_169.ogg"/>
     </CSound>
     <CSound id="e_cmdCantBuildOnThat">
-        <AssetArray index="0" File="LocalizedData\Sounds\VO\zMission_Lab01_DropShipAdjutant_169.ogg" FacialAnim="Alert_TerranPlaceOnVespeneGeyser"/>
+        <AssetArray index="0" File="LocalizedData\Sounds\VO\zMission_Lab01_DropShipAdjutant_169.ogg"/>
     </CSound>
     <CSound id="e_cmdCantBuildTooCloseToCreepSource_Terr">
-        <AssetArray index="0" File="LocalizedData\Sounds\VO\zMission_Lab01_DropShipAdjutant_169.ogg" FacialAnim="SCV_CantBuild00"/>
+        <AssetArray index="0" File="LocalizedData\Sounds\VO\zMission_Lab01_DropShipAdjutant_169.ogg"/>
     </CSound>
     <CSound id="e_cmdCantBuildTooCloseToDropOff">
-        <AssetArray index="0" File="LocalizedData\Sounds\VO\zMission_Lab01_DropShipAdjutant_169.ogg" FacialAnim="SCV_CantBuild01"/>
+        <AssetArray index="0" File="LocalizedData\Sounds\VO\zMission_Lab01_DropShipAdjutant_169.ogg"/>
     </CSound>
     <CSound id="e_cmdCantBuildTooCloseToResources">
-        <AssetArray index="0" File="LocalizedData\Sounds\VO\zMission_Lab01_DropShipAdjutant_169.ogg" FacialAnim="SCV_CantBuild01"/>
+        <AssetArray index="0" File="LocalizedData\Sounds\VO\zMission_Lab01_DropShipAdjutant_169.ogg"/>
     </CSound>
     <CSound id="e_cmdCantBuildTooFarFromCreepSource">
         <AssetArray index="0" File="LocalizedData\Sounds\VO\zMission_Lab01_DropShipAdjutant_166.ogg"/>
     </CSound>
     <CSound id="e_cmdCantBuildTooFarFromWater">
-        <AssetArray index="0" File="LocalizedData\Sounds\VO\zMission_Lab01_DropShipAdjutant_169.ogg" FacialAnim="SCV_CantBuild01"/>
+        <AssetArray index="0" File="LocalizedData\Sounds\VO\zMission_Lab01_DropShipAdjutant_169.ogg"/>
     </CSound>
     <CSound id="e_cmdCantFinishBuildingLocationBlocked">
-        <AssetArray index="0" File="LocalizedData\Sounds\VO\zMission_Lab01_DropShipAdjutant_169.ogg" FacialAnim="SCV_CantBuild00"/>
+        <AssetArray index="0" File="LocalizedData\Sounds\VO\zMission_Lab01_DropShipAdjutant_169.ogg"/>
     </CSound>
     <CSound id="e_cmdCantLandTooFarFromBuildPowerSource">
-        <AssetArray index="0" File="LocalizedData\Sounds\VO\zMission_Lab01_DropShipAdjutant_169.ogg" FacialAnim="Alert_TerranUnacceptableLandingZone"/>
+        <AssetArray index="0" File="LocalizedData\Sounds\VO\zMission_Lab01_DropShipAdjutant_169.ogg"/>
     </CSound>
     <CSound id="e_cmdCantSeeBuildLocation">
-        <AssetArray index="0" File="LocalizedData\Sounds\VO\zMission_Lab01_DropShipAdjutant_169.ogg" FacialAnim="SCV_CantBuild01"/>
+        <AssetArray index="0" File="LocalizedData\Sounds\VO\zMission_Lab01_DropShipAdjutant_169.ogg"/>
     </CSound>
     <CSound id="e_cmdCouldntReachTarget_Terr">
-        <AssetArray index="0" File="LocalizedData\Sounds\VO\zMission_Lab01_DropShipAdjutant_170.ogg" FacialAnim="SCV_CantBuild02"/>
+        <AssetArray index="0" File="LocalizedData\Sounds\VO\zMission_Lab01_DropShipAdjutant_170.ogg"/>
     </CSound>
     <CSound id="e_cmdNotEnoughFood">
-        <AssetArray index="0" File="LocalizedData\Sounds\VO\zMission_Lab01_DropShipAdjutant_168.ogg" FacialAnim="Alert_TerranNeedMoreFood"/>
+        <AssetArray index="0" File="LocalizedData\Sounds\VO\zMission_Lab01_DropShipAdjutant_168.ogg"/>
     </CSound>
     <CSound id="zMission_Lab01_DropShipAdjutant_168" Portrait="AdjutantPortrait" Subtitle="Genericphrases" Speaker="CharAdjutant" Line="00002">
         <AssetArray index="0" PortraitModel="AdjutantPortrait"/>
-        <Flags index="NeedsUpdate" value="0"/>
-        <Flags index="NeedsTTS" value="0"/>
+    </CSound>
+    <CSound id="zMission_Lab02_Raynor_010">
+        <Flags index="Obsolete" value="0"/>
+    </CSound>
+    <CSound id="zMission_Lab02_Raynor_013">
+        <Flags index="Obsolete" value="0"/>
     </CSound>
 </Catalog>
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_lab_rat.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/HotS/ap_lab_rat.SC2Map/DocumentHeader
diff --git a/Maps/ArchipelagoCampaign/HotS/ap_lab_rat.SC2Map/GameData.version b/Maps/ArchipelagoCampaign/HotS/ap_lab_rat.SC2Map/GameData.version