diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties index 70a7b99..c720038 100644 --- a/assets/bundles/bundle.properties +++ b/assets/bundles/bundle.properties @@ -572,6 +572,10 @@ item.meld-tenbris.name = Tenbris item.meld-tenbris.description = Raw material, valued for its ability to insulate aspect when refined. item.meld-tenbris.details = Fume infused hematite, more malleable and less brittle but less hard than usual. +item.meld-motis.name = Motis +item.meld-motis.description = Raw material, valued for its natural magnetism. +item.meld-motis.details = Fume infused magnetite, more malleable and less brittle but less hard than usual. + item.meld-shadesteel.name = Shadesteel item.meld-shadesteel.description = Not just some rock anymore.\nDurable building material. item.meld-shadesteel.details = IT'S NOT IRON I SWEAR @@ -596,6 +600,22 @@ item.meld-annealed-silver.name = Annealed Silver item.meld-annealed-silver.description = Highly refined and attuned. Makes for a great aspect conductor. item.meld-annealed-silver.details = An easily made aspect superconductor. +item.meld-iampsi.name = Iampsi +item.meld-iampsi.description = Hardy mineral found accumulating in deposits under dried riverbeds, or as spikes above surface.\n\nDecomposable for Silver and Quartz Strata, useful for grinding. +item.meld-iampsi.details = Radiance. + +item.meld-sandy-particulate.name = Sandy Particulate +item.meld-sandy-particulate.description = Can't be mined by drill, crumbles too easily. Must be quarried.\n\nCan be filtered through for Quartz Strata. +item.meld-sandy-particulate.details = Him. + +item.meld-quartz-strata.name = Quartz Strata +item.meld-quartz-strata.description = Silicon oxide grains and crystals of various sizes, ready for industrial or military use.\n\nToo disorderly to be used in electronics raw. +item.meld-quartz-strata.details = Me... + +item.meld-likestone-sediments.name = Likestone Sediments +item.meld-likestone-sediments.description = Claystone deposited bessides old rivers. Acts as a great glass flux. +item.meld-likestone-sediments.details = Family. + item.meld-electrum-sheet.name = Electrum Sheet item.meld-electrum-sheet.description = Refined material used in power transmission and advanced unit production. item.meld-electrum-sheet.details = Also functions as a capsule for [#cbdbfc]Aspect[]. @@ -839,7 +859,7 @@ unit.meld-iguana.description = Commander of the Bunker core. Launches out sap vo unit.meld-iguana.details = One hell of an alien. unit.meld-shark.name = Shark -unit.meld-shark.description = Launches missiles which sap target's health. Hovers over deep bodies of liquid. An [accent]excellent[] scout.\n[red]Struggles against force fields.[] +unit.meld-shark.description = Launches salvos of missiles which sap target's health. Can hover on land at a reduced speed. An [accent]excellent[] scout.\n[red]Struggles against force fields.[] unit.meld-shark.details = Enables the other mechanized fish, especially Remora and Narwhal. unit.meld-narwhal.name = Narwhal diff --git a/assets/sprites/blocks/environment/badlands/aspect-soil1.png b/assets/sprites/blocks/environment/badlands/aspect-soil1.png index ade29f2..6b3de9b 100644 Binary files a/assets/sprites/blocks/environment/badlands/aspect-soil1.png and b/assets/sprites/blocks/environment/badlands/aspect-soil1.png differ diff --git a/assets/sprites/blocks/environment/badlands/aspect-soil2.png b/assets/sprites/blocks/environment/badlands/aspect-soil2.png index 981f518..cc97705 100644 Binary files a/assets/sprites/blocks/environment/badlands/aspect-soil2.png and b/assets/sprites/blocks/environment/badlands/aspect-soil2.png differ diff --git a/assets/sprites/blocks/environment/badlands/aspect-soil3.png b/assets/sprites/blocks/environment/badlands/aspect-soil3.png index 6d6c1dc..9f8e259 100644 Binary files a/assets/sprites/blocks/environment/badlands/aspect-soil3.png and b/assets/sprites/blocks/environment/badlands/aspect-soil3.png differ diff --git a/assets/sprites/blocks/environment/badlands/electrum-deposit1.png b/assets/sprites/blocks/environment/badlands/electrum-deposit1.png new file mode 100644 index 0000000..c67f8ec Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/electrum-deposit1.png differ diff --git a/assets/sprites/blocks/environment/badlands/electrum-deposit2.png b/assets/sprites/blocks/environment/badlands/electrum-deposit2.png new file mode 100644 index 0000000..6c1caa3 Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/electrum-deposit2.png differ diff --git a/assets/sprites/blocks/environment/badlands/electrum-deposit3.png b/assets/sprites/blocks/environment/badlands/electrum-deposit3.png new file mode 100644 index 0000000..e153daf Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/electrum-deposit3.png differ diff --git a/assets/sprites/blocks/environment/badlands/gold-sand1.png b/assets/sprites/blocks/environment/badlands/gold-sand1.png new file mode 100644 index 0000000..9f2ab96 Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/gold-sand1.png differ diff --git a/assets/sprites/blocks/environment/badlands/gold-sand2.png b/assets/sprites/blocks/environment/badlands/gold-sand2.png new file mode 100644 index 0000000..b713c1a Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/gold-sand2.png differ diff --git a/assets/sprites/blocks/environment/badlands/gold-sand3.png b/assets/sprites/blocks/environment/badlands/gold-sand3.png new file mode 100644 index 0000000..0261be9 Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/gold-sand3.png differ diff --git a/assets/sprites/blocks/environment/badlands/gold-slurry1.png b/assets/sprites/blocks/environment/badlands/gold-slurry1.png new file mode 100644 index 0000000..f22d206 Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/gold-slurry1.png differ diff --git a/assets/sprites/blocks/environment/badlands/gold-slurry2.png b/assets/sprites/blocks/environment/badlands/gold-slurry2.png new file mode 100644 index 0000000..5732cf8 Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/gold-slurry2.png differ diff --git a/assets/sprites/blocks/environment/badlands/gold-slurry3.png b/assets/sprites/blocks/environment/badlands/gold-slurry3.png new file mode 100644 index 0000000..ecab9bd Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/gold-slurry3.png differ diff --git a/assets/sprites/blocks/environment/badlands/gold-slurry4.png b/assets/sprites/blocks/environment/badlands/gold-slurry4.png new file mode 100644 index 0000000..86a09eb Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/gold-slurry4.png differ diff --git a/assets/sprites/blocks/environment/badlands/likesalt-wall1.png b/assets/sprites/blocks/environment/badlands/likesalt-wall1.png new file mode 100644 index 0000000..3e09787 Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/likesalt-wall1.png differ diff --git a/assets/sprites/blocks/environment/badlands/likesalt-wall2.png b/assets/sprites/blocks/environment/badlands/likesalt-wall2.png new file mode 100644 index 0000000..5a2ff20 Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/likesalt-wall2.png differ diff --git a/assets/sprites/blocks/environment/badlands/likesalt1.png b/assets/sprites/blocks/environment/badlands/likesalt1.png new file mode 100644 index 0000000..d07caa6 Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/likesalt1.png differ diff --git a/assets/sprites/blocks/environment/badlands/likesalt2.png b/assets/sprites/blocks/environment/badlands/likesalt2.png new file mode 100644 index 0000000..213e679 Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/likesalt2.png differ diff --git a/assets/sprites/blocks/environment/badlands/likesalt3.png b/assets/sprites/blocks/environment/badlands/likesalt3.png new file mode 100644 index 0000000..8368b5e Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/likesalt3.png differ diff --git a/assets/sprites/blocks/environment/badlands/likesand-wall1.png b/assets/sprites/blocks/environment/badlands/likesand-wall1.png new file mode 100644 index 0000000..b0dff15 Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/likesand-wall1.png differ diff --git a/assets/sprites/blocks/environment/badlands/likesand-wall2.png b/assets/sprites/blocks/environment/badlands/likesand-wall2.png new file mode 100644 index 0000000..1633370 Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/likesand-wall2.png differ diff --git a/assets/sprites/blocks/environment/badlands/likesand1.png b/assets/sprites/blocks/environment/badlands/likesand1.png new file mode 100644 index 0000000..92752ad Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/likesand1.png differ diff --git a/assets/sprites/blocks/environment/badlands/likesand2.png b/assets/sprites/blocks/environment/badlands/likesand2.png new file mode 100644 index 0000000..bc41e78 Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/likesand2.png differ diff --git a/assets/sprites/blocks/environment/badlands/likesand3.png b/assets/sprites/blocks/environment/badlands/likesand3.png new file mode 100644 index 0000000..8ec3162 Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/likesand3.png differ diff --git a/assets/sprites/blocks/environment/badlands/likestone-wall1.png b/assets/sprites/blocks/environment/badlands/likestone-wall1.png new file mode 100644 index 0000000..926eaf0 Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/likestone-wall1.png differ diff --git a/assets/sprites/blocks/environment/badlands/likestone-wall2.png b/assets/sprites/blocks/environment/badlands/likestone-wall2.png new file mode 100644 index 0000000..a47a71e Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/likestone-wall2.png differ diff --git a/assets/sprites/blocks/environment/badlands/likestone1.png b/assets/sprites/blocks/environment/badlands/likestone1.png new file mode 100644 index 0000000..0bce7ab Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/likestone1.png differ diff --git a/assets/sprites/blocks/environment/badlands/likestone2.png b/assets/sprites/blocks/environment/badlands/likestone2.png new file mode 100644 index 0000000..081a3a5 Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/likestone2.png differ diff --git a/assets/sprites/blocks/environment/badlands/likestone3.png b/assets/sprites/blocks/environment/badlands/likestone3.png new file mode 100644 index 0000000..3800ca4 Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/likestone3.png differ diff --git a/assets/sprites/blocks/environment/badlands/polished-sandstone-tile1.png b/assets/sprites/blocks/environment/badlands/polished-sandstone-tile1.png new file mode 100644 index 0000000..74ba27a Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/polished-sandstone-tile1.png differ diff --git a/assets/sprites/blocks/environment/badlands/polished-sandstone-tile2.png b/assets/sprites/blocks/environment/badlands/polished-sandstone-tile2.png new file mode 100644 index 0000000..6890ed2 Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/polished-sandstone-tile2.png differ diff --git a/assets/sprites/blocks/environment/badlands/polished-sandstone-tile3.png b/assets/sprites/blocks/environment/badlands/polished-sandstone-tile3.png new file mode 100644 index 0000000..40d3eca Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/polished-sandstone-tile3.png differ diff --git a/assets/sprites/blocks/environment/badlands/polished-sandstone-wall1.png b/assets/sprites/blocks/environment/badlands/polished-sandstone-wall1.png new file mode 100644 index 0000000..543eaa1 Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/polished-sandstone-wall1.png differ diff --git a/assets/sprites/blocks/environment/badlands/polished-sandstone-wall2.png b/assets/sprites/blocks/environment/badlands/polished-sandstone-wall2.png new file mode 100644 index 0000000..428f21b Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/polished-sandstone-wall2.png differ diff --git a/assets/sprites/blocks/environment/badlands/polished-sandstone-wall3.png b/assets/sprites/blocks/environment/badlands/polished-sandstone-wall3.png new file mode 100644 index 0000000..3744269 Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/polished-sandstone-wall3.png differ diff --git a/assets/sprites/blocks/environment/badlands/quartz-flakes1.png b/assets/sprites/blocks/environment/badlands/quartz-flakes1.png new file mode 100644 index 0000000..131d186 Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/quartz-flakes1.png differ diff --git a/assets/sprites/blocks/environment/badlands/quartz-flakes2.png b/assets/sprites/blocks/environment/badlands/quartz-flakes2.png new file mode 100644 index 0000000..e7425a8 Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/quartz-flakes2.png differ diff --git a/assets/sprites/blocks/environment/badlands/quartz-flakes3.png b/assets/sprites/blocks/environment/badlands/quartz-flakes3.png new file mode 100644 index 0000000..d60fe69 Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/quartz-flakes3.png differ diff --git a/assets/sprites/blocks/environment/badlands/quartz-flakes4.png b/assets/sprites/blocks/environment/badlands/quartz-flakes4.png new file mode 100644 index 0000000..148f59f Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/quartz-flakes4.png differ diff --git a/assets/sprites/blocks/environment/badlands/red-sand-edge.png b/assets/sprites/blocks/environment/badlands/red-sand-edge.png new file mode 100644 index 0000000..55d34f8 Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/red-sand-edge.png differ diff --git a/assets/sprites/blocks/environment/badlands/red-silt1.png b/assets/sprites/blocks/environment/badlands/red-silt1.png new file mode 100644 index 0000000..2c6d501 Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/red-silt1.png differ diff --git a/assets/sprites/blocks/environment/badlands/red-silt2.png b/assets/sprites/blocks/environment/badlands/red-silt2.png new file mode 100644 index 0000000..cc17e85 Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/red-silt2.png differ diff --git a/assets/sprites/blocks/environment/badlands/red-silt3.png b/assets/sprites/blocks/environment/badlands/red-silt3.png new file mode 100644 index 0000000..e03ff5c Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/red-silt3.png differ diff --git a/assets/sprites/blocks/environment/badlands/sand-meld1.png b/assets/sprites/blocks/environment/badlands/sand-meld1.png index e4b1d74..abde4ee 100644 Binary files a/assets/sprites/blocks/environment/badlands/sand-meld1.png and b/assets/sprites/blocks/environment/badlands/sand-meld1.png differ diff --git a/assets/sprites/blocks/environment/badlands/sand-meld2.png b/assets/sprites/blocks/environment/badlands/sand-meld2.png index 4ddd5f7..457f612 100644 Binary files a/assets/sprites/blocks/environment/badlands/sand-meld2.png and b/assets/sprites/blocks/environment/badlands/sand-meld2.png differ diff --git a/assets/sprites/blocks/environment/badlands/sand-meld3.png b/assets/sprites/blocks/environment/badlands/sand-meld3.png index e8aa9c4..0d53008 100644 Binary files a/assets/sprites/blocks/environment/badlands/sand-meld3.png and b/assets/sprites/blocks/environment/badlands/sand-meld3.png differ diff --git a/assets/sprites/blocks/environment/badlands/silver-deposit-depleted1.png b/assets/sprites/blocks/environment/badlands/silver-deposit-depleted1.png new file mode 100644 index 0000000..fe6379d Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/silver-deposit-depleted1.png differ diff --git a/assets/sprites/blocks/environment/badlands/soft-sand-edge.png b/assets/sprites/blocks/environment/badlands/soft-sand-edge.png new file mode 100644 index 0000000..bd89446 Binary files /dev/null and b/assets/sprites/blocks/environment/badlands/soft-sand-edge.png differ diff --git a/assets/sprites/blocks/environment/badlands/soft-sand1.png b/assets/sprites/blocks/environment/badlands/soft-sand1.png index ad72b44..f630ead 100644 Binary files a/assets/sprites/blocks/environment/badlands/soft-sand1.png and b/assets/sprites/blocks/environment/badlands/soft-sand1.png differ diff --git a/assets/sprites/blocks/environment/badlands/soft-sand2.png b/assets/sprites/blocks/environment/badlands/soft-sand2.png index 3533057..de1a3de 100644 Binary files a/assets/sprites/blocks/environment/badlands/soft-sand2.png and b/assets/sprites/blocks/environment/badlands/soft-sand2.png differ diff --git a/assets/sprites/blocks/environment/badlands/soft-sand3.png b/assets/sprites/blocks/environment/badlands/soft-sand3.png index 6f67b18..b4a13cb 100644 Binary files a/assets/sprites/blocks/environment/badlands/soft-sand3.png and b/assets/sprites/blocks/environment/badlands/soft-sand3.png differ diff --git a/assets/sprites/blocks/environment/barrens/iampsi-specks1.png b/assets/sprites/blocks/environment/barrens/iampsi-specks1.png new file mode 100644 index 0000000..76fedfe Binary files /dev/null and b/assets/sprites/blocks/environment/barrens/iampsi-specks1.png differ diff --git a/assets/sprites/blocks/environment/barrens/iampsi-specks2.png b/assets/sprites/blocks/environment/barrens/iampsi-specks2.png new file mode 100644 index 0000000..51e9a5d Binary files /dev/null and b/assets/sprites/blocks/environment/barrens/iampsi-specks2.png differ diff --git a/assets/sprites/blocks/environment/barrens/iampsi-specks3.png b/assets/sprites/blocks/environment/barrens/iampsi-specks3.png new file mode 100644 index 0000000..97d663e Binary files /dev/null and b/assets/sprites/blocks/environment/barrens/iampsi-specks3.png differ diff --git a/assets/sprites/blocks/environment/barrens/iampsi-specks4.png b/assets/sprites/blocks/environment/barrens/iampsi-specks4.png new file mode 100644 index 0000000..c0f37fd Binary files /dev/null and b/assets/sprites/blocks/environment/barrens/iampsi-specks4.png differ diff --git a/assets/sprites/blocks/environment/metal-pebbles-dense1.png b/assets/sprites/blocks/environment/metal-pebbles-dense1.png new file mode 100644 index 0000000..df28adf Binary files /dev/null and b/assets/sprites/blocks/environment/metal-pebbles-dense1.png differ diff --git a/assets/sprites/blocks/environment/metal-pebbles-dense2.png b/assets/sprites/blocks/environment/metal-pebbles-dense2.png new file mode 100644 index 0000000..53656f7 Binary files /dev/null and b/assets/sprites/blocks/environment/metal-pebbles-dense2.png differ diff --git a/assets/sprites/blocks/environment/metal-pebbles-dense3.png b/assets/sprites/blocks/environment/metal-pebbles-dense3.png new file mode 100644 index 0000000..2cb3a37 Binary files /dev/null and b/assets/sprites/blocks/environment/metal-pebbles-dense3.png differ diff --git a/assets/sprites/blocks/environment/metal-pebbles1.png b/assets/sprites/blocks/environment/metal-pebbles1.png new file mode 100644 index 0000000..829153f Binary files /dev/null and b/assets/sprites/blocks/environment/metal-pebbles1.png differ diff --git a/assets/sprites/blocks/environment/metal-pebbles2.png b/assets/sprites/blocks/environment/metal-pebbles2.png new file mode 100644 index 0000000..3f85659 Binary files /dev/null and b/assets/sprites/blocks/environment/metal-pebbles2.png differ diff --git a/assets/sprites/blocks/environment/metal-pebbles3.png b/assets/sprites/blocks/environment/metal-pebbles3.png new file mode 100644 index 0000000..bd26c1c Binary files /dev/null and b/assets/sprites/blocks/environment/metal-pebbles3.png differ diff --git a/assets/sprites/blocks/environment/metal-sheeting1.png b/assets/sprites/blocks/environment/metal-sheeting1.png new file mode 100644 index 0000000..c975169 Binary files /dev/null and b/assets/sprites/blocks/environment/metal-sheeting1.png differ diff --git a/assets/sprites/blocks/environment/metal-sheeting2.png b/assets/sprites/blocks/environment/metal-sheeting2.png new file mode 100644 index 0000000..1acf1e6 Binary files /dev/null and b/assets/sprites/blocks/environment/metal-sheeting2.png differ diff --git a/assets/sprites/blocks/environment/metal-sheeting3.png b/assets/sprites/blocks/environment/metal-sheeting3.png new file mode 100644 index 0000000..4e2dd32 Binary files /dev/null and b/assets/sprites/blocks/environment/metal-sheeting3.png differ diff --git a/assets/sprites/blocks/props/iampsi-gemstone1.png b/assets/sprites/blocks/props/iampsi-gemstone1.png new file mode 100644 index 0000000..e8c1c94 Binary files /dev/null and b/assets/sprites/blocks/props/iampsi-gemstone1.png differ diff --git a/assets/sprites/blocks/props/iampsi-gemstone2.png b/assets/sprites/blocks/props/iampsi-gemstone2.png new file mode 100644 index 0000000..74bcb09 Binary files /dev/null and b/assets/sprites/blocks/props/iampsi-gemstone2.png differ diff --git a/assets/sprites/blocks/props/iampsi-gemstone3.png b/assets/sprites/blocks/props/iampsi-gemstone3.png new file mode 100644 index 0000000..2714355 Binary files /dev/null and b/assets/sprites/blocks/props/iampsi-gemstone3.png differ diff --git a/assets/sprites/blocks/props/iampsi-gemstone4.png b/assets/sprites/blocks/props/iampsi-gemstone4.png new file mode 100644 index 0000000..b60eaef Binary files /dev/null and b/assets/sprites/blocks/props/iampsi-gemstone4.png differ diff --git a/assets/sprites/blocks/environment/meld-cluster-large.png b/assets/sprites/blocks/props/meld-cluster-large.png similarity index 100% rename from assets/sprites/blocks/environment/meld-cluster-large.png rename to assets/sprites/blocks/props/meld-cluster-large.png diff --git a/assets/sprites/blocks/environment/meld-cluster-small1.png b/assets/sprites/blocks/props/meld-cluster-small1.png similarity index 100% rename from assets/sprites/blocks/environment/meld-cluster-small1.png rename to assets/sprites/blocks/props/meld-cluster-small1.png diff --git a/assets/sprites/blocks/environment/meld-cluster-small2.png b/assets/sprites/blocks/props/meld-cluster-small2.png similarity index 100% rename from assets/sprites/blocks/environment/meld-cluster-small2.png rename to assets/sprites/blocks/props/meld-cluster-small2.png diff --git a/assets/sprites/blocks/props/meld-crystal-large-shadow1.png b/assets/sprites/blocks/props/meld-crystal-large-shadow1.png new file mode 100644 index 0000000..84c8a45 Binary files /dev/null and b/assets/sprites/blocks/props/meld-crystal-large-shadow1.png differ diff --git a/assets/sprites/blocks/props/meld-crystal-large1.png b/assets/sprites/blocks/props/meld-crystal-large1.png new file mode 100644 index 0000000..c2ce8dd Binary files /dev/null and b/assets/sprites/blocks/props/meld-crystal-large1.png differ diff --git a/assets/sprites/blocks/props/meld-crystal1.png b/assets/sprites/blocks/props/meld-crystal1.png new file mode 100644 index 0000000..ca8f4f3 Binary files /dev/null and b/assets/sprites/blocks/props/meld-crystal1.png differ diff --git a/assets/sprites/blocks/props/meld-crystal2.png b/assets/sprites/blocks/props/meld-crystal2.png new file mode 100644 index 0000000..31a49a0 Binary files /dev/null and b/assets/sprites/blocks/props/meld-crystal2.png differ diff --git a/assets/sprites/blocks/props/meld-crystal3.png b/assets/sprites/blocks/props/meld-crystal3.png new file mode 100644 index 0000000..9e54e9d Binary files /dev/null and b/assets/sprites/blocks/props/meld-crystal3.png differ diff --git a/assets/sprites/blocks/props/meld-metal-stick1.png b/assets/sprites/blocks/props/meld-metal-stick1.png new file mode 100644 index 0000000..087f08c Binary files /dev/null and b/assets/sprites/blocks/props/meld-metal-stick1.png differ diff --git a/assets/sprites/blocks/props/meld-metal-stick2.png b/assets/sprites/blocks/props/meld-metal-stick2.png new file mode 100644 index 0000000..561b082 Binary files /dev/null and b/assets/sprites/blocks/props/meld-metal-stick2.png differ diff --git a/assets/sprites/blocks/props/meld-metal-stick3.png b/assets/sprites/blocks/props/meld-metal-stick3.png new file mode 100644 index 0000000..8cd0554 Binary files /dev/null and b/assets/sprites/blocks/props/meld-metal-stick3.png differ diff --git a/assets/sprites/blocks/props/meld-pools-shadow1.png b/assets/sprites/blocks/props/meld-pools-shadow1.png new file mode 100644 index 0000000..9cc1eee Binary files /dev/null and b/assets/sprites/blocks/props/meld-pools-shadow1.png differ diff --git a/assets/sprites/blocks/props/meld-pools-shadow2.png b/assets/sprites/blocks/props/meld-pools-shadow2.png new file mode 100644 index 0000000..62549e6 Binary files /dev/null and b/assets/sprites/blocks/props/meld-pools-shadow2.png differ diff --git a/assets/sprites/blocks/props/meld-pools-shadow3.png b/assets/sprites/blocks/props/meld-pools-shadow3.png new file mode 100644 index 0000000..8146d40 Binary files /dev/null and b/assets/sprites/blocks/props/meld-pools-shadow3.png differ diff --git a/assets/sprites/blocks/props/meld-pools1.png b/assets/sprites/blocks/props/meld-pools1.png new file mode 100644 index 0000000..afd64e5 Binary files /dev/null and b/assets/sprites/blocks/props/meld-pools1.png differ diff --git a/assets/sprites/blocks/props/meld-pools2.png b/assets/sprites/blocks/props/meld-pools2.png new file mode 100644 index 0000000..98e58a3 Binary files /dev/null and b/assets/sprites/blocks/props/meld-pools2.png differ diff --git a/assets/sprites/blocks/props/meld-pools3.png b/assets/sprites/blocks/props/meld-pools3.png new file mode 100644 index 0000000..3561062 Binary files /dev/null and b/assets/sprites/blocks/props/meld-pools3.png differ diff --git a/assets/sprites/blocks/props/meld-protrusion1.png b/assets/sprites/blocks/props/meld-protrusion1.png new file mode 100644 index 0000000..0083035 Binary files /dev/null and b/assets/sprites/blocks/props/meld-protrusion1.png differ diff --git a/assets/sprites/blocks/props/meld-protrusion2.png b/assets/sprites/blocks/props/meld-protrusion2.png new file mode 100644 index 0000000..e5b0677 Binary files /dev/null and b/assets/sprites/blocks/props/meld-protrusion2.png differ diff --git a/assets/sprites/blocks/props/meld-support-frame1.png b/assets/sprites/blocks/props/meld-support-frame1.png new file mode 100644 index 0000000..db85c20 Binary files /dev/null and b/assets/sprites/blocks/props/meld-support-frame1.png differ diff --git a/assets/sprites/blocks/props/meld-support-frame2.png b/assets/sprites/blocks/props/meld-support-frame2.png new file mode 100644 index 0000000..1573991 Binary files /dev/null and b/assets/sprites/blocks/props/meld-support-frame2.png differ diff --git a/assets/sprites/blocks/props/quartz-spikes-shadow1.png b/assets/sprites/blocks/props/quartz-spikes-shadow1.png new file mode 100644 index 0000000..fecb6cc Binary files /dev/null and b/assets/sprites/blocks/props/quartz-spikes-shadow1.png differ diff --git a/assets/sprites/blocks/props/quartz-spikes-shadow2.png b/assets/sprites/blocks/props/quartz-spikes-shadow2.png new file mode 100644 index 0000000..772292e Binary files /dev/null and b/assets/sprites/blocks/props/quartz-spikes-shadow2.png differ diff --git a/assets/sprites/blocks/props/quartz-spikes-shadow3.png b/assets/sprites/blocks/props/quartz-spikes-shadow3.png new file mode 100644 index 0000000..9559a18 Binary files /dev/null and b/assets/sprites/blocks/props/quartz-spikes-shadow3.png differ diff --git a/assets/sprites/blocks/props/quartz-spikes-shadow4.png b/assets/sprites/blocks/props/quartz-spikes-shadow4.png new file mode 100644 index 0000000..8bf3d87 Binary files /dev/null and b/assets/sprites/blocks/props/quartz-spikes-shadow4.png differ diff --git a/assets/sprites/blocks/props/quartz-spikes-shadow5.png b/assets/sprites/blocks/props/quartz-spikes-shadow5.png new file mode 100644 index 0000000..7a21f80 Binary files /dev/null and b/assets/sprites/blocks/props/quartz-spikes-shadow5.png differ diff --git a/assets/sprites/blocks/props/quartz-spikes1.png b/assets/sprites/blocks/props/quartz-spikes1.png new file mode 100644 index 0000000..1da48ec Binary files /dev/null and b/assets/sprites/blocks/props/quartz-spikes1.png differ diff --git a/assets/sprites/blocks/props/quartz-spikes2.png b/assets/sprites/blocks/props/quartz-spikes2.png new file mode 100644 index 0000000..910f47c Binary files /dev/null and b/assets/sprites/blocks/props/quartz-spikes2.png differ diff --git a/assets/sprites/blocks/props/quartz-spikes3.png b/assets/sprites/blocks/props/quartz-spikes3.png new file mode 100644 index 0000000..8c1efb6 Binary files /dev/null and b/assets/sprites/blocks/props/quartz-spikes3.png differ diff --git a/assets/sprites/blocks/props/quartz-spikes4.png b/assets/sprites/blocks/props/quartz-spikes4.png new file mode 100644 index 0000000..f1bc925 Binary files /dev/null and b/assets/sprites/blocks/props/quartz-spikes4.png differ diff --git a/assets/sprites/blocks/props/quartz-spikes5.png b/assets/sprites/blocks/props/quartz-spikes5.png new file mode 100644 index 0000000..da58aac Binary files /dev/null and b/assets/sprites/blocks/props/quartz-spikes5.png differ diff --git a/assets/sprites/items/dissonitre.png b/assets/sprites/items/dissonitre.png new file mode 100644 index 0000000..0957370 Binary files /dev/null and b/assets/sprites/items/dissonitre.png differ diff --git a/assets/sprites/items/electrum-sheet.png b/assets/sprites/items/electrum-sheet.png new file mode 100644 index 0000000..bbc0b34 Binary files /dev/null and b/assets/sprites/items/electrum-sheet.png differ diff --git a/assets/sprites/items/heavy ind/iampsi.png b/assets/sprites/items/heavy ind/iampsi.png new file mode 100644 index 0000000..7f99598 Binary files /dev/null and b/assets/sprites/items/heavy ind/iampsi.png differ diff --git a/assets/sprites/items/quartz-strata.png b/assets/sprites/items/quartz-strata.png new file mode 100644 index 0000000..e6588b0 Binary files /dev/null and b/assets/sprites/items/quartz-strata.png differ diff --git a/assets/sprites/items/vitric-mesh.png b/assets/sprites/items/vitric-mesh.png new file mode 100644 index 0000000..8319704 Binary files /dev/null and b/assets/sprites/items/vitric-mesh.png differ diff --git a/mod.hjson b/mod.hjson index dadda92..51ec40f 100644 --- a/mod.hjson +++ b/mod.hjson @@ -14,7 +14,7 @@ main: "meld.Meld" description: "Meld Java.\n\n[[]accent]Only has custom game content! (play the info map to understand)[[]]\n\nIncompatable with hjson meld" #the mod version -version: gameplay expirimental v4 +version: gameplay test v3 #the minimum game build required to run this mod minGameVersion: 154 diff --git a/src/meld/content/MeldBlocks.java b/src/meld/content/MeldBlocks.java index 2eefbfd..cb4f1b0 100644 --- a/src/meld/content/MeldBlocks.java +++ b/src/meld/content/MeldBlocks.java @@ -122,7 +122,7 @@ public static Item item(String name){ public static void load(){ - int channelHealth = 120; + int channelHealth = 100; channelFace = new FlexibleSizeJunction("channel-face"){{ requirements(Category.liquid, with( @@ -172,6 +172,9 @@ public static void load(){ new DrawLiquidTile(){{ drawLiquid = MeldLiquids.boundAspect; }}, + new DrawLiquidTile(){{ + drawLiquid = MeldLiquids.stormingAspect; + }}, new DrawRegion(), new DrawSideRegion() ); @@ -187,31 +190,31 @@ public static void load(){ recipes.addAll( new TimedRecipe(){{ craftTime = 10; - float multi = MeldLiquids.aetherEfficiencies.get(MeldLiquids.aether, 1); - float density = MeldLiquids.aetherDensities.get(MeldLiquids.aether, 1); + float multi = AspectGroup.aether.getEfficiency(MeldLiquids.aether); + float density = AspectGroup.aether.getDensity(MeldLiquids.aether); inputLiquids = LiquidStack.with(MeldLiquids.aether, outletRate/density); - outputLiquids = LiquidStack.with(MeldLiquids.aspect, outletRate * multi * 10); + outputLiquids = LiquidStack.with(MeldLiquids.aspect, outletRate * multi * 10 * density); }}, new TimedRecipe(){{ craftTime = 10; - float multi = MeldLiquids.aetherEfficiencies.get(MeldLiquids.pollutantMixture, 1); - float density = MeldLiquids.aetherDensities.get(MeldLiquids.pollutantMixture, 1); - inputLiquids = LiquidStack.with(MeldLiquids.pollutantMixture, outletRate/density); - outputLiquids = LiquidStack.with(MeldLiquids.boundAspect, outletRate * multi * 10); + float multi = AspectGroup.aether.getEfficiency(MeldLiquids.pollutantMixture); + float density = AspectGroup.aether.getDensity(MeldLiquids.pollutantMixture); + inputLiquids = LiquidStack.with(MeldLiquids.pollutantMixture, outletRate); + outputLiquids = LiquidStack.with(MeldLiquids.boundAspect, outletRate * multi * 10 * density); }}, new TimedRecipe(){{ craftTime = 10; - float multi = MeldLiquids.aetherEfficiencies.get(MeldLiquids.thunderingAether, 1); - float density = MeldLiquids.aetherDensities.get(MeldLiquids.thunderingAether, 1); + float multi = AspectGroup.aether.getEfficiency(MeldLiquids.thunderingAether); + float density = AspectGroup.aether.getDensity(MeldLiquids.thunderingAether); inputLiquids = LiquidStack.with(MeldLiquids.thunderingAether, outletRate/density); - outputLiquids = LiquidStack.with(MeldLiquids.stormingAspect, outletRate * multi * 10); + outputLiquids = LiquidStack.with(MeldLiquids.stormingAspect, outletRate * multi * 10 * density); }} ); }}; aspectChannel = new VisualAspectPipe("aspect-channel"){{ requirements(Category.liquid, with( - MeldItems.annealedSilver, 5, MeldItems.glassMallows, 2 + MeldItems.annealedSilver, 5, MeldItems.aspectPipe, 2 )); underBullets = false; leaks = false; @@ -408,7 +411,7 @@ public static void load(){ shotDelay = 0; shots = 7; - float[] spreadCone = new float[]{0, 3, 6, 15}; + float[] spreadCone = new float[]{0, 3, 12, 25}; barrels = new float[]{ 0, 0, spreadCone[0], 0, 0, -spreadCone[2], @@ -636,7 +639,7 @@ public static void load(){ ); consume( - new ConsumeAspects(outletRate, MeldLiquids.aspectEfficiencies, MeldLiquids.aspectDensities) + new StupidConsumeAspects(outletRate, AspectGroup.aspect) ); }}; @@ -669,7 +672,7 @@ public static void load(){ firstShotDelay = 60; }}; - consume(new ConsumeAspects(outletRate * 3, MeldLiquids.aspectEfficiencies, MeldLiquids.aspectDensities)); + consume(new StupidConsumeAspects(outletRate * 3, AspectGroup.aspect)); drawer = new DrawTurret(){{ @@ -1005,7 +1008,7 @@ public void update(Bullet b){ new DrawDefault() ); - consume(new ConsumeAspects(outletRate/2, MeldLiquids.aspectEfficiencies, MeldLiquids.aspectDensities)); + consume(new StupidConsumeAspects(outletRate/2, AspectGroup.aspect)); }}; coreRaft = new CoreRaft("core-raft"){{ @@ -1105,12 +1108,22 @@ public void update(Bullet b){ optionalBoostIntensity = 2; + sparkColor = Color.valueOf("8cc7ee"); + boostHeatColor = Color.valueOf("ecb6eb"); + + sparks = 24; + sparkLife = 15; + sparkSpread = 25; + drillMultipliers.put( MeldItems.clayMallows, 0.5f ); drillMultipliers.put( MeldItems.resonarum, 0.5f ); + drillMultipliers.put( + MeldItems.electrumSheets, 2 + ); consume(new StupidConsumeAspects( outletRate, AspectGroup.aspect @@ -1250,7 +1263,7 @@ public void update(Bullet b){ b.setPin(ModOUT.FIVE, a); }; }}, - new ConsumeAspectModule(outletRate * 2, MeldLiquids.aspectEfficiencies, MeldLiquids.aspectDensities, ModIN.FIVE, ModOUT.SIX), + new ConsumeAspectModule(outletRate * 2, AspectGroup.aspect, ModIN.FIVE, ModOUT.SIX), new RecipeCraftingModule(){{ recipe = shadesteel; efficiencyPins = new int[]{ModIN.SIX, ModIN.ZERO}; @@ -1311,7 +1324,7 @@ public void update(Bullet b){ modules.addAll( //Set the base rate based on aspect intake - new ConsumeAspectModule(outletRate * 8, MeldLiquids.aspectEfficiencies, MeldLiquids.aspectDensities, 0, 1), + new ConsumeAspectModule(outletRate * 8, AspectGroup.aspect, 0, 1), //Setup the flags for possible recipies new GateModule( ModOUT.TWO, @@ -1456,9 +1469,9 @@ public void update(Bullet b){ size = 5; health = 2500; - consume(new ConsumeLiquid(MeldLiquids.aspect, outletRate * 12)); + consume(new StupidConsumeAspects(outletRate * 12, AspectGroup.aspect)); plans.addAll( - new UnitPlan(MeldUnits.shark, 60 * 5, with(MeldItems.silver, 80, MeldItems.carbolith, 60)) + new UnitPlan(MeldUnits.shark, 60 * 5, with(MeldItems.annealedSilver, 120, MeldItems.carbolith, 60)) ); }}; @@ -1493,7 +1506,7 @@ public void update(Bullet b){ health = 1200; range = 22 * Vars.tilesize; - consume(new ConsumeAspects(outletRate * 3, MeldLiquids.aspectEfficiencies, MeldLiquids.aspectDensities)); + consume(new StupidConsumeAspects(outletRate * 3, AspectGroup.aspect)); }}; nullifier = new Nullifier("nullifier"){{ diff --git a/src/meld/content/MeldBullets.java b/src/meld/content/MeldBullets.java index d42e747..72a5aa0 100644 --- a/src/meld/content/MeldBullets.java +++ b/src/meld/content/MeldBullets.java @@ -217,7 +217,7 @@ public static void load(){ fragRandomSpread = 5; fragBullets = 3; - fragBullet = new BasicBulletType(12, 1, Meld.prefix("clump")){{ + fragBullet = new BasicBulletType(12, 6, Meld.prefix("clump")){{ lifetime = 21; drag = 0.01f; width = 6; @@ -225,8 +225,6 @@ public static void load(){ shrinkX = 0.7f; shrinkY = 0.2f; - splashDamage = 1; - splashDamageRadius = 20; knockback = 0.25f; impact = true; @@ -244,7 +242,7 @@ public static void load(){ bulletInterval = 2; - fragBullet = new BasicBulletType(9, 2, Meld.prefix("clump")){{ + fragBullet = new BasicBulletType(9, 4, Meld.prefix("clump")){{ speed = 9; damage = 0.5f; lifetime = 8; @@ -261,7 +259,7 @@ public static void load(){ despawnHit = false; sticky = true; - stickyExtraLifetime = 60; + stickyExtraLifetime = 120; status = MeldStatusEffects.impaled; statusDuration = 5; diff --git a/src/meld/content/MeldEnvironment.java b/src/meld/content/MeldEnvironment.java index 15ccfbd..7bdfd66 100644 --- a/src/meld/content/MeldEnvironment.java +++ b/src/meld/content/MeldEnvironment.java @@ -2,6 +2,7 @@ import arc.graphics.Color; import meld.world.blocks.AetherCluster; +import mindustry.content.Blocks; import mindustry.content.Fx; import mindustry.graphics.CacheLayer; import mindustry.type.Category; @@ -13,15 +14,16 @@ public class MeldEnvironment { - //Ore deposits + //Ore deposits & overlays public static Block //Marsh pt1 debrisDeposit, debrisDepositLarge, debrisNodule, + metalPebbles, metalPebblesDense, metalSheeting, //Barrens carbolithDeposit, carbolithDepositDepleted, tenbrisMix, tenbrisRidges, elnarSilt, embeddedElnar, embeddedElnarOverflowing, //Badlands - silverDeposit, + silverDeposit, silverDepositDepleted, electrumDeposit, iampsiSpecks, quartzFlakes, //Storm Planes resonarumDeposit, resonarumCrystal, resonarumOutcrop, @@ -31,6 +33,9 @@ public class MeldEnvironment { //Badlands pillowWall, sandstoneWall, mallowWall, crackstoneWall, + likesandWall, likestoneWall, likesaltWall, + + polishedSandstoneWall, //Barrens carbonicWall, earthenWall //Storm Planes @@ -40,25 +45,43 @@ public class MeldEnvironment { public static Floor metalWeave, metalWeaveHole, metalWeaveGlow, //Badlands - sandMeld, softSand, sandstone, - redsandMeld, redSand, aspectSoil, redSandWeave, crackstone, + polishedSandstoneTile, + + sandMeld, softSand, sandstone, + redsandMeld, redSand, redSilt, aspectSoil, redSandWeave, crackstone, + likesand, likestone, likesalt, + goldSand, goldSlurry, + //Barrens - bedrock, bedrockMeld, - slate, slateMeld, - runicSlate, runicSlateMeld, - literallyCarbonStoneFromMindustryButSlightlyDifferent, carbonicPlates, carbonicVent, - earthenStone, mixtureStone, - resonantStone, + bedrock, bedrockMeld, + slate, slateMeld, + runicSlate, runicSlateMeld, + literallyCarbonStoneFromMindustryButSlightlyDifferent, carbonicPlates, carbonicVent, + earthenStone, mixtureStone, + resonantStone, //Marsh - meldPlates, meldHadaland, meldTrenchland, meldSwampland, meldCrystalScattered, meldCrystal, meldCrystalHard; + meldPlates, meldHadaland, meldTrenchland, meldSwampland, meldCrystalScattered, meldCrystalFloor, meldCrystalHardFloor; - public static Block aetherGrowth, metalWeaveAether; + public static SteamVent aetherGrowth, metalWeaveAether; - public static Prop meldCluster; + public static Prop meldCluster, meldPools, meldProtrusion, meldMetalStick, meldCrystal, iampsiGemstone, quartzSpikes; + public static TallBlock meldCrystalLarge, meldSupportFrame; public static AetherCluster meldClusterLarge; public static void load(){ + metalPebbles = new OverlayFloor("metal-pebbles"){{ + variants = 3; + needsSurface = false; + }}; + metalSheeting = new OverlayFloor("metal-sheeting"){{ + variants = 3; + needsSurface = false; + }}; + metalPebblesDense = new OverlayFloor("metal-pebbles-dense"){{ + variants = 3; + needsSurface = false; + }}; debrisNodule = new OreBlock("debris-nodule"){{ variants = 3; @@ -116,6 +139,15 @@ public static void load(){ itemDrop = MeldItems.silver; }}; + silverDepositDepleted = new StaticWall("silver-deposit-depleted"){{ + variants = 3; + }}; + + electrumDeposit = new StaticWall("electrum-deposit"){{ + variants = 3; + itemDrop = MeldItems.electrumSheets; + }}; + resonarumDeposit = new SeaBush("resonarum-deposit"){{ variants = 0; itemDrop = MeldItems.resonarum; @@ -207,29 +239,35 @@ public static void load(){ isLiquid = true; cacheLayer = CacheLayer.water; + supportsOverlay = true; }}; meldPlates = new Floor("meld-plates", 2){{ isLiquid = true; cacheLayer = CacheLayer.water; + supportsOverlay = true; }}; meldCrystalScattered = new Floor("meld-crystal-scattered", 3){{ isLiquid = true; cacheLayer = CacheLayer.water; + supportsOverlay = true; }}; sandMeld = new Floor("sand-meld", 3){{ isLiquid = true; cacheLayer = CacheLayer.water; + supportsOverlay = true; }}; redsandMeld = new Floor("red-sand-meld", 3){{ isLiquid = true; cacheLayer = CacheLayer.water; + supportsOverlay = true; }}; slateMeld = new Floor("slate-meld", 3){{ isLiquid = true; cacheLayer = CacheLayer.water; + supportsOverlay = true; }}; bedrockMeld = new Floor("bedrock-meld", 3){{ @@ -238,13 +276,14 @@ public static void load(){ status = MeldStatusEffects.drenched; statusDuration = 25; + supportsOverlay = true; }}; - meldCrystal = new Floor("meld-crystal-floor", 3){{ + meldCrystalFloor = new Floor("meld-crystal-floor", 3){{ }}; - meldCrystalHard = new Floor("meld-hard-crystal-floor", 3){{ + meldCrystalFloor = new Floor("meld-hard-crystal-floor", 3){{ }}; carbonicVent = new SteamVent("carbonic-vent"){{ @@ -277,13 +316,48 @@ public static void load(){ variants = 2; }}; + polishedSandstoneTile = new Floor("polished-sandstone-tile", 3); + + likesand = new Floor("likesand", 3); + likestone = new Floor("likestone", 3); + likesalt = new Floor("likesalt", 3); + redSilt = new Floor("red-silt", 3); + aspectSoil = new Floor("aspect-soil", 3); softSand = new Floor("soft-sand", 3); sandstone = new Floor("hard-sand", 3); - redSandWeave = new Floor("red-sand-weave", 3); redSand = new Floor("red-sand", 3); - aspectSoil = new Floor("aspect-soil", 3); + redSandWeave = new Floor("red-sand-weave", 3); crackstone = new Floor("cracked-sand", 4); + goldSand = new Floor("gold-sand", 3){{ + isLiquid = true; + cacheLayer = CacheLayer.water; + + status = MeldStatusEffects.drenched; + statusDuration = 25; + supportsOverlay = true; + }}; + goldSlurry = new Floor("gold-slurry", 4){{ + isLiquid = true; + cacheLayer = CacheLayer.water; + + status = MeldStatusEffects.drenched; + statusDuration = 45; + supportsOverlay = true; + }}; + + iampsiSpecks = new OreBlock("iampsi-specks"){{ + variants = 4; + itemDrop = MeldItems.iampsi; + needsSurface = false; + }}; + + quartzFlakes = new OreBlock("quartz-flakes"){{ + variants = 4; + itemDrop = MeldItems.quartzStrata; + needsSurface = false; + }}; + meldWall = new StaticWall("meld-wall"){{ variants = 3; }}; @@ -313,6 +387,10 @@ public static void load(){ variants = 2; }}; + polishedSandstoneWall = new StaticWall("polished-sandstone-wall"){{ + variants = 2; + }}; + mallowWall = new StaticWall("mallow-wall"){{ variants = 2; itemDrop = MeldItems.clayMallows; @@ -322,6 +400,18 @@ public static void load(){ variants = 2; }}; + likesandWall = new StaticTree("likesand-wall"){{ + variants = 2; + }}; + + likestoneWall = new StaticTree("likestone-wall"){{ + variants = 2; + }}; + + likesaltWall= new StaticTree("likesalt-wall"){{ + variants = 2; + }}; + resonantStone = new Floor("resonant-stone", 3); aetherGrowth = new SteamVent("aether-growth"){{ @@ -345,6 +435,36 @@ public static void load(){ buildTime = 10; variants = 2; }}; + meldMetalStick = new WobbleProp("meld-metal-stick"){{ + requirements(Category.effect, ItemStack.with(MeldItems.debris, 15)); + + buildVisibility = BuildVisibility.sandboxOnly; + + instantDeconstruct = false; + buildTime = 10; + variants = 3; + }}; + meldProtrusion = new Prop("meld-protrusion"){{ + requirements(Category.effect, ItemStack.with(MeldItems.debris, 35)); + + buildVisibility = BuildVisibility.sandboxOnly; + + solid = true; + instantDeconstruct = false; + buildTime = 10; + variants = 2; + }}; + meldPools = new Prop("meld-pools"){{ + requirements(Category.effect, ItemStack.with(MeldItems.debris, 25)); + + buildVisibility = BuildVisibility.sandboxOnly; + + solid = true; + customShadow = true; + instantDeconstruct = false; + buildTime = 45; + variants = 3; + }}; meldClusterLarge = new AetherCluster("meld-cluster-large"){{ requirements(Category.effect, ItemStack.with(MeldItems.debris, 300)); @@ -353,5 +473,50 @@ public static void load(){ buildVisibility = BuildVisibility.sandboxOnly; }}; + + meldCrystal = new WobbleProp("meld-crystal"){{ + requirements(Category.effect, ItemStack.with(MeldItems.meldShard, 25)); + + buildVisibility = BuildVisibility.sandboxOnly; + + instantDeconstruct = false; + buildTime = 10; + variants = 3; + }}; + + + iampsiGemstone = new Prop("iampsi-gemstone"){{ + requirements(Category.effect, ItemStack.with(MeldItems.silver, 25, MeldItems.iampsi, 45, MeldItems.quartzStrata, 25)); + solid = true; + alwaysReplace = false; + + buildVisibility = BuildVisibility.sandboxOnly; + + instantDeconstruct = false; + buildTime = 35; + variants = 4; + }}; + + quartzSpikes = new Prop("quartz-spikes"){{ + requirements(Category.effect, ItemStack.with(MeldItems.quartzStrata, 15)); + solid = false; + alwaysReplace = true; + + buildVisibility = BuildVisibility.sandboxOnly; + + customShadow = true; + instantDeconstruct = false; + buildTime = 5; + variants = 5; + }}; + + meldCrystalLarge = new TallBlock("meld-crystal-large"){{ + variants = 1; + customShadow = true; + }}; + meldSupportFrame = new TallBlock("meld-support-frame"){{ + variants = 2; + customShadow = true; + }}; } } diff --git a/src/meld/content/MeldItems.java b/src/meld/content/MeldItems.java index 4a15505..0f295de 100644 --- a/src/meld/content/MeldItems.java +++ b/src/meld/content/MeldItems.java @@ -1,11 +1,18 @@ package meld.content; import arc.struct.Seq; +import mindustry.content.Items; import mindustry.type.Item; public class MeldItems { public static Item - debris, carbolith, silver, resonarum, clayMallows, + debris, carbolith, + + //The badlands hall of shame + silver, clayMallows, electrumSheets, + + //The storm planes hall of shame... + resonarum, dissonitre, vitricMesh, meldShard; @@ -14,7 +21,9 @@ public class MeldItems { //Heavy industry content public static Item - tenbris, motis, shadesteel, elnarDust, annealedSilver, glassMallows, cruciblePlating, aspectPipe; + tenbris, motis, shadesteel, elnarDust, + annealedSilver, glassMallows, iampsi, quartzStrata, likestoneSediments, + cruciblePlating, aspectPipe; public static void load(){ @@ -31,8 +40,22 @@ public static void load(){ cost = 0.2f; }}; + electrumSheets = new Item("electrum-sheets"){{ + cost = 0.2f; + }}; + resonarum = new Item("resonarum"); + dissonitre = new Item("dissonitre"){{ + cost = 0.05f; + }}; + + vitricMesh = new Item("vitric-mesh"){{ + cost = 0.25f; + }}; + + meldShard = new Item("meld-shard"); + stonyParticulate = new Item("stony-particulate"){{ }}; @@ -64,6 +87,14 @@ public static void load(){ glassMallows = new Item("glass-mallow"); + iampsi = new Item("iampsi"){{ + + }}; + + quartzStrata = new Item("quartz-strata"){{}}; + + likestoneSediments = new Item("likestone-sediments"){{}}; + aspectPipe = new Item("aspect-pipe"){{ }}; @@ -72,7 +103,7 @@ public static void load(){ }}; - Seq heavyIndustry = Seq.with(tenbris, motis, shadesteel, elnarDust, annealedSilver, glassMallows, cruciblePlating, aspectPipe); + Seq heavyIndustry = Seq.with(tenbris, motis, shadesteel, elnarDust, annealedSilver, glassMallows, iampsi, quartzStrata, likestoneSediments, cruciblePlating, aspectPipe); heavyIndustry.each(i -> i.databaseTag = "heavy-industry"); }; } diff --git a/src/meld/content/MeldLiquids.java b/src/meld/content/MeldLiquids.java index a8d130e..03a3667 100644 --- a/src/meld/content/MeldLiquids.java +++ b/src/meld/content/MeldLiquids.java @@ -16,12 +16,6 @@ public class MeldLiquids { pollutantMixture, boundAspect, thunderingAether, stormingAspect; - public static ObjectFloatMap aetherEfficiencies = new ObjectFloatMap<>(); - public static ObjectFloatMap aetherDensities = new ObjectFloatMap<>(); - - public static ObjectFloatMap aspectEfficiencies = new ObjectFloatMap<>(); - public static ObjectFloatMap aspectDensities = new ObjectFloatMap<>(); - public static ObjectFloatMap outletEfficiencies = new ObjectFloatMap<>(); public static ObjectFloatMap outletDensities = new ObjectFloatMap<>(); @@ -83,8 +77,7 @@ public static void load(){ }}; put(aether, AspectGroup.aether, new AspectStats(1, 1)); - put(pollutantMixture, AspectGroup.aether, new AspectStats(1, 0.5f)); - put(pollutantMixture, AspectGroup.aether, new AspectStats(1, 0.5f)); + put(pollutantMixture, AspectGroup.aether, new AspectStats(0.5f, 0.5f)); put(thunderingAether, AspectGroup.aether, new AspectStats(2, 0.5f)); put(aspect, AspectGroup.aspect, new AspectStats(1, 1)); @@ -100,21 +93,6 @@ public static void load(){ thunderingAether, stormingAspect ); - aetherEfficiencies.put(aether, 1); - aetherEfficiencies.put(pollutantMixture, 1); - aetherEfficiencies.put(thunderingAether, 2); - - aetherDensities.put(aether, 1); - aetherDensities.put(pollutantMixture, 1/5f); - aetherDensities.put(thunderingAether, 0.5f); - - aspectEfficiencies.put(aspect, 1); - aspectEfficiencies.put(boundAspect, 1); - aspectEfficiencies.put(stormingAspect, 2); - - aspectDensities.put(aspect, 1); - aspectDensities.put(boundAspect, 2.5f); - aspectDensities.put(stormingAspect, 1f); aether.databaseTag = pollutantMixture.databaseTag = thunderingAether.databaseTag = aspect.databaseTag = boundAspect.databaseTag = stormingAspect.databaseTag = "aspect-powergen"; @@ -129,8 +107,8 @@ public static void load(){ public static void mapOutlet(Liquid input, Liquid output){ outletMapping.putAll(input, output); - outletEfficiencies.put(input, aetherEfficiencies.get(input, 1) * aspectEfficiencies.get(output, 1)); + outletEfficiencies.put(input, AspectGroup.aether.getEfficiency(input) * AspectGroup.aspect.getEfficiency(output)); - outletDensities.put(input, aetherDensities.get(input, 1) * aspectDensities.get(output, 1)); + outletDensities.put(input, AspectGroup.aether.getDensity(input) * AspectGroup.aspect.getDensity(output)); } } diff --git a/src/meld/content/MeldStatusEffects.java b/src/meld/content/MeldStatusEffects.java index 2c3d7fa..971148a 100644 --- a/src/meld/content/MeldStatusEffects.java +++ b/src/meld/content/MeldStatusEffects.java @@ -101,7 +101,7 @@ public void update(Unit unit, StatusEntry entry) { }}; sentry = new StatusEffect("sentry"){{ - damage = 0.1f; + damage = 0.2f; reloadMultiplier = 2; speedMultiplier = 0.15f; }}; diff --git a/src/meld/content/MeldUnits.java b/src/meld/content/MeldUnits.java index 0fed4bf..5f915e5 100644 --- a/src/meld/content/MeldUnits.java +++ b/src/meld/content/MeldUnits.java @@ -292,9 +292,9 @@ public static void load(){ fogRadius = IR/ Vars.tilesize; canBoost = true; - boostMultiplier = 0.5f; + boostMultiplier = 0.1f; shadowElevation = 0; - shadowElevationScl = 0.5f; + shadowElevationScl = 0f; weapons.add( new RepairBeamWeapon("meld-bulbhead-healer"){{ @@ -492,7 +492,7 @@ public static void load(){ y = -2; reload = 180; rotateSpeed = 3.5f; - recoil = 1.25f; + recoil = 3.25f; inaccuracy = 15; velocityRnd = 0.05f; shoot.shots = 5; @@ -509,7 +509,7 @@ public static void load(){ lifetime = 30; damage = 1; - splashDamage = 15; + splashDamage = 5; splashDamageRadius = 25; homingDelay = 10; @@ -547,7 +547,7 @@ public static void load(){ fragSpread = 15; fragRandomSpread = 0; fragBullet = new SapBulletType(){{ - damage = 5; + damage = 10; sapStrength = 1; length = 15; pierce = true; @@ -1417,7 +1417,7 @@ public static void load(){ accel = 0.35f; speed = 1.5f; - hitSize = 32; + hitSize = 16; rotateSpeed = 8; faceTarget = true; diff --git a/src/meld/core/Melting.java b/src/meld/core/Melting.java index e2de6d4..625d9ab 100644 --- a/src/meld/core/Melting.java +++ b/src/meld/core/Melting.java @@ -15,7 +15,7 @@ // TODO: fix melting stopping when leaving world // TODO: make a way to add more melting patterns public class Melting implements Runnable{ - private static final Floor stable = MeldEnvironment.meldCrystal; + private static final Floor stable = MeldEnvironment.meldCrystalFloor; private static final Floor unstable = MeldEnvironment.meldCrystalScattered; private static final Floor melted = MeldEnvironment.meldSwampland; diff --git a/src/meld/fluid/AspectGroup.java b/src/meld/fluid/AspectGroup.java index 9a50577..d76282b 100644 --- a/src/meld/fluid/AspectGroup.java +++ b/src/meld/fluid/AspectGroup.java @@ -41,12 +41,12 @@ public static void put(Liquid liquid, AspectGroup group, AspectStats stats){ public float getDensity(Liquid liquid){ AspectStats stat = stats.get(liquid); - return stat == null ? 0 : stat.density; + return stat == null ? 1 : stat.density; } public float getEfficiency(Liquid liquid){ AspectStats stat = stats.get(liquid); - return stat == null ? 0 : stat.efficiency; + return stat == null ? 1 : stat.efficiency; } public static class AspectStats{ diff --git a/src/meld/world/blocks/crafting/modules/ConsumeAspectModule.java b/src/meld/world/blocks/crafting/modules/ConsumeAspectModule.java index 3f32c21..984dc4b 100644 --- a/src/meld/world/blocks/crafting/modules/ConsumeAspectModule.java +++ b/src/meld/world/blocks/crafting/modules/ConsumeAspectModule.java @@ -3,22 +3,21 @@ import arc.math.Mathf; import arc.struct.ObjectFloatMap; import arc.struct.ObjectMap; +import meld.fluid.AspectGroup; import meld.world.blocks.crafting.ModularCrafter; import mindustry.type.Liquid; import mindustry.type.LiquidStack; public class ConsumeAspectModule extends ModularCrafter.CrafterModule{ - public ObjectFloatMap efficiencyMap; - public ObjectFloatMap densityMap; + public AspectGroup group; - float consumeRate; + public float consumeRate; public int efficiencyPin; public int outputEfficiencyPin; - public ConsumeAspectModule(float consumeRate, ObjectFloatMap efficiencyMap, ObjectFloatMap densityMap, int efficiencyPin, int outputEfficiencyPin) { + public ConsumeAspectModule(float consumeRate, AspectGroup group, int efficiencyPin, int outputEfficiencyPin) { this.consumeRate = consumeRate; - this.efficiencyMap = efficiencyMap; - this.densityMap = densityMap; + this.group = group; this.efficiencyPin = efficiencyPin; this.outputEfficiencyPin = outputEfficiencyPin; } @@ -30,9 +29,10 @@ public void update(ModularCrafter.ModularCrafterBuild build) { float highest = 0; Liquid liquid = null; - for(Liquid aspect: efficiencyMap.keys()){ + + for(Liquid aspect: group.stats.keys()){ if(!Mathf.zero(build.liquids.get(aspect))){ - float current = efficiencyMap.get(aspect, 1); + float current = group.getEfficiency(aspect); if(current > highest){ liquid = aspect; highest = current; @@ -46,13 +46,13 @@ public void update(ModularCrafter.ModularCrafterBuild build) { } float amount = build.liquids.get(liquid); - float consumeAmount = consumeRate * efficiency/densityMap.get(liquid, 1); + float consumeAmount = consumeRate * efficiency/group.getDensity(liquid); float maxEfficiency = Math.min(amount/consumeAmount, 1); consumeAmount *= maxEfficiency; build.liquids.remove(liquid, consumeAmount); - build.setPin(outputEfficiencyPin, efficiency * maxEfficiency * efficiencyMap.get(liquid, 1)); + build.setPin(outputEfficiencyPin, efficiency * maxEfficiency * group.getEfficiency(liquid)); } } diff --git a/src/meld/world/blocks/fluid/AspectPipe.java b/src/meld/world/blocks/fluid/AspectPipe.java index b54c801..8b0e747 100644 --- a/src/meld/world/blocks/fluid/AspectPipe.java +++ b/src/meld/world/blocks/fluid/AspectPipe.java @@ -5,6 +5,7 @@ import arc.struct.Seq; import arc.util.Log; import meld.content.MeldLiquids; +import meld.fluid.AspectGroup; import meld.world.blocks.crafting.ModularCrafter; import meld.world.blocks.crafting.RecipeCrafter; import mindustry.Vars; @@ -89,6 +90,8 @@ public float moveLiquid(Building other, Liquid liquid) { } Liquid outletProduct = outletMapping.get(liquid); + + //TODO: Horridly jank, please redo. //At the same time try dumping aspect if(outletProduct != null && !(other instanceof ConduitBuild || other instanceof LiquidRouter.LiquidRouterBuild) && this.canDumpLiquid(other, outletProduct)) { Liquid original = liquid; @@ -103,7 +106,7 @@ public float moveLiquid(Building other, Liquid liquid) { float flow = Math.min(other.block.liquidCapacity - other.liquids.get(liquid), amount) * 10; if (other.acceptLiquid(this, liquid)) { other.handleLiquid(this, liquid, flow); - this.liquids.remove(original, flow/aetherDensities.get(liquid, 1)/10); + this.liquids.remove(original, flow/AspectGroup.aether.getDensity(liquid)/10/AspectGroup.aether.getEfficiency(liquid)); total += amount; }