Commit Graph

84 Commits

Author SHA1 Message Date
Jonathan G Rennison
38c2fa3b66 Add a change counter value special order type 2022-10-13 20:09:20 +01:00
Jonathan G Rennison
7c4c75d181 Add tracerestrict conditional on direction of order target from signal 2022-09-07 22:53:03 +01:00
Jonathan G Rennison
12566f05ca Add tracerestrict actions used flags for order conditionals present 2022-07-01 00:16:26 +01:00
Jonathan G Rennison
6a69a5495f Add tracerestrict action to set combined normal/shunt signal mode
Add associated conditional to get reservation end tile
2022-06-28 01:16:57 +01:00
Jonathan G Rennison
b37209c3af Tracerestrict: Programs maintain a list of signals referencing them 2022-06-11 22:15:19 +01:00
Jonathan G Rennison
02dabad81e Tracerestrict: Add flag for whether reserve through is always set 2022-06-11 16:40:32 +01:00
Jonathan G Rennison
c4ea3e0335 Fully simulate slot occupancy changes in PBS res end dry-run mode 2022-03-14 02:26:03 +00:00
Jonathan G Rennison
221120090e Fix wrong prefix in trace restrict enum
TRSACF_REMOVE_SPEED_ADAPT_EXEMPT in
TraceRestrictSpeedAdaptationControlField
2022-03-07 00:40:22 +00:00
Jonathan G Rennison
92142e5684 Add routing restriction action to make exempt from speed adaptation 2022-03-06 22:39:53 +00:00
Jonathan G Rennison
904ff6757d Add slot support to road vehicles, ships and aircraft 2022-01-19 00:10:49 +00:00
Jonathan G Rennison
b23d394f0b Handle predictable conditional orders in timetable window 2022-01-15 15:57:09 +00:00
Jonathan G Rennison
b259d04339 Add tunnel/bridge entrance/exit values to entry direction conditional 2021-11-13 22:52:27 +00:00
Jonathan G Rennison
74bfe4e6d2 Allow placing routing restrictions on tunnel/bridge entrance/exit signals
No reserve through support
2021-11-13 22:28:14 +00:00
Jonathan G Rennison
dad007e16a Fix spelling of TRPRF_SPEED_RESTRICTION_SET 2021-11-13 02:00:37 +00:00
Jonathan G Rennison
53139c2405 Add current day/month to tracerestrict and conditional order conditionals 2021-10-26 23:39:40 +01:00
Jonathan G Rennison
b8d5113c5a Tracerestrict: Add slot action mode, try to acquire (only on reserve) 2021-08-15 22:39:52 +01:00
Jonathan G Rennison
0579c8755c Add tracerestrict action: No PBS signal back PF penalty 2021-05-25 18:50:36 +01:00
Jonathan G Rennison
112b235b71 Fix name prefix of TraceRestrictNewsControlField enum values 2021-05-25 18:21:24 +01:00
Jonathan G Rennison
2e28bc8e6a Tracerestrict: Add engine class conditional 2021-05-13 23:49:03 +01:00
Jonathan G Rennison
aff89b61f5 Add tracerestrict reserved tiles ahead conditional 2021-02-13 03:29:35 +00:00
Jonathan G Rennison
35d720b0ad Add tracerestrict PBS end signal conditional
This is for realistic braking long reserve
2021-02-13 02:12:16 +00:00
Jonathan G Rennison
d42ad99688 Add conditional order for current time/date 2021-02-10 18:34:46 +00:00
Jonathan G Rennison
270a748b64 Tracerestrict: Add time/date conditional 2020-11-27 18:43:32 +00:00
Jonathan G Rennison
abb7b69861 Add slot and counter support to programmable pre-signals 2020-09-01 18:37:53 +01:00
Jonathan G Rennison
817bc44a3e Initial implementation of tracerestrict counter mechanism 2020-08-31 19:08:35 +01:00
Jonathan G Rennison
d2594ece79 Add routing restrictions action to control news reports about stuck trains 2020-08-29 13:38:19 +01:00
Jonathan G Rennison
7960db35f2 Merge branch 'master' into jgrpp
# Conflicts:
#	config.lib
#	projects/openttd_vs140.vcxproj
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj
#	projects/openttd_vs142.vcxproj.filters
#	src/aircraft_cmd.cpp
#	src/base_station_base.h
#	src/core/pool_type.hpp
#	src/disaster_vehicle.cpp
#	src/economy.cpp
#	src/engine.cpp
#	src/group.h
#	src/group_cmd.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/network_command.cpp
#	src/network/network_server.cpp
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/road_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/cargopacket_sl.cpp
#	src/saveload/linkgraph_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/screenshot.cpp
#	src/screenshot.h
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/station.cpp
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehiclelist.cpp
#	src/window_type.h
2020-01-06 18:45:51 +00:00
Jonathan G Rennison
aa8aae9a62 Initial implementation of tracerestrict speed restriction feature 2019-12-06 21:15:07 +00:00
Jonathan G Rennison
7332c0b673 Tracerestrict: Add load percentage conditional 2019-10-08 18:42:18 +01:00
Jonathan G Rennison
36eb4165b8 Merge branch 'master' into jgrpp
# Conflicts:
#	src/bridge_map.h
#	src/crashlog.cpp
#	src/industry.h
#	src/linkgraph/linkgraph_type.h
#	src/order_type.h
#	src/saveload/afterload.cpp
#	src/settings.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/stdafx.h
#	src/table/settings.h.preamble
#	src/train.h
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/viewport_func.h
#	src/widgets/station_widget.h
#	src/zoom_func.h
#	src/zoom_type.h
2019-07-08 16:19:07 +01:00
Jonathan G Rennison
e1d98e1b37 Check trace restrict slot vehicle index and occupants in CheckCaches 2019-05-19 18:40:18 +01:00
Jonathan G Rennison
674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 2019-04-11 18:14:13 +01:00
Jonathan G Rennison
cd41683b9b Add tracerestrict feature reverse behind signal 2018-12-09 01:13:27 +00:00
Jonathan G Rennison
a315d39067 Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/tracerestrict.h
2018-12-05 20:15:53 +00:00
Jonathan G Rennison
cae0b21534 Trace restrict: Bump size of item type field
Reserve value for TRIT_REVERSE
2018-12-05 20:14:21 +00:00
Jonathan G Rennison
bd6f7b29fc Fix incorrect description of TraceRestrictPathfinderPenaltyAuxField enum 2018-12-05 20:08:48 +00:00
Jonathan G Rennison
3e50336079 Add trace restrict train status conditional 2018-08-21 19:22:35 +01:00
Jonathan G Rennison
2586096ef6 Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
2018-06-17 23:24:22 +01:00
Jonathan G Rennison
e9f5d80440 Trace restrict slots: Add support for slot operations at PBS end signal 2018-06-17 21:13:53 +01:00
Jonathan G Rennison
1b4db7d86c Trace restrict: Add wait at entrance PBS for reservation ending here 2018-06-17 18:55:33 +01:00
Jonathan G Rennison
64d9cdd6f0 Merge branch 'tracerestrict-sx' into jgrpp 2017-06-20 19:19:39 +01:00
Jonathan G Rennison
b004c1998f Merge branch 'tracerestrict' into tracerestrict-sx 2017-06-20 19:19:21 +01:00
Jonathan G Rennison
7986367c1f Tracerestrict: Add program append management action. 2017-06-20 19:18:39 +01:00
Jonathan G Rennison
bfb8f6f32e Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
2017-04-11 23:42:14 +01:00
Jonathan G Rennison
c44141bad6 Add conditional to test slot occupancy state.
Bump tracerestrict version.
2017-04-10 19:00:52 +01:00
Jonathan G Rennison
b8328ad21f Merge branch 'tracerestrict-sx' into jgrpp
# Conflicts:
#	src/command.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/vehiclelist.cpp
#	src/window_type.h
2017-04-05 19:00:24 +01:00
Jonathan G Rennison
0772236986 Add a release slot at front of train slot action.
Distinguish from release slot at back.
Fix slot release and acquire at front when passing PBS from back.
2017-03-31 01:10:26 +01:00
Jonathan G Rennison
927323dcb1 Add trace restrict slot membership conditional. 2017-03-30 21:53:30 +01:00
Jonathan G Rennison
6417fb16c3 Initial implementation of trace restrict slots 2017-03-30 21:14:14 +01:00
Jonathan G Rennison
5a2d482c28 Tracerestrict: Add wait at PBS signal action. 2017-03-27 23:30:15 +01:00