Skip to content

Commit

Permalink
Merge pull request #79 from RimNauts/main
Browse files Browse the repository at this point in the history
Minor update
  • Loading branch information
sindre0830 committed Apr 7, 2024
2 parents 1ab6a62 + b391679 commit 0d5fc51
Show file tree
Hide file tree
Showing 163 changed files with 3,281 additions and 3 deletions.
Binary file added 1.4/Assemblies/RimNauts2.dll
Binary file not shown.
2 changes: 2 additions & 0 deletions 1.4/AssetBundles/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.meta
AssetBundles*
63 changes: 63 additions & 0 deletions 1.4/AssetBundles/neo.shader
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
Shader "Custom/neo" {
Properties {
_MainTex ("Texture", 2D) = "white" {}
_Color ("Color", Vector) = (1, 1, 1, 1)
}

SubShader {
Pass {
CGPROGRAM
#pragma vertex vert
#pragma fragment frag

#include "UnityCG.cginc"

struct vertex_data {
float4 vertex : POSITION;
float2 texcoord : TEXCOORD;
};

struct fragment_data {
float4 vertex : SV_POSITION;
float4 color : COLOR;
float2 texcoord : TEXCOORD;
float4 object_in_world : TEXCOORD1;
};

float4 _PlanetSunLightDirection;
float _PlanetSunLightEnabled;
float4 _Color;
sampler2D _MainTex;

fragment_data vert(vertex_data v) {
fragment_data f;
f.object_in_world = mul(unity_ObjectToWorld, v.vertex);
f.color = _Color;
f.texcoord.xy = v.texcoord.xy;
f.vertex = mul(unity_MatrixVP, f.object_in_world);
return f;
}

fixed4 frag(fragment_data f) : SV_Target {
float4 pixel;
pixel = tex2D(_MainTex, f.texcoord.xy);
if (pixel.w <= 0.5) {
discard;
}
float4 light;
light.x = dot(f.object_in_world.xyz, f.object_in_world.xyz);
light.x = rsqrt(light.x);
light.xyz = light.xxx * f.object_in_world.xyz;
light.x = dot(light.xyz, _PlanetSunLightDirection.xyz);
light.x = light.x * 0.5 + 0.5;
light.x = -_PlanetSunLightEnabled * light.x + 0.55;
light.x = saturate(light.x * 10.0);
light.xyz = light.xxx * float3(0.518, 0.397, 0.318) + float3(0.482, 0.603, 0.682);
pixel.xyz = pixel.xyz * light.xyz * f.color;
return pixel;
}
ENDCG
}
}
Fallback "Unlit/Texture"
}
Binary file added 1.4/AssetBundles/rimnauts_linux
Binary file not shown.
16 changes: 16 additions & 0 deletions 1.4/AssetBundles/rimnauts_linux.manifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
ManifestFileVersion: 0
CRC: 47845845
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: ff38c4068da689d77f4db483fc49900f
TypeTreeHash:
serializedVersion: 2
Hash: 7e9ee104d6bb707fb2602b751e6f78b1
HashAppended: 0
ClassTypes:
- Class: 48
Script: {instanceID: 0}
Assets:
- Assets/neo.shader
Dependencies: []
Binary file added 1.4/AssetBundles/rimnauts_mac
Binary file not shown.
16 changes: 16 additions & 0 deletions 1.4/AssetBundles/rimnauts_mac.manifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
ManifestFileVersion: 0
CRC: 2260534530
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 854bac9b57f6cee3a4fb83691943c48f
TypeTreeHash:
serializedVersion: 2
Hash: 7e9ee104d6bb707fb2602b751e6f78b1
HashAppended: 0
ClassTypes:
- Class: 48
Script: {instanceID: 0}
Assets:
- Assets/neo.shader
Dependencies: []
Binary file added 1.4/AssetBundles/rimnauts_windows
Binary file not shown.
16 changes: 16 additions & 0 deletions 1.4/AssetBundles/rimnauts_windows.manifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
ManifestFileVersion: 0
CRC: 1570015886
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 7584cfcd94e2d9324c8eb1434caa69a9
TypeTreeHash:
serializedVersion: 2
Hash: 7e9ee104d6bb707fb2602b751e6f78b1
HashAppended: 0
ClassTypes:
- Class: 48
Script: {instanceID: 0}
Assets:
- Assets/neo.shader
Dependencies: []
125 changes: 125 additions & 0 deletions 1.4/Defs/BiomeDefs/satellite.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<!-- Root class -->
<BiomeDef Name="RimNauts2_Biome" Abstract="True">
<workerClass>RimNauts2.Biome.Worker</workerClass>
<canBuildBase>true</canBuildBase>
<canAutoChoose>false</canAutoChoose>
<allowRoads>false</allowRoads>
<allowRivers>false</allowRivers>
<hasVirtualPlants>false</hasVirtualPlants>
<texture>World/Biomes/Ocean</texture>
<impassable>false</impassable>
<allowFarmingCamps>false</allowFarmingCamps>
<animalDensity>0</animalDensity>
<plantDensity>0</plantDensity>
<settlementSelectionWeight>0</settlementSelectionWeight>
<movementDifficulty>1</movementDifficulty>
<forageability>0</forageability>
<isExtremeBiome>true</isExtremeBiome>
<soundsAmbient></soundsAmbient>
<diseaseMtbDays>90</diseaseMtbDays>
<diseases>
<li>
<diseaseInc>Disease_Flu</diseaseInc>
<commonality>100</commonality>
</li>
</diseases>
<baseWeatherCommonalities>
<RimNauts2_OuterSpaceWeather_Moon>0</RimNauts2_OuterSpaceWeather_Moon>
<RimNauts2_OuterSpaceWeather>1</RimNauts2_OuterSpaceWeather>
<Clear>0</Clear>
<Fog>0</Fog>
<Rain>0</Rain>
<DryThunderstorm>0</DryThunderstorm>
<RainyThunderstorm>0</RainyThunderstorm>
<FoggyRain>0</FoggyRain>
<SnowGentle>0</SnowGentle>
<SnowHard>0</SnowHard>
</baseWeatherCommonalities>
<wildPlants><!-- nothing --></wildPlants>
<wildAnimals><!-- nothing --></wildAnimals>
<allowedPackAnimals><!-- nothing --></allowedPackAnimals>
<modExtensions>
<li Class="GeologicalLandforms.BiomeProperties" MayRequire="m00nl1ght.GeologicalLandforms">
<allowLandforms>false</allowLandforms>
<allowBiomeTransitions>false</allowBiomeTransitions>
</li>
</modExtensions>
</BiomeDef>
<!-- Satellite objects -->
<BiomeDef ParentName="RimNauts2_Biome">
<defName>RimNauts2_Satellite_Biome</defName>
<label>Ocean</label>
<description>Open ocean. Great for fish. Not so great for you.</description>
<modExtensions>
<li Class="Universum.Utilities.Biome.Properties">
<allowed_utilities>
<li>universum.vacuum_decompression</li>
<li>universum.vacuum_suffocation</li>
<li>universum.temperature</li>
<li>universum.ocean_masking</li>
<li>universum.vacuum</li>
<li>universum.disable_weather_change</li>
<li>universum.remove_shadows</li>
</allowed_utilities>
<temperature>-100.0</temperature>
</li>
</modExtensions>
</BiomeDef>
<!-- Moons -->
<BiomeDef ParentName="RimNauts2_Biome">
<defName>RimNauts2_MoonBarren_Biome</defName>
<label>Ocean</label>
<description>Open ocean. Great for fish. Not so great for you.</description>
<baseWeatherCommonalities>
<RimNauts2_OuterSpaceWeather_Moon>1</RimNauts2_OuterSpaceWeather_Moon>
<RimNauts2_OuterSpaceWeather>0</RimNauts2_OuterSpaceWeather>
<Clear>0</Clear>
<Fog>0</Fog>
<Rain>0</Rain>
<DryThunderstorm>0</DryThunderstorm>
<RainyThunderstorm>0</RainyThunderstorm>
<FoggyRain>0</FoggyRain>
<SnowGentle>0</SnowGentle>
<SnowHard>0</SnowHard>
</baseWeatherCommonalities>
<modExtensions>
<li Class="Universum.Utilities.Biome.Properties">
<allowed_utilities>
<li>universum.vacuum_decompression</li>
<li>universum.vacuum_suffocation</li>
<li>universum.temperature</li>
<li>universum.ocean_masking</li>
<li>universum.vacuum</li>
<li>universum.disable_weather_change</li>
</allowed_utilities>
<temperature>-100.0</temperature>
</li>
</modExtensions>
</BiomeDef>
<BiomeDef ParentName="RimNauts2_Biome">
<defName>RimNauts2_MoonWater_Biome</defName>
<label>Ocean</label>
<description>Open ocean. Great for fish. Not so great for you.</description>
<baseWeatherCommonalities>
<RimNauts2_OuterSpaceWeather_Moon>0</RimNauts2_OuterSpaceWeather_Moon>
<RimNauts2_OuterSpaceWeather>0</RimNauts2_OuterSpaceWeather>
<Clear>0.4</Clear>
<Fog>0.2</Fog>
<Rain>1</Rain>
<DryThunderstorm>0</DryThunderstorm>
<RainyThunderstorm>0.8</RainyThunderstorm>
<FoggyRain>0.2</FoggyRain>
<SnowGentle>0</SnowGentle>
<SnowHard>0</SnowHard>
</baseWeatherCommonalities>
<modExtensions>
<li Class="Universum.Utilities.Biome.Properties">
<allowed_utilities>
<li>universum.ocean_masking</li>
</allowed_utilities>
</li>
</modExtensions>
</BiomeDef>
</Defs>
13 changes: 13 additions & 0 deletions 1.4/Defs/CelestialComponentDefs/Asteroid.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Defs>
<Universum.Defs.Component Name="RimNauts2_Component_Trail_CrashingAsteroid">
<defName>RimNauts2_Component_Trail_CrashingAsteroid</defName>
<componentClass>Universum.World.Component.Trail</componentClass>
<materialDefName>RimNauts2_Material_Trail</materialDefName>
<offSet>(0.0, 0.0, 0.0)</offSet>
<color>(211, 211, 211)</color>
<trailWidth>0.2</trailWidth>
<trailLength>2.0</trailLength>
<trailTransparency>0.5</trailTransparency>
</Universum.Defs.Component>
</Defs>
36 changes: 36 additions & 0 deletions 1.4/Defs/CelestialComponentDefs/AsteroidOre.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<Defs>
<Universum.Defs.Component Name="RimNauts2_Component_AsteroidOre" Abstract="True">
<componentClass>Universum.World.Component.FloatingLabel</componentClass>
<offSet>(0.0, 0.0, 0.0)</offSet>
<hideAtMinAltitude>50</hideAtMinAltitude>
<hideAtMaxAltitude>300</hideAtMaxAltitude>
<fontSize>10.0</fontSize>
<outlineColor>(0, 0, 0)</outlineColor>
<outlineWidth>0.1</outlineWidth>
</Universum.Defs.Component>

<Universum.Defs.Component Name="RimNauts2_Component_AsteroidOre_Steel" ParentName="RimNauts2_Component_AsteroidOre">
<defName>RimNauts2_Component_AsteroidOre_Steel</defName>
<overwriteText>Steel</overwriteText>
<color>(211, 211, 211)</color>
</Universum.Defs.Component>

<Universum.Defs.Component Name="RimNauts2_Component_AsteroidOre_Gold" ParentName="RimNauts2_Component_AsteroidOre">
<defName>RimNauts2_Component_AsteroidOre_Gold</defName>
<overwriteText>Gold</overwriteText>
<color>(232, 185, 35)</color>
</Universum.Defs.Component>

<Universum.Defs.Component Name="RimNauts2_Component_AsteroidOre_Plasteel" ParentName="RimNauts2_Component_AsteroidOre">
<defName>RimNauts2_Component_AsteroidOre_Plasteel</defName>
<overwriteText>Plasteel</overwriteText>
<color>(111, 186, 223)</color>
</Universum.Defs.Component>

<Universum.Defs.Component Name="RimNauts2_Component_AsteroidOre_Uranium" ParentName="RimNauts2_Component_AsteroidOre">
<defName>RimNauts2_Component_AsteroidOre_Uranium</defName>
<overwriteText>Uranium</overwriteText>
<color>(44, 250, 31)</color>
</Universum.Defs.Component>
</Defs>
21 changes: 21 additions & 0 deletions 1.4/Defs/CelestialComponentDefs/Moon.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Defs>
<Universum.Defs.Component Name="RimNauts2_Component_Label_Moon" Abstract="True">
<componentClass>Universum.World.Component.FloatingLabel</componentClass>
<offSet>(0.0, 0.0, 0.0)</offSet>
<color>(255, 255, 255)</color>
<hideAtMinAltitude>200</hideAtMinAltitude>
<hideAtMaxAltitude>700</hideAtMaxAltitude>
<fontSize>40.0</fontSize>
<outlineColor>(0, 0, 0)</outlineColor>
<outlineWidth>0.2</outlineWidth>
</Universum.Defs.Component>

<Universum.Defs.Component Name="RimNauts2_Component_Label_Moon_Barren" ParentName="RimNauts2_Component_Label_Moon">
<defName>RimNauts2_Component_Label_Moon_Barren</defName>
</Universum.Defs.Component>

<Universum.Defs.Component Name="RimNauts2_Component_Label_Moon_Ocean" ParentName="RimNauts2_Component_Label_Moon">
<defName>RimNauts2_Component_Label_Moon_Ocean</defName>
</Universum.Defs.Component>
</Defs>
55 changes: 55 additions & 0 deletions 1.4/Defs/CelestialComponentDefs/Satellite.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<Defs>
<Universum.Defs.Component Name="RimNauts2_Component_Trail_Satellite">
<defName>RimNauts2_Component_Trail_Satellite</defName>
<componentClass>Universum.World.Component.Trail</componentClass>
<materialDefName>RimNauts2_Material_Trail</materialDefName>
<color>(211, 211, 211)</color>
<trailWidth>0.3</trailWidth>
<trailLength>2.0</trailLength>
<trailTransparency>0.5</trailTransparency>
</Universum.Defs.Component>

<Universum.Defs.Component Name="RimNauts2_Component_Label_Satellite" Abstract="True">
<componentClass>Universum.World.Component.FloatingLabel</componentClass>
<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>
</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>
Loading

0 comments on commit 0d5fc51

Please sign in to comment.