Fixed 24 hour ToD to follow the latest esr's and Espreon's suggestions
This commit is contained in:
parent
05d438229b
commit
481e74bc8e
1 changed files with 96 additions and 96 deletions
|
@ -173,10 +173,10 @@
|
|||
|
||||
# 24-hour clock time-of-day macros.
|
||||
|
||||
#define HOUR0
|
||||
#define MIDNIGHT_HOUR
|
||||
[time]
|
||||
id=hour0
|
||||
name=_"0:00 - Midnight"
|
||||
id=midnight_hour
|
||||
name= _ "Midnight"
|
||||
image=misc/tod-schedule-24hrs.png~CROP(0,195,125,39)
|
||||
lawful_bonus=-25
|
||||
red=-40
|
||||
|
@ -185,10 +185,10 @@
|
|||
[/time]
|
||||
#enddef
|
||||
|
||||
#define HOUR1
|
||||
#define SECOND_WATCH_HOUR1
|
||||
[time]
|
||||
id=hour1
|
||||
name=_"1:00"
|
||||
id=second_watch_hour1
|
||||
name= _ "Second Watch — First Hour"
|
||||
image=misc/tod-schedule-24hrs.png~CROP(250,234,125,39)
|
||||
lawful_bonus=-25
|
||||
red=-40
|
||||
|
@ -197,10 +197,10 @@
|
|||
[/time]
|
||||
#enddef
|
||||
|
||||
#define HOUR2
|
||||
#define SECOND_WATCH_HOUR2
|
||||
[time]
|
||||
id=hour2
|
||||
name=_"2:00"
|
||||
id=second_watch_hour2
|
||||
name= _ "Second Watch — Second Hour"
|
||||
image=misc/tod-schedule-24hrs.png~CROP(125,234,125,39)
|
||||
lawful_bonus=-25
|
||||
red=-40
|
||||
|
@ -209,10 +209,10 @@
|
|||
[/time]
|
||||
#enddef
|
||||
|
||||
#define HOUR3
|
||||
#define SECOND_WATCH_HOUR3
|
||||
[time]
|
||||
id=hour3
|
||||
name=_"3:00"
|
||||
id=second_watch_hour3
|
||||
name= _ "Second Watch — Third Hour"
|
||||
image=misc/tod-schedule-24hrs.png~CROP(0,234,125,39)
|
||||
lawful_bonus=-25
|
||||
red=-40
|
||||
|
@ -221,10 +221,10 @@
|
|||
[/time]
|
||||
#enddef
|
||||
|
||||
#define HOUR4
|
||||
#define SECOND_WATCH_HOUR4
|
||||
[time]
|
||||
id=hour4
|
||||
name=_"4:00"
|
||||
id=second_watch_hour4
|
||||
name= _ "Second Watch — Fourth Hour"
|
||||
image=misc/tod-schedule-24hrs.png~CROP(250,273,125,39)
|
||||
lawful_bonus=-25
|
||||
red=-40
|
||||
|
@ -233,10 +233,10 @@
|
|||
[/time]
|
||||
#enddef
|
||||
|
||||
#define HOUR5
|
||||
#define SECOND_WATCH_HOUR5
|
||||
[time]
|
||||
id=hour5
|
||||
name=_"5:00"
|
||||
id=second_watch_hour5
|
||||
name= _ "Second Watch — Fifth Hour"
|
||||
image=misc/tod-schedule-24hrs.png~CROP(125,273,125,39)
|
||||
lawful_bonus=-15
|
||||
red=-40
|
||||
|
@ -245,10 +245,10 @@
|
|||
[/time]
|
||||
#enddef
|
||||
|
||||
#define HOUR6
|
||||
#define SECOND_WATCH_HOUR6
|
||||
[time]
|
||||
id=hour6
|
||||
name=_"6:00"
|
||||
id=second_watch_hour6
|
||||
name= _ "Second Watch — Sixth Hour"
|
||||
image=misc/tod-schedule-24hrs.png~CROP(0,273,125,39)
|
||||
lawful_bonus=-5
|
||||
red=-30
|
||||
|
@ -257,10 +257,10 @@
|
|||
[/time]
|
||||
#enddef
|
||||
|
||||
#define HOUR7
|
||||
#define DAWN_HOUR
|
||||
[time]
|
||||
id=hour7
|
||||
name=_"7:00 - Dawn"
|
||||
id=dawn_hour
|
||||
name= _ "Dawn"
|
||||
image=misc/tod-schedule-24hrs.png~CROP(250,0,125,39)
|
||||
red=-20
|
||||
green=-20
|
||||
|
@ -268,100 +268,100 @@
|
|||
[/time]
|
||||
#enddef
|
||||
|
||||
#define HOUR8
|
||||
#define MORNING_HOUR1
|
||||
[time]
|
||||
id=hour8
|
||||
name=_"8:00"
|
||||
id=morning_hour1
|
||||
name= _ "Morning — First Hour"
|
||||
image=misc/tod-schedule-24hrs.png~CROP(125,0,125,39)
|
||||
lawful_bonus=5
|
||||
[/time]
|
||||
#enddef
|
||||
|
||||
#define HOUR9
|
||||
#define MORNING_HOUR2
|
||||
[time]
|
||||
id=hour9
|
||||
name=_"9:00"
|
||||
id=morning_hour2
|
||||
name= _ "Morning — Second Hour"
|
||||
image=misc/tod-schedule-24hrs.png~CROP(0,0,125,39)
|
||||
lawful_bonus=15
|
||||
[/time]
|
||||
#enddef
|
||||
|
||||
#define HOUR10
|
||||
#define MORNING_HOUR3
|
||||
[time]
|
||||
id=hour10
|
||||
name=_"10:00"
|
||||
id=morning_hour3
|
||||
name= _ "Morning — Third Hour"
|
||||
image=misc/tod-schedule-24hrs.png~CROP(250,39,125,39)
|
||||
lawful_bonus=25
|
||||
[/time]
|
||||
#enddef
|
||||
|
||||
#define HOUR11
|
||||
#define MORNING_HOUR4
|
||||
[time]
|
||||
id=hour11
|
||||
name=_"11:00"
|
||||
id=morning_hour4
|
||||
name= _ "Morning — Fourth Hour"
|
||||
image=misc/tod-schedule-24hrs.png~CROP(125,39,125,39)
|
||||
lawful_bonus=25
|
||||
[/time]
|
||||
#enddef
|
||||
|
||||
#define HOUR12
|
||||
#define MIDDAY_HOUR
|
||||
[time]
|
||||
id=hour12
|
||||
name=_"12:00 - Noon"
|
||||
id=midday_hour
|
||||
name= _ "Midday"
|
||||
image=misc/tod-schedule-24hrs.png~CROP(0,39,125,39)
|
||||
lawful_bonus=25
|
||||
[/time]
|
||||
#enddef
|
||||
|
||||
#define HOUR13
|
||||
#define AFTERNOON_HOUR1
|
||||
[time]
|
||||
id=hour13
|
||||
name=_"13:00"
|
||||
id=afternoon_hour1
|
||||
name= _ "Afternoon — First Hour"
|
||||
image=misc/tod-schedule-24hrs.png~CROP(250,78,125,39)
|
||||
lawful_bonus=25
|
||||
[/time]
|
||||
#enddef
|
||||
|
||||
#define HOUR14
|
||||
#define AFTERNOON_HOUR2
|
||||
[time]
|
||||
id=hour14
|
||||
name=_"14:00"
|
||||
id=afternoon_hour2
|
||||
name= _ "Afternoon — Second Hour"
|
||||
image=misc/tod-schedule-24hrs.png~CROP(125,78,125,39)
|
||||
lawful_bonus=25
|
||||
[/time]
|
||||
#enddef
|
||||
|
||||
#define HOUR15
|
||||
#define AFTERNOON_HOUR3
|
||||
[time]
|
||||
id=hour15
|
||||
name=_"15:00"
|
||||
id=afternoon_hour3
|
||||
name= _ "Afternoon — Third Hour"
|
||||
image=misc/tod-schedule-24hrs.png~CROP(0,78,125,39)
|
||||
lawful_bonus=25
|
||||
[/time]
|
||||
#enddef
|
||||
|
||||
#define HOUR16
|
||||
#define AFTERNOON_HOUR4
|
||||
[time]
|
||||
id=hour16
|
||||
name=_"16:00"
|
||||
id=afternoon_hour4
|
||||
name= _ "Afternoon — Fourth Hour"
|
||||
image=misc/tod-schedule-24hrs.png~CROP(250,117,125,39)
|
||||
lawful_bonus=25
|
||||
[/time]
|
||||
#enddef
|
||||
|
||||
#define HOUR17
|
||||
#define AFTERNOON_HOUR5
|
||||
[time]
|
||||
id=hour17
|
||||
name=_"17:00"
|
||||
id=afternoon_hour5
|
||||
name= _ "Afternoon — Fifth Hour"
|
||||
image=misc/tod-schedule-24hrs.png~CROP(125,117,125,39)
|
||||
lawful_bonus=15
|
||||
[/time]
|
||||
#enddef
|
||||
|
||||
#define HOUR18
|
||||
#define AFTERNOON_HOUR6
|
||||
[time]
|
||||
id=hour18
|
||||
name=_"18:00"
|
||||
id=afternoon_hour6
|
||||
name= _ "Afternoon — Sixth Hour"
|
||||
image=misc/tod-schedule-24hrs.png~CROP(0,117,125,39)
|
||||
lawful_bonus=5
|
||||
green=-10
|
||||
|
@ -369,10 +369,10 @@
|
|||
[/time]
|
||||
#enddef
|
||||
|
||||
#define HOUR19
|
||||
#define DUSK_HOUR
|
||||
[time]
|
||||
id=hour19
|
||||
name=_"19:00 - Sunset"
|
||||
id=dusk_hour
|
||||
name= _ "Dusk"
|
||||
image=misc/tod-schedule-24hrs.png~CROP(250,156,125,39)
|
||||
green=-20
|
||||
blue=-20
|
||||
|
@ -380,10 +380,10 @@
|
|||
[/time]
|
||||
#enddef
|
||||
|
||||
#define HOUR20
|
||||
#define FIRST_WATCH_HOUR1
|
||||
[time]
|
||||
id=hour20
|
||||
name=_"20:00"
|
||||
id=first_watch_hour1
|
||||
name= _ "First Watch — First Hour"
|
||||
image=misc/tod-schedule-24hrs.png~CROP(125,156,125,39)
|
||||
lawful_bonus=-5
|
||||
red=-20
|
||||
|
@ -392,10 +392,10 @@
|
|||
[/time]
|
||||
#enddef
|
||||
|
||||
#define HOUR21
|
||||
#define FIRST_WATCH_HOUR2
|
||||
[time]
|
||||
id=hour21
|
||||
name=_"21:00"
|
||||
id=first_watch_hour2
|
||||
name= _ "First Watch — Second Hour"
|
||||
image=misc/tod-schedule-24hrs.png~CROP(0,156,125,39)
|
||||
lawful_bonus=-15
|
||||
red=-40
|
||||
|
@ -404,10 +404,10 @@
|
|||
[/time]
|
||||
#enddef
|
||||
|
||||
#define HOUR22
|
||||
#define FIRST_WATCH_HOUR3
|
||||
[time]
|
||||
id=hour22
|
||||
name=_"22:00"
|
||||
id=first_watch_hour3
|
||||
name= _ "First Watch — Third Hour"
|
||||
image=misc/tod-schedule-24hrs.png~CROP(250,195,125,39)
|
||||
lawful_bonus=-25
|
||||
red=-40
|
||||
|
@ -416,10 +416,10 @@
|
|||
[/time]
|
||||
#enddef
|
||||
|
||||
#define HOUR23
|
||||
#define FIRST_WATCH_HOUR4
|
||||
[time]
|
||||
id=hour23
|
||||
name=_"23:00"
|
||||
id=first_watch_hour4
|
||||
name= _ "First Watch — Fourth Hour"
|
||||
image=misc/tod-schedule-24hrs.png~CROP(125,195,125,39)
|
||||
lawful_bonus=-25
|
||||
red=-40
|
||||
|
@ -429,28 +429,28 @@
|
|||
#enddef
|
||||
|
||||
#define DEFAULT_SCHEDULE_24H
|
||||
{HOUR7}
|
||||
{HOUR8}
|
||||
{HOUR9}
|
||||
{HOUR10}
|
||||
{HOUR11}
|
||||
{HOUR12}
|
||||
{HOUR13}
|
||||
{HOUR14}
|
||||
{HOUR15}
|
||||
{HOUR16}
|
||||
{HOUR17}
|
||||
{HOUR18}
|
||||
{HOUR19}
|
||||
{HOUR20}
|
||||
{HOUR21}
|
||||
{HOUR22}
|
||||
{HOUR23}
|
||||
{HOUR0}
|
||||
{HOUR1}
|
||||
{HOUR2}
|
||||
{HOUR3}
|
||||
{HOUR4}
|
||||
{HOUR5}
|
||||
{HOUR6}
|
||||
{DAWN_HOUR}
|
||||
{MORNING_HOUR1}
|
||||
{MORNING_HOUR2}
|
||||
{MORNING_HOUR3}
|
||||
{MORNING_HOUR4}
|
||||
{MIDDAY_HOUR}
|
||||
{AFTERNOON_HOUR1}
|
||||
{AFTERNOON_HOUR2}
|
||||
{AFTERNOON_HOUR3}
|
||||
{AFTERNOON_HOUR4}
|
||||
{AFTERNOON_HOUR5}
|
||||
{AFTERNOON_HOUR6}
|
||||
{DUSK_HOUR}
|
||||
{FIRST_WATCH_HOUR1}
|
||||
{FIRST_WATCH_HOUR2}
|
||||
{FIRST_WATCH_HOUR3}
|
||||
{FIRST_WATCH_HOUR4}
|
||||
{MIDNIGHT_HOUR}
|
||||
{SECOND_WATCH_HOUR1}
|
||||
{SECOND_WATCH_HOUR2}
|
||||
{SECOND_WATCH_HOUR3}
|
||||
{SECOND_WATCH_HOUR4}
|
||||
{SECOND_WATCH_HOUR5}
|
||||
{SECOND_WATCH_HOUR6}
|
||||
#enddef
|
||||
|
|
Loading…
Add table
Reference in a new issue