Skip to content

Commit

Permalink
Merge pull request #77 from RimNauts/main
Browse files Browse the repository at this point in the history 
Patch
  • Loading branch information
@sindre0830
sindre0830 committed Feb 9, 2024
2 parents 65d708a + 2467f2b commit 78a5c14
Show file tree
Hide file tree
Showing 42 changed files with 752 additions and 117 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
*.sln.docstates
AssetBuilder*/*
*.dds
.vscode/

# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs
Expand Down
Binary file modified Assemblies/RimNauts2.dll
View file
Binary file not shown.
4 changes: 4 additions & 0 deletions Changelog.md
View file
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
# Changelog
- Add VFE patch to allow fishing zones on ocean moon
- Rename 'Satellite' to 'Relay Satellite' for a future update.
- Meteor events can no longer trigger in space
- Add compatibility with the latest SOS2 EVA system
41 changes: 36 additions & 5 deletions Defs/CelestialComponentDefs/Satellite.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,46 @@
<trailTransparency>0.5</trailTransparency>
</Universum.Defs.Component>

<Universum.Defs.Component Name="RimNauts2_Component_Label_Satellite">
<defName>RimNauts2_Component_Label_Satellite</defName>
<Universum.Defs.Component Name="RimNauts2_Component_Label_Satellite" Abstract="True">
<componentClass>Universum.World.Component.FloatingLabel</componentClass>
<offSet>(0.0, -5.0, 0.0)</offSet>
<offSet>(0.0, -2.0, 0.0)</offSet>
<color>(255, 255, 255)</color>
<hideAtMinAltitude>50</hideAtMinAltitude>
<hideAtMaxAltitude>150</hideAtMaxAltitude>
<fontSize>10.0</fontSize>
<outlineColor>(0, 0, 0)</outlineColor>
<outlineWidth>0.2</outlineWidth>
</Universum.Defs.Component>

<Universum.Defs.Component ParentName="RimNauts2_Component_Label_Satellite">
<defName>RimNauts2_Component_Label_Satellite_Station</defName>
<offSet>(0.0, -5.0, 0.0)</offSet>
<hideAtMinAltitude>10</hideAtMinAltitude>
<hideAtMaxAltitude>400</hideAtMaxAltitude>
<fontSize>20.0</fontSize>
<outlineColor>(0, 0, 0)</outlineColor>
<outlineWidth>0.2</outlineWidth>
</Universum.Defs.Component>

<Universum.Defs.Component ParentName="RimNauts2_Component_Label_Satellite">
<defName>RimNauts2_Component_Label_Satellite_Relay</defName>
<color>(116, 101, 90)</color>
<overwriteText>Relay Satellite</overwriteText>
</Universum.Defs.Component>

<Universum.Defs.Component ParentName="RimNauts2_Component_Label_Satellite">
<defName>RimNauts2_Component_Label_Satellite_Energy</defName>
<color>(192, 150, 7)</color>
<overwriteText>Energy Relay Satellite</overwriteText>
</Universum.Defs.Component>

<Universum.Defs.Component ParentName="RimNauts2_Component_Label_Satellite">
<defName>RimNauts2_Component_Label_Satellite_EnergyBooster</defName>
<color>(255, 205, 120)</color>
<overwriteText>Energy Booster Satellite</overwriteText>
</Universum.Defs.Component>

<Universum.Defs.Component ParentName="RimNauts2_Component_Label_Satellite">
<defName>RimNauts2_Component_Label_Satellite_CosmicSurveillance</defName>
<color>(41, 58, 160)</color>
<overwriteText>Cosmic Surveillance Satellite</overwriteText>
</Universum.Defs.Component>
</Defs>
3 changes: 3 additions & 0 deletions Defs/CelestialObjectDefs/AsteroidOre.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
<biomeDef>RimNauts2_Satellite_Biome</biomeDef>
<keepAfterAbandon>false</keepAfterAbandon>
<overlayIconPath>UI/Designators/Mine</overlayIconPath>
<commandLabelKey>RimNauts.asteroid_command_label</commandLabelKey>
<commandDescKey>RimNauts.asteroid_command_desc</commandDescKey>
<commandIconPath>UI/Designators/Mine</commandIconPath>
</objectHolder>
<shape>
<meshes>
Expand Down
59 changes: 48 additions & 11 deletions Defs/CelestialObjectDefs/Satellite.xml
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,76 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<Universum.Defs.CelestialObject Name="RimNauts2_CelestialObject_Satellite">
<defName>RimNauts2_CelestialObject_Satellite</defName>
<Universum.Defs.CelestialObject Name="RimNauts2_CelestialObject_Satellite" Abstract="True">
<celestialObjectClass>Universum.World.Objects.Basic</celestialObjectClass>
<namePackDefName>RimNauts2_NamePack_Basic</namePackDefName>
<scalePercentageBetween>(0.002, 0.002)</scalePercentageBetween>
<scalePercentageBetween>(0.003, 0.003)</scalePercentageBetween>
<minSize>0.3</minSize>
<speedPercentageBetween>(8.0, 10.0)</speedPercentageBetween>
<orbitPathOffsetPercentage>1.2</orbitPathOffsetPercentage>
<orbitSpreadBetween>(0.05, 0.05)</orbitSpreadBetween>
<orbitDirection>RANDOM</orbitDirection>
<axialAngleBetween>(-90.0, 270.0)</axialAngleBetween>
<axialAngleBetween>(0.0, 360.0)</axialAngleBetween>
<inclinationAngleBetween>(0.0, 180.0)</inclinationAngleBetween>
<components>
<li>RimNauts2_Component_Trail_Satellite</li>
</components>
<icon>
<texturePath>Satellites/ArtificalSatellites/RimNauts2_ArtificialSatellite</texturePath>
</icon>
</Universum.Defs.CelestialObject>

<Universum.Defs.CelestialObject Name="RimNauts2_CelestialObject_Satellite_Station" ParentName="RimNauts2_CelestialObject_Satellite">
<Universum.Defs.CelestialObject ParentName="RimNauts2_CelestialObject_Satellite">
<defName>RimNauts2_CelestialObject_Satellite_Station</defName>
<scalePercentageBetween>(0.004, 0.004)</scalePercentageBetween>
<scalePercentageBetween>(0.005, 0.005)</scalePercentageBetween>
<minSize>0.5</minSize>
<objectHolder>
<mapGeneratorDef>RimNauts2_SpaceStation_MapGen</mapGeneratorDef>
<biomeDef>RimNauts2_Satellite_Biome</biomeDef>
<keepAfterAbandon>false</keepAfterAbandon>
<description>Space Station</description>
</objectHolder>
<components>
<li>RimNauts2_Component_Trail_Satellite</li>
<li>RimNauts2_Component_Label_Satellite</li>
<li>RimNauts2_Component_Label_Satellite_Station</li>
</components>
<icon>
<texturePath>Satellites/ArtificalSatellites/RimNauts2_SpaceStation</texturePath>
</icon>
</Universum.Defs.CelestialObject>

<Universum.Defs.CelestialObject ParentName="RimNauts2_CelestialObject_Satellite">
<defName>RimNauts2_CelestialObject_Satellite_Relay</defName>
<components>
<li>RimNauts2_Component_Label_Satellite_Relay</li>
</components>
<icon>
<texturePath>Satellites/ArtificalSatellites/RimNauts2_ArtificialSatellite_Relay</texturePath>
</icon>
</Universum.Defs.CelestialObject>

<Universum.Defs.CelestialObject ParentName="RimNauts2_CelestialObject_Satellite">
<defName>RimNauts2_CelestialObject_Satellite_Energy</defName>
<components>
<li>RimNauts2_Component_Label_Satellite_Energy</li>
</components>
<icon>
<texturePath>Satellites/ArtificalSatellites/RimNauts2_ArtificialSatellite_Energy</texturePath>
</icon>
</Universum.Defs.CelestialObject>

<Universum.Defs.CelestialObject ParentName="RimNauts2_CelestialObject_Satellite">
<defName>RimNauts2_CelestialObject_Satellite_EnergyBooster</defName>
<components>
<li>RimNauts2_Component_Label_Satellite_EnergyBooster</li>
</components>
<icon>
<texturePath>Satellites/ArtificalSatellites/RimNauts2_ArtificialSatellite_EnergyBooster</texturePath>
</icon>
</Universum.Defs.CelestialObject>

<Universum.Defs.CelestialObject ParentName="RimNauts2_CelestialObject_Satellite">
<defName>RimNauts2_CelestialObject_Satellite_CosmicSurveillance</defName>
<components>
<li>RimNauts2_Component_Label_Satellite_CosmicSurveillance</li>
</components>
<icon>
<texturePath>Satellites/ArtificalSatellites/RimNauts2_ArtificialSatellite_CosmicSurveillance</texturePath>
</icon>
</Universum.Defs.CelestialObject>
</Defs>
6 changes: 6 additions & 0 deletions Defs/CelestialObjectDefs/moon.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
<keepAfterAbandon>true</keepAfterAbandon>
<description>Barren Moon</description>
<overlayIconPath>Satellites/Moons/RimNauts2_Moon_Base</overlayIconPath>
<commandLabelKey>RimNauts.moon_command_label</commandLabelKey>
<commandDescKey>RimNauts.moon_command_desc</commandDescKey>
<commandIconPath>Satellites/Moons/RimNauts2_Moon_Base</commandIconPath>
</objectHolder>
<components>
<li>RimNauts2_Component_Label_Moon_Barren</li>
Expand Down Expand Up @@ -52,6 +55,9 @@
<keepAfterAbandon>true</keepAfterAbandon>
<description>Ocean Moon</description>
<overlayIconPath>Satellites/Moons/RimNauts2_Moon_Base</overlayIconPath>
<commandLabelKey>RimNauts.moon_command_label</commandLabelKey>
<commandDescKey>RimNauts.moon_command_desc</commandDescKey>
<commandIconPath>Satellites/Moons/RimNauts2_Moon_Base</commandIconPath>
</objectHolder>
<components>
<li>RimNauts2_Component_Label_Moon_Ocean</li>
Expand Down
1 change: 0 additions & 1 deletion Defs/DefOfs.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<li>Infestation</li>
<li>GiveQuest_Random</li>
<li>MechCluster</li>
<li>MeteoriteImpact</li>
<li>PsychicDrone</li>
<li>PsychicSoothe</li>
<li>ResourcePodCrash</li>
Expand Down
116 changes: 107 additions & 9 deletions Defs/RecipesDefs/Modules.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Defs>
<RecipeDef Name="RimNauts2_Make_Module" Abstract="True">
<description>Make module.</description>
<jobString>Making module.</jobString>
<workSpeedStat>GeneralLaborSpeed</workSpeedStat>
<effectWorking>Cook</effectWorking>
Expand All @@ -13,10 +14,42 @@
<displayPriority>0</displayPriority>
</RecipeDef>

<RecipeDef ParentName="RimNauts2_Make_Module">
<defName>RimNauts2_Make_Module_Station</defName>
<label>make station module</label>
<unfinishedThingDef>RimNauts2_Unifinished_Module_Station</unfinishedThingDef>
<ingredients>
<li>
<filter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</filter>
<count>1000</count>
</li>
<li>
<filter>
<thingDefs>
<li>ComponentIndustrial</li>
</thingDefs>
</filter>
<count>40</count>
</li>
</ingredients>
<fixedIngredientFilter>
<thingDefs>
<li>Steel</li>
<li>ComponentIndustrial</li>
</thingDefs>
</fixedIngredientFilter>
<products>
<RimNauts2_Module_Station>1</RimNauts2_Module_Station>
</products>
</RecipeDef>

<RecipeDef ParentName="RimNauts2_Make_Module">
<defName>RimNauts2_Make_Module_Satellite</defName>
<label>make satellite module</label>
<description>Make a satellite module.</description>
<label>Make Relay Satellite module</label>
<unfinishedThingDef>RimNauts2_Unifinished_Module_Satellite</unfinishedThingDef>
<ingredients>
<li>
Expand Down Expand Up @@ -47,27 +80,59 @@
</products>
</RecipeDef>

<!--<RecipeDef ParentName="RimNauts2_Make_Module">
<defName>RimNauts2_Make_Module_Satellite_Energy</defName>
<label>Make Energy Relay Satellite module</label>
<unfinishedThingDef>RimNauts2_Unifinished_Module_Satellite_Energy</unfinishedThingDef>
<ingredients>
<li>
<filter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</filter>
<count>60</count>
</li>
<li>
<filter>
<thingDefs>
<li>ComponentIndustrial</li>
</thingDefs>
</filter>
<count>1</count>
</li>
</ingredients>
<fixedIngredientFilter>
<thingDefs>
<li>Steel</li>
<li>ComponentIndustrial</li>
</thingDefs>
</fixedIngredientFilter>
<products>
<RimNauts2_Module_Satellite>1</RimNauts2_Module_Satellite>
</products>
</RecipeDef>
<RecipeDef ParentName="RimNauts2_Make_Module">
<defName>RimNauts2_Make_Module_Station</defName>
<label>make station module</label>
<description>Make a station module.</description>
<unfinishedThingDef>RimNauts2_Unifinished_Module_Station</unfinishedThingDef>
<defName>RimNauts2_Make_Module_Satellite_EnergyBooster</defName>
<label>Make Energy Booster Satellite module</label>
<unfinishedThingDef>RimNauts2_Unifinished_Module_Satellite_EnergyBooster</unfinishedThingDef>
<ingredients>
<li>
<filter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</filter>
<count>1000</count>
<count>60</count>
</li>
<li>
<filter>
<thingDefs>
<li>ComponentIndustrial</li>
</thingDefs>
</filter>
<count>40</count>
<count>1</count>
</li>
</ingredients>
<fixedIngredientFilter>
Expand All @@ -77,7 +142,40 @@
</thingDefs>
</fixedIngredientFilter>
<products>
<RimNauts2_Module_Station>1</RimNauts2_Module_Station>
<RimNauts2_Module_Satellite>1</RimNauts2_Module_Satellite>
</products>
</RecipeDef>
<RecipeDef ParentName="RimNauts2_Make_Module">
<defName>RimNauts2_Make_Module_Satellite_CosmicSurveillance</defName>
<label>Make Cosmic Surveillance Satellite module</label>
<unfinishedThingDef>RimNauts2_Unifinished_Module_Satellite_CosmicSurveillance</unfinishedThingDef>
<ingredients>
<li>
<filter>
<thingDefs>
<li>Steel</li>
</thingDefs>
</filter>
<count>60</count>
</li>
<li>
<filter>
<thingDefs>
<li>ComponentIndustrial</li>
</thingDefs>
</filter>
<count>1</count>
</li>
</ingredients>
<fixedIngredientFilter>
<thingDefs>
<li>Steel</li>
<li>ComponentIndustrial</li>
</thingDefs>
</fixedIngredientFilter>
<products>
<RimNauts2_Module_Satellite>1</RimNauts2_Module_Satellite>
</products>
</RecipeDef>-->
</Defs>
Loading

0 comments on commit 78a5c14

Please sign in to comment.