Skip to content

Commit a6791f2

Browse files
authored
Add: Constants for (new) station and roadstop animation and random triggers. (#375)
1 parent 25b3ba4 commit a6791f2

File tree

1 file changed

+28
-14
lines changed

1 file changed

+28
-14
lines changed

nml/global_constants.py

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -385,15 +385,6 @@ def constant_number(name, info, pos):
385385
# station tiles
386386
"STAT_ALL_TILES" : 0xFF,
387387

388-
# station animation triggers
389-
"STAT_ANIM_IS_BUILT" : 0,
390-
"STAT_ANIM_CARGO_ARRIVES" : 1,
391-
"STAT_ANIM_CARGO_REMOVED" : 2,
392-
"STAT_ANIM_TRAIN_ENTERS" : 3,
393-
"STAT_ANIM_TRAIN_LEAVES" : 4,
394-
"STAT_ANIM_TRAIN_LOAD_UNLOAD" : 5,
395-
"STAT_ANIM_250_TICKS" : 6,
396-
397388
# house flags
398389
"HOUSE_FLAG_NOT_SLOPED" : 1,
399390
"HOUSE_FLAG_ANIMATE" : 5,
@@ -517,11 +508,6 @@ def constant_number(name, info, pos):
517508
"OBJ_FLAG_RANDOM_ANIMATION": 12,
518509
"OBJ_FLAG_SCALE_BY_WATER" : 13,
519510

520-
# object animation triggers
521-
"OBJ_ANIM_IS_BUILT" : 0,
522-
"OBJ_ANIM_PERIODIC" : 1,
523-
"OBJ_ANIM_SYNC" : 2,
524-
525511
# Special values for object var 0x60
526512
"OBJECT_TYPE_OTHER_GRF" : 0xFFFE,
527513
"OBJECT_TYPE_NO_OBJECT" : 0xFFFF,
@@ -784,6 +770,13 @@ def constant_number(name, info, pos):
784770
"TRIGGER_STATION_TRAIN_LOADS_UNLOADS" : 4,
785771
"TRIGGER_STATION_TRAIN_RESERVES" : 5,
786772

773+
"TRIGGER_ROAD_STOP_NEW_CARGO" : 0,
774+
"TRIGGER_ROAD_STOP_NO_MORE_CARGO" : 1,
775+
"TRIGGER_ROAD_STOP_VEH_ARRIVES" : 2,
776+
"TRIGGER_ROAD_STOP_VEH_LEAVES" : 3,
777+
"TRIGGER_ROAD_STOP_VEH_LOADS_UNLOADS" : 4,
778+
"TRIGGER_ROAD_STOP_VEH_RESERVES" : 5,
779+
787780
"TRIGGER_HOUSE_TILELOOP" : 0,
788781
"TRIGGER_HOUSE_TOP_TILELOOP" : 1,
789782

@@ -819,6 +812,9 @@ def constant_number(name, info, pos):
819812
"ANIM_TRIGGER_INDTILE_RECEIVED_CARGO" : 3,
820813
"ANIM_TRIGGER_INDTILE_DISTRIBUTES_CARGO" : 4,
821814

815+
"OBJ_ANIM_IS_BUILT" : "ANIM_TRIGGER_OBJ_BUILT",
816+
"OBJ_ANIM_PERIODIC" : "ANIM_TRIGGER_OBJ_TILELOOP",
817+
"OBJ_ANIM_SYNC" : "ANIM_TRIGGER_OBJ_256_TICKS",
822818
"ANIM_TRIGGER_OBJ_BUILT" : 0,
823819
"ANIM_TRIGGER_OBJ_TILELOOP" : 1,
824820
"ANIM_TRIGGER_OBJ_256_TICKS" : 2,
@@ -837,6 +833,24 @@ def constant_number(name, info, pos):
837833
"ANIM_TRIGGER_ROAD_STOP_VEH_LEAVE" : 4,
838834
"ANIM_TRIGGER_ROAD_STOP_VEH_LOAD" : 5,
839835
"ANIM_TRIGGER_ROAD_STOP_250_TICKS" : 6,
836+
"ANIM_TRIGGER_ROAD_STOP_TILELOOP" : 7,
837+
838+
"STAT_ANIM_IS_BUILT" : "ANIM_TRIGGER_STAT_BUILT",
839+
"STAT_ANIM_CARGO_ARRIVES" : "ANIM_TRIGGER_STAT_NEW_CARGO",
840+
"STAT_ANIM_CARGO_REMOVED" : "ANIM_TRIGGER_STAT_CARGO_TAKEN",
841+
"STAT_ANIM_TRAIN_ENTERS" : "ANIM_TRIGGER_STAT_VEH_ENTER",
842+
"STAT_ANIM_TRAIN_LEAVES" : "ANIM_TRIGGER_STAT_VEH_LEAVE",
843+
"STAT_ANIM_TRAIN_LOAD_UNLOAD" : "ANIM_TRIGGER_STAT_VEH_LOAD",
844+
"STAT_ANIM_250_TICKS" : "ANIM_TRIGGER_STAT_250_TICKS",
845+
"ANIM_TRIGGER_STAT_BUILT" : 0,
846+
"ANIM_TRIGGER_STAT_NEW_CARGO" : 1,
847+
"ANIM_TRIGGER_STAT_CARGO_TAKEN" : 2,
848+
"ANIM_TRIGGER_STAT_VEH_ENTER" : 3,
849+
"ANIM_TRIGGER_STAT_VEH_LEAVE" : 4,
850+
"ANIM_TRIGGER_STAT_VEH_LOAD" : 5,
851+
"ANIM_TRIGGER_STAT_250_TICKS" : 6,
852+
"ANIM_TRIGGER_STAT_TILELOOP" : 7,
853+
"ANIM_TRIGGER_STAT_TRAIN_RESERVES" : 8,
840854

841855
# Animation looping
842856
"ANIMATION_NON_LOOPING" : 0,

0 commit comments

Comments
 (0)