From 8ad39a5944c787ea695977fceac03a7eae19feb0 Mon Sep 17 00:00:00 2001 From: NealRead <160118416+NealRead@users.noreply.github.com> Date: Sat, 6 Apr 2024 20:50:08 +0700 Subject: [PATCH 1/3] Update servers_v7.json (#9712) --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 1bc2162697..d77ae5e3a9 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -291,7 +291,7 @@ }, { "name": "NPTS", - "address": ["94.198.54.132:26863"] + "address": ["81.94.156.54"] }, { "name": "Skywar.VN", From ef0f89efcfa42aaeb0df5ac8c9e520ab9ad79ed8 Mon Sep 17 00:00:00 2001 From: TheCrux_ <134880334+The1Crux@users.noreply.github.com> Date: Sat, 6 Apr 2024 09:50:19 -0400 Subject: [PATCH 2/3] Update servers_v7.json (#9699) don't ask how did i got 9 servers, just enjoy it --- servers_v7.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/servers_v7.json b/servers_v7.json index d77ae5e3a9..5ae3b91ff5 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -29,8 +29,8 @@ "address": ["cn1.meiqiumdt.top","cn1.meiqiumdt.top:7000","cn1.meiqiumdt.top:8000","cn1.meiqiumdt.top:7013","cn1.meiqiumdt.top:9000"] }, { - "name": "Crux's Revelations", - "address": ["de-free-01.hosts.optikservers.com:31528","de-prem-01.hosts.optikservers.com:35922"] + "name": "Crux's Citadel", + "address": ["45.158.9.198:32865","45.158.9.198:30055","45.158.9.198:32175","45.158.9.198:30252","94.130.132.149:35899","129.154.47.57:26645","94.130.132.149:35930","129.154.47.57:27993","129.154.47.57:26881"] }, { "name": "Chilldustry", From 58d6b3e2d6a646698b88a0d09490e2a0e32259dd Mon Sep 17 00:00:00 2001 From: MEEPofFaith <54301439+MEEPofFaith@users.noreply.github.com> Date: Sat, 6 Apr 2024 06:52:39 -0700 Subject: [PATCH 3/3] Make ChildComp work with turrets (#9706) --- .../mindustry/entities/comp/ChildComp.java | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/core/src/mindustry/entities/comp/ChildComp.java b/core/src/mindustry/entities/comp/ChildComp.java index f34a9198c9..03465fbf78 100644 --- a/core/src/mindustry/entities/comp/ChildComp.java +++ b/core/src/mindustry/entities/comp/ChildComp.java @@ -4,6 +4,7 @@ import arc.math.*; import arc.util.*; import mindustry.annotations.Annotations.*; import mindustry.gen.*; +import mindustry.world.blocks.defense.turrets.BaseTurret.*; @Component abstract class ChildComp implements Posc, Rotc{ @@ -18,9 +19,14 @@ abstract class ChildComp implements Posc, Rotc{ if(parent != null){ offsetX = x - parent.getX(); offsetY = y - parent.getY(); - if(rotWithParent && parent instanceof Rotc r){ - offsetPos = -r.rotation(); - offsetRot = rotation - r.rotation(); + if(rotWithParent){ + if(parent instanceof Rotc r){ + offsetPos = -r.rotation(); + offsetRot = rotation - r.rotation(); + }else if(parent instanceof BaseTurretBuild build){ + offsetPos = -build.rotation; + offsetRot = rotation - build.rotation; + } } } } @@ -28,10 +34,16 @@ abstract class ChildComp implements Posc, Rotc{ @Override public void update(){ if(parent != null){ - if(rotWithParent && parent instanceof Rotc r){ - x = parent.getX() + Angles.trnsx(r.rotation() + offsetPos, offsetX, offsetY); - y = parent.getY() + Angles.trnsy(r.rotation() + offsetPos, offsetX, offsetY); - rotation = r.rotation() + offsetRot; + if(rotWithParent){ + if(parent instanceof Rotc r){ + x = parent.getX() + Angles.trnsx(r.rotation() + offsetPos, offsetX, offsetY); + y = parent.getY() + Angles.trnsy(r.rotation() + offsetPos, offsetX, offsetY); + rotation = r.rotation() + offsetRot; + }else if(parent instanceof BaseTurretBuild build){ + x = parent.getX() + Angles.trnsx(build.rotation + offsetPos, offsetX, offsetY); + y = parent.getY() + Angles.trnsy(build.rotation + offsetPos, offsetX, offsetY); + rotation = build.rotation + offsetRot; + } }else{ x = parent.getX() + offsetX; y = parent.getY() + offsetY;