Author: elvish_hunter
Date: Fri Aug 26 21:50:23 2011
New Revision: 50929
URL: http://svn.gna.org/viewcvs/wesnoth?rev=50929&view=rev
Log:
Fixed 24 hour ToD to follow the latest esr's and Espreon's suggestions
Modified:
trunk/data/core/macros/schedules.cfg
Modified: trunk/data/core/macros/schedules.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/macros/schedules.cfg?rev=50929&r1=50928&r2=50929&view=diff
==============================================================================
--- trunk/data/core/macros/schedules.cfg (original)
+++ trunk/data/core/macros/schedules.cfg Fri Aug 26 21:50:23 2011
@@ -173,10 +173,10 @@
# 24-hour clock time-of-day macros.
-#define HOUR0
- [time]
- id=hour0
- name=_"0:00 - Midnight"
+#define MIDNIGHT_HOUR
+ [time]
+ 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
- [time]
- id=hour1
- name=_"1:00"
+#define SECOND_WATCH_HOUR1
+ [time]
+ 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
- [time]
- id=hour2
- name=_"2:00"
+#define SECOND_WATCH_HOUR2
+ [time]
+ 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
- [time]
- id=hour3
- name=_"3:00"
+#define SECOND_WATCH_HOUR3
+ [time]
+ 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
- [time]
- id=hour4
- name=_"4:00"
+#define SECOND_WATCH_HOUR4
+ [time]
+ 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
- [time]
- id=hour5
- name=_"5:00"
+#define SECOND_WATCH_HOUR5
+ [time]
+ 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
- [time]
- id=hour6
- name=_"6:00"
+#define SECOND_WATCH_HOUR6
+ [time]
+ 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
- [time]
- id=hour7
- name=_"7:00 - Dawn"
+#define DAWN_HOUR
+ [time]
+ 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
- [time]
- id=hour8
- name=_"8:00"
+#define MORNING_HOUR1
+ [time]
+ 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
- [time]
- id=hour9
- name=_"9:00"
+#define MORNING_HOUR2
+ [time]
+ 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
- [time]
- id=hour10
- name=_"10:00"
+#define MORNING_HOUR3
+ [time]
+ 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
- [time]
- id=hour11
- name=_"11:00"
+#define MORNING_HOUR4
+ [time]
+ 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
- [time]
- id=hour12
- name=_"12:00 - Noon"
+#define MIDDAY_HOUR
+ [time]
+ id=midday_hour
+ name= _ "Midday"
image=misc/tod-schedule-24hrs.png~CROP(0,39,125,39)
lawful_bonus=25
[/time]
#enddef
-#define HOUR13
- [time]
- id=hour13
- name=_"13:00"
+#define AFTERNOON_HOUR1
+ [time]
+ 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
- [time]
- id=hour14
- name=_"14:00"
+#define AFTERNOON_HOUR2
+ [time]
+ 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
- [time]
- id=hour15
- name=_"15:00"
+#define AFTERNOON_HOUR3
+ [time]
+ 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
- [time]
- id=hour16
- name=_"16:00"
+#define AFTERNOON_HOUR4
+ [time]
+ 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
- [time]
- id=hour17
- name=_"17:00"
+#define AFTERNOON_HOUR5
+ [time]
+ 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
- [time]
- id=hour18
- name=_"18:00"
+#define AFTERNOON_HOUR6
+ [time]
+ 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
- [time]
- id=hour19
- name=_"19:00 - Sunset"
+#define DUSK_HOUR
+ [time]
+ 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
- [time]
- id=hour20
- name=_"20:00"
+#define FIRST_WATCH_HOUR1
+ [time]
+ 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
- [time]
- id=hour21
- name=_"21:00"
+#define FIRST_WATCH_HOUR2
+ [time]
+ 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
- [time]
- id=hour22
- name=_"22:00"
+#define FIRST_WATCH_HOUR3
+ [time]
+ 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
- [time]
- id=hour23
- name=_"23:00"
+#define FIRST_WATCH_HOUR4
+ [time]
+ 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}
-#enddef
+ {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
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
