larger solar velocity range, solar screen

new-frontiers-14 · Feb 10, 2025 · b567d0c · b567d0c
1 parent 52c21d2
commit b567d0c
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 2 deletions.
diff --git a/Content.Server/_NF/Solar/EntitySystems/NFPowerSolarSystem.cs b/Content.Server/_NF/Solar/EntitySystems/NFPowerSolarSystem.cs
@@ -66,7 +66,9 @@ private void RandomizeSun()
     {
         // Initialize the sun to something random
         TowardsSun = MathHelper.TwoPi * _robustRandom.NextDouble();
-        SunAngularVelocity = Angle.FromDegrees(0.1 + ((_robustRandom.NextDouble() - 0.5) * 0.05));
+        SunAngularVelocity = Angle.FromDegrees(0.125 + (_robustRandom.NextDouble() - 0.5) * 0.1); // 0.075/s - 0.175/s (4800s - ~2000s per orbit)
+        if (_robustRandom.Prob(0.5f))
+            SunAngularVelocity = -SunAngularVelocity; // retrograde rotation(?)
     }
 
     private void OnMapInit(EntityUid uid, NFSolarPanelComponent component, MapInitEvent args)

diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -743,6 +743,7 @@
     - map: ["computerLayerKeyboard"]
       state: generic_keyboard
     - map: ["computerLayerScreen"]
+      sprite: _NF/Structures/Machines/computers.rsi # Frontier
       state: solar_screen
     - map: ["computerLayerKeys"]
       state: generic_keys

diff --git a/Resources/Textures/_NF/Structures/Machines/computers.rsi/meta.json b/Resources/Textures/_NF/Structures/Machines/computers.rsi/meta.json
@@ -2,7 +2,7 @@
   "version": 1,
   "license": "CC-BY-SA-3.0",
   "copyright": "shipyard_security and shipyard made by Potato1234_x, black market versions by terezi4real on github, medical versions by sungyandy, piratebounty* by @gentlebutter, sr by Tych0thesynth on github",
-  "copyright": "contraband by gentlebutter, animated by whatston3; cargo_market, cargo_sale, shuttle_records, station_atm by whatston3",
+  "copyright": "contraband by gentlebutter, animated by whatston3; cargo_market, cargo_sale, shuttle_records, solar_screen, station_atm by whatston3",
   "size": {
     "x": 32,
     "y": 32
@@ -417,6 +417,36 @@
             0.5
           ]
         ]
+    },
+    {
+        "name": "solar_screen",
+        "directions": 4,
+        "delays": [
+          [
+            0.6,
+            0.4,
+            0.4,
+            0.6
+          ],
+          [
+            0.6,
+            0.4,
+            0.4,
+            0.6
+          ],
+          [
+            0.6,
+            0.4,
+            0.4,
+            0.6
+          ],
+          [
+            0.6,
+            0.4,
+            0.4,
+            0.6
+          ]
+        ]
     }
   ]
 }
diff --git a/Resources/Textures/_NF/Structures/Machines/computers.rsi/solar_screen.png b/Resources/Textures/_NF/Structures/Machines/computers.rsi/solar_screen.png