Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2024-04-06 18:20:50 -04:00
parent 33f01112ca 58d6b3e2d6
commit f093f949f5
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/src/mindustry/entities/comp/ChildComp.java
View File

@@ -4,6 +4,7 @@ import arc.math.*;
import arc.util.*; import arc.util.*;
import mindustry.annotations.Annotations.*; import mindustry.annotations.Annotations.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.world.blocks.defense.turrets.BaseTurret.*;
@Component @Component
abstract class ChildComp implements Posc, Rotc{ abstract class ChildComp implements Posc, Rotc{
@@ -18,9 +19,14 @@ abstract class ChildComp implements Posc, Rotc{
if(parent != null){ if(parent != null){
offsetX = x - parent.getX(); offsetX = x - parent.getX();
offsetY = y - parent.getY(); offsetY = y - parent.getY();
if(rotWithParent && parent instanceof Rotc r){ if(rotWithParent){
offsetPos = -r.rotation(); if(parent instanceof Rotc r){
offsetRot = rotation - r.rotation(); 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 @Override
public void update(){ public void update(){
if(parent != null){ if(parent != null){
if(rotWithParent && parent instanceof Rotc r){ if(rotWithParent){
x = parent.getX() + Angles.trnsx(r.rotation() + offsetPos, offsetX, offsetY); if(parent instanceof Rotc r){
y = parent.getY() + Angles.trnsy(r.rotation() + offsetPos, offsetX, offsetY); x = parent.getX() + Angles.trnsx(r.rotation() + offsetPos, offsetX, offsetY);
rotation = r.rotation() + offsetRot; 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{ }else{
x = parent.getX() + offsetX; x = parent.getX() + offsetX;
y = parent.getY() + offsetY; y = parent.getY() + offsetY;

6
servers_v7.json
View File

@@ -29,8 +29,8 @@
"address": ["cn1.meiqiumdt.top","cn1.meiqiumdt.top:7000","cn1.meiqiumdt.top:8000","cn1.meiqiumdt.top:7013","cn1.meiqiumdt.top:9000"] "address": ["cn1.meiqiumdt.top","cn1.meiqiumdt.top:7000","cn1.meiqiumdt.top:8000","cn1.meiqiumdt.top:7013","cn1.meiqiumdt.top:9000"]
}, },
{ {
"name": "Crux's Revelations", "name": "Crux's Citadel",
"address": ["de-free-01.hosts.optikservers.com:31528","de-prem-01.hosts.optikservers.com:35922"] "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", "name": "Chilldustry",
@@ -291,7 +291,7 @@
}, },
{ {
"name": "NPTS", "name": "NPTS",
"address": ["94.198.54.132:26863"] "address": ["81.94.156.54"]
}, },
{ {
"name": "Skywar.VN", "name": "Skywar.VN",