From a55a38b8952204a04aa789a4958c8f86690e8f5e Mon Sep 17 00:00:00 2001 From: KJeff01 Date: Mon, 17 Jul 2023 11:34:48 -0500 Subject: [PATCH] Add T and L shaped Nexus faction walls Co-authored-by: MaNGusT- --- data/base/structs/blwallh_l_nex.pie | 103 +++++++++++++++++++++ data/base/structs/blwallh_nex.pie | 137 +++++++++++++--------------- data/base/structs/blwallh_t_nex.pie | 117 ++++++++++++++++++++++++ src/faction.cpp | 2 + 4 files changed, 287 insertions(+), 72 deletions(-) create mode 100644 data/base/structs/blwallh_l_nex.pie create mode 100644 data/base/structs/blwallh_t_nex.pie diff --git a/data/base/structs/blwallh_l_nex.pie b/data/base/structs/blwallh_l_nex.pie new file mode 100644 index 00000000000..36c0e7ed313 --- /dev/null +++ b/data/base/structs/blwallh_l_nex.pie @@ -0,0 +1,103 @@ +PIE 3 +TYPE 10200 +TEXTURE 0 page-12-player-buildings.png 0 0 +LEVELS 1 +LEVEL 1 +POINTS 44 + -60 -10 -26 + 12 65 -12 + 26 -10 -26 + -60 65 -12 + -60 78 15 + -15 65 15 + -15 78 15 + -60 65 15 + -69 -10 38 + -69 89 -18 + -69 -10 -38 + -69 89 18 + -60 89 18 + -60 -10 -38 + -60 89 -18 + -60 -10 38 + -60 -10 26 + -12 65 12 + -60 65 12 + -26 -10 26 + -15 78 -15 + 15 65 -15 + -15 65 -15 + 15 78 -15 + -60 78 -15 + -60 65 -15 + -26 -10 60 + -12 65 60 + 15 78 60 + 15 65 15 + 15 78 15 + 15 65 60 + 38 -10 69 + -18 89 69 + -38 -10 69 + 18 89 69 + 18 89 60 + -38 -10 60 + -18 89 60 + 38 -10 60 + 26 -10 60 + 12 65 60 + -15 78 60 + -15 65 60 +POLYGONS 52 + 200 3 0 1 2 0.675622 0.810599 0.738227 0.703738 0.750241 0.810599 + 200 3 1 0 3 0.738227 0.703738 0.675622 0.810599 0.675622 0.703785 + 200 3 4 5 6 0.103341 0.875 0.0518479 0.910156 0.0518479 0.875 + 200 3 5 4 7 0.0518479 0.910156 0.103341 0.875 0.103341 0.910156 + 200 3 8 9 10 0.683482 0.810544 0.778402 0.666859 0.814882 0.810544 + 200 3 9 8 11 0.778402 0.666859 0.683482 0.810544 0.719962 0.666859 + 200 3 12 13 14 0.778402 0.666859 0.683482 0.810544 0.719962 0.666859 + 200 3 13 12 15 0.683482 0.810544 0.778402 0.666859 0.814882 0.810544 + 200 3 12 9 11 0.720064 0.666887 0.778092 0.681846 0.720064 0.681846 + 200 3 9 12 14 0.778092 0.681846 0.720064 0.666887 0.778092 0.666887 + 200 3 14 10 9 0.804599 0.667083 0.791815 0.810609 0.791815 0.667083 + 200 3 10 14 13 0.791815 0.810609 0.804599 0.667083 0.804599 0.810609 + 200 3 15 11 8 0.791815 0.810609 0.804599 0.667083 0.804599 0.810609 + 200 3 11 15 12 0.804599 0.667083 0.791815 0.810609 0.791815 0.667083 + 200 3 16 17 18 0.738227 0.810599 0.675622 0.703738 0.738227 0.703785 + 200 3 17 16 19 0.675622 0.703738 0.738227 0.810599 0.693688 0.810599 + 200 3 20 21 22 0.0518479 0.875 0.0121332 0.910156 0.0518479 0.910156 + 200 3 21 20 23 0.0121332 0.910156 0.0518479 0.875 0.0121332 0.875 + 200 3 24 22 25 0.103341 0.875 0.0518479 0.910156 0.103341 0.910156 + 200 3 22 24 20 0.0518479 0.910156 0.103341 0.875 0.0518479 0.875 + 200 3 4 20 24 0.103341 0.93356 0.0518479 0.878906 0.103341 0.878906 + 200 3 20 4 6 0.0518479 0.878906 0.103341 0.93356 0.0518479 0.93356 + 200 3 25 5 7 0.218642 0.93193 0.164611 0.877898 0.218642 0.877898 + 200 3 5 25 22 0.164611 0.877898 0.218642 0.93193 0.164611 0.93193 + 200 3 26 17 19 0.738227 0.810599 0.675622 0.703738 0.693688 0.810599 + 200 3 17 26 27 0.675622 0.703738 0.738227 0.810599 0.738227 0.703785 + 200 3 28 29 30 0.103341 0.875 0.0518479 0.910156 0.0518479 0.875 + 200 3 29 28 31 0.0518479 0.910156 0.103341 0.875 0.103341 0.910156 + 200 3 32 33 34 0.683482 0.810544 0.778402 0.666859 0.814882 0.810544 + 200 3 33 32 35 0.778402 0.666859 0.683482 0.810544 0.719962 0.666859 + 200 3 36 37 38 0.778402 0.666859 0.683482 0.810544 0.719962 0.666859 + 200 3 37 36 39 0.683482 0.810544 0.778402 0.666859 0.814882 0.810544 + 200 3 36 33 35 0.720064 0.666887 0.778092 0.681846 0.720064 0.681846 + 200 3 33 36 38 0.778092 0.681846 0.720064 0.666887 0.778092 0.666887 + 200 3 38 34 33 0.804599 0.667083 0.791815 0.810609 0.791815 0.667083 + 200 3 34 38 37 0.791815 0.810609 0.804599 0.667083 0.804599 0.810609 + 200 3 39 35 32 0.791815 0.810609 0.804599 0.667083 0.804599 0.810609 + 200 3 35 39 36 0.804599 0.667083 0.791815 0.810609 0.791815 0.667083 + 200 3 40 1 41 0.675622 0.810599 0.738227 0.703738 0.675622 0.703785 + 200 3 1 40 2 0.738227 0.703738 0.675622 0.810599 0.750241 0.810599 + 200 3 30 20 6 0.0518479 0.93356 0.0121332 0.878906 0.0518479 0.878906 + 200 3 20 30 23 0.0121332 0.878906 0.0518479 0.93356 0.0121332 0.93356 + 200 3 5 21 29 0.164611 0.93193 0.111389 0.877898 0.164611 0.877898 + 200 3 21 5 22 0.111389 0.877898 0.164611 0.93193 0.111389 0.93193 + 200 3 23 29 21 0.0121332 0.875 0.0518479 0.910156 0.0121332 0.910156 + 200 3 29 23 30 0.0518479 0.910156 0.0121332 0.875 0.0518479 0.875 + 200 3 42 5 43 0.103341 0.875 0.0518479 0.910156 0.103341 0.910156 + 200 3 5 42 6 0.0518479 0.910156 0.103341 0.875 0.0518479 0.875 + 200 3 28 6 42 0.103341 0.93356 0.0518479 0.878906 0.103341 0.878906 + 200 3 6 28 30 0.0518479 0.878906 0.103341 0.93356 0.0518479 0.93356 + 200 3 43 29 31 0.218642 0.93193 0.164611 0.877898 0.218642 0.877898 + 200 3 29 43 5 0.164611 0.877898 0.218642 0.93193 0.164611 0.93193 diff --git a/data/base/structs/blwallh_nex.pie b/data/base/structs/blwallh_nex.pie index c2fbcd61739..e3c9b2cf2d7 100644 --- a/data/base/structs/blwallh_nex.pie +++ b/data/base/structs/blwallh_nex.pie @@ -1,78 +1,71 @@ -PIE 2 +PIE 3 TYPE 10200 -TEXTURE 0 page-12-player-buildings.png 256 256 +TEXTURE 0 page-12-player-buildings.png 0 0 LEVELS 1 LEVEL 1 POINTS 32 - -66 65 -12 - 65 -10 -28 - -65 -10 -28 - 64 65 -12 - 64 65 10 - -65 -10 26 - 65 -10 26 - -66 65 10 - -65 61 14 - 64 73 14 - -65 73 14 - 64 61 14 - 64 61 -15 - -65 73 -15 - 64 73 -15 - -65 61 -15 - -69 89 -17 - -62 -10 -38 + 60 -10 -26 + -60 65 -12 + 60 65 -12 + -60 -10 -26 + -60 -10 26 + 60 65 12 + -60 65 12 + 60 -10 26 + 60 78 15 + -60 65 15 + 60 65 15 + -60 78 15 + -60 78 -15 + 60 65 -15 + -60 65 -15 + 60 78 -15 + -69 -10 38 + -69 89 -18 -69 -10 -38 - -62 89 -17 - -62 89 16 - -69 -10 36 - -62 -10 36 - -69 89 16 + -69 89 18 + -60 89 18 + -60 -10 -38 + -60 89 -18 + -60 -10 38 + 60 -10 38 60 89 -18 - 67 -10 -39 - 60 -10 -39 - 67 89 -18 - 67 89 15 - 60 -10 36 - 67 -10 36 - 60 89 15 -POLYGONS 39 - 200 3 0 1 2 172 171 210 207 172 207 - 200 3 0 3 1 172 171 210 171 210 207 - 200 3 4 5 6 210 171 172 207 210 207 - 200 3 4 7 5 210 171 172 171 172 207 - 200 3 8 9 10 1 233 56 224 1 224 - 200 3 8 11 9 1 233 56 233 56 224 - 200 3 12 13 14 56 233 1 224 56 224 - 200 3 12 15 13 56 233 1 233 1 224 - 200 3 16 17 18 195 171 203 207 203 207 - 200 3 16 19 17 195 171 195 171 203 207 - 200 3 20 21 22 182 171 174 207 174 207 - 200 3 20 23 21 182 171 182 171 174 207 - 200 3 24 25 26 195 171 204 207 204 207 - 200 3 24 27 25 195 171 195 171 204 207 - 200 3 28 29 30 182 171 174 207 174 207 - 200 3 28 31 29 182 171 182 171 174 207 - 200 3 0 5 7 105 172 92 207 92 172 - 200 3 0 2 5 105 172 105 207 92 207 - 200 3 1 4 6 105 207 92 172 92 207 - 200 3 1 3 4 105 207 105 172 92 172 - 200 3 10 13 8 54 224 55 238 45 224 - 200 3 13 15 8 55 238 45 238 45 224 - 200 3 14 9 12 55 238 54 224 45 238 - 200 3 9 11 12 54 224 45 224 45 238 - 200 3 16 21 23 195 171 174 207 182 171 - 200 3 16 18 21 195 171 203 207 174 207 - 200 3 17 20 22 203 207 182 171 174 207 - 200 3 17 19 20 203 207 195 171 182 171 - 200 3 24 29 31 195 171 174 207 182 171 - 200 3 24 26 29 195 171 204 207 174 207 - 200 3 25 28 30 204 207 182 171 174 207 - 200 3 25 27 28 204 207 195 171 182 171 - 200 3 14 13 9 56 225 1 225 56 238 - 200 3 13 10 9 1 225 1 238 56 238 - 200 3 23 20 16 182 171 182 171 195 171 - 200 3 20 19 16 182 171 195 171 195 171 - 200 3 31 28 24 182 171 182 171 195 171 - 200 3 28 27 24 182 171 195 171 195 171 - 200 3 28 27 24 182 171 195 171 195 171 + 60 -10 -38 + 60 89 18 + 69 89 18 + 69 -10 -38 + 69 89 -18 + 69 -10 38 +POLYGONS 32 + 200 3 0 1 2 0.81925 0.810599 0.675622 0.703785 0.819557 0.70369 + 200 3 1 0 3 0.675622 0.703785 0.81925 0.810599 0.675622 0.810599 + 200 3 4 5 6 0.675622 0.810599 0.819557 0.70369 0.675622 0.703785 + 200 3 5 4 7 0.819557 0.70369 0.675622 0.810599 0.81925 0.810599 + 200 3 8 9 10 0.21875 0.875 0.00390625 0.910156 0.21875 0.910156 + 200 3 9 8 11 0.00390625 0.910156 0.21875 0.875 0.00390625 0.875 + 200 3 12 13 14 0.00390625 0.875 0.21875 0.910156 0.00390625 0.910156 + 200 3 13 12 15 0.21875 0.910156 0.00390625 0.875 0.21875 0.875 + 200 3 16 17 18 0.683482 0.810544 0.778402 0.666859 0.814882 0.810544 + 200 3 17 16 19 0.778402 0.666859 0.683482 0.810544 0.719962 0.666859 + 200 3 20 21 22 0.778402 0.666859 0.683482 0.810544 0.719962 0.666859 + 200 3 21 20 23 0.683482 0.810544 0.778402 0.666859 0.814882 0.810544 + 200 3 24 25 26 0.814882 0.810544 0.719962 0.666859 0.683482 0.810544 + 200 3 25 24 27 0.719962 0.666859 0.814882 0.810544 0.778402 0.666859 + 200 3 28 29 30 0.778402 0.666859 0.683482 0.810544 0.719962 0.666859 + 200 3 29 28 31 0.683482 0.810544 0.778402 0.666859 0.814882 0.810544 + 200 3 8 12 11 0.21875 0.93356 0.00390625 0.878906 0.00390625 0.93356 + 200 3 12 8 15 0.00390625 0.878906 0.21875 0.93356 0.21875 0.878906 + 200 3 20 17 19 0.720064 0.666887 0.778092 0.681846 0.720064 0.681846 + 200 3 17 20 22 0.778092 0.681846 0.720064 0.666887 0.778092 0.666887 + 200 3 22 18 17 0.804599 0.667083 0.791815 0.810609 0.791815 0.667083 + 200 3 18 22 21 0.791815 0.810609 0.804599 0.667083 0.804599 0.810609 + 200 3 23 19 16 0.791815 0.810609 0.804599 0.667083 0.804599 0.810609 + 200 3 19 23 20 0.804599 0.667083 0.791815 0.810609 0.791815 0.667083 + 200 3 31 27 24 0.791815 0.810609 0.804599 0.667082 0.804599 0.810609 + 200 3 27 31 28 0.804599 0.667082 0.791815 0.810609 0.791815 0.667082 + 200 3 28 25 27 0.720064 0.666887 0.778092 0.681846 0.720064 0.681846 + 200 3 25 28 30 0.778092 0.681846 0.720064 0.666887 0.778092 0.666887 + 200 3 30 26 25 0.804599 0.667082 0.791815 0.810609 0.791815 0.667082 + 200 3 26 30 29 0.791815 0.810609 0.804599 0.667082 0.804599 0.810609 + 200 3 14 10 9 0.218642 0.93193 0.00251602 0.877898 0.218642 0.877898 + 200 3 10 14 13 0.00251602 0.877898 0.218642 0.93193 0.00251602 0.93193 diff --git a/data/base/structs/blwallh_t_nex.pie b/data/base/structs/blwallh_t_nex.pie new file mode 100644 index 00000000000..de254174d0f --- /dev/null +++ b/data/base/structs/blwallh_t_nex.pie @@ -0,0 +1,117 @@ +PIE 3 +TYPE 10200 +TEXTURE 0 page-12-player-buildings.png 0 0 +LEVELS 1 +LEVEL 1 +POINTS 56 + -26 -10 60 + -12 65 12 + -26 -10 26 + -12 65 60 + 15 78 60 + 15 65 15 + 15 78 15 + 15 65 60 + 38 -10 69 + -18 89 69 + -38 -10 69 + 18 89 69 + 18 89 60 + -38 -10 60 + -18 89 60 + 38 -10 60 + 26 -10 60 + 12 65 12 + 12 65 60 + 26 -10 26 + -15 78 60 + -15 65 15 + -15 65 60 + -15 78 15 + 60 -10 -26 + -60 65 -12 + 60 65 -12 + -60 -10 -26 + -60 -10 26 + 60 65 12 + -60 65 12 + 60 -10 26 + 60 78 15 + -60 65 15 + 60 65 15 + -60 78 15 + -60 78 -15 + 60 65 -15 + -60 65 -15 + 60 78 -15 + -69 -10 38 + -69 89 -18 + -69 -10 -38 + -69 89 18 + -60 89 18 + -60 -10 -38 + -60 89 -18 + -60 -10 38 + 60 -10 38 + 60 89 -18 + 60 -10 -38 + 60 89 18 + 69 89 18 + 69 -10 -38 + 69 89 -18 + 69 -10 38 +POLYGONS 54 + 200 3 0 1 2 0.675622 0.810599 0.734555 0.703738 0.716855 0.810599 + 200 3 1 0 3 0.734555 0.703738 0.675622 0.810599 0.675622 0.703785 + 200 3 4 5 6 0.0329687 0.875 0.11331 0.910156 0.11331 0.875 + 200 3 5 4 7 0.11331 0.910156 0.0329687 0.875 0.0329687 0.910156 + 200 3 8 9 10 0.683482 0.810544 0.778402 0.666859 0.814882 0.810544 + 200 3 9 8 11 0.778402 0.666859 0.683482 0.810544 0.719962 0.666859 + 200 3 12 13 14 0.778402 0.666859 0.683482 0.810544 0.719962 0.666859 + 200 3 13 12 15 0.683482 0.810544 0.778402 0.666859 0.814882 0.810544 + 200 3 12 9 11 0.720064 0.666887 0.778092 0.681846 0.720064 0.681846 + 200 3 9 12 14 0.778092 0.681846 0.720064 0.666887 0.778092 0.666887 + 200 3 14 10 9 0.804599 0.667083 0.791815 0.810609 0.791815 0.667083 + 200 3 10 14 13 0.791815 0.810609 0.804599 0.667083 0.804599 0.810609 + 200 3 15 11 8 0.791815 0.810609 0.804599 0.667083 0.804599 0.810609 + 200 3 11 15 12 0.804599 0.667083 0.791815 0.810609 0.791815 0.667083 + 200 3 16 17 18 0.675622 0.810599 0.734555 0.703738 0.675622 0.703785 + 200 3 17 16 19 0.734555 0.703738 0.675622 0.810599 0.716855 0.810599 + 200 3 20 21 22 0.0329687 0.875 0.11331 0.910156 0.0329687 0.910156 + 200 3 21 20 23 0.11331 0.910156 0.0329687 0.875 0.11331 0.875 + 200 3 4 23 20 0.0329687 0.93356 0.11331 0.878906 0.0329687 0.878906 + 200 3 23 4 6 0.11331 0.878906 0.0329687 0.93356 0.11331 0.93356 + 200 3 22 5 7 0.218642 0.93193 0.110579 0.877898 0.218642 0.877898 + 200 3 5 22 21 0.110579 0.877898 0.218642 0.93193 0.110579 0.93193 + 200 3 24 25 26 0.81925 0.810599 0.675622 0.703785 0.819557 0.70369 + 200 3 25 24 27 0.675622 0.703785 0.81925 0.810599 0.675622 0.810599 + 200 3 28 29 30 0.675622 0.810599 0.819557 0.70369 0.675622 0.703785 + 200 3 29 28 31 0.819557 0.70369 0.675622 0.810599 0.81925 0.810599 + 200 3 32 33 34 0.21875 0.875 0.00390625 0.910156 0.21875 0.910156 + 200 3 33 32 35 0.00390625 0.910156 0.21875 0.875 0.00390625 0.875 + 200 3 36 37 38 0.00390625 0.875 0.21875 0.910156 0.00390625 0.910156 + 200 3 37 36 39 0.21875 0.910156 0.00390625 0.875 0.21875 0.875 + 200 3 40 41 42 0.683482 0.810544 0.778402 0.666859 0.814882 0.810544 + 200 3 41 40 43 0.778402 0.666859 0.683482 0.810544 0.719962 0.666859 + 200 3 44 45 46 0.778402 0.666859 0.683482 0.810544 0.719962 0.666859 + 200 3 45 44 47 0.683482 0.810544 0.778402 0.666859 0.814882 0.810544 + 200 3 48 49 50 0.814882 0.810544 0.719962 0.666859 0.683482 0.810544 + 200 3 49 48 51 0.719962 0.666859 0.814882 0.810544 0.778402 0.666859 + 200 3 52 53 54 0.778402 0.666859 0.683482 0.810544 0.719962 0.666859 + 200 3 53 52 55 0.683482 0.810544 0.778402 0.666859 0.814882 0.810544 + 200 3 32 36 35 0.21875 0.93356 0.00390625 0.878906 0.00390625 0.93356 + 200 3 36 32 39 0.00390625 0.878906 0.21875 0.93356 0.21875 0.878906 + 200 3 44 41 43 0.720064 0.666887 0.778092 0.681846 0.720064 0.681846 + 200 3 41 44 46 0.778092 0.681846 0.720064 0.666887 0.778092 0.666887 + 200 3 46 42 41 0.804599 0.667083 0.791815 0.810609 0.791815 0.667083 + 200 3 42 46 45 0.791815 0.810609 0.804599 0.667083 0.804599 0.810609 + 200 3 47 43 40 0.791815 0.810609 0.804599 0.667083 0.804599 0.810609 + 200 3 43 47 44 0.804599 0.667083 0.791815 0.810609 0.791815 0.667083 + 200 3 55 51 48 0.791815 0.810609 0.804599 0.667082 0.804599 0.810609 + 200 3 51 55 52 0.804599 0.667082 0.791815 0.810609 0.791815 0.667082 + 200 3 52 49 51 0.720064 0.666887 0.778092 0.681846 0.720064 0.681846 + 200 3 49 52 54 0.778092 0.681846 0.720064 0.666887 0.778092 0.666887 + 200 3 54 50 49 0.804599 0.667082 0.791815 0.810609 0.791815 0.667082 + 200 3 50 54 53 0.791815 0.810609 0.804599 0.667082 0.804599 0.810609 + 200 3 38 34 33 0.218642 0.93193 0.00251602 0.877898 0.218642 0.877898 + 200 3 34 38 37 0.00251602 0.877898 0.218642 0.93193 0.00251602 0.93193 diff --git a/src/faction.cpp b/src/faction.cpp index 72a25b1caca..08f23825416 100644 --- a/src/faction.cpp +++ b/src/faction.cpp @@ -37,6 +37,8 @@ std::array getInitialFactionsMappingTable() { {"blwallc1.pie", "blwallc_nex.pie"}, {"blwallh.pie", "blwallh_nex.pie"}, + {"blwallh_t.pie", "blwallh_t_nex.pie"}, + {"blwallh_l.pie", "blwallh_l_nex.pie"}, {"blhq.pie", "blhq_nex.pie"}, {"blguard1.pie", "blguard_nex.pie"}, {"blguardr.pie", "blguardr_nex.pie"},