Author: esr
Date: Thu Apr 23 04:26:39 2009
New Revision: 35129
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35129&view=rev
Log:
Deprecate two redundant macros, and change mainline to use the simpler ones.
Modified:
trunk/data/campaigns/Delfadors_Memoirs/WALKTHROUGH
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/scenarios/17_a_new_ally.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg
trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg
trunk/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg
trunk/data/core/macros/deprecated-utils.cfg
trunk/data/core/macros/image-utils.cfg
Modified: trunk/data/campaigns/Delfadors_Memoirs/WALKTHROUGH
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/WALKTHROUGH?rev=35129&r1=35128&r2=35129&view=diff
==============================================================================
--- trunk/data/campaigns/Delfadors_Memoirs/WALKTHROUGH (original)
+++ trunk/data/campaigns/Delfadors_Memoirs/WALKTHROUGH Thu Apr 23 04:26:39 2009
@@ -13,12 +13,17 @@
horseman and then about half mages to half spearmen; you need your
spearmen to block for wounded mages.
-It's actually not a bad idea to just fort up on Methor's keep; the
-orcs will reach you about dawn of the second day, and the
-fortifications will tilt the kill ratio in your favor. Once you've
-dealt with the initial assault wave, cross the bridge in force and run
-north to kill the boss. Use Methor's lightbeam attack to soften up
-opponents so your baby mages can get kills.
+On Easy and Normal, it's actually not a bad idea to just fort up on
+Methor's keep; the orcs will reach you about dawn of the second day,
+and the fortifications will tilt the kill ratio in your favor. Once
+you've dealt with the initial assault wave, cross the bridge in force
+and run north to kill the boss. Use Methor's lightbeam attack to
+soften up opponents so your baby mages can get kills.
+
+On Hard, the AI may very hang back and never attack if you fort up, so
+you have to send troops over the river early. If it looks like the
+orcs will make contact befor morning, fort up in the treeline just west
+and south of the bridge, as this wioll improve your spearmens' defense.
The Road to Weldyn
==================
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=35129&r1=35128&r2=35129&view=diff
==============================================================================
--- trunk/data/campaigns/Delfadors_Memoirs/scenarios/08_ur_thorodor.cfg
(original)
+++ trunk/data/campaigns/Delfadors_Memoirs/scenarios/08_ur_thorodor.cfg Thu Apr
23 04:26:39 2009
@@ -34,7 +34,7 @@
name=prestart
{RECALL_OR_CREATE_UNIT {LIONEL} Lionel}
# wmllint: recognize Lionel
- {ADD_HERO_ICON id=Lionel}
+ {MAKE_HERO 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=35129&r1=35128&r2=35129&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
Thu Apr 23 04:26:39 2009
@@ -101,7 +101,7 @@
id=Chantal
x,y=32,2
[/recall]
- {ADD_HERO_ICON id=Chantal}
+ {MAKE_HERO Chantal}
[/event]
[side]
Modified: trunk/data/campaigns/Delfadors_Memoirs/scenarios/17_a_new_ally.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Delfadors_Memoirs/scenarios/17_a_new_ally.cfg?rev=35129&r1=35128&r2=35129&view=diff
==============================================================================
--- trunk/data/campaigns/Delfadors_Memoirs/scenarios/17_a_new_ally.cfg
(original)
+++ trunk/data/campaigns/Delfadors_Memoirs/scenarios/17_a_new_ally.cfg Thu Apr
23 04:26:39 2009
@@ -55,6 +55,7 @@
team_name=player
# wmllint: recognize Relgorn
{NAMED_UNIT 2 (Dwarvish Fighter) 5 10 "Relgorn" (_"Relgorn")
(ai_special=guardian)}
+ {MAKE_HERO Relgorn}
{NAMED_UNIT 2 (Dwarvish Fighter) 9 7 "Udrin" (_"Udrin")
(ai_special=guardian)}
[/side]
[side]
@@ -161,25 +162,7 @@
id=Delfador
[/scroll_to_unit]
- [sound]
- name=lightning.ogg
- [/sound]
-
- [colour_adjust]
- red=100
- green=100
- blue=100
- [/colour_adjust]
-
- [delay]
- time=10
- [/delay]
-
- [colour_adjust]
- red=0
- green=0
- blue=0
- [/colour_adjust]
+ {DELFADOR_LIGHTNING}
[message]
speaker=Delfador
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg?rev=35129&r1=35128&r2=35129&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg Thu
Apr 23 04:26:39 2009
@@ -180,7 +180,7 @@
[/unstore_unit]
{CLEAR_VARIABLE landar_store}
- {REMOVE_HERO_ICON (id=Landar)}
+ {UNMAKE_HERO Landar}
#TODO unstore troop_store
[/event]
Modified: trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg?rev=35129&r1=35128&r2=35129&view=diff
==============================================================================
--- trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg (original)
+++ trunk/data/campaigns/Liberty/scenarios/08_Glory.cfg Thu Apr 23 04:26:39 2009
@@ -379,7 +379,7 @@
id=Harper
[/recall]
- {REMOVE_HERO_ICON id=Harper}
+ {UNMAKE_HERO Harper}
[message]
speaker=Baldras
Modified:
trunk/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg?rev=35129&r1=35128&r2=35129&view=diff
==============================================================================
---
trunk/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
(original)
+++
trunk/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
Thu Apr 23 04:26:39 2009
@@ -589,7 +589,7 @@
speaker=Thursagan
message= _ "Well, now we are in the caves again! Come on, back
south, to the city."
[/message]
- {REMOVE_HERO_ICON id=Baglur}
+ {UNMAKE_HERO id=Baglur}
[endlevel]
result=victory
bonus=yes
Modified:
trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg?rev=35129&r1=35128&r2=35129&view=diff
==============================================================================
--- trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg
(original)
+++ trunk/data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg Thu
Apr 23 04:26:39 2009
@@ -338,7 +338,7 @@
message=_"Aye. But I've a grim feeling we might be going to
discover that in person."
[/message]
- {REMOVE_HERO_ICON id=Ratheln}
+ {UNMAKE_HERO Ratheln}
[endlevel]
result=victory
Modified: trunk/data/core/macros/deprecated-utils.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/macros/deprecated-utils.cfg?rev=35129&r1=35128&r2=35129&view=diff
==============================================================================
--- trunk/data/core/macros/deprecated-utils.cfg (original)
+++ trunk/data/core/macros/deprecated-utils.cfg Thu Apr 23 04:26:39 2009
@@ -14,3 +14,53 @@
#enddef
#wmllint: markcheck on
+
+#define ADD_HERO_ICON FILTER
+ # Add hero icon to specified units
+ {DEPRECATED_MACRO ADD_HERO_ICON 1.7.2}
+ [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
+ # Remove the hero icon from a unit by ID or other filter
+ {DEPRECATED_MACRO REMOVE_HERO_ICON 1.7.2}
+ [store_unit]
+ [filter]
+ {FILTER}
+ [/filter]
+
+ kill=no
+ variable=hero_removal_target
+ [/store_unit]
+
+ [remove_unit_overlay]
+ x,y=$hero_removal_target.x,$hero_removal_target.y
+ image=misc/hero-icon.png
+ [/remove_unit_overlay]
+
+ [clear_variable]
+ name=hero_removal_target
+ [/clear_variable]
+#enddef
+
Modified: trunk/data/core/macros/image-utils.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/macros/image-utils.cfg?rev=35129&r1=35128&r2=35129&view=diff
==============================================================================
--- trunk/data/core/macros/image-utils.cfg (original)
+++ trunk/data/core/macros/image-utils.cfg Thu Apr 23 04:26:39 2009
@@ -26,52 +26,6 @@
#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
- # Remove the hero icon from a unit by ID or other filter
- [store_unit]
- [filter]
- {FILTER}
- [/filter]
-
- kill=no
- variable=hero_removal_target
- [/store_unit]
-
- [remove_unit_overlay]
- x,y=$hero_removal_target.x,$hero_removal_target.y
- image=misc/hero-icon.png
- [/remove_unit_overlay]
-
- [clear_variable]
- name=hero_removal_target
- [/clear_variable]
#enddef
#define NEW_JOURNEY X Y
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
