this repo has no description
match generated EnemyTerritory field order to declaration order (#19)
Modify EnemyTerritoryWander and EnemyTerritoryPatrol generation to match the declaration order in https://github.com/bates64/papermario-dx/blob/main/include/npc.h. This allows the generated macros to be used in C++.
authored by
Alex Bates
and committed by
GitHub
abab34be
5b152472
+5
-8
+5
-8
src/main/java/game/map/marker/NpcComponent.java
+5
-8
src/main/java/game/map/marker/NpcComponent.java
···
737
737
if (moveType.get() == MoveType.Wander) {
738
738
lines.add("{");
739
739
lines.addf(" .wander = {");
740
-
lines.addf(" .isFlying = %s,", isFlying);
741
-
lines.addf(" .moveSpeedOverride = %s,", speedOverride);
742
-
lines.addf(" .wanderShape = %s,", useWanderCircle.get() ? "SHAPE_CYLINDER" : "SHAPE_RECT");
743
740
lines.addf(" .centerPos = { %d, %d, %d },",
744
741
wanderCenter.point.getX(), wanderCenter.point.getY(), wanderCenter.point.getZ());
745
742
if (useWanderCircle.get())
746
743
lines.addf(" .wanderSize = { %d },", wanderRadius.get());
747
744
else
748
745
lines.addf(" .wanderSize = { %d, %d },", wanderSizeX.get(), wanderSizeZ.get());
749
-
746
+
lines.addf(" .moveSpeedOverride = %s,", speedOverride);
747
+
lines.addf(" .wanderShape = %s,", useWanderCircle.get() ? "SHAPE_CYLINDER" : "SHAPE_RECT");
750
748
}
751
749
else if (moveType.get() == MoveType.Patrol) {
752
750
lines.add("{");
753
751
lines.addf(" .patrol = {");
754
-
lines.addf(" .isFlying = %s,", isFlying);
755
-
lines.addf(" .moveSpeedOverride = %s,", speedOverride);
756
752
lines.addf(" .numPoints = %d,", patrolPath.points.size());
757
753
lines.addf(" .points = {");
758
754
for (PathPoint wp : patrolPath.points) {
759
755
lines.addf(" { %d, %d, %d },", wp.point.getX(), wp.point.getY(), wp.point.getZ());
760
756
}
761
757
lines.addf(" },");
758
+
lines.addf(" .moveSpeedOverride = %s,", speedOverride);
762
759
}
763
760
764
761
if (moveType.get() != MoveType.Stationary) {
765
-
lines.addf(" .detectShape = %s,", useDetectCircle.get() ? "SHAPE_CYLINDER" : "SHAPE_RECT");
766
762
lines.addf(" .detectPos = { %d, %d, %d },",
767
763
detectCenter.point.getX(), detectCenter.point.getY(), detectCenter.point.getZ());
768
764
if (useDetectCircle.get())
769
765
lines.addf(" .detectSize = { %d },", detectRadius.get());
770
766
else
771
767
lines.addf(" .detectSize = { %d, %d },", detectSizeX.get(), detectSizeZ.get());
772
-
768
+
lines.addf(" .detectShape = %s,", useDetectCircle.get() ? "SHAPE_CYLINDER" : "SHAPE_RECT");
769
+
lines.addf(" .isFlying = %s,", isFlying);
773
770
lines.addf(" },");
774
771
lines.addf("}");
775
772
}