Merge pull request #143 from InvalidArgument3/initialversion

respawnship, npc namechanges
StarCoreSE · Oct 18, 2024 · 460b8f5 · 460b8f5
2 parents 72fe130 + d5c2b10
commit 460b8f5
Show file tree

Hide file tree

Showing 8 changed files with 1,683 additions and 6 deletions.
diff --git a/NPC.Pack.EnceladusCo/Data/Factions.sbc b/NPC.Pack.EnceladusCo/Data/Factions.sbc
@@ -7,7 +7,7 @@
                 <TypeId>MyObjectBuilder_FactionDefinition</TypeId>
                 <SubtypeId>ECO-NPC</SubtypeId>
             </Id>
-            <DisplayName>ECO Logistics</DisplayName>
+            <DisplayName>Enceladus Corporation</DisplayName>
             <IsDefault>true</IsDefault>
             <StartingBalance>1000000000</StartingBalance>
             <Type>Trader</Type>
@@ -16,7 +16,7 @@
             <AutoAcceptPeace>false</AutoAcceptPeace>
             <DiscoveredByDefault>true</DiscoveredByDefault>
             <DefaultRelation>Neutral</DefaultRelation>
-            <Description>Enceladus Corporation NPCs</Description>
+            <Description>The combined assets of several wealthy CEOs and government entities with the goal of harvesting the rings of Saturn for its riches.</Description>
         </Faction>
 
     </Factions>

diff --git a/NPC.Pack.EnceladusCo/Data/Scripts/FactionDefinition/ECO-NPC.cs b/NPC.Pack.EnceladusCo/Data/Scripts/FactionDefinition/ECO-NPC.cs
@@ -140,7 +140,7 @@ public partial class FactionDefs
             },
             Player = new List<string>
             {
-                "ECO"
+               // "ECO"
             },
 
             // formations

diff --git a/NPC.Pack.GanymedeLiberationFront/Data/Factions.sbc b/NPC.Pack.GanymedeLiberationFront/Data/Factions.sbc
@@ -7,7 +7,7 @@
                 <TypeId>MyObjectBuilder_FactionDefinition</TypeId>
                 <SubtypeId>GLF-NPC</SubtypeId>
             </Id>
-            <DisplayName>GLF Logistics</DisplayName>
+            <DisplayName>Ganymede Liberation Front</DisplayName>
             <IsDefault>true</IsDefault>
             <StartingBalance>1000000000</StartingBalance>
             <Type>Trader</Type>
@@ -16,7 +16,7 @@
             <AutoAcceptPeace>false</AutoAcceptPeace>
             <DiscoveredByDefault>true</DiscoveredByDefault>
             <DefaultRelation>Neutral</DefaultRelation>
-            <Description>Ganymede Liberation Front NPCs</Description>
+            <Description>The Ganymede Liberation Front (GLF) emerged from a workers' revolt against the Enceladus Corporation (ECO) after years of labor exploitation.</Description>
         </Faction>
 
     </Factions>

diff --git a/NPC.Pack.GanymedeLiberationFront/Data/Scripts/FactionDefinition/GLF-NPC.cs b/NPC.Pack.GanymedeLiberationFront/Data/Scripts/FactionDefinition/GLF-NPC.cs
@@ -141,7 +141,7 @@ public partial class FactionDefs
             },
             Player = new List<string>
             {
-                "GLF"
+                //"GLF"
             },
 
             // formations

diff --git a/TSTSSESTweaks/Data/Prefabs/RespawnShip_V2_Sour_Lemon.sbc b/TSTSSESTweaks/Data/Prefabs/RespawnShip_V2_Sour_Lemon.sbc
diff --git a/TSTSSESTweaks/Data/RespawnShips.sbc b/TSTSSESTweaks/Data/RespawnShips.sbc
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<Definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <RespawnShips>
+
+    <!-- <Ship>
+      <Id>
+        <TypeId>RespawnShipDefinition</TypeId>
+        <SubtypeId>RespawnShip</SubtypeId>
+      </Id>
+      <DisplayName>Sour Lemon RespawnShip</DisplayName>
+      <Icon>Textures\GUI\Icons\RespawnShips\Sour_Lemon.dds</Icon>
+      <CooldownSeconds>900</CooldownSeconds>
+      <Prefab>RespawnShip_V2_Sour_Lemon</Prefab>
+    </Ship> -->
+	<Ship>
+      <Id>
+        <TypeId>RespawnShipDefinition</TypeId>
+        <SubtypeId>RespawnSpacePod</SubtypeId>
+      </Id>
+      <DisplayName>Sour Lemon</DisplayName>
+      <Icon>Textures\GUI\Icons\RespawnShips\Sour_Lemon.dds</Icon>
+      <CooldownSeconds>900</CooldownSeconds>
+      <Prefab>RespawnShip_V2_Sour_Lemon</Prefab>
+	  <PlanetDeployAltitude>100000</PlanetDeployAltitude>
+      <!-- <SpawnPosition x="0" y="140000" z="-150000" />
+	  <SpawnPositionDispersionMin>20000</SpawnPositionDispersionMin>
+	  <SpawnPositionDispersionMax>50000</SpawnPositionDispersionMax> -->
+      <UseForSpace>true</UseForSpace>
+      <HelpTextLocalizationId>RespawnScreeenHelpTextSpaceSpawn</HelpTextLocalizationId>
+    </Ship>
+
+  </RespawnShips>                
+</Definitions>
diff --git a/TSTSSESTweaks/Textures/GUI/Icons/RespawnShips/Sour_Lemon.dds b/TSTSSESTweaks/Textures/GUI/Icons/RespawnShips/Sour_Lemon.dds
diff --git a/TSTSSESTweaks/Textures/GUI/Icons/RespawnShips/Sour_Lemon.png b/TSTSSESTweaks/Textures/GUI/Icons/RespawnShips/Sour_Lemon.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -140,7 +140,7 @@ public partial class FactionDefs @@
                 },
                 Player = new List<string>
                 {
-                    "ECO"
+                   // "ECO"
                 },
                 // formations
@@ Expand Down @@