Skip to content

Commit 020fad0

Browse files
spacek531spacek531
committed
add diagonal banked and add legacy inverted sprite
1 parent 4d022c4 commit 020fad0

File tree

1 file changed

+44
-16
lines changed
  • rct-graphics-helper/angle_sections

1 file changed

+44
-16
lines changed

‎rct-graphics-helper/angle_sections/track.py‎

Lines changed: 44 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,19 @@
99

1010
# This is the order sprite groups are rendered in
1111
sprite_group_names = [
12-
"slopeFlat", "slopes12", "slopes25", "slopes42", "slopes60",
13-
"slopes75", "slopes90", "slopesLoop", "slopeInverted", "slopes8",
14-
"slopes16", "slopes50", "flatBanked22", "flatBanked45", "flatBanked67",
15-
"flatBanked90", "inlineTwists", "slopes12Banked22", "slopes8Banked22", "slopes25Banked22",
16-
"slopes25Banked45", "slopes12Banked45", "slopes25Banked67", "slopes25Banked90", "slopes25InlineTwists",
17-
"slopes42Banked22", "slopes42Banked45", "slopes42Banked67", "slopes42Banked90", "slopes60Banked22",
18-
"corkscrews", "restraintAnimation", "curvedLiftHillUp", "curvedLiftHillDown"
12+
"slopeFlat", "slopes12", "slopes25", "slopes42",
13+
"slopes60", "slopes75", "slopes90", "slopesLoop",
14+
"slopeInverted", "slopes8", "slopes16", "slopes50",
15+
"flatBanked22", "flatBanked45", "flatBanked67", "flatBanked90",
16+
"inlineTwists", "slopes12Banked22", "slopes8Banked22", "slopes25Banked22",
17+
"slopes8Banked45", "slopes16Banked22", "slopes16Banked45", "slopes25Banked45",
18+
"slopes12Banked45", "slopes25Banked67", "slopes25Banked90", "slopes25InlineTwists",
19+
"slopes42Banked22", "slopes42Banked45", "slopes42Banked67", "slopes42Banked90",
20+
"slopes60Banked22", "corkscrews", "restraintAnimation", "curvedLiftHillUp",
21+
"curvedLiftHillDown"
1922
]
2023

21-
# The sprites to render in each sprite group. The given rotation values are used in simple mode
24+
# The sprites to render in each sprite group. The given rotation values are unused
2225
sprite_group_manifest = {
2326
'slopeFlat': [
2427
[False, 32, 0, 0, 0]
@@ -116,6 +119,24 @@
116119
[False, 4, -22.2052, -22.5, 0],
117120
[False, 4, -22.2052, 22.5, 0]
118121
],
122+
'slopes8Banked45': [
123+
[True, 4, 8.0503, -45, 0],
124+
[True, 4, 8.0503, 45, 0],
125+
[True, 4, -8.0503, -45, 0],
126+
[True, 4, -8.0503, 45, 0]
127+
],
128+
'Slopes16Banked22': [
129+
[True, 4, 16.1005, -22.5, 0],
130+
[True, 4, 16.1005, 22.5, 0],
131+
[True, 4, -16.1005, -22.5, 0],
132+
[True, 4, -16.1005, 22.5, 0]
133+
],
134+
'Slopes16Banked45': [
135+
[True, 4, 16.1005, -45, 0],
136+
[True, 4, 16.1005, 45, 0],
137+
[True, 4, -16.1005, -45, 0],
138+
[True, 4, -16.1005, 45, 0]
139+
],
119140
'slopes25Banked45': [
120141
[False, 32, 22.2052, -45, 0],
121142
[False, 32, 22.2052, 45, 0],
@@ -243,6 +264,9 @@
243264
"slopes8Banked22": [4, "Diagonal flat-to-gentle-and-flat-to-banked transition track"],
244265
"slopes25Banked22": [4, "Orthogonal gentle slope flat-to-bank transition track"],
245266
"slopes25Banked45": [32, "Gentle sloped banked turns"],
267+
"slopes8Banked45": [4, "Diagonal flat-to-gentle slope banked transition track"],
268+
"slopes16Banked22": [4, "Diagonal gentle slope flat-to-banked transition track"],
269+
"slopes16Banked45": [4, "Diagonal gentle slope banked track"],
246270
"slopes12Banked45": [4, "Orthogonal flat-to-gentle-slope banked transition track"],
247271
"slopes25Banked67": [4, "Part of small zero-G rolls"],
248272
"slopes25Banked90": [4, "Part of small zero-G rolls"],
@@ -274,7 +298,8 @@
274298
"VEHICLE_SPRITE_FLAG_CORKSCREWS",
275299
"VEHICLE_SPRITE_FLAG_RESTRAINT_ANIMATION",
276300
"VEHICLE_SPRITE_FLAG_CURVED_LIFT_HILL",
277-
"VEHICLE_SPRITE_FLAG_ZERO_G_ROLLS"
301+
"VEHICLE_SPRITE_FLAG_ZERO_G_ROLLS",
302+
"VEHICLE_SPRITE_FLAG_INVERTED"
278303
]
279304

280305
# Display name of each sprite group, tooltip for each sprite group, default state of each sprite group
@@ -288,21 +313,23 @@
288313
"VEHICLE_SPRITE_FLAG_INLINE_TWISTS": ["Inline Twist", "Render sprites for the inline twist element", False],
289314
"VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS": ["", "", False],
290315
"VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS": ["", "", False],
316+
"VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS": ["", "", False],
291317
"VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS": ["", "", False],
292318
"VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS": ["Sloped Banked Turns","Render sprites for sloped banked turns", False],
293319
"VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_WHILE_BANKED_TRANSITIONS": ["", "", False],
294320
"VEHICLE_SPRITE_FLAG_CORKSCREWS": ["Corkscrew", "Render sprites for corkscrews", False],
295321
"VEHICLE_SPRITE_FLAG_RESTRAINT_ANIMATION": ["Animated Restraints", "Render animated restraints", False],
296322
"VEHICLE_SPRITE_FLAG_CURVED_LIFT_HILL": ["Spiral Lifthill", "Render sprites for spiral lifthills", False],
297-
"VEHICLE_SPRITE_FLAG_ZERO_G_ROLLS": ["Zero-G Rolls", "Render sprites for zero-G rolls", False]
323+
"VEHICLE_SPRITE_FLAG_ZERO_G_ROLLS": ["Zero-G Rolls", "Render sprites for zero-G rolls", False],
324+
"VEHICLE_SPRITE_FLAG_INVERTED": ["", "", False],
298325
}
299326

300327
# What full sprite groups each legacy group maps to
301328
legacy_group_map = {
302329
'VEHICLE_SPRITE_FLAG_FLAT': [ 'slopeFlat' ],
303330
'VEHICLE_SPRITE_FLAG_GENTLE_SLOPES': ['slopes12', 'slopes25'],
304331
'VEHICLE_SPRITE_FLAG_STEEP_SLOPES': ['slopes42', 'slopes60'],
305-
'VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES': ['slopes75', 'slopes90', 'slopesLoop','slopeInverted'],
332+
'VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES': ['slopes75', 'slopes90', 'slopesLoop'],
306333
'VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES': ['slopes8', 'slopes16','slopes50'],
307334
'VEHICLE_SPRITE_FLAG_FLAT_BANKED': ['flatBanked22','flatBanked45'],
308335
'VEHICLE_SPRITE_FLAG_INLINE_TWISTS': ['flatBanked67', 'flatBanked90', 'inlineTwists'],
@@ -314,15 +341,16 @@
314341
'VEHICLE_SPRITE_FLAG_CORKSCREWS': ['corkscrews'],
315342
'VEHICLE_SPRITE_FLAG_RESTRAINT_ANIMATION': ['restraintAnimation'],
316343
'VEHICLE_SPRITE_FLAG_CURVED_LIFT_HILL': ['curvedLiftHillUp', 'curvedLiftHillDown'],
317-
'VEHICLE_SPRITE_FLAG_ZERO_G_ROLLS': ["slopes60Banked22", "slopes42Banked22","slopes42Banked45","slopes42Banked67","slopes42Banked90", "slopes25InlineTwists", "slopes25Banked67","slopes25Banked90"]
344+
'VEHICLE_SPRITE_FLAG_ZERO_G_ROLLS': ["slopes60Banked22", "slopes42Banked22","slopes42Banked45","slopes42Banked67","slopes42Banked90", "slopes25InlineTwists", "slopes25Banked67","slopes25Banked90"],
345+
'VEHICLE_SPRITE_FLAG_INVERTED': ['slopeInverted']
318346
}
319347

320348
# What legacy groups are implied by combinations of other legacy sprite groups
321349
legacy_group_implications = {
322350
frozenset({'VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS'}): frozenset({'VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS','VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_WHILE_BANKED_TRANSITIONS','VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS'}),
323351
frozenset({'VEHICLE_SPRITE_FLAG_FLAT_BANKED','VEHICLE_SPRITE_FLAG_GENTLE_SLOPES'}): frozenset({'VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS'}),
324352
frozenset({'VEHICLE_SPRITE_FLAG_FLAT_BANKED','VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES'}): frozenset({'VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS'}),
325-
frozenset({'VEHICLE_SPRITE_FLAG_INLINE_TWISTS'}): frozenset({'VEHICLE_SPRITE_FLAG_FLAT_BANKED', 'VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES'}),
326-
frozenset({'VEHICLE_SPRITE_FLAG_CORKSCREWS'}): frozenset({'VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES'}),
327-
frozenset({'VEHICLE_SPRITE_FLAG_ZERO_G_ROLLS'}): frozenset({'VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS', 'VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS', 'VEHICLE_SPRITE_FLAG_GENTLE_SLOPES', 'VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES'})
328-
}
353+
frozenset({'VEHICLE_SPRITE_FLAG_INLINE_TWISTS'}): frozenset({'VEHICLE_SPRITE_FLAG_FLAT_BANKED', 'VEHICLE_SPRITE_FLAG_INVERTED'}),
354+
frozenset({'VEHICLE_SPRITE_FLAG_CORKSCREWS'}): frozenset({'VEHICLE_SPRITE_FLAG_INVERTED_SLOPES'}),
355+
frozenset({'VEHICLE_SPRITE_FLAG_ZERO_G_ROLLS'}): frozenset({'VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS', 'VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS', 'VEHICLE_SPRITE_FLAG_GENTLE_SLOPES', 'VEHICLE_SPRITE_FLAG_INVERTED'})
356+
}

0 commit comments

Comments
 (0)