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

Add support for multiple scheduled dispatch schedules per order list

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-01-13 19:46:43 +00:00
parent 29521ef883
commit ff3473fe6a
23 changed files with 755 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/lang/english.txt
View File

@@ -5701,8 +5701,9 @@ STR_TIMETABLE_AUTO_SEPARATION_TOOLTIP :{BLACK}Automati
STR_TIMETABLE_SCHEDULED_DISPATCH :{BLACK}Scheduled Dispatch
STR_TIMETABLE_SCHEDULED_DISPATCH_TOOLTIP :{BLACK}Open scheduled dispatch windows for automatic setting of timetable start time
STR_TIMETABLE_SCHEDULED_DISPATCH_ORDER :[scheduled dispatch]
STR_TIMETABLE_SCHEDULED_DISPATCH_ORDER_NO_WAIT_TIME :{PUSH_COLOUR}{RED}[scheduled dispatch - no wait time timetabled]{POP_COLOUR}
STR_TIMETABLE_SCHEDULED_DISPATCH_ORDER :[{STRING1}scheduled dispatch]
STR_TIMETABLE_SCHEDULED_DISPATCH_ORDER_NO_WAIT_TIME :{PUSH_COLOUR}{RED}[{STRING1}scheduled dispatch - no wait time timetabled]{POP_COLOUR}
STR_TIMETABLE_SCHEDULED_DISPATCH_ORDER_SCHEDULE_INDEX :{NUM}{NBSP}-{NBSP}
STR_TIMETABLE_EXPECTED :{BLACK}Expected
STR_TIMETABLE_SCHEDULED :{BLACK}Scheduled
@@ -5721,6 +5722,11 @@ STR_TIMETABLE_LEAVE_EARLY_FULL_ALL :Leave early if
STR_TIMETABLE_EXTRA_DROP_DOWN :{BLACK}Extra
STR_TIMETABLE_EXTRA_DROP_DOWN_TOOLTIP :{BLACK}Extra Options{}{}Leave as timetabled: Vehicles wait until their timetabled departure time before leaving (default).{}Leave Early: Vehicles leave as soon as loading/unloading is done, possibly before the timetabled departure time.{}Leave Early if Any Full: As above, if any cargo is fully loaded.{}Leave Early if All Full: As above, if all cargoes are fully loaded.
STR_TIMETABLE_ASSIGN_SCHEDULE_DROP_DOWN :{BLACK}Assign Schedule
STR_TIMETABLE_ASSIGN_SCHEDULE_DROP_DOWN_TOOLTIP :{BLACK}Assign or unassign a scheduled dispatch schedule to the selected order
STR_TIMETABLE_ASSIGN_SCHEDULE_NONE :No Schedule
STR_TIMETABLE_ASSIGN_SCHEDULE_ID :Schedule {NUM}
STR_TIMETABLE_ARRIVAL_ABBREVIATION :A:
STR_TIMETABLE_DEPARTURE_ABBREVIATION :D:
@@ -5730,10 +5736,11 @@ STR_TIMETABLE_AUTOSEP_SINGLE_VEH :{BLACK}This tim
STR_TIMETABLE_WARNING_AUTOSEP_CONDITIONAL :{BLACK}Cannot auto separate timetable: conditional order(s) present
STR_TIMETABLE_WARNING_AUTOSEP_MISSING_TIMINGS :{BLACK}Cannot auto separate timetable: wait or travel time(s) missing
STR_TIMETABLE_WARNING_FULL_LOAD :{BLACK}Timetabling full-load orders is not recommended
STR_TIMETABLE_WARNING_AUTOFILL_CONDITIONAL :{BLACK}Autofill will only update taken branch of conditional orders.
STR_TIMETABLE_NON_TIMETABLED_BRANCH :{BLACK}Not all conditional order branch-taken travel times are timetabled.
STR_TIMETABLE_WARNING_NO_SCHEDULED_DISPATCH_ORDER :{BLACK}No order is suitable for use with scheduled dispatch.
STR_TIMETABLE_WARNING_SCHEDULED_DISPATCH_ORDER_NO_WAIT_TIME :{BLACK}The scheduled dispatch order should have a timetabled wait time.
STR_TIMETABLE_WARNING_AUTOFILL_CONDITIONAL :{BLACK}Autofill will only update taken branch of conditional orders
STR_TIMETABLE_NON_TIMETABLED_BRANCH :{BLACK}Not all conditional order branch-taken travel times are timetabled
STR_TIMETABLE_WARNING_NO_SCHEDULED_DISPATCH_ORDER_ASSIGNED :{BLACK}The dispatch schedule is not assigned to an order
STR_TIMETABLE_WARNING_SCHEDULED_DISPATCH_ORDER_NO_WAIT_TIME :{BLACK}The scheduled dispatch order should have a timetabled wait time
STR_TIMETABLE_WARNING_SCHEDULE_ID :{BLACK}Schedule {NUM}: {STRING}
# Date window (for timetable)
STR_DATE_CAPTION :{WHITE}Set date
@@ -7115,7 +7122,17 @@ STR_SCHDISPATCH_RESET_LAST_DISPATCH_TOOLTIP :{BLACK}Reset wh
STR_SCHDISPATCH_CLEAR :{BLACK}Clear Departure Slots
STR_SCHDISPATCH_CLEAR_TOOLTIP :{BLACK}Clear all departure slots from the schedule.
STR_SCHDISPATCH_MANAGE :{BLACK}Manage Schedule
STR_SCHDISPATCH_MANAGE_TOOLTIP :{STRING}{}{}{STRING}
STR_SCHDISPATCH_MANAGE_TOOLTIP :{STRING}{}{}{STRING}{}{}{STRING}
STR_SCHDISPATCH_PREV_SCHEDULE :{BLACK}Previous
STR_SCHDISPATCH_PREV_SCHEDULE_TOOLTIP :{BLACK}Go to previous dispatch schedule
STR_SCHDISPATCH_NEXT_SCHEDULE :{BLACK}Next
STR_SCHDISPATCH_NEXT_SCHEDULE_TOOLTIP :{BLACK}Go to next dispatch schedule
STR_SCHDISPATCH_ADD_SCHEDULE :{BLACK}Add
STR_SCHDISPATCH_ADD_SCHEDULE_TOOLTIP :{BLACK}Add a new dispatch schedule
STR_SCHDISPATCH_REMOVE_SCHEDULE :{BLACK}Remove Current Schedule
STR_SCHDISPATCH_REMOVE_SCHEDULE_TOOLTIP :{BLACK}Remove this dispatch schedule entirely.
STR_SCHDISPATCH_NO_SCHEDULES :{BLACK}No Schedules
STR_SCHDISPATCH_SCHEDULE_ID :{BLACK}Schedule {NUM} of {NUM}
STR_SCHDISPATCH_SUMMARY_LAST_DEPARTURE_PAST :{BLACK}Last departure at {DATE_WALLCLOCK_TINY}.
STR_SCHDISPATCH_SUMMARY_LAST_DEPARTURE_FUTURE :{BLACK}Last departure has not left yet, it will depart at {DATE_WALLCLOCK_TINY}.

5
src/lang/galician.txt
View File

@@ -6681,8 +6681,8 @@ STR_TIMETABLE_AUTO_SEPARATION :{BLACK}Auto Sep
STR_TIMETABLE_AUTO_SEPARATION_TOOLTIP :{BLACK}Automáticamente axusta a hora de comezo dos horarios para asegurar a separación dos vehículos
STR_TIMETABLE_SCHEDULED_DISPATCH :{BLACK}Saída programada
STR_TIMETABLE_SCHEDULED_DISPATCH_TOOLTIP :{BLACK}Abrir fiestras de saídas programadas para configurar automáticamente a hora de inicio dos horarios
STR_TIMETABLE_SCHEDULED_DISPATCH_ORDER :[saída programada]
STR_TIMETABLE_SCHEDULED_DISPATCH_ORDER_NO_WAIT_TIME :{PUSH_COLOUR}{RED}[saída programadda - sen tempo de espera no horario]{POP_COLOUR}
STR_TIMETABLE_SCHEDULED_DISPATCH_ORDER :[{STRING}saída programada]
STR_TIMETABLE_SCHEDULED_DISPATCH_ORDER_NO_WAIT_TIME :{PUSH_COLOUR}{RED}[{STRING}saída programadda - sen tempo de espera no horario]{POP_COLOUR}
STR_TIMETABLE_LOCK_ORDER_TIME_TOOLTIP :{BLACK}Bloquear/desbloquear a cantidade de tempo para a orde resaltada (Ctrl+Click fixa o estado de bloqueo para todas as ordes).{}Cando estea bloqueado, a hora non se modificará mediante o autocompletado ou automatización do horario.
STR_TIMETABLE_LEAVE_EARLY_ORDER :[saír cedo]
STR_TIMETABLE_LEAVE_EARLY_ORDER_FULL_ANY :[saír cedo se calquera cargamento está cheo]
@@ -6701,7 +6701,6 @@ STR_TIMETABLE_WARNING_AUTOSEP_MISSING_TIMINGS :{BLACK}Non se p
STR_TIMETABLE_WARNING_FULL_LOAD :{BLACK}Non se recomenda a programación de ordes a carga completa
STR_TIMETABLE_WARNING_AUTOFILL_CONDITIONAL :{BLACK}O enchemento automático só actualizará as ordes condicionais da rama escollida
STR_TIMETABLE_NON_TIMETABLED_BRANCH :{BLACK}Non todas as ordes da rama condicional escollida están programadas.
STR_TIMETABLE_WARNING_NO_SCHEDULED_DISPATCH_ORDER :{BLACK}Non hai unha orde axeitada para usar coa saída programada.
STR_TIMETABLE_WARNING_SCHEDULED_DISPATCH_ORDER_NO_WAIT_TIME :{BLACK}A orde de saída programada debería ter un temepo de espera programado.
STR_DATE_MINUTES_MINUTE_TOOLTIP :{BLACK}Seleccionar minuto

5
src/lang/german.txt
View File

@@ -5479,8 +5479,8 @@ STR_TIMETABLE_AUTO_SEPARATION_TOOLTIP :{BLACK}Passt au
STR_TIMETABLE_SCHEDULED_DISPATCH :{BLACK}Geplante Beförderung
STR_TIMETABLE_SCHEDULED_DISPATCH_TOOLTIP :{BLACK}Öffnet das Fenster für die geplante Beförderung, um den Beginn des Fahrplans automatisch zu setzen
STR_TIMETABLE_SCHEDULED_DISPATCH_ORDER :[Geplante Beförderung]
STR_TIMETABLE_SCHEDULED_DISPATCH_ORDER_NO_WAIT_TIME :{PUSH_COLOUR}{RED}[Geplante Beförderung - keine Wartezeit geplant]{POP_COLOUR}
STR_TIMETABLE_SCHEDULED_DISPATCH_ORDER :[{STRING}Geplante Beförderung]
STR_TIMETABLE_SCHEDULED_DISPATCH_ORDER_NO_WAIT_TIME :{PUSH_COLOUR}{RED}[{STRING}Geplante Beförderung - keine Wartezeit geplant]{POP_COLOUR}
STR_TIMETABLE_EXPECTED :{BLACK}Voraussichtlich
STR_TIMETABLE_SCHEDULED :{BLACK}Fahrplanmäßig
@@ -5510,7 +5510,6 @@ STR_TIMETABLE_WARNING_AUTOSEP_MISSING_TIMINGS :{BLACK}Kann Fah
STR_TIMETABLE_WARNING_FULL_LOAD :{BLACK}Volllade-Aufträge zu planen ist nicht empfohlen
STR_TIMETABLE_WARNING_AUTOFILL_CONDITIONAL :{BLACK}Es werden nur bedingte Sprünge erfasst, die genommen wurden
STR_TIMETABLE_NON_TIMETABLED_BRANCH :{BLACK}Nicht alle Reisezeiten der bedingten Sprünge sind geplant
STR_TIMETABLE_WARNING_NO_SCHEDULED_DISPATCH_ORDER :{BLACK}Kein Auftrag ist geeignet für die Nutzung der geplanten Beförderung
STR_TIMETABLE_WARNING_SCHEDULED_DISPATCH_ORDER_NO_WAIT_TIME :{BLACK}Der geplant beförderte Auftrag sollte eine geplante Wartezeit haben
# Date window (for timetable)

7
src/lang/korean.txt
View File

@@ -5697,8 +5697,8 @@ STR_TIMETABLE_AUTO_SEPARATION_TOOLTIP :{BLACK}시간
STR_TIMETABLE_SCHEDULED_DISPATCH :{BLACK}배차 일정
STR_TIMETABLE_SCHEDULED_DISPATCH_TOOLTIP :{BLACK}시간표 시작 시간 자동 설정을 위한 '배차 일정' 창을 엽니다.
STR_TIMETABLE_SCHEDULED_DISPATCH_ORDER :[배차 기준]
STR_TIMETABLE_SCHEDULED_DISPATCH_ORDER_NO_WAIT_TIME :{PUSH_COLOUR}{RED}[배차 기준 - 대기 시간표가 작성되지 않음]{POP_COLOUR}
STR_TIMETABLE_SCHEDULED_DISPATCH_ORDER :[배{STRING}차 기준]
STR_TIMETABLE_SCHEDULED_DISPATCH_ORDER_NO_WAIT_TIME :{PUSH_COLOUR}{RED}[{STRING}배차 기준 - 대기 시간표가 작성되지 않음]{POP_COLOUR}
STR_TIMETABLE_EXPECTED :{BLACK}예정일 기준
STR_TIMETABLE_SCHEDULED :{BLACK}예정 소요시간 기준
@@ -5728,7 +5728,6 @@ STR_TIMETABLE_WARNING_AUTOSEP_MISSING_TIMINGS :{BLACK}자동
STR_TIMETABLE_WARNING_FULL_LOAD :{BLACK}'가득 싣기'가 설정되어 있는 경로에 시간표를 지정하는 것은 권장하지 않습니다.
STR_TIMETABLE_WARNING_AUTOFILL_CONDITIONAL :{BLACK}자동 시간 설정은 조건부 경로 중 한 경로만 채울 것입니다.
STR_TIMETABLE_NON_TIMETABLED_BRANCH :{BLACK}하나 이상의 조건부 경로 운행 시간이 채워지지 않았습니다.
STR_TIMETABLE_WARNING_NO_SCHEDULED_DISPATCH_ORDER :{BLACK}배차 일정을 사용하기에 적합한 경로가 존재하지 않습니다.
STR_TIMETABLE_WARNING_SCHEDULED_DISPATCH_ORDER_NO_WAIT_TIME :{BLACK}배차 기준은 대기 시간이 작성되어 있어야 합니다.
# Date window (for timetable)
@@ -7111,7 +7110,7 @@ STR_SCHDISPATCH_RESET_LAST_DISPATCH_TOOLTIP :{BLACK}최근
STR_SCHDISPATCH_CLEAR :{BLACK}출발 슬롯 초기화
STR_SCHDISPATCH_CLEAR_TOOLTIP :{BLACK}일정에서 모든 출발 슬롯을 제거합니다.
STR_SCHDISPATCH_MANAGE :{BLACK}일정 관리
STR_SCHDISPATCH_MANAGE_TOOLTIP :{STRING}{}{}{STRING}
STR_SCHDISPATCH_MANAGE_TOOLTIP :{STRING}{}{}{STRING}{}{}{STRING}
STR_SCHDISPATCH_SUMMARY_LAST_DEPARTURE_PAST :{BLACK}최근 출발: {DATE_WALLCLOCK_TINY}
STR_SCHDISPATCH_SUMMARY_LAST_DEPARTURE_FUTURE :{BLACK}최근 배차된 열차가 아직 출발하지 않았습니다. {DATE_WALLCLOCK_TINY}에 출발할 예정입니다.