From 57cd20e2a1cbbf36685361571199612599ff0e7d Mon Sep 17 00:00:00 2001 From: Volas171 <60143910+Volas171@users.noreply.github.com> Date: Sat, 4 Sep 2021 11:49:11 -0500 Subject: [PATCH 1/8] update mindustry reborn v7 (#5933) * update mindustry reborn ip * i forgo- --- servers_v7.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/servers_v7.json b/servers_v7.json index b7dbd2b066..a4b2c7ef83 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -5,7 +5,7 @@ }, { "name": "C.A.M.S.", - "address": ["baseduser.eu.org:6569", "v7.thedimas.pp.ua", "mindustry.me:7000"] + "address": ["baseduser.eu.org:6569", "v7.thedimas.pp.ua", "yeeth.mindustry.me:7000", "yeeth.mindustry.me:4000", "yeeth.mindustry.me:2000", "yeeth.mindustry.me:3000"] }, { "name": "hexpvp.ml", @@ -13,7 +13,7 @@ }, { "name": "Omega", - "address": ["yeet.mindustry.me", "yeeth.mindustry.me:2006", "yeeth.mindustry.me:2003","yeeth.mindustry.me:2002", "yeeth.mindustry.me:2001", "yeeth.mindustry.me:2007", "yeeth.mindustry.me:2005"] + "address": ["yeeth.mindustry.me", "yeet.mindustry.me:2345", "n3.mindustry.me:4444","n2.mindustry.me:4040", "n2.mindustry.me:4002", "n2.mindustry.me:4001", "n3.mindustry.me", "n2.mindustry.me:4004"] }, { "name": "MeowLand", From 24b0f445b8a7c61343fd3cb8e0107641bc5b656c Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 4 Sep 2021 15:23:47 -0400 Subject: [PATCH 2/8] Added rivers on Serpulo / Added deep tainted water --- .../blocks/environment/deep-tainted-water.png | Bin 0 -> 291 bytes .../blocks/environment/tainted-water.png | Bin 290 -> 290 bytes core/assets/bundles/bundle.properties | 1 + core/assets/icons/icons.properties | 1 + core/src/mindustry/content/Blocks.java | 17 ++++++- .../maps/planet/SerpuloPlanetGenerator.java | 43 +++++++++++++++--- .../world/blocks/environment/AirBlock.java | 1 + 7 files changed, 55 insertions(+), 8 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/environment/deep-tainted-water.png diff --git a/core/assets-raw/sprites/blocks/environment/deep-tainted-water.png b/core/assets-raw/sprites/blocks/environment/deep-tainted-water.png new file mode 100644 index 0000000000000000000000000000000000000000..c072c0ebeab3ea74884cb355962c26ecf60397c3 GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>V7Tk) z;usRq`gWQl*AWFCSL2`w^V0h++&=Sn;f}0uG0jf3UyEn|+iHN?2*fF9H3+3>HmLOa$1u7nBrr%G;@TA1yu{eFIU;JiHZzBD z+KG2U3#^h(FmrHhX3r7`V?Jiv$LwJcW8jyV(xD*IaZGJySWwwKp(z6Qq$jXyd_Bj( z)ghg<%FJcji&}{ndM_FSm>2Z^dc$=7b{|`kw*02Fb8OpKjEy%PY4L4%sybt(eFNu# t!_v>p-t4TJ&1mA}*ugL>v87=LW6pyBk=v$)$_xw)44$rjF6*2UngB~4Y?lB4 literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/environment/tainted-water.png b/core/assets-raw/sprites/blocks/environment/tainted-water.png index 330aca5f1497e32928298225be3c330361c5a75c..d2686d28b8d6dc24e3e063028fc8382321610a39 100644 GIT binary patch delta 38 ucmZ3)w1{bf3;WS$BDPoVY@O(RSj4d=AnnPuXUq%?3=E#GelF{r5}E)zeh)wZ delta 38 ucmZ3)w1{bf3;W(@LVGX8Y@g_TSY(1)Ky=9)^I8T51_n=8KbLh*2~7YoK@ODw diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 039f3bad70..75df389a5f 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1158,6 +1158,7 @@ block.core-nucleus.name = Core: Nucleus block.deep-water.name = Deep Water block.shallow-water.name = Water block.tainted-water.name = Tainted Water +block.deep-tainted-water.name = Deep Tainted Water block.darksand-tainted-water.name = Dark Sand Tainted Water block.tar.name = Tar block.stone.name = Stone diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 88b2e7d939..2b29514b5b 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -360,3 +360,4 @@ 63349=shallow-water|block-shallow-water-ui 63348=molten-slag|block-molten-slag-ui 63347=crater-stone|block-crater-stone-ui +63346=deep-tainted-water|block-deep-tainted-water-ui diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 6746e14984..4393a72fba 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -35,7 +35,7 @@ public class Blocks implements ContentList{ public static Block //environment - air, spawn, cliff, deepwater, water, taintedWater, tar, slag, stone, craters, charr, sand, darksand, dirt, mud, ice, snow, darksandTaintedWater, space, + air, spawn, cliff, deepwater, water, taintedWater, deepTaintedWater, tar, slag, stone, craters, charr, sand, darksand, dirt, mud, ice, snow, darksandTaintedWater, space, dacite, stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster, iceSnow, sandWater, darksandWater, duneWall, sandWall, moss, sporeMoss, shale, shaleWall, shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, grass, salt, @@ -142,7 +142,19 @@ public class Blocks implements ContentList{ }}; taintedWater = new Floor("tainted-water"){{ - speedMultiplier = 0.17f; + speedMultiplier = 0.5f; + variants = 0; + status = StatusEffects.wet; + statusDuration = 90f; + liquidDrop = Liquids.water; + isLiquid = true; + cacheLayer = CacheLayer.water; + albedo = 0.5f; + attributes.set(Attribute.spores, 0.15f); + }}; + + deepTaintedWater = new Floor("deep-tainted-water"){{ + speedMultiplier = 0.18f; variants = 0; status = StatusEffects.wet; statusDuration = 140f; @@ -313,6 +325,7 @@ public class Blocks implements ContentList{ sporeWall = new StaticWall("spore-wall"){{ variants = 2; + taintedWater.asFloor().wall = deepTaintedWater.asFloor().wall = this; }}; dirtWall = new StaticWall("dirt-wall"){{ diff --git a/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java index 112838d405..b00ba5d3a6 100644 --- a/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java @@ -23,6 +23,7 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{ BaseGenerator basegen = new BaseGenerator(); float scl = 5f; float waterOffset = 0.07f; + boolean genLakes = false; Block[][] arr = { @@ -33,11 +34,11 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{ {Blocks.deepwater, Blocks.water, Blocks.sandWater, Blocks.sand, Blocks.salt, Blocks.sand, Blocks.sand, Blocks.basalt, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.ice}, {Blocks.deepwater, Blocks.water, Blocks.sandWater, Blocks.sand, Blocks.sand, Blocks.sand, Blocks.moss, Blocks.iceSnow, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.snow, Blocks.ice}, {Blocks.deepwater, Blocks.sandWater, Blocks.sand, Blocks.sand, Blocks.moss, Blocks.moss, Blocks.snow, Blocks.basalt, Blocks.basalt, Blocks.basalt, Blocks.ice, Blocks.snow, Blocks.ice}, - {Blocks.taintedWater, Blocks.darksandTaintedWater, Blocks.darksand, Blocks.darksand, Blocks.basalt, Blocks.moss, Blocks.basalt, Blocks.hotrock, Blocks.basalt, Blocks.ice, Blocks.snow, Blocks.ice, Blocks.ice}, + {Blocks.deepTaintedWater, Blocks.darksandTaintedWater, Blocks.darksand, Blocks.darksand, Blocks.basalt, Blocks.moss, Blocks.basalt, Blocks.hotrock, Blocks.basalt, Blocks.ice, Blocks.snow, Blocks.ice, Blocks.ice}, {Blocks.darksandWater, Blocks.darksand, Blocks.darksand, Blocks.darksand, Blocks.moss, Blocks.sporeMoss, Blocks.snow, Blocks.basalt, Blocks.basalt, Blocks.ice, Blocks.snow, Blocks.ice, Blocks.ice}, {Blocks.darksandWater, Blocks.darksand, Blocks.darksand, Blocks.sporeMoss, Blocks.ice, Blocks.ice, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.ice, Blocks.ice}, - {Blocks.taintedWater, Blocks.darksandTaintedWater, Blocks.darksand, Blocks.sporeMoss, Blocks.sporeMoss, Blocks.ice, Blocks.ice, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.ice, Blocks.ice, Blocks.ice}, - {Blocks.darksandTaintedWater, Blocks.darksandTaintedWater, Blocks.darksand, Blocks.sporeMoss, Blocks.moss, Blocks.sporeMoss, Blocks.iceSnow, Blocks.snow, Blocks.ice, Blocks.ice, Blocks.ice, Blocks.ice, Blocks.ice}, + {Blocks.deepTaintedWater, Blocks.darksandTaintedWater, Blocks.darksand, Blocks.sporeMoss, Blocks.sporeMoss, Blocks.ice, Blocks.ice, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.ice, Blocks.ice, Blocks.ice}, + {Blocks.taintedWater, Blocks.darksandTaintedWater, Blocks.darksand, Blocks.sporeMoss, Blocks.moss, Blocks.sporeMoss, Blocks.iceSnow, Blocks.snow, Blocks.ice, Blocks.ice, Blocks.ice, Blocks.ice, Blocks.ice}, {Blocks.darksandWater, Blocks.darksand, Blocks.snow, Blocks.ice, Blocks.iceSnow, Blocks.snow, Blocks.snow, Blocks.snow, Blocks.ice, Blocks.ice, Blocks.ice, Blocks.ice, Blocks.ice} }; @@ -255,10 +256,35 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{ for(Room room : roomseq){ spawn.connect(room); } + Room fspawn = spawn; cells(1); distort(10f, 6f); + //rivers + pass((x, y) -> { + if(block.solid) return; + + Vec3 v = sector.rect.project(x, y); + + float rr = Simplex.noise2d(sector.id, (float)2, 0.6f, 1f / 7f, x, y) * 0.1f; + float value = Ridged.noise3d(2, v.x, v.y, v.z, 1, 1f / 53f) + rr - rawHeight(v) * 0f; + float rrscl = rr * 44 - 2; + + if(value > 0.12f && !Mathf.within(x, y, fspawn.x, fspawn.y, 12 + rrscl)){ + boolean deep = value > 0.12f + 0.1f && !Mathf.within(x, y, fspawn.x, fspawn.y, 15 + rrscl); + boolean spore = floor != Blocks.sand && floor != Blocks.salt; + //do not place rivers on ice, they're frozen + //ignore pre-existing liquids + if(!(floor == Blocks.ice || floor == Blocks.iceSnow || floor == Blocks.snow || floor.asFloor().isLiquid)){ + floor = spore ? + (deep ? Blocks.taintedWater : Blocks.darksandTaintedWater) : + (deep ? Blocks.water : + (floor == Blocks.sand ? Blocks.sandWater : Blocks.darksandWater)); + } + } + }); + Seq ores = Seq.with(Blocks.oreCopper, Blocks.oreLead); float poles = Math.abs(sector.tile.v.y); float nmag = 0.5f; @@ -326,7 +352,6 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{ if(Math.abs(0.5f - noise(x - 40, y, 2, 0.7, 80)) > 0.25f && Math.abs(0.5f - noise(x, y + sector.id*10, 1, 1, 60)) > 0.41f && !(roomseq.contains(r -> Mathf.within(x, y, r.x, r.y, 15)))){ floor = Blocks.tar; - ore = Blocks.air; } } @@ -347,7 +372,7 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{ floor = Blocks.magmarock; } } - }else if(floor != Blocks.basalt && floor != Blocks.ice && floor.asFloor().hasSurface()){ + }else if(genLakes && floor != Blocks.basalt && floor != Blocks.ice && floor.asFloor().hasSurface()){ float noise = noise(x + 782, y, 5, 0.75f, 260f, 1f); if(noise > 0.67f && !roomseq.contains(e -> Mathf.within(x, y, e.x, e.y, 14))){ if(noise > 0.72f){ @@ -355,7 +380,6 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{ }else{ floor = (floor == Blocks.sand ? floor : Blocks.darksand); } - ore = Blocks.air; } } @@ -470,6 +494,13 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{ } } + //remove invalid ores + for(Tile tile : tiles){ + if(tile.overlay().needsSurface && !tile.floor().hasSurface()){ + tile.setOverlay(Blocks.air); + } + } + Schematics.placeLaunchLoadout(spawn.x, spawn.y); for(Room espawn : enemies){ diff --git a/core/src/mindustry/world/blocks/environment/AirBlock.java b/core/src/mindustry/world/blocks/environment/AirBlock.java index 4ecd1667df..b100bbc4ef 100644 --- a/core/src/mindustry/world/blocks/environment/AirBlock.java +++ b/core/src/mindustry/world/blocks/environment/AirBlock.java @@ -13,6 +13,7 @@ public class AirBlock extends Floor{ hasShadow = false; useColor = false; wall = this; + needsSurface = false; } @Override From 23d0dfe6bf184e4c7ebe922551dcfae82d5c2562 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 4 Sep 2021 16:29:14 -0400 Subject: [PATCH 3/8] Deprecated DoubleOverlayFloor --- core/src/mindustry/content/Blocks.java | 2 +- .../blocks/environment/DoubleOverlayFloor.java | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 4393a72fba..11de55975b 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -442,7 +442,7 @@ public class Blocks implements ContentList{ Seq.with(metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6) .each(b -> b.asFloor().wall = darkMetal); - pebbles = new DoubleOverlayFloor("pebbles"); + pebbles = new OverlayFloor("pebbles"); tendrils = new OverlayFloor("tendrils"); diff --git a/core/src/mindustry/world/blocks/environment/DoubleOverlayFloor.java b/core/src/mindustry/world/blocks/environment/DoubleOverlayFloor.java index c26107caa1..5d6af64871 100644 --- a/core/src/mindustry/world/blocks/environment/DoubleOverlayFloor.java +++ b/core/src/mindustry/world/blocks/environment/DoubleOverlayFloor.java @@ -1,20 +1,10 @@ package mindustry.world.blocks.environment; -import arc.graphics.g2d.*; -import arc.math.*; -import mindustry.world.*; - +/** @deprecated pointless, just use your own sprite instead */ +@Deprecated public class DoubleOverlayFloor extends OverlayFloor{ public DoubleOverlayFloor(String name){ super(name); } - - @Override - public void drawBase(Tile tile){ - Draw.colorl(0.4f); - Draw.rect(variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))], tile.worldx(), tile.worldy() - 0.75f); - Draw.color(); - Draw.rect(variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))], tile.worldx(), tile.worldy()); - } } From 3985620289789d00a144faafd004a15d8475922f Mon Sep 17 00:00:00 2001 From: ZestyLemonade <56274831+sample-text-here@users.noreply.github.com> Date: Sat, 4 Sep 2021 14:43:03 -0700 Subject: [PATCH 4/8] space-begone (#5935) Co-authored-by: sample-text-here --- core/src/mindustry/ui/dialogs/ModsDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/ui/dialogs/ModsDialog.java b/core/src/mindustry/ui/dialogs/ModsDialog.java index 5c5d86634e..d31aa1694c 100644 --- a/core/src/mindustry/ui/dialogs/ModsDialog.java +++ b/core/src/mindustry/ui/dialogs/ModsDialog.java @@ -368,7 +368,7 @@ public class ModsDialog extends BaseDialog{ Seq all = Seq.with(content.getContentMap()).flatten().select(c -> c.minfo.mod == mod && c instanceof UnlockableContent).as(); if(all.any()){ dialog.cont.row(); - dialog.cont.button( "@mods.viewcontent", Icon.book, () -> { + dialog.cont.button("@mods.viewcontent", Icon.book, () -> { BaseDialog d = new BaseDialog(mod.meta.displayName()); d.cont.pane(cs -> { int i = 0; From 063d2ce6c065a71bb52f7683a4e8fd503363085f Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 4 Sep 2021 18:07:08 -0400 Subject: [PATCH 5/8] Implemented #5905 properly --- core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java b/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java index a8462502ea..7ef511d054 100644 --- a/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java +++ b/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java @@ -128,8 +128,9 @@ public class ItemLiquidGenerator extends PowerGenerator{ liquids.remove(liquid, used * power.graph.getUsageFraction()); productionEfficiency = baseLiquidEfficiency * used / maximumPossible; - if(used > 0.001f && Mathf.chance(0.05 * delta())){ + if(used > 0.001f && (generateTime -= delta()) <= 0f){ generateEffect.at(x + Mathf.range(generateEffectRnd), y + Mathf.range(generateEffectRnd)); + generateTime = 1f; } }else if(hasItems){ // No liquids accepted or none supplied, try using items if accepted From 15882016caa4ca7acfe7f205f2a5f0c1aeb5f5ef Mon Sep 17 00:00:00 2001 From: Volas171 <60143910+Volas171@users.noreply.github.com> Date: Sat, 4 Sep 2021 17:07:29 -0500 Subject: [PATCH 6/8] :facepalm: (#5936) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index a4b2c7ef83..2e7da6b094 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -13,7 +13,7 @@ }, { "name": "Omega", - "address": ["yeeth.mindustry.me", "yeet.mindustry.me:2345", "n3.mindustry.me:4444","n2.mindustry.me:4040", "n2.mindustry.me:4002", "n2.mindustry.me:4001", "n3.mindustry.me", "n2.mindustry.me:4004"] + "address": ["yeeth.mindustry.me", "yeeth.mindustry.me:2006", "yeeth.mindustry.me:2003","yeeth.mindustry.me:2002", "yeeth.mindustry.me:2001", "yeeth.mindustry.me:2007", "yeeth.mindustry.me:2005"] }, { "name": "MeowLand", From 0331d8c6c4a86035b8c5d58be75cc26dbc4bcc79 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 4 Sep 2021 20:37:26 -0400 Subject: [PATCH 7/8] Fixed #5937 --- core/src/mindustry/world/meta/StatValues.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/world/meta/StatValues.java b/core/src/mindustry/world/meta/StatValues.java index 3d60297e47..b556e7809c 100644 --- a/core/src/mindustry/world/meta/StatValues.java +++ b/core/src/mindustry/world/meta/StatValues.java @@ -126,7 +126,7 @@ public class StatValues{ if(state.isGame()){ var blocks = Vars.content.blocks() - .select(block -> block instanceof Floor f && indexer.isBlockPresent(block) && f.attributes.get(attr) != 0 && !(f.isLiquid && !floating)) + .select(block -> block instanceof Floor f && indexer.isBlockPresent(block) && f.attributes.get(attr) != 0 && !(f.isDeep() && !floating)) .as().with(s -> s.sort(f -> f.attributes.get(attr))); if(blocks.any()){ From f20b9c828c50d6b6385f20834a9f6a401c9aba19 Mon Sep 17 00:00:00 2001 From: SoMall-dumpling <57857764+SoMall-dumpling@users.noreply.github.com> Date: Sun, 5 Sep 2021 10:30:07 +0800 Subject: [PATCH 8/8] Update Blocks.java (#5939) simplest integer ratio --- core/src/mindustry/content/Blocks.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 11de55975b..9f73851010 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -683,10 +683,10 @@ public class Blocks implements ContentList{ disassembler = new Separator("disassembler"){{ requirements(Category.crafting, with(Items.plastanium, 40, Items.titanium, 100, Items.silicon, 150, Items.thorium, 80)); results = with( - Items.sand, 4, - Items.graphite, 2, - Items.titanium, 2, - Items.thorium, 2 + Items.sand, 2, + Items.graphite, 1, + Items.titanium, 1, + Items.thorium, 1 ); hasPower = true; craftTime = 15f;