Merge remote-tracking branch 'origin/master'

TeamOct · Dec 9, 2023 · 406a5c6 · 406a5c6
2 parents b49251b + d20762f
commit 406a5c6
Show file tree

Hide file tree

Showing 13 changed files with 513 additions and 7 deletions.
diff --git a/core/res/shaders/los.frag b/core/res/shaders/los.frag
@@ -28,11 +28,12 @@ vec3 hsv2rgb(vec3 c){
 
 void main(){
     vec2 coords = vec2(v_texCoords.x * u_resolution.x + u_campos.x, v_texCoords.y * u_resolution.y + u_campos.y);
+    float random = rand(ceil(vec2(coords.x, coords.y) / 8. * u_cameraScale));
 
     vec4 c = texture2D(u_texture, v_texCoords);
 
     vec3 hsv = rgb2hsv(c.rgb);
-    hsv.r += sin(u_time + rand(vec2(coords.x / u_cameraScale, coords.y / u_cameraScale)) * 100.0) * 0.08 - 0.04;
+    hsv.r += sin(u_time + random) * 0.16 - 0.04;
     c = vec4(hsv2rgb(hsv), c.a);
 
     gl_FragColor = c;

diff --git a/core/res/sprites/blocks/turrets/bases/lumoni-block-4.png b/core/res/sprites/blocks/turrets/bases/lumoni-block-4.png
diff --git a/core/res/sprites/blocks/turrets/bases/lumoni-block-5.png b/core/res/sprites/blocks/turrets/bases/lumoni-block-5.png
diff --git a/core/res/sprites/items/aluminium.png b/core/res/sprites/items/aluminium.png
diff --git a/core/res/sprites/items/cuberium.png b/core/res/sprites/items/cuberium.png
diff --git a/core/res/sprites/items/luminium.png b/core/res/sprites/items/luminium.png
diff --git a/core/res/sprites/items/nickel.png b/core/res/sprites/items/nickel.png
diff --git a/core/res/sprites/items/sulphur.png b/core/res/sprites/items/sulphur.png
diff --git a/core/src/fos/content/FOSItems.java b/core/src/fos/content/FOSItems.java
@@ -42,7 +42,10 @@ public static void load(){
         brass = new Item("brass", Color.valueOf("b57050")){{
             cost = 2f;
         }};
-        sulphur = new Item("sulphur", Color.valueOf("000000" /*TODO*/));
+        sulphur = new Item("sulphur", Color.valueOf("f0b454")){{
+            flammability = 0.6f;
+            cost = 0.5f;
+        }};
         cuberium = new Item("cuberium", Color.valueOf("855992")){{
             cost = 3f;
         }};

diff --git a/core/src/fos/core/FOSMod.java b/core/src/fos/core/FOSMod.java
@@ -13,6 +13,7 @@
 import fos.content.*;
 import fos.controllers.CapsulesController;
 import fos.gen.FosEntityMapping;
+import fos.graphics.FOSOreRenderer;
 import fos.graphics.FOSShaders;
 import fos.net.FOSPackets;
 import fos.ui.DamageDisplay;
@@ -83,6 +84,8 @@ public FOSMod() {
 
     @Override
     public void loadContent() {
+        FOSVars.oreRenderer = new FOSOreRenderer();
+
         SplashTexts.load();
 
         FOSShaders.init();

diff --git a/core/src/fos/core/FOSVars.java b/core/src/fos/core/FOSVars.java
@@ -6,6 +6,7 @@
 import fos.content.FOSFluids;
 import fos.controllers.CapsulesController;
 import fos.files.InternalFileTree;
+import fos.graphics.FOSOreRenderer;
 import fos.ui.*;
 import fos.ui.menus.FOSMenuRenderer;
 import mindustry.ai.Pathfinder;
@@ -51,6 +52,9 @@ public class FOSVars {
     /** Main menu renderer **/
     public static FOSMenuRenderer menuRenderer = new FOSMenuRenderer();
 
+    /** Ore cache renderer **/
+    public static FOSOreRenderer oreRenderer;
+
     /** Mod reference **/
     public static Mods.LoadedMod mod;