Author: elvish_hunter
Date: Sun Aug 21 15:38:26 2011
New Revision: 50870
URL: http://svn.gna.org/viewcvs/wesnoth?rev=50870&view=rev
Log:
Added support for 24 hour ToD
Modified:
trunk/changelog
trunk/data/core/macros/schedules.cfg
Modified: trunk/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=50870&r1=50869&r2=50870&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Sun Aug 21 15:38:26 2011
@@ -121,6 +121,7 @@
* Added [primary_attack] support to [harm_unit]
* Added wml tag [store_items]
* [harm_unit] now supports an harmer unit and experience calculation.
+ * Added support for 24 hour ToD.
* Miscellaneous and bug fixes:
* Teach wmllint to fix deprecated implicit side=1 in [store_gold], [gold]
[remove_shroud], [place_shroud], [modify_side], [modify_ai] actions
Modified: trunk/data/core/macros/schedules.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/macros/schedules.cfg?rev=50870&r1=50869&r2=50870&view=diff
==============================================================================
--- trunk/data/core/macros/schedules.cfg (original)
+++ trunk/data/core/macros/schedules.cfg Sun Aug 21 15:38:26 2011
@@ -170,3 +170,288 @@
{DUSK}
{FIRST_WATCH}
#enddef
+
+# 24-hour clock time-of-day macros.
+#textdomain wesnoth
+
+#define HOUR0
+ [time]
+ id=hour0
+ name=_"0:00 - Midnight"
+ image=misc/tod-schedule-24hrs.png~CROP(0,195,125,39)
+ lawful_bonus=-25
+ red=-40
+ green=-40
+ blue=-10
+ [/time]
+#enddef
+
+#define HOUR1
+ [time]
+ id=hour1
+ name=_"1:00"
+ image=misc/tod-schedule-24hrs.png~CROP(250,234,125,39)
+ lawful_bonus=-25
+ red=-40
+ green=-40
+ blue=-10
+ [/time]
+#enddef
+
+#define HOUR2
+ [time]
+ id=hour2
+ name=_"2:00"
+ image=misc/tod-schedule-24hrs.png~CROP(125,234,125,39)
+ lawful_bonus=-25
+ red=-40
+ green=-40
+ blue=-10
+ [/time]
+#enddef
+
+#define HOUR3
+ [time]
+ id=hour3
+ name=_"3:00"
+ image=misc/tod-schedule-24hrs.png~CROP(0,234,125,39)
+ lawful_bonus=-25
+ red=-40
+ green=-40
+ blue=-10
+ [/time]
+#enddef
+
+#define HOUR4
+ [time]
+ id=hour4
+ name=_"4:00"
+ image=misc/tod-schedule-24hrs.png~CROP(250,273,125,39)
+ lawful_bonus=-25
+ red=-40
+ green=-40
+ blue=-10
+ [/time]
+#enddef
+
+#define HOUR5
+ [time]
+ id=hour5
+ name=_"5:00"
+ image=misc/tod-schedule-24hrs.png~CROP(125,273,125,39)
+ lawful_bonus=-15
+ red=-40
+ green=-40
+ blue=-10
+ [/time]
+#enddef
+
+#define HOUR6
+ [time]
+ id=hour6
+ name=_"6:00"
+ image=misc/tod-schedule-24hrs.png~CROP(0,273,125,39)
+ lawful_bonus=-5
+ red=-30
+ green=-30
+ blue=-5
+ [/time]
+#enddef
+
+#define HOUR7
+ [time]
+ id=hour7
+ name=_"7:00 - Dawn"
+ image=misc/tod-schedule-24hrs.png~CROP(250,0,125,39)
+ red=-20
+ green=-20
+ sound=ambient/morning.ogg
+ [/time]
+#enddef
+
+#define HOUR8
+ [time]
+ id=hour8
+ name=_"8:00"
+ image=misc/tod-schedule-24hrs.png~CROP(125,0,125,39)
+ lawful_bonus=5
+ [/time]
+#enddef
+
+#define HOUR9
+ [time]
+ id=hour9
+ name=_"9:00"
+ image=misc/tod-schedule-24hrs.png~CROP(0,0,125,39)
+ lawful_bonus=15
+ [/time]
+#enddef
+
+#define HOUR10
+ [time]
+ id=hour10
+ name=_"10:00"
+ image=misc/tod-schedule-24hrs.png~CROP(250,39,125,39)
+ lawful_bonus=25
+ [/time]
+#enddef
+
+#define HOUR11
+ [time]
+ id=hour11
+ name=_"11:00"
+ 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"
+ image=misc/tod-schedule-24hrs.png~CROP(0,39,125,39)
+ lawful_bonus=25
+ [/time]
+#enddef
+
+#define HOUR13
+ [time]
+ id=hour13
+ name=_"13:00"
+ image=misc/tod-schedule-24hrs.png~CROP(250,78,125,39)
+ lawful_bonus=25
+ [/time]
+#enddef
+
+#define HOUR14
+ [time]
+ id=hour14
+ name=_"14:00"
+ image=misc/tod-schedule-24hrs.png~CROP(125,78,125,39)
+ lawful_bonus=25
+ [/time]
+#enddef
+
+#define HOUR15
+ [time]
+ id=hour15
+ name=_"15:00"
+ image=misc/tod-schedule-24hrs.png~CROP(0,78,125,39)
+ lawful_bonus=25
+ [/time]
+#enddef
+
+#define HOUR16
+ [time]
+ id=hour16
+ name=_"16:00"
+ image=misc/tod-schedule-24hrs.png~CROP(250,117,125,39)
+ lawful_bonus=25
+ [/time]
+#enddef
+
+#define HOUR17
+ [time]
+ id=hour17
+ name=_"17:00"
+ image=misc/tod-schedule-24hrs.png~CROP(125,117,125,39)
+ lawful_bonus=15
+ [/time]
+#enddef
+
+#define HOUR18
+ [time]
+ id=hour18
+ name=_"18:00"
+ image=misc/tod-schedule-24hrs.png~CROP(0,117,125,39)
+ lawful_bonus=5
+ green=-10
+ blue=-10
+ [/time]
+#enddef
+
+#define HOUR19
+ [time]
+ id=hour19
+ name=_"19:00 - Sunset"
+ image=misc/tod-schedule-24hrs.png~CROP(250,156,125,39)
+ green=-20
+ blue=-20
+ sound=ambient/night.ogg
+ [/time]
+#enddef
+
+#define HOUR20
+ [time]
+ id=hour20
+ name=_"20:00"
+ image=misc/tod-schedule-24hrs.png~CROP(125,156,125,39)
+ lawful_bonus=-5
+ red=-20
+ green=-30
+ blue=-5
+ [/time]
+#enddef
+
+#define HOUR21
+ [time]
+ id=hour21
+ name=_"21:00"
+ image=misc/tod-schedule-24hrs.png~CROP(0,156,125,39)
+ lawful_bonus=-15
+ red=-40
+ green=-40
+ blue=-10
+ [/time]
+#enddef
+
+#define HOUR22
+ [time]
+ id=hour22
+ name=_"22:00"
+ image=misc/tod-schedule-24hrs.png~CROP(250,195,125,39)
+ lawful_bonus=-25
+ red=-40
+ green=-40
+ blue=-10
+ [/time]
+#enddef
+
+#define HOUR23
+ [time]
+ id=hour23
+ name=_"23:00"
+ image=misc/tod-schedule-24hrs.png~CROP(125,195,125,39)
+ lawful_bonus=-25
+ red=-40
+ green=-40
+ blue=-10
+ [/time]
+#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
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
