solvent

uujuju1 · Mar 28, 2024 · da5dd37 · da5dd37
1 parent 0d60e5d
commit da5dd37
Show file tree

Hide file tree

Showing 18 changed files with 41 additions and 2 deletions.
diff --git a/assets/sprites/blocks/environment/ash-graphite-large.png b/assets/sprites/blocks/environment/ash-graphite-large.png
diff --git a/assets/sprites/blocks/environment/ash-graphite1.png b/assets/sprites/blocks/environment/ash-graphite1.png
diff --git a/assets/sprites/blocks/environment/ash-graphite2.png b/assets/sprites/blocks/environment/ash-graphite2.png
diff --git a/assets/sprites/blocks/environment/marble-graphite-large.png b/assets/sprites/blocks/environment/marble-graphite-large.png
diff --git a/assets/sprites/blocks/environment/marble-graphite1.png b/assets/sprites/blocks/environment/marble-graphite1.png
diff --git a/assets/sprites/blocks/environment/marble-graphite2.png b/assets/sprites/blocks/environment/marble-graphite2.png
diff --git a/assets/sprites/blocks/environment/marble3.png b/assets/sprites/blocks/environment/marble3.png
diff --git a/assets/sprites/blocks/environment/marble4.png b/assets/sprites/blocks/environment/marble4.png
diff --git a/assets/sprites/blocks/environment/shallow-solvent1.png b/assets/sprites/blocks/environment/shallow-solvent1.png
diff --git a/assets/sprites/blocks/environment/shallow-solvent2.png b/assets/sprites/blocks/environment/shallow-solvent2.png
diff --git a/assets/sprites/blocks/environment/shallow-solvent3.png b/assets/sprites/blocks/environment/shallow-solvent3.png
diff --git a/assets/sprites/blocks/environment/shallower-solvent1.png b/assets/sprites/blocks/environment/shallower-solvent1.png
diff --git a/assets/sprites/blocks/environment/shallower-solvent2.png b/assets/sprites/blocks/environment/shallower-solvent2.png
diff --git a/assets/sprites/blocks/environment/shallower-solvent3.png b/assets/sprites/blocks/environment/shallower-solvent3.png
diff --git a/assets/sprites/blocks/environment/solvent.png b/assets/sprites/blocks/environment/solvent.png
diff --git a/atlas.sai2 b/atlas.sai2
diff --git a/src/sw/SWVars.java b/src/sw/SWVars.java
@@ -42,6 +42,7 @@ function importModClass(name){
 	  Vars.mods.getScripts().runConsole("importModClass(\"sw.dream.events\")");
 	  Vars.mods.getScripts().runConsole("importModClass(\"sw.maps\")");
 	  Vars.mods.getScripts().runConsole("importModClass(\"sw.maps.generators\")");
+    Vars.mods.getScripts().runConsole("importModClass(\"sw.graphics\")");
     Vars.mods.getScripts().runConsole("importModClass(\"sw.util\")");
     Vars.mods.getScripts().runConsole("importModClass(\"sw.world.graph\")");
 	}

diff --git a/src/sw/content/blocks/SWEnvironment.java b/src/sw/content/blocks/SWEnvironment.java
@@ -1,27 +1,47 @@
 package sw.content.blocks;
 
+import mindustry.content.*;
+import mindustry.graphics.*;
 import mindustry.world.*;
 import mindustry.world.blocks.environment.*;
+import sw.content.*;
 
 public class SWEnvironment {
 	public static Block
 	spinyTree, deadSpinyTree,
 
-	ash, fineAsh, ashWall,
+	oreNickel, oreIron,
+
+	ash, fineAsh, ashWall, ashGraphite,
 	fauna, denseFauna, faunaWall,
 	deadFauna, denseDeadFauna, deadFaunaWall,
 	biomass, folliage, biomassWall,
 	gravel, flatGravel, gravelWall,
 	roots, tangledRoots, rootsWall,
 	soil, clay, soilWall,
-	marble, roughMarble, marbleWall, marbleBoulder,
+	marble, roughMarble, marbleWall, marbleGraphite, marbleBoulder,
+
+	solvent, shallowSolvent, shallowerSolvent,
+
 	plate, plateCross, plateVent, plateWall;
 
 	public static void load() {
 		spinyTree = new TreeBlock("spiny-tree");
 		deadSpinyTree = new TreeBlock("dead-spiny-tree");
 
+
+		oreNickel = new OreBlock(SWItems.nickel) {{
+			variants = 4;
+		}};
+		oreIron = new OreBlock(SWItems.iron) {{
+			variants = 4;
+		}};
+
+
 		ashWall = new StaticWall("ash-wall");
+		ashGraphite = new StaticWall("ash-graphite") {{
+			itemDrop = Items.graphite;
+		}};
 		ash = new Floor("ash", 4) {{
 			wall = ashWall;
 		}};
@@ -78,6 +98,9 @@ public static void load() {
 		}};
 
 		marbleWall = new StaticWall("marble-wall");
+		marbleGraphite = new StaticWall("marble-graphite") {{
+			itemDrop = Items.graphite;
+		}};
 		marbleBoulder = new Prop("marble-boulder") {{
 			variants = 2;
 		}};
@@ -90,6 +113,21 @@ public static void load() {
 			decoration = marbleBoulder;
 		}};
 
+
+		solvent = new Floor("solvent", 0) {{
+			cacheLayer = CacheLayer.water;
+//			liquidDrop = SWLiquids.solvent
+		}};
+		shallowSolvent = new Floor("shallow-solvent") {{
+			cacheLayer = CacheLayer.water;
+//			liquidDrop = SWLiquids.solvent
+		}};
+		shallowerSolvent = new Floor("shallower-solvent") {{
+			cacheLayer = CacheLayer.water;
+//			liquidDrop = SWLiquids.solvent
+		}};
+
+
 		plateWall = new StaticWall("plate-wall");
 		plate = new Floor("plate", 4) {{
 			wall = plateWall;