keep testing up to date with master cause I pushed the dam commits to master over testing

assets/bundles/bundle.properties

@@ -42,7 +42,7 @@ block.meld2-rotary-kiln.name = Rotary Kiln
 block.meld2-rotary-kiln.description = Burns mass amounts of [#cbdbfc]Aspect[] as fuel, heats materials to process them in bulk.\n\n[accent]Carbolith + Tenbris -> Shadesteel + [#5b4739]Fumes[]\nSilver -> Annealed Silver\n\nClay-Mallows + Quartz Strata + Likestone Sediments -> Glassy-Mallows\n\nClay-Mallows + Likestone Sediments + Debris -> Crucible-Plating\nDebris + Shadesteel -> Crucible Platings
 
 block.meld2-pneumatic-extruder.name = Pneumatic Extruder
-block.meld2-pneumatic-extruder.description = Extrudes material into pipes and capsules, uses [#cbdbfc]Aspect[] to run. [accent]\n\nDebris + Elnar -> Aspect Pipe\n\nSilver/Annealed Silver + Debris -> Aspect Pipe\n\nGlassy-Mallows + Silver/Annealed Silver + Storming Aspect -> [red]Aspect Bombs[]
+block.meld2-pneumatic-extruder.description = Extrudes material into pipes and capsules, uses [#cbdbfc]Aspect[] to run.\n\nCan process crushing recipies but at a far reduced rate.\n\n[accent]\n\nDebris + Elnar -> Aspect Pipe\n\nSilver/Annealed Silver + Debris -> Aspect Pipe\n\nGlassy-Mallows + Silver/Annealed Silver + Storming Aspect -> [red]Aspect Bombs[]
 
 block.meld2-storm-iris.name = Storm Iris
 block.meld2-storm-iris.description = Converts stable [meld2-aether]Aether[] into charged [meld2-thundering-aether]Thundering Aether[]
@@ -88,6 +88,12 @@ block.meld2-shadesteel-shingles.name = Shadesteel Shingles
 block.meld2-shadesteel-shingles.description = Mundane and bulky.
 block.meld2-shadesteel-shingles.details = Brick of Shadesteel bricks of Shadesteel ingots.
 
+block.meld2-gate-spike.name = Gate Spike
+block.meld2-gate-spike.description = Acts as a door. Causes all connected doors to enabling or disable when toggled.
+
+block.meld2-lake-rim.name = Lake Rim
+block.meld2-lake-rim.description = Acts as a door, only placeable on the shoreline.
+
 block.meld2-barricade.name = Barricade
 block.meld2-barricade.description = Provides cover against enemy projectiles.\nQuick to build.\n\nEasy way to store Compacted Bricks/Stony Gloop outside of the core for onsite use.\n\n[accent]Armored.[]
 
@@ -621,7 +627,7 @@ item.meld2-tenbris.details = Fume infused hematite, more malleable and less brit
 
 item.meld2-motis.name = Motis
 item.meld2-motis.description = Raw material, valued for its natural magnetism.
-item.meld2-motis.details = Fume infused magnetite, more malleable and less brittle but less hard than usual.
+item.meld2-motis.details = Both motis and motus are valid spellings for this material. The correct pronunciation, however, is "mottes".\n\nThank god I took those linguistics classes...
 
 item.meld2-shadesteel.name = Shadesteel
 item.meld2-shadesteel.description = Not just some rock anymore.\nDurable building material.
@@ -647,6 +653,20 @@ item.meld2-annealed-silver.name = Annealed Silver
 item.meld2-annealed-silver.description = Highly refined and attuned. Makes for a great aspect conductor.
 item.meld2-annealed-silver.details = An easily made aspect superconductor.
 
+
+item.meld2-vitali.name = Vitali
+item.meld2-vitali.description = A component of Blood, and the primary material in Shadesteel.
+item.meld2-vitali.details = Many attempts have been made to make Vitali into something more durable and flexible than Shadesteel.
+
+item.meld2-limmeri.name = Limmeri
+item.meld2-limmeri.description = A lightweight, silvery metal.
+item.meld2-limmeri.details = Mixes of Limmeri & Fume-bound Vitali have been used as a source of heat.\n\nIgniting Limmeri's passion for connection with a Pyro containing aspect allows it to steal the Fumes from the Vitali, scorching the air and ground around itself.
+
+item.meld2-mallum.name = Mallum
+item.meld2-mallum.description = A dull, but flexible metal. Resistant to worldly corrosion, yet easily decayed by the aspects.\n\nGreat for soldering aplication.
+item.meld2-mallum.details =
+
+
 item.meld2-iampsi.name = Iampsi
 item.meld2-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.meld2-iampsi.details = Radiance.
@@ -1120,44 +1140,41 @@ status.meld2-fringe.name = Fringe
 status.meld2-fringe.description = Enlightens materials into a useable form.
 status.meld2-fringe.details = Hello Strata!
 
-status.meld2-mangrove-a0-refreshed.name = Refreshed
-status.meld2-mangrove-a0-refreshed.description = Doubles reload speed and slightly reduces damage taken. Invokes slight regeneration.
-
-status.meld2-mangrove-a1-infested.name = Infested
-status.meld2-mangrove-a1-infested.description = Hefty amount of DoT an' damage taken and dealt is magnified. Doubles... reload speed?\n\n[gray]What applies this again?\nI don't know, but we've got to ru-[]\n[red]<RECORDING CUT>[]
+status.meld2-refreshed.name = Refreshed
+status.meld2-refreshed.description = Doubles reload speed and slightly reduces damage taken. Invokes slight regeneration.
 
-status.meld2-mangrove-b0-shattered-flame.name = Shattered Flame
-status.meld2-mangrove-b0-shattered-flame.description = Sacrifice is power.
+status.meld2-infested.name = Infested
+status.meld2-infested.description = Hefty amount of DoT an' damage taken and dealt is magnified. Doubles... reload speed?\n\n[gray]What applies this again?\nI don't know, but we've got to ru-[]\n[red]<RECORDING CUT>[]
 
-status.meld2-mangrove-d0-mercury-poisoning.name = Mercury Poisoning
-status.meld2-mangrove-d0-mercury-poisoning.description = Extremely deadly to critters of [#ea9ad6]Meld[] origin. Effects unknown.\n[gray]TODO: Update this for Strata
+status.meld2-shattered-flame.name = Shattered Flame
+status.meld2-shattered-flame.description = Sacrifice is power.
 
-status.meld2-mangrove-d1-slippery.name = Mercury Coating
-status.meld2-mangrove-d1-slippery.description = Coating of [#89828c]Mercury[].\n[gray]Fun!\nHey don't eat that-[]
+status.meld2-mercury-poisoning.name = Mercury Poisoning
+status.meld2-mercury-poisoning.description = Extremely deadly to critters of [#ea9ad6]Meld[] origin. Effects unknown.\n[gray]TODO: Update this for Strata
 
-status.meld2-strata-a0-rally.name = Rally
-status.meld2-strata-a0-rally.description = Increased mobility and reload. Applied by [accent]Commanders[] and [accent]Sonars[].
+status.meld2-slippery.name = Mercury Coating
+status.meld2-slippery.description = Coating of [#89828c]Mercury[].\n[gray]Fun!\nHey don't eat that-[]
 
-status.meld2-strata-a1-primed.name = Primed
-status.meld2-strata-a1-primed.description = Increased mobility, damage, reload. Heavly increased health. This unit's ready to go off!
+status.meld2-rally.name = Rally
+status.meld2-rally.description = Increased mobility and reload. Applied by [accent]Commanders[] and [accent]Sonars[].
 
-status.meld2-strata-b0-anchored.name = Anchored
-status.meld2-strata-b0-anchored.description = Heavly increased drag and health. Heavly decreased speed. Applied by [accent]Movement Anchors[]
+status.meld2-anchored.name = Anchored
+status.meld2-anchored.description = Heavly increased drag and health. Heavly decreased speed. Applied by [accent]Movement Anchors[]
 
-status.meld2-strata-b1-rebound.name = Rebound
-status.meld2-strata-b1-rebound.description = Heavly increased speed, slightly increased reload speed. Decreased drag. Applied by [accent]Movement Anchors[]
+status.meld2-rebound.name = Rebound
+status.meld2-rebound.description = Heavly increased speed, slightly increased reload speed. Decreased drag. Applied by [accent]Movement Anchors[]
 
-status.meld2-wildlife-a0-amplified.name = Amplified
-status.meld2-wildlife-a0-amplified.description = Amplifies mobility, durability and reload. Applied by [#ea9ad6]Meld Amplifiers[].
+status.meld2-amplified.name = Amplified
+status.meld2-amplified.description = Amplifies mobility, durability and reload. Applied by [#ea9ad6]Meld Amplifiers[].
 
-status.meld2-wildlife-a1-reconstitution.name = Reconstitution
-status.meld2-wildlife-a1-reconstitution.description = Increases durability and drag. Slightly decreases speed. Light regeneration. Applied by [#ea9ad6]Meld Beacons[]. Certain constructs spawn with this.\nOnly affects biological targets.
+status.meld2-reconstitution.name = Reconstitution
+status.meld2-reconstitution.description = Increases durability and drag. Slightly decreases speed. Light regeneration. Applied by [#ea9ad6]Meld Beacons[]. Certain constructs spawn with this.\nOnly affects biological targets.
 
-status.meld2-wildlife-b0-sentry.name = Sentry
-status.meld2-wildlife-b0-sentry.description = Heavily reduced mobility, but double fireate. Does constant DoT.\nCertain constructs apply this upon shooting.
+status.meld2-sentry.name = Sentry
+status.meld2-sentry.description = Heavily reduced mobility, but double fireate. Does constant DoT.\nCertain constructs apply this upon shooting.
 
-status.meld2-wildlife-c0-surge.name = Surge
-status.meld2-wildlife-c0-surge.description = Massive boost in reload speed, but heavly decreased damage.\nCertain constructs can intiate a surge with a long cooldown.
+status.meld2-surge.name = Surge
+status.meld2-surge.description = Massive boost in reload speed, but heavly decreased damage.\nCertain constructs can intiate a surge with a long cooldown.
 
 status.meld2-lacerated.name = Lacerated
 status.meld2-lacerated.description = Heavly reduced mobility and fireate. Increases durability slightly and encourages light regeneration.\n\nApplied by [#4bb66b]Resonarum[] related sources. No effect on armored meld or inorganic targets.
@@ -1301,6 +1318,22 @@ objective.wavestarting = [accent]Waves starting in:[] [lightgray]{0}[]
 
 ability.spawndeath = Death Spawn(s)
 
+ability.solidspeed = Solid Speed
+ability.solidspeed.description = Speed when traveling on solid floors
+ability.solidspeed.multi = Speed multiplier: {0}x
+
+ability.slipstreamhull = Slipstream Hull
+ability.slipstreamhull.description = Moves unimpeded by sticky terrain!
+
+ability.beached = Beaches
+ability.beached.description = Able to move on land, but rapidly loses speed.
+
+ability.fabricatorbattery = Fabricator Battery
+ability.fabricatorbattery.description = Unit builds 5x as quickly while it has charge.
+
+ability.deathbirth = Death Birth
+ability.deathbirth.description = Units spawned have a short, intense regeneration.
+
 //Vanilla modifications
 research = Defragment
 researched = [lightgray]Defragmentation Progress: {0}%
@@ -1330,6 +1363,9 @@ sectors.underattack.nodamage = [accent]In Progress...
 
 status.disarmed.name = Disarmed
 
+database-category.lamp-psi = Lamp Psi
+database-tag.lamp-psi = Iamp Psl
+
 database-category.aspect = Aspecti
 database-tag.aspect-powergen = Potential/Power family
 database-tag.aspect-omnipotence = Progress
@@ -1359,4 +1395,10 @@ bar.spool = Spool
 
 stat.aspect-efficiency = Efficiency
 stat.aspect-density = Density
-stat.aspect-stats = Aspect Stats
+stat.aspect-stats = Aspect Stats
+
+overlay.deposit-missing = No deposits found :c
+overlay.ore-missing = No ores found :c
+overlay.drop-missing = Nothing to harvest...
+overlay.friendly-fire = <SHOOTING FRIENDLY, BEWARE>
+overlay.in-fog = <SENSORS BLOCKED>

assets/bundles/bundle.shitpost → assets/bundles/bundle_shitpost.properties

@@ -14,16 +14,19 @@ block.meld2-pressure-vent.name = Amogus Escape route
 block.meld2-crystal-cracker.name = Tasty Wafer
 block.meld2-crystal-cracker.description = ...you know you wana\n\njust a lil nibble
 
-block.meld2-overflow-chute.name = Smart Router
-block.meld2-overflow-chute.description = Smart Router
+block.meld2-aspect-channel.name = BetterConduit
+
+block.meld2-chute-overflow.name = Smart Router
+block.meld2-chute-overflow.description = Smart Router
 
 block.meld2-depot.name = frankouloadertainer's frankouloadertainer-er
 
 liquid.meld2-aspect.name = Outdated Ass Destroyer
 liquid.meld2-storming-aspect.name = Bombspect
 liquid.meld2-bound-aspect.name = Leanspect
 
-unit.meld-bulbhead.name = Bulbster
-unit.meld-bulbhead.description = Meldieps the allied blocks as it Meldarras.io the enemies
+unit.meld2-bulbhead.name = Bulbster
+unit.meld2-bulbhead.description = Meldieps the allied blocks as it Meldarras.io the enemies
 
-liquid.meld2-meld = Meld 2: Electric meldaloo
+liquid.meld2-meld.name = Meld 2: Electric meldaloo
+liquid.meld2-meld.description = (the same)

assets/shaders/light.frag

@@ -9,9 +9,10 @@ uniform vec4 u_ambient;
 
 varying vec2 v_texCoords;
 
-void main(){
+#define banding 8.0
+#define banding2 3.0
 
-    float banding = 8.0;
+void main(){
 
     //Exclusion
     vec4 exclusion = texture2D(u_exclusion, v_texCoords);
@@ -24,9 +25,9 @@ void main(){
     float alpha = color.a;
 
     //Get the scaling right here...
-    alpha = clamp(floor((alpha) * 8.0)/8.0, 0.0, 1.0) * 0.3 + clamp(floor(alpha * 3.0)/3.0, 0.0, 1.0) * 0.3 + alpha * 0.4;
+    alpha = clamp(floor((alpha) * banding)/banding, 0.0, 1.0) * 0.3 + clamp(floor(alpha * banding2)/banding2, 0.0, 1.0) * 0.3 + alpha * 0.4;
 
-    vec4 totalColor = clamp(vec4(color.rgb * alpha, 1) + vec4(positionAmbient.rgb * positionAmbient.a, 1), 0.0, 1.0);
+    vec4 totalColor = clamp(vec4(color.rgb * alpha, 1.0) + vec4(positionAmbient.rgb * positionAmbient.a, 1.0), 0.0, 1.0);
 
     vec4 background = clamp(texture2D(u_texture, v_texCoords), 0.0, 1.0);
 

assets/shaders/sonar.frag

@@ -14,7 +14,7 @@ void main() {
     vec4 color = texture2D(u_texture, v_texCoords);
     gl_FragColor = color;
 
-    if(color.r == 1 && color.g + color.b > 0){
+    if(color.r == 1.0 && color.g + color.b > 0.0){
 
         color.a *= 0.5 * abs(sin((v_texCoords.x + v_texCoords.y) * 20.0 + u_time/20.0));
 

mod.hjson

@@ -16,10 +16,10 @@ description: "[[]gray]Under scattered gloomy sunlight in the shimmering seas, wi
 subtitle: "[[]accent]What choice do I have...[[]]"
 
 #the mod version
-version: gameplay test 5
+version: gameplay test 6
 
 #the minimum game build required to run this mod
-minGameVersion: 154
+minGameVersion: 157
 
 #this is a java mod
 java: true

src/meld/Meld.java

@@ -34,7 +34,7 @@ public class Meld extends Mod{
     public static NativeJavaPackage p = null;
 
     public static Melting melting;
-
+    
     public Meld(){
         Events.on(EventType.ClientLoadEvent.class, e -> {
             MeldRegions.load();
@@ -43,45 +43,24 @@ public Meld(){
 
         Events.run(EventType.Trigger.draw, () -> {
             if(!MeldSettings.overlayOverFog) return;
-            Draw.draw(Layer.fogOfWar + 2, AboveOverlayRenderer::draw);
-
-            //Just additive blending the fuck out of this layer in particular cause like fuck yes
-            Draw.drawRange(MeldLayers.smokeHigh, 1, () -> Draw.blend(Blending.additive), () -> Draw.blend(Blending.normal));
+            Draw.draw(MeldLayers.overlayOver, AboveOverlayRenderer::draw);
         });
 
         Events.on(EventType.FileTreeInitEvent.class, e -> {
             Core.app.post(MeldShaders::load);
         });
+
+        Events.on(EventType.FileTreeInitEvent.class, e -> {
+            // TODO: potentially run earlier?
+            Bundles.load();
+        });
 
         CustomExplosions.load();
     }
 
     public static String prefix(String in){
         return name + "-" + in;
     }
-    private static final StringBuilder b = new StringBuilder();
-
-    //Thanks smolkey
-    public static String gradient(String in, Color... colors){
-        if(colors.length == 1) return "[#" + colors[0].toString().substring(0, 6) + "]" + in + "[]";
-
-        b.setLength(0);
-        b.trimToSize();
-        int length = in.length();
-        int spaces = 0;
-
-        for(int i = 0; i < length; i++){
-            char ind = in.charAt(i);
-            if(Character.isWhitespace(ind)){
-                spaces++;
-                b.append(' ');
-                continue;
-            }
-            b.append("[#").append(Tmp.c1.set(colors[0]).lerp(colors, (float) i / (length - spaces)).toString(), 0, 6).append("]").append(ind).append("[]");
-        }
-
-        return b.toString();
-    }
 
     @Override
     public void init() {

src/meld/content/MeldBlocks.java

@@ -1158,7 +1158,7 @@ public void update(Bullet b){
         lakeRim = new LakeRim("lake-rim"){{
             requirements(Category.defense, with(MeldItems.debris, 4));
             size = 1;
-            health = 120;
+            health = 400;
         }};
 
         frictionPad = new FrictionPad("friction-pad"){{
@@ -1202,7 +1202,7 @@ public void update(Bullet b){
             size = 2;
             health = 800;
 
-            itemCapacity = 20;
+            itemCapacity = 50;
         }};
 
         aspectIncinerator = new StorageIncinerator("aspect-incinerator"){{
@@ -1269,7 +1269,7 @@ public void update(Bullet b){
             health = 420;
             placeableLiquid = true;
 
-            drillTime = 90;
+            drillTime = 180;
             tier = 2;
 
             buildTime = 90;
@@ -1535,7 +1535,7 @@ Category.production, with(
             outputLiquidSlots = 1;
 
             inputLiquids.addAll(MeldLiquids.aspect, MeldLiquids.boundAspect, MeldLiquids.stormingAspect);
-            inputItems.addAll(MeldItems.tenbris, MeldItems.clayMallows, MeldItems.carbolith, MeldItems.debris, MeldItems.shadesteel, MeldItems.glassMallows, MeldItems.silver, MeldItems.likestoneSediments, MeldItems.quartzStrata);
+            inputItems.addAll(MeldItems.tenbris, MeldItems.clayMallows, MeldItems.carbolith, MeldItems.debris, MeldItems.shadesteel, MeldItems.silver, MeldItems.likestoneSediments, MeldItems.quartzStrata);
             outputItems.addAll(MeldItems.cruciblePlating, MeldItems.shadesteel, MeldItems.glassMallows, MeldItems.annealedSilver);
             outputLiquids.addAll(MeldLiquids.fumes);
 
@@ -1553,8 +1553,8 @@ Category.production, with(
             itemCapacity = 10;
 
             inputLiquids.addAll(MeldLiquids.aspect, MeldLiquids.boundAspect, MeldLiquids.stormingAspect);
-            inputItems.addAll(MeldItems.shadesteel, MeldItems.elnarDust, MeldItems.debris, MeldItems.silver, MeldItems.annealedSilver, MeldItems.glassMallows);
-            outputItems.addAll(MeldItems.aspectPipe, MeldItems.aspectBomb);
+            inputItems.addAll(MeldItems.shadesteel, MeldItems.elnarDust, MeldItems.debris, MeldItems.silver, MeldItems.annealedSilver, MeldItems.glassMallows, MeldItems.iampsi);
+            outputItems.addAll(MeldItems.aspectPipe, MeldItems.aspectBomb, MeldItems.quartzStrata);
 
             inputLiquidSlots = 1;
 
@@ -1606,6 +1606,9 @@ Category.production, with(
                         );
                     }}
             );
+            recipes.addAll(
+                    MeldRecipes.crusherRecipies(2, 0.25f)
+            );
         }};
 
         crushWeaver = new AttributeCrafter("crush-weaver"){{
@@ -1933,6 +1936,8 @@ Category.production, with(
             requirements(Category.effect, with(MeldItems.iampsi, 30));
             configurable = false;
             radius = 32;
+            databaseCategory = "lamp-psi";
+            databaseTag = "lamp-psi";
 
             consume(new StupidConsumeAspects(outletRate/5, AspectGroup.aspect));
         }};
@@ -1967,7 +1972,7 @@ Category.production, with(
         platedChute = new Duct("plated-chute"){{
             requirements(Category.distribution, with(MeldItems.cruciblePlating, 2));
             armored = true;
-            health = 45;
+            health = 70;
             armor = 10;
             speed = 4f;
         }};
@@ -2472,7 +2477,7 @@ Category.production, with(
                 meldCannon, meldMortar,
                 craigCoffer, jillaCoffer, braigCoffer, billaCoffer,
                 meldCultivator,
-                pipebox, pipelineBridge, pipelineCrossing, pipelineRouter,
+                pipeline, pipelineBridge, pipelineCrossing, pipelineRouter,
                 carbonicBarrier, carbonicBarrierLarge, crystalBarrier, crystalBarrierLarge,
                 meldAmplifier, meldCapsule, meldNode, meldSuppressor
         );

src/meld/content/MeldBullets.java

@@ -260,6 +260,9 @@ public static void load(){
 
                 bulletInterval = 2;
 
+                status = MeldStatusEffects.impaled;
+                statusDuration = 30;
+
                 fragBullet = new BasicBulletType(9, 4, Meld.prefix("clump")){{
                     speed = 9;
                     damage = 0.5f;