Author: zookeeper
Date: Sun Sep 21 19:35:41 2008
New Revision: 29625
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29625&view=rev
Log:
Added the new Al'Brock and Flar'Tar portraits and fixed a bug that caused them
not to carry over correctly to the final scenario.
Added:
trunk/data/campaigns/Son_Of_The_Black_Eye/images/portraits/albrock.png
(with props)
trunk/data/campaigns/Son_Of_The_Black_Eye/images/portraits/flartar.png
(with props)
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/12_Giving_Some_Back.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/17_Human_Horde.cfg
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/18_Northern_Alliance.cfg
Added: trunk/data/campaigns/Son_Of_The_Black_Eye/images/portraits/albrock.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/images/portraits/albrock.png?rev=29625&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
trunk/data/campaigns/Son_Of_The_Black_Eye/images/portraits/albrock.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/data/campaigns/Son_Of_The_Black_Eye/images/portraits/flartar.png
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/images/portraits/flartar.png?rev=29625&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
trunk/data/campaigns/Son_Of_The_Black_Eye/images/portraits/flartar.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/12_Giving_Some_Back.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/12_Giving_Some_Back.cfg?rev=29625&r1=29624&r2=29625&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/12_Giving_Some_Back.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/12_Giving_Some_Back.cfg
Sun Sep 21 19:35:41 2008
@@ -58,7 +58,7 @@
name= _ "Al'Brock"
side=2
canrecruit=yes
- profile=portraits/James_Woo/orc-warlord2.png
+ profile=portraits/albrock.png
recruit=Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer, Orcish
Crossbowman, Orcish Warrior
team_name=Kapoue
user_team_name=_ "Kapou'e"
@@ -71,7 +71,7 @@
name= _ "Flar'Tar"
side=3
canrecruit=yes
- profile=portraits/James_Woo/orc-warlord3.png
+ profile=portraits/flartar.png
facing=sw
recruit=Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer, Orcish
Crossbowman, Orcish Warrior
team_name=Kapoue
Modified: trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/17_Human_Horde.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/17_Human_Horde.cfg?rev=29625&r1=29624&r2=29625&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/17_Human_Horde.cfg
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/17_Human_Horde.cfg Sun
Sep 21 19:35:41 2008
@@ -59,6 +59,7 @@
name= _ "Al'Brock"
side=2
canrecruit=yes
+ profile=portraits/albrock.png
recruit= Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer, Orcish
Crossbowman, Orcish Warrior, Orcish Assassin
team_name=Kapoue
user_team_name=_ "Kapou'e"
@@ -73,6 +74,7 @@
name= _ "Flar'Tar"
side=3
canrecruit=yes
+ profile=portraits/flartar.png
recruit= Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer, Orcish
Crossbowman, Orcish Warrior, Orcish Assassin
team_name=Kapoue
user_team_name=_ "Kapou'e"
@@ -142,7 +144,7 @@
[/part]
[/story]
- {GOT_THE_GREAT_HORDE 1}
+ {GOT_THE_GREAT_HORDE 1,2,3}
[event]
name=prestart
@@ -786,6 +788,58 @@
speaker="Kapou'e"
message= _ "Funny, that name sounds oddly familiar..."
[/message]
+
+ [store_unit]
+ [filter]
+ id="Al'Brock"
+ [/filter]
+
+ kill=yes
+ variable=stored_AlBrock
+ [/store_unit]
+
+ [store_unit]
+ [filter]
+ id="Flar'Tar"
+ [/filter]
+
+ kill=yes
+ variable=stored_FlarTar
+ [/store_unit]
+
+ {VARIABLE stored_AlBrock.side 1}
+ {VARIABLE stored_AlBrock.canrecruit no}
+
+ {VARIABLE stored_FlarTar.side 1}
+ {VARIABLE stored_FlarTar.canrecruit no}
+
+ [unstore_unit]
+ variable=stored_AlBrock
+ [/unstore_unit]
+
+ [unstore_unit]
+ variable=stored_FlarTar
+ [/unstore_unit]
+
+ # [store_unit]
+ # [filter]
+ # side=2
+ # [/filter]
+ #
+ # kill=no
+ # variable=AlBrock_recalls
+ # [/store_unit]
+ #
+ # [store_unit]
+ # [filter]
+ # side=3
+ # [/filter]
+ #
+ # kill=no
+ # variable=FlarTar_recalls
+ # [/store_unit]
+
+ {CLEAR_VARIABLE stored_AlBrock,stored_FlarTar}
[/event]
[event]
Modified:
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/18_Northern_Alliance.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/18_Northern_Alliance.cfg?rev=29625&r1=29624&r2=29625&view=diff
==============================================================================
---
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/18_Northern_Alliance.cfg
(original)
+++
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/18_Northern_Alliance.cfg
Sun Sep 21 19:35:41 2008
@@ -59,11 +59,8 @@
{STARTING_VILLAGES_AREA 1 22 5 10}
[side]
- type=Orcish Warlord
- id="Al'Brock"
- name= _ "Al'Brock"
side=2
- canrecruit=yes
+ no_leader=yes
recruit= Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer, Orcish
Crossbowman, Orcish Warrior, Orcish Assassin
team_name=Kapoue
user_team_name=_ "Kapou'e"
@@ -73,11 +70,8 @@
{STARTING_VILLAGES 2 6}
[side]
- type=Orcish Warlord
- id="Flar'Tar"
- name= _ "Flar'Tar"
side=3
- canrecruit=yes
+ no_leader=yes
recruit= Wolf Rider, Orcish Grunt, Troll Whelp, Orcish Archer, Orcish
Crossbowman, Orcish Warrior, Orcish Assassin
team_name=Kapoue
user_team_name=_ "Kapou'e"
@@ -182,6 +176,48 @@
name=prestart
[recall]
+ id="Al'Brock"
+ x,y=11,10
+ [/recall]
+
+ [recall]
+ id="Flar'Tar"
+ x,y=33,10
+ [/recall]
+
+ [store_unit]
+ [filter]
+ id="Al'Brock"
+ [/filter]
+ variable=stored_AlBrock
+ kill=yes
+ [/store_unit]
+
+ [store_unit]
+ [filter]
+ id="Flar'Tar"
+ [/filter]
+ variable=stored_FlarTar
+ kill=yes
+ [/store_unit]
+
+ {VARIABLE stored_AlBrock.side 2}
+ {VARIABLE stored_AlBrock.canrecruit yes}
+
+ {VARIABLE stored_FlarTar.side 3}
+ {VARIABLE stored_FlarTar.canrecruit yes}
+
+ [unstore_unit]
+ variable=stored_AlBrock
+ [/unstore_unit]
+
+ [unstore_unit]
+ variable=stored_FlarTar
+ [/unstore_unit]
+
+ {CLEAR_VARIABLE stored_AlBrock,stored_FlarTar}
+
+ [recall]
id=Grüü
x,y=45,20
[/recall]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
