Author: espreon
Date: Fri Apr 23 04:12:27 2010
New Revision: 42218
URL: http://svn.gna.org/viewcvs/wesnoth?rev=42218&view=rev
Log:
Ran umcpropfix.
Modified:
trunk/data/core/images/attacks/claws-fire-elemental.png (props changed)
trunk/data/core/images/attacks/fire-blast.png (props changed)
trunk/data/core/images/halo/darkens-aura.png (props changed)
trunk/data/core/images/halo/misc/leadership-flare-1.png (props changed)
trunk/data/core/images/halo/misc/leadership-flare-10.png (props changed)
trunk/data/core/images/halo/misc/leadership-flare-11.png (props changed)
trunk/data/core/images/halo/misc/leadership-flare-12.png (props changed)
trunk/data/core/images/halo/misc/leadership-flare-13.png (props changed)
trunk/data/core/images/halo/misc/leadership-flare-2.png (props changed)
trunk/data/core/images/halo/misc/leadership-flare-3.png (props changed)
trunk/data/core/images/halo/misc/leadership-flare-4.png (props changed)
trunk/data/core/images/halo/misc/leadership-flare-5.png (props changed)
trunk/data/core/images/halo/misc/leadership-flare-6.png (props changed)
trunk/data/core/images/halo/misc/leadership-flare-7.png (props changed)
trunk/data/core/images/halo/misc/leadership-flare-8.png (props changed)
trunk/data/core/images/halo/misc/leadership-flare-9.png (props changed)
trunk/data/core/images/units/human-peasants/woodsman-idle-1.png (props
changed)
trunk/data/core/images/units/human-peasants/woodsman-idle-10.png (props
changed)
trunk/data/core/images/units/human-peasants/woodsman-idle-11.png (props
changed)
trunk/data/core/images/units/human-peasants/woodsman-idle-12.png (props
changed)
trunk/data/core/images/units/human-peasants/woodsman-idle-13.png (props
changed)
trunk/data/core/images/units/human-peasants/woodsman-idle-14.png (props
changed)
trunk/data/core/images/units/human-peasants/woodsman-idle-2.png (props
changed)
trunk/data/core/images/units/human-peasants/woodsman-idle-3.png (props
changed)
trunk/data/core/images/units/human-peasants/woodsman-idle-4.png (props
changed)
trunk/data/core/images/units/human-peasants/woodsman-idle-5.png (props
changed)
trunk/data/core/images/units/human-peasants/woodsman-idle-6.png (props
changed)
trunk/data/core/images/units/human-peasants/woodsman-idle-7.png (props
changed)
trunk/data/core/images/units/human-peasants/woodsman-idle-8.png (props
changed)
trunk/data/core/images/units/human-peasants/woodsman-idle-9.png (props
changed)
trunk/data/multiplayer/maps/2p_Elensefar_Courtyard.map (props changed)
trunk/data/multiplayer/scenarios/2p_Elensefar_Courtyard.cfg (contents,
props changed)
Propchange: trunk/data/core/images/attacks/claws-fire-elemental.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/attacks/fire-blast.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/halo/darkens-aura.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Propchange: trunk/data/core/images/halo/misc/leadership-flare-1.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/halo/misc/leadership-flare-10.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/halo/misc/leadership-flare-11.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/halo/misc/leadership-flare-12.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/halo/misc/leadership-flare-13.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/halo/misc/leadership-flare-2.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/halo/misc/leadership-flare-3.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/halo/misc/leadership-flare-4.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/halo/misc/leadership-flare-5.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/halo/misc/leadership-flare-6.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/halo/misc/leadership-flare-7.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/halo/misc/leadership-flare-8.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/halo/misc/leadership-flare-9.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/units/human-peasants/woodsman-idle-1.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/units/human-peasants/woodsman-idle-10.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/units/human-peasants/woodsman-idle-11.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/units/human-peasants/woodsman-idle-12.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/units/human-peasants/woodsman-idle-13.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/units/human-peasants/woodsman-idle-14.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/units/human-peasants/woodsman-idle-2.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/units/human-peasants/woodsman-idle-3.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/units/human-peasants/woodsman-idle-4.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/units/human-peasants/woodsman-idle-5.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/units/human-peasants/woodsman-idle-6.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/units/human-peasants/woodsman-idle-7.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/units/human-peasants/woodsman-idle-8.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/core/images/units/human-peasants/woodsman-idle-9.png
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Apr 23 04:12:27 2010
@@ -1,1 +1,1 @@
-application/octet-stream
+image/png
Propchange: trunk/data/multiplayer/maps/2p_Elensefar_Courtyard.map
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/data/multiplayer/scenarios/2p_Elensefar_Courtyard.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/multiplayer/scenarios/2p_Elensefar_Courtyard.cfg?rev=42218&r1=42217&r2=42218&view=diff
==============================================================================
--- trunk/data/multiplayer/scenarios/2p_Elensefar_Courtyard.cfg (original)
+++ trunk/data/multiplayer/scenarios/2p_Elensefar_Courtyard.cfg Fri Apr 23
04:12:27 2010
@@ -1,118 +1,118 @@
-#textdomain wesnoth-multiplayer
-
-[multiplayer]
- id=multiplayer_elensefar_courtyard
- name= _ "2p - Elensefar Courtyard"
- map_data="{multiplayer/maps/2p_Elensefar_Courtyard.map}"
- description= _ "Fight through corridors and gardens, and dominate the
eastern courtyard of what used to be the glorious city of Elensefar.
-Still in testing phase."
- random_start_time="no"
-
- {DEFAULT_SCHEDULE}
- {DEFAULT_MUSIC_PLAYLIST}
-
- [side]
- [ai]
- villages_per_scout=7
- [/ai]
- side=1
- gold=125
- canrecruit=yes
- controller=human
- team_name=south
- user_team_name= _ "teamname^South"
- fog=yes
- [/side]
- [side]
- [ai]
- villages_per_scout=7
- [/ai]
- side=2
- gold=125
- canrecruit=yes
- controller=human
- team_name=north
- user_team_name= _ "teamname^North"
- fog=yes
- [/side]
-
- [item]
- x=16
- y=14
- image=units/elves-wood/lord-magic-1.png~GS()
- [/item]
- [item]
- x=19
- y=2
- image=units/elves-wood/champion-attack-5.png~GS()
- [/item]
- [item]
- x=20
- y=25
- image="units/elves-wood/sharpshooter+female-bow-attack3.png~GS()"
- [/item]
-
- {PLACE_IMAGE scenery/village-human-burned1.png 35 3}
- {PLACE_IMAGE scenery/rubble.png 27 6}
- {PLACE_IMAGE scenery/tent-fancy-red.png 15 27}
- {PLACE_IMAGE scenery/leanto.png 14 27}
- {PLACE_IMAGE units/transport/boat.png 2 5}
- {PLACE_IMAGE items/scarecrow.png 5 25}
- {PLACE_IMAGE items/straw-bale2.png 37 25}
- {PLACE_IMAGE items/straw-bale1.png 35 24}
- {PLACE_IMAGE items/box.png 2 21}
- {PLACE_IMAGE items/ornate1.png 2 22}
- {PLACE_IMAGE items/barrel.png 1 13}
- {PLACE_IMAGE items/brazier.png 1 16}
- {PLACE_IMAGE items/barrel.png 2 18}
- {PLACE_IMAGE scenery/monolith2.png 19 11}
- {PLACE_IMAGE scenery/monolith3.png 22 12}
- {PLACE_IMAGE scenery/monolith1.png 22 15}
- {PLACE_IMAGE scenery/monolith3.png 19 17}
- {PLACE_IMAGE scenery/monolith2.png 13 17}
- {PLACE_IMAGE scenery/monolith3.png 10 15}
- {PLACE_IMAGE scenery/monolith1.png 10 12}
- {PLACE_IMAGE scenery/monolith3.png 13 11}
- {PLACE_IMAGE scenery/whirlpool.png 15 14}
- {PLACE_IMAGE scenery/whirlpool.png 17 14}
- {PLACE_IMAGE scenery/well.png 15 26}
-
- [event]
- name=prestart
-
- [store_locations]
- variable=ToD_change_to_litcave
- x=28-31
- [or]
- x,y=25-27,1
- [/or]
- [or]
- x,y=27,2
- [/or]
- [or]
- x,y=26-27,26
- [/or]
- [or]
- x,y=32-36,9-19
- terrain=R*,Ggf,Rp^Uf,Rp^Dr,Rd^Uf
- [/or]
- [or]
- x=1-3
- terrain=Rr,Xos
- [/or]
- [or]
- x=22-37
- terrain=Xos
- [/or]
- [/store_locations]
- [time_area]
- find_in=ToD_change_to_litcave
- [time]
- id=underground_illum
- name= _ "Underground"
- image=misc/schedule-underground-illum.png
- [/time]
- [/time_area]
- {CLEAR_VARIABLE ToD_change_to_litcave}
- [/event]
+#textdomain wesnoth-multiplayer
+
+[multiplayer]
+ id=multiplayer_elensefar_courtyard
+ name= _ "2p - Elensefar Courtyard"
+ map_data="{multiplayer/maps/2p_Elensefar_Courtyard.map}"
+ description= _ "Fight through corridors and gardens, and dominate the
eastern courtyard of what used to be the glorious city of Elensefar.
+Still in testing phase."
+ random_start_time="no"
+
+ {DEFAULT_SCHEDULE}
+ {DEFAULT_MUSIC_PLAYLIST}
+
+ [side]
+ [ai]
+ villages_per_scout=7
+ [/ai]
+ side=1
+ gold=125
+ canrecruit=yes
+ controller=human
+ team_name=south
+ user_team_name= _ "teamname^South"
+ fog=yes
+ [/side]
+ [side]
+ [ai]
+ villages_per_scout=7
+ [/ai]
+ side=2
+ gold=125
+ canrecruit=yes
+ controller=human
+ team_name=north
+ user_team_name= _ "teamname^North"
+ fog=yes
+ [/side]
+
+ [item]
+ x=16
+ y=14
+ image=units/elves-wood/lord-magic-1.png~GS()
+ [/item]
+ [item]
+ x=19
+ y=2
+ image=units/elves-wood/champion-attack-5.png~GS()
+ [/item]
+ [item]
+ x=20
+ y=25
+ image="units/elves-wood/sharpshooter+female-bow-attack3.png~GS()"
+ [/item]
+
+ {PLACE_IMAGE scenery/village-human-burned1.png 35 3}
+ {PLACE_IMAGE scenery/rubble.png 27 6}
+ {PLACE_IMAGE scenery/tent-fancy-red.png 15 27}
+ {PLACE_IMAGE scenery/leanto.png 14 27}
+ {PLACE_IMAGE units/transport/boat.png 2 5}
+ {PLACE_IMAGE items/scarecrow.png 5 25}
+ {PLACE_IMAGE items/straw-bale2.png 37 25}
+ {PLACE_IMAGE items/straw-bale1.png 35 24}
+ {PLACE_IMAGE items/box.png 2 21}
+ {PLACE_IMAGE items/ornate1.png 2 22}
+ {PLACE_IMAGE items/barrel.png 1 13}
+ {PLACE_IMAGE items/brazier.png 1 16}
+ {PLACE_IMAGE items/barrel.png 2 18}
+ {PLACE_IMAGE scenery/monolith2.png 19 11}
+ {PLACE_IMAGE scenery/monolith3.png 22 12}
+ {PLACE_IMAGE scenery/monolith1.png 22 15}
+ {PLACE_IMAGE scenery/monolith3.png 19 17}
+ {PLACE_IMAGE scenery/monolith2.png 13 17}
+ {PLACE_IMAGE scenery/monolith3.png 10 15}
+ {PLACE_IMAGE scenery/monolith1.png 10 12}
+ {PLACE_IMAGE scenery/monolith3.png 13 11}
+ {PLACE_IMAGE scenery/whirlpool.png 15 14}
+ {PLACE_IMAGE scenery/whirlpool.png 17 14}
+ {PLACE_IMAGE scenery/well.png 15 26}
+
+ [event]
+ name=prestart
+
+ [store_locations]
+ variable=ToD_change_to_litcave
+ x=28-31
+ [or]
+ x,y=25-27,1
+ [/or]
+ [or]
+ x,y=27,2
+ [/or]
+ [or]
+ x,y=26-27,26
+ [/or]
+ [or]
+ x,y=32-36,9-19
+ terrain=R*,Ggf,Rp^Uf,Rp^Dr,Rd^Uf
+ [/or]
+ [or]
+ x=1-3
+ terrain=Rr,Xos
+ [/or]
+ [or]
+ x=22-37
+ terrain=Xos
+ [/or]
+ [/store_locations]
+ [time_area]
+ find_in=ToD_change_to_litcave
+ [time]
+ id=underground_illum
+ name= _ "Underground"
+ image=misc/schedule-underground-illum.png
+ [/time]
+ [/time_area]
+ {CLEAR_VARIABLE ToD_change_to_litcave}
+ [/event]
[/multiplayer]
Propchange: trunk/data/multiplayer/scenarios/2p_Elensefar_Courtyard.cfg
------------------------------------------------------------------------------
svn:eol-style = native
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
