Author: esr
Date: Sat Apr 11 21:32:51 2009
New Revision: 34730
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34730&view=rev
Log:
Add some hero icons where needed. Add a standard macro to do this.
Modified:
trunk/data/campaigns/Delfadors_Memoirs/TODO
trunk/data/campaigns/Delfadors_Memoirs/scenarios/08_ur_thorodor.cfg
trunk/data/campaigns/Delfadors_Memoirs/scenarios/12_terror_at_the_ford_of_parthyn.cfg
trunk/data/campaigns/Delfadors_Memoirs/utils/characters.cfg
trunk/data/core/macros/image-utils.cfg
Modified: trunk/data/campaigns/Delfadors_Memoirs/TODO
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/TODO?rev=34730&r1=34729&r2=34730&view=diff
==============================================================================
--- trunk/data/campaigns/Delfadors_Memoirs/TODO (original)
+++ trunk/data/campaigns/Delfadors_Memoirs/TODO Sat Apr 11 21:32:51 2009
@@ -11,8 +11,6 @@
In scenario 19, maybe do an animation with a wall appearing in the
place of the portal?
-
-In Ur-Thirodur (8), Lionel needs a hero crown.
Other
-----
Modified: trunk/data/campaigns/Delfadors_Memoirs/scenarios/08_ur_thorodor.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/08_ur_thorodor.cfg?rev=34730&r1=34729&r2=34730&view=diff
==============================================================================
--- trunk/data/campaigns/Delfadors_Memoirs/scenarios/08_ur_thorodor.cfg
(original)
+++ trunk/data/campaigns/Delfadors_Memoirs/scenarios/08_ur_thorodor.cfg Sat Apr
11 21:32:51 2009
@@ -34,6 +34,7 @@
name=prestart
{RECALL_OR_CREATE_UNIT {LIONEL} Lionel}
# wmllint: recognize Lionel
+ {ADD_HERO_ICON id=Lionel}
[/event]
{STARTING_VILLAGES 1 4}
#### /Delfador's code ####
Modified:
trunk/data/campaigns/Delfadors_Memoirs/scenarios/12_terror_at_the_ford_of_parthyn.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/12_terror_at_the_ford_of_parthyn.cfg?rev=34730&r1=34729&r2=34730&view=diff
==============================================================================
---
trunk/data/campaigns/Delfadors_Memoirs/scenarios/12_terror_at_the_ford_of_parthyn.cfg
(original)
+++
trunk/data/campaigns/Delfadors_Memoirs/scenarios/12_terror_at_the_ford_of_parthyn.cfg
Sat Apr 11 21:32:51 2009
@@ -103,6 +103,7 @@
id=Chantal
x,y=32,2
[/recall]
+ {ADD_HERO_ICON id=Chantal}
[/event]
[side]
Modified: trunk/data/campaigns/Delfadors_Memoirs/utils/characters.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/utils/characters.cfg?rev=34730&r1=34729&r2=34730&view=diff
==============================================================================
--- trunk/data/campaigns/Delfadors_Memoirs/utils/characters.cfg (original)
+++ trunk/data/campaigns/Delfadors_Memoirs/utils/characters.cfg Sat Apr 11
21:32:51 2009
@@ -50,6 +50,7 @@
controller=ai
recruit=Elvish Ranger,Elvish Rider
team_name=goodies
+ {IS_HERO}
[modifications]
{TRAIT_INTELLIGENT}
{TRAIT_RESILIENT}
@@ -68,6 +69,7 @@
id=Lionel
name=_ "Lionel"
profile="portraits/lionel.png"
+ {IS_HERO}
[modifications]
{TRAIT_FEARLESS}
{TRAIT_STRONG}
Modified: trunk/data/core/macros/image-utils.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/macros/image-utils.cfg?rev=34730&r1=34729&r2=34730&view=diff
==============================================================================
--- trunk/data/core/macros/image-utils.cfg (original)
+++ trunk/data/core/macros/image-utils.cfg Sat Apr 11 21:32:51 2009
@@ -26,6 +26,31 @@
#define IS_HERO
# Embed this into a unit declaration to add a hero icon to the unit.
overlays="misc/hero-icon.png"
+#enddef
+
+#define ADD_HERO_ICON FILTER
+ [store_unit]
+ [filter]
+ {FILTER}
+ [/filter]
+
+ variable=MODIFY_UNIT_store
+ kill=yes
+ [/store_unit]
+
+ {FOREACH MODIFY_UNIT_store MODIFY_UNIT_i}
+ [set_variable]
+ name=MODIFY_UNIT_store[$MODIFY_UNIT_i].overlays
+ value="misc/hero-icon.png"
+ [/set_variable]
+
+ [unstore_unit]
+ variable=MODIFY_UNIT_store[$MODIFY_UNIT_i]
+ find_vacant=no
+ [/unstore_unit]
+ {NEXT MODIFY_UNIT_i}
+
+ {CLEAR_VARIABLE MODIFY_UNIT_store}
#enddef
#define REMOVE_HERO_ICON FILTER
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
