dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add tracerestrict action to set combined normal/shunt signal mode

Browse Source 
Add associated conditional to get reservation end tile
This commit is contained in:
Jonathan G Rennison
2022-06-28 01:16:57 +01:00
parent 52f28eb5c1
commit 6a69a5495f
10 changed files with 216 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/lang/english.txt
View File

@@ -3242,6 +3242,8 @@ STR_TRACE_RESTRICT_VARIABLE_PBS_ENTRY_SIGNAL :PBS entry signa
STR_TRACE_RESTRICT_VARIABLE_PBS_ENTRY_SIGNAL_LONG :entered signal of PBS block
STR_TRACE_RESTRICT_VARIABLE_PBS_RES_END_SIGNAL :PBS end signal
STR_TRACE_RESTRICT_VARIABLE_PBS_RES_END_SIGNAL_LONG :signal at current end of PBS reservation
STR_TRACE_RESTRICT_VARIABLE_PBS_RES_END_TILE :PBS reservation end tile
STR_TRACE_RESTRICT_VARIABLE_PBS_RES_END_TILE_LONG :tile at end of PBS reservation from this signal
STR_TRACE_RESTRICT_VARIABLE_TRAIN_GROUP :train group
STR_TRACE_RESTRICT_VARIABLE_TRAIN_SLOT :train in slot
STR_TRACE_RESTRICT_VARIABLE_SLOT_OCCUPANCY :slot occupancy
@@ -3330,6 +3332,7 @@ STR_TRACE_RESTRICT_NEWS_CONTROL :News control
STR_TRACE_RESTRICT_COUNTER_OP :Counter operation
STR_TRACE_RESTRICT_PF_PENALTY_CONTROL :Penalty config
STR_TRACE_RESTRICT_SPEED_ADAPTATION_CONTROL :Speed adap. control
STR_TRACE_RESTRICT_SIGNAL_MODE_CONTROL :Signal mode control
STR_TRACE_RESTRICT_SLOT_ACQUIRE_WAIT :Acquire or wait
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE :Try to acquire
STR_TRACE_RESTRICT_SLOT_TRY_ACQUIRE_ON_RES :Try to acquire (on reserve)
@@ -3384,6 +3387,10 @@ STR_TRACE_RESTRICT_MAKE_TRAIN_SPEED_ADAPTATION_EXEMPT :Make train exem
STR_TRACE_RESTRICT_REMOVE_TRAIN_SPEED_ADAPTATION_EXEMPT :Remove train exemption from automatic speed adaptation
STR_TRACE_RESTRICT_MAKE_TRAIN_SPEED_ADAPTATION_EXEMPT_SHORT :Make exempt
STR_TRACE_RESTRICT_REMOVE_TRAIN_SPEED_ADAPTATION_EXEMPT_SHORT :Remove exemption
STR_TRACE_RESTRICT_USE_NORMAL_ASPECT_MODE :Use normal signal aspect (combined normal/shunt aspect signal)
STR_TRACE_RESTRICT_USE_SHUNT_ASPECT_MODE :Use shunt signal aspect (combined normal/shunt aspect signal)
STR_TRACE_RESTRICT_USE_NORMAL_ASPECT_MODE_SHORT :Use normal signal aspect
STR_TRACE_RESTRICT_USE_SHUNT_ASPECT_MODE_SHORT :Use shunt signal aspect
STR_TRACE_RESTRICT_TIME_MINUTE :current minute (0 - 59)
STR_TRACE_RESTRICT_TIME_HOUR :current hour (0 - 23)
STR_TRACE_RESTRICT_TIME_HOUR_MINUTE :current hour and minute (0 - 2359)
@@ -3451,6 +3458,7 @@ STR_TRACE_RESTRICT_SHARE :{BLACK}Share
STR_TRACE_RESTRICT_UNSHARE :{BLACK}Unshare
STR_TRACE_RESTRICT_SELECT_TARGET :{BLACK}Select Target
STR_TRACE_RESTRICT_SELECT_SIGNAL :{BLACK}Select Signal
STR_TRACE_RESTRICT_SELECT_TILE :{BLACK}Select Tile
STR_TRACE_RESTRICT_INSERT_TOOLTIP :{BLACK}Insert an instruction
STR_TRACE_RESTRICT_REMOVE_TOOLTIP :{BLACK}Remove the selected instruction{}Ctrl+Click to remove the selected conditional instruction but retain its contents
STR_TRACE_RESTRICT_RESET_TOOLTIP :{BLACK}Reset the current signal (without affecting shared programs)
@@ -3461,6 +3469,8 @@ STR_TRACE_RESTRICT_SIGNAL_GUI_TOOLTIP :{BLACK}Routefin
STR_TRACE_RESTRICT_INSTRUCTION_LIST_TOOLTIP :{BLACK}Click an instruction to select it{}Ctrl+Click to scroll to the instruction's target (if any)
STR_TRACE_RESTRICT_HIGHLIGHT_TOOLTIP :{BLACK}Toggle highlighting all signals sharing this program
STR_TRACE_RESTRICT_WARNING_REQUIRES_REALISTIC_BRAKING :{STRING} {PUSH_COLOUR}{RED}(requires realistic braking){POP_COLOUR}
STR_TRACE_RESTRICT_WARNING_SIGNAL_MODE_CONTROL_ONLY :{STRING} {PUSH_COLOUR}{RED}(only for signal mode control actions){POP_COLOUR}
STR_TRACE_RESTRICT_WARNING_NO_SIGNAL_MODE_CONTROL :{STRING} {PUSH_COLOUR}{RED}(not for signal mode control actions){POP_COLOUR}
STR_TRACE_RESTRICT_ERROR_CAN_T_INSERT_ITEM :{WHITE}Can't insert instruction
STR_TRACE_RESTRICT_ERROR_CAN_T_MODIFY_ITEM :{WHITE}Can't modify instruction
STR_TRACE_RESTRICT_ERROR_CAN_T_REMOVE_ITEM :{WHITE}Can't remove instruction

2
src/lang/galician.txt
View File

@@ -6025,7 +6025,6 @@ STR_TRACE_RESTRICT_VARIABLE_PBS_ENTRY_SIGNAL :Sinal de entrad
STR_TRACE_RESTRICT_VARIABLE_PBS_ENTRY_SIGNAL_LONG :entrou nun sinal de entrada a cantón
STR_TRACE_RESTRICT_VARIABLE_PBS_RES_END_SIGNAL :Sinal de saída de ruta
STR_TRACE_RESTRICT_VARIABLE_PBS_RES_END_SIGNAL_LONG :sinal no final da reserva actual de ruta
STR_TRACE_RESTRICT_VARIABLE_PBS_RES_END_SIGNAL_LONG_WARN :sinal no final da reserva actual de ruta {PUSH_COLOUR}{RED}(require freo realista){POP_COLOUR}
STR_TRACE_RESTRICT_VARIABLE_TRAIN_GROUP :o grupo de tren
STR_TRACE_RESTRICT_VARIABLE_TRAIN_SLOT :tren no slot
STR_TRACE_RESTRICT_VARIABLE_SLOT_OCCUPANCY :ocupación de slots
@@ -6237,6 +6236,7 @@ STR_TRACE_RESTRICT_SELECT_TARGET :{BLACK}Seleccio
STR_TRACE_RESTRICT_SELECT_SIGNAL :{BLACK}Seleccionar sinal
STR_TRACE_RESTRICT_SIGNAL_GUI_TOOLTIP :{BLACK}Restrición de busca de ruta
STR_TRACE_RESTRICT_INSTRUCTION_LIST_TOOLTIP :{BLACK}Fai click nunha instrución para seleccionala{}Ctrl+Click para desplazarte ata o obxectivo da instrución(se o hai)
STR_TRACE_RESTRICT_WARNING_REQUIRES_REALISTIC_BRAKING :{STRING} {PUSH_COLOUR}{RED}(require freo realista){POP_COLOUR}
STR_TRACE_RESTRICT_ERROR_CAN_T_INSERT_ITEM :{WHITE}Non se pode insertar a instrución
STR_TRACE_RESTRICT_ERROR_CAN_T_MODIFY_ITEM :{WHITE}Non se pode modificar a instrución
STR_TRACE_RESTRICT_ERROR_CAN_T_REMOVE_ITEM :{WHITE}Non se pode eliminar a instrución

2
src/lang/korean.txt
View File

@@ -3243,7 +3243,6 @@ STR_TRACE_RESTRICT_VARIABLE_PBS_ENTRY_SIGNAL :경로 신호
STR_TRACE_RESTRICT_VARIABLE_PBS_ENTRY_SIGNAL_LONG :통과한 경로 신호기
STR_TRACE_RESTRICT_VARIABLE_PBS_RES_END_SIGNAL :끝 경로 신호기
STR_TRACE_RESTRICT_VARIABLE_PBS_RES_END_SIGNAL_LONG :현재 예약된 경로의 끝에 있는 신호기
STR_TRACE_RESTRICT_VARIABLE_PBS_RES_END_SIGNAL_LONG_WARN :현재 예약된 경로의 끝에 있는 신호기 {PUSH_COLOUR}{RED}(현실적인 감속을 켜야 함){POP_COLOUR}
STR_TRACE_RESTRICT_VARIABLE_TRAIN_GROUP :열차 그룹
STR_TRACE_RESTRICT_VARIABLE_TRAIN_SLOT :열차 슬롯
STR_TRACE_RESTRICT_VARIABLE_SLOT_OCCUPANCY :슬롯 사용량
@@ -3462,6 +3461,7 @@ STR_TRACE_RESTRICT_UNSHARE_TOOLTIP :{BLACK}다른
STR_TRACE_RESTRICT_SIGNAL_GUI_TOOLTIP :{BLACK}경로 탐색 제한
STR_TRACE_RESTRICT_INSTRUCTION_LIST_TOOLTIP :{BLACK}선택하려면 구문을 클릭하십시오.{}구문에서 지정된 장소가 있다면, 지정된 장소로 가려면 구문을 Ctrl+클릭하십시오.
STR_TRACE_RESTRICT_HIGHLIGHT_TOOLTIP :{BLACK}이 프로그램을 공유하는 모든 신호기를 선택하여 표시합니다.
STR_TRACE_RESTRICT_WARNING_REQUIRES_REALISTIC_BRAKING :{STRING} {PUSH_COLOUR}{RED}(현실적인 감속을 켜야 함){POP_COLOUR}
STR_TRACE_RESTRICT_ERROR_CAN_T_INSERT_ITEM :{WHITE}구문을 삽입할 수 없습니다.
STR_TRACE_RESTRICT_ERROR_CAN_T_MODIFY_ITEM :{WHITE}구문을 수정할 수 없습니다.
STR_TRACE_RESTRICT_ERROR_CAN_T_REMOVE_ITEM :{WHITE}구문을 제거할 수 없습니다.