diff --git a/assets/sprites/blocks/environment/ash-graphite-large.png b/assets/sprites/blocks/environment/ash-graphite-large.png new file mode 100644 index 0000000..2e0085b Binary files /dev/null and b/assets/sprites/blocks/environment/ash-graphite-large.png differ diff --git a/assets/sprites/blocks/environment/ash-graphite1.png b/assets/sprites/blocks/environment/ash-graphite1.png new file mode 100644 index 0000000..c04c033 Binary files /dev/null and b/assets/sprites/blocks/environment/ash-graphite1.png differ diff --git a/assets/sprites/blocks/environment/ash-graphite2.png b/assets/sprites/blocks/environment/ash-graphite2.png new file mode 100644 index 0000000..083e2de Binary files /dev/null and b/assets/sprites/blocks/environment/ash-graphite2.png differ diff --git a/assets/sprites/blocks/environment/marble-graphite-large.png b/assets/sprites/blocks/environment/marble-graphite-large.png new file mode 100644 index 0000000..ae4d494 Binary files /dev/null and b/assets/sprites/blocks/environment/marble-graphite-large.png differ diff --git a/assets/sprites/blocks/environment/marble-graphite1.png b/assets/sprites/blocks/environment/marble-graphite1.png new file mode 100644 index 0000000..adcf4c0 Binary files /dev/null and b/assets/sprites/blocks/environment/marble-graphite1.png differ diff --git a/assets/sprites/blocks/environment/marble-graphite2.png b/assets/sprites/blocks/environment/marble-graphite2.png new file mode 100644 index 0000000..c5c4d22 Binary files /dev/null and b/assets/sprites/blocks/environment/marble-graphite2.png differ diff --git a/assets/sprites/blocks/environment/marble3.png b/assets/sprites/blocks/environment/marble3.png index f0310c5..5daf7be 100644 Binary files a/assets/sprites/blocks/environment/marble3.png and b/assets/sprites/blocks/environment/marble3.png differ diff --git a/assets/sprites/blocks/environment/marble4.png b/assets/sprites/blocks/environment/marble4.png index dd54237..8b6521f 100644 Binary files a/assets/sprites/blocks/environment/marble4.png and b/assets/sprites/blocks/environment/marble4.png differ diff --git a/assets/sprites/blocks/environment/shallow-solvent1.png b/assets/sprites/blocks/environment/shallow-solvent1.png new file mode 100644 index 0000000..5bb18cb Binary files /dev/null and b/assets/sprites/blocks/environment/shallow-solvent1.png differ diff --git a/assets/sprites/blocks/environment/shallow-solvent2.png b/assets/sprites/blocks/environment/shallow-solvent2.png new file mode 100644 index 0000000..4020dc5 Binary files /dev/null and b/assets/sprites/blocks/environment/shallow-solvent2.png differ diff --git a/assets/sprites/blocks/environment/shallow-solvent3.png b/assets/sprites/blocks/environment/shallow-solvent3.png new file mode 100644 index 0000000..111b278 Binary files /dev/null and b/assets/sprites/blocks/environment/shallow-solvent3.png differ diff --git a/assets/sprites/blocks/environment/shallower-solvent1.png b/assets/sprites/blocks/environment/shallower-solvent1.png new file mode 100644 index 0000000..12f1e73 Binary files /dev/null and b/assets/sprites/blocks/environment/shallower-solvent1.png differ diff --git a/assets/sprites/blocks/environment/shallower-solvent2.png b/assets/sprites/blocks/environment/shallower-solvent2.png new file mode 100644 index 0000000..99f898d Binary files /dev/null and b/assets/sprites/blocks/environment/shallower-solvent2.png differ diff --git a/assets/sprites/blocks/environment/shallower-solvent3.png b/assets/sprites/blocks/environment/shallower-solvent3.png new file mode 100644 index 0000000..e8020b6 Binary files /dev/null and b/assets/sprites/blocks/environment/shallower-solvent3.png differ diff --git a/assets/sprites/blocks/environment/solvent.png b/assets/sprites/blocks/environment/solvent.png new file mode 100644 index 0000000..6394d0a Binary files /dev/null and b/assets/sprites/blocks/environment/solvent.png differ diff --git a/atlas.sai2 b/atlas.sai2 index 6e03834..6ba062f 100644 Binary files a/atlas.sai2 and b/atlas.sai2 differ diff --git a/src/sw/SWVars.java b/src/sw/SWVars.java index d0a9f3b..4c76f9a 100644 --- 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 index c1482c6..a3be570 100644 --- 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;