From 6d49bd39be8f2878fab76a8278ba3a92047eed57 Mon Sep 17 00:00:00 2001 From: way-zer Date: Mon, 4 Oct 2021 21:21:02 +0800 Subject: [PATCH 1/5] Fix #5702 (#6098) --- core/src/mindustry/entities/comp/PuddleComp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/entities/comp/PuddleComp.java b/core/src/mindustry/entities/comp/PuddleComp.java index c14c49a826..09fc49dfe9 100644 --- a/core/src/mindustry/entities/comp/PuddleComp.java +++ b/core/src/mindustry/entities/comp/PuddleComp.java @@ -60,7 +60,7 @@ abstract class PuddleComp implements Posc, Puddlec, Drawc{ accepting = 0f; if(amount >= maxLiquid / 1.5f){ - float deposited = Math.min((amount - maxLiquid / 1.5f) / 4f, 0.3f) * Time.delta; + float deposited = Math.min((amount - maxLiquid / 1.5f) / 4f, 0.3f * Time.delta); int targets = 0; for(Point2 point : Geometry.d4){ Tile other = world.tile(tile.x + point.x, tile.y + point.y); From 77736f227f23d9959b5baca9200dade37df1b7fc Mon Sep 17 00:00:00 2001 From: Fatonndev <56699208+Fatonndev@users.noreply.github.com> Date: Mon, 4 Oct 2021 21:39:55 +0300 Subject: [PATCH 2/5] New domain name (#6076) * new domain name * moved to new domain --- servers_v6.json | 4 ++-- servers_v7.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/servers_v6.json b/servers_v6.json index 1c862a5c10..913fb3989b 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -60,8 +60,8 @@ "address": ["yeeth.mindustry.me:2004","185.86.230.61:25570"] }, { - "name": "md.obvilionnetwork.ru", - "address": ["obvilionnetwork.ru", "obvilionnetwork.ru:7001", "obvilionnetwork.ru:7002", "obvilionnetwork.ru:7003"] + "name": "Obvilion Network", + "address": ["obvilion.ru", "obvilion.ru:7001", "obvilion.ru:7002", "obvilion.ru:7003"] }, { "name": "Mindustry PLAY", diff --git a/servers_v7.json b/servers_v7.json index 3ac3890c61..49c9880814 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -33,7 +33,7 @@ }, { "name": "Obvilion Network", - "address": ["obvilionnetwork.ru:7004", "obvilionnetwork.ru:7005"] + "address": ["obvilion.ru:7004", "obvilion.ru:7005"] }, { "name": "io", From bc3da30d455a6c5b7286425c1efd4458c1e19689 Mon Sep 17 00:00:00 2001 From: Matthew Peng <54301439+MEEPofFaith@users.noreply.github.com> Date: Tue, 5 Oct 2021 09:36:29 -0700 Subject: [PATCH 3/5] Allow for dynamic laser absorption and insulation (#5047) * Allow for dynamic laser absorption * Might as well do insulated as well * null checks are important --- core/src/mindustry/entities/Damage.java | 2 +- core/src/mindustry/entities/Lightning.java | 2 +- core/src/mindustry/entities/comp/BuildingComp.java | 8 ++++++++ core/src/mindustry/world/blocks/power/PowerNode.java | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/entities/Damage.java b/core/src/mindustry/entities/Damage.java index e1d9e4e857..8dcea7cbb2 100644 --- a/core/src/mindustry/entities/Damage.java +++ b/core/src/mindustry/entities/Damage.java @@ -108,7 +108,7 @@ public class Damage{ furthest = null; boolean found = world.raycast(b.tileX(), b.tileY(), World.toTile(b.x + Tmp.v1.x), World.toTile(b.y + Tmp.v1.y), - (x, y) -> (furthest = world.tile(x, y)) != null && furthest.team() != b.team && furthest.block().absorbLasers); + (x, y) -> (furthest = world.tile(x, y)) != null && furthest.team() != b.team && (furthest.build != null && furthest.build.absorbLasers())); return found && furthest != null ? Math.max(6f, b.dst(furthest.worldx(), furthest.worldy())) : length; } diff --git a/core/src/mindustry/entities/Lightning.java b/core/src/mindustry/entities/Lightning.java index 6ba1dcc240..29181de687 100644 --- a/core/src/mindustry/entities/Lightning.java +++ b/core/src/mindustry/entities/Lightning.java @@ -53,7 +53,7 @@ public class Lightning{ world.raycastEach(World.toTile(from.getX()), World.toTile(from.getY()), World.toTile(to.getX()), World.toTile(to.getY()), (wx, wy) -> { Tile tile = world.tile(wx, wy); - if(tile != null && tile.block().insulated && tile.team() != team){ + if(tile != null && (tile.build != null && tile.build.isInsulated()) && tile.team() != team){ bhit = true; //snap it instead of removing lines.get(lines.size - 1).set(wx * tilesize, wy * tilesize); diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index d1f5cf3202..0e1b4ea09d 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -1241,6 +1241,14 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, return amount; } + public boolean absorbLasers(){ + return block.absorbLasers; + } + + public boolean isInsulated(){ + return block.insulated; + } + public boolean collide(Bullet other){ return true; } diff --git a/core/src/mindustry/world/blocks/power/PowerNode.java b/core/src/mindustry/world/blocks/power/PowerNode.java index f9fb216592..7d8c609b77 100644 --- a/core/src/mindustry/world/blocks/power/PowerNode.java +++ b/core/src/mindustry/world/blocks/power/PowerNode.java @@ -348,7 +348,7 @@ public class PowerNode extends PowerBlock{ public static boolean insulated(int x, int y, int x2, int y2){ return world.raycast(x, y, x2, y2, (wx, wy) -> { Building tile = world.build(wx, wy); - return tile != null && tile.block.insulated; + return tile != null && tile.isInsulated(); }); } From 373c73f492126ef43b352ca0dc3b1d3e2e3f0bea Mon Sep 17 00:00:00 2001 From: maxutka99 <43550690+maxutka99@users.noreply.github.com> Date: Tue, 5 Oct 2021 20:00:11 +0300 Subject: [PATCH 4/5] Update servers_v7.json (#6079) * Update servers_v7.json * Update servers_v7.json * Update servers_v7.json --- servers_v7.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers_v7.json b/servers_v7.json index 49c9880814..73a584e8aa 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -50,5 +50,9 @@ { "name": "Shiza Minigames", "address": ["shizashizashiza.ml"] + }, + { + "name": "devass.su", + "address": ["185.22.152.66"] } ] From 4ed471f77b05264cb5e2fac5f848e17fc210bca3 Mon Sep 17 00:00:00 2001 From: Darkness#3729 <79508138+Darkness6030@users.noreply.github.com> Date: Tue, 5 Oct 2021 20:42:06 +0300 Subject: [PATCH 5/5] Change server port (#6105) :-/ --- servers_v6.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v6.json b/servers_v6.json index 913fb3989b..f4ccaeb496 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -113,7 +113,7 @@ }, { "name": "NukeDustry", - "address": ["nukedustry.tk", "nukedustry.tk:6568"] + "address": ["nukedustry.tk:7777", "nukedustry.tk:8888"] }, { "name": "MindustryBR",