Author: zookeeper
Date: Sun Sep 21 14:48:33 2008
New Revision: 29621
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29621&view=rev
Log:
Converted DiD to the new gold carryover system.
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
trunk/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
trunk/data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg
trunk/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg
trunk/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
trunk/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg
trunk/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg
trunk/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg
trunk/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
trunk/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
trunk/data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg?rev=29621&r1=29620&r2=29621&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
(original)
+++ trunk/data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
Sun Sep 21 14:48:33 2008
@@ -131,6 +131,9 @@
condition=lose
description=_ "Death of Drogan"
[/objective]
+
+ note= _ "Early finish bonus." + "
+20%" + _" of finishing gold carried over to the next scenario."
[/objectives]
# Place signpost to mark area defended
@@ -347,6 +350,9 @@
[/kill]
[endlevel]
result=victory
+ bonus=yes
+ carryover_add=yes
+ carryover_percentage=20
[/endlevel]
#enddef
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg?rev=29621&r1=29620&r2=29621&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
(original)
+++ trunk/data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
Sun Sep 21 14:48:33 2008
@@ -79,6 +79,9 @@
condition=lose
description=_ "Death of Darken Volk"
[/objective]
+
+ note= _ "Early finish bonus." + "
+20%" + _" of finishing gold carried over to the next scenario."
[/objectives]
[/event]
@@ -338,8 +341,10 @@
[/message]
[endlevel]
+ result=victory
bonus=yes
- result=victory
+ carryover_add=yes
+ carryover_percentage=20
[/endlevel]
[/else]
[/if]
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg?rev=29621&r1=29620&r2=29621&view=diff
==============================================================================
---
trunk/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
(original)
+++
trunk/data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
Sun Sep 21 14:48:33 2008
@@ -110,6 +110,9 @@
condition=lose
description=_ "Death of Darken Volk"
[/objective]
+
+ note= _ "Early finish bonus." + "
+20%" + _" of finishing gold carried over to the next scenario."
[/objectives]
# {SCATTER_IMAGE (terrain=Uu) 5 scenery/rubble.png}
@@ -297,8 +300,10 @@
[event]
name=enemies defeated
[endlevel]
+ result=victory
bonus=yes
- result=victory
+ carryover_add=yes
+ carryover_percentage=20
[/endlevel]
[/event]
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg?rev=29621&r1=29620&r2=29621&view=diff
==============================================================================
---
trunk/data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg
(original)
+++
trunk/data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg
Sun Sep 21 14:48:33 2008
@@ -110,6 +110,9 @@
condition=lose
description=_ "Death of Darken Volk"
[/objective]
+
+ note= _ "Early finish bonus." + "
+20%" + _" of finishing gold carried over to the next scenario."
[/objectives]
# Signpost at the end of the pass
@@ -285,8 +288,21 @@
{CLEAR_VARIABLE weakened_ice}
[endlevel]
+ result=victory
bonus=yes
+ carryover_add=yes
+ carryover_percentage=20
+ [/endlevel]
+ [/event]
+
+ [event]
+ name=enemies defeated
+
+ [endlevel]
result=victory
+ bonus=yes
+ carryover_add=yes
+ carryover_percentage=20
[/endlevel]
[/event]
[/scenario]
Modified: trunk/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg?rev=29621&r1=29620&r2=29621&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg
(original)
+++ trunk/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg Sun Sep
21 14:48:33 2008
@@ -157,6 +157,9 @@
condition=lose
description=_ "Death of Darken Volk"
[/objective]
+
+ note= _ "Early finish bonus." + "
+20%" + _" of finishing gold carried over to the next scenario."
[/objectives]
[recall]
@@ -322,8 +325,10 @@
[/store_unit]
[endlevel]
+ result=victory
bonus=yes
- result=victory
+ carryover_add=yes
+ carryover_percentage=20
[/endlevel]
[/then]
[/if]
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg?rev=29621&r1=29620&r2=29621&view=diff
==============================================================================
---
trunk/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
(original)
+++
trunk/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
Sun Sep 21 14:48:33 2008
@@ -123,6 +123,9 @@
condition=lose
description= _ "Death of Malin Keshar"
[/objective]
+
+ note= _ "No early finish bonus." + "
+20%" + _" of finishing gold carried over to the next scenario."
[/objectives]
# Replace the fallback orcish leader with the stored one from the
@@ -305,6 +308,9 @@
condition=lose
description= _ "Death of Malin Keshar"
[/objective]
+
+ note= _ "No early finish bonus." + "
+20%" + _" of finishing gold carried over to the next scenario."
[/objectives]
[music]
name=loyalists.ogg
@@ -332,8 +338,10 @@
[/message]
[endlevel]
+ result=victory
bonus=no
- result=continue
+ carryover_add=yes
+ carryover_percentage=20
[/endlevel]
[/event]
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg?rev=29621&r1=29620&r2=29621&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg
(original)
+++ trunk/data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg
Sun Sep 21 14:48:33 2008
@@ -105,6 +105,9 @@
condition=lose
description= _ "Death of Darken Volk"
[/objective]
+
+ note= _ "No early finish bonus." + "
+20%" + _" of finishing gold carried over to the next scenario."
[/objectives]
# Add a little randomness to the forest
@@ -315,8 +318,10 @@
[/message]
[endlevel]
+ result=continue
bonus=no
- result=continue
+ carryover_add=yes
+ carryover_percentage=20
[/endlevel]
[/then]
[/if]
@@ -342,8 +347,10 @@
message=_ "Here is the entrance! Hurry!"
[/message]
[endlevel]
+ result=continue
bonus=no
- result=continue
+ carryover_add=yes
+ carryover_percentage=20
[/endlevel]
[/then]
[/if]
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg?rev=29621&r1=29620&r2=29621&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg
(original)
+++ trunk/data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg
Sun Sep 21 14:48:33 2008
@@ -416,8 +416,10 @@
message=_ "I think I have found the passage to the great hall.
Follow me quickly!"
[/message]
[endlevel]
- result=victory
- bonus=yes
+ result=continue
+ bonus=no
+ carryover_add=yes
+ carryover_percentage=100
[/endlevel]
[/event]
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg?rev=29621&r1=29620&r2=29621&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg
(original)
+++ trunk/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg
Sun Sep 21 14:48:33 2008
@@ -28,6 +28,7 @@
canrecruit=yes
recruit=
gold=0
+ income=-2
shroud=yes
fog=no
share_maps=yes
@@ -408,8 +409,10 @@
message=_ "Phew! Let's get out of here."
[/message]
[endlevel]
+ result=victory
bonus=no
- result=continue
+ carryover_add=yes
+ carryover_percentage=100
[/endlevel]
[/event]
[/then]
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg?rev=29621&r1=29620&r2=29621&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
(original)
+++ trunk/data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
Sun Sep 21 14:48:33 2008
@@ -41,7 +41,7 @@
recruit=Walking Corpse,Vampire Bat,Ghost,Ghoul,Skeleton
Archer,Skeleton,Dark Adept DiD
fog=no
shroud=no
- gold=180
+ gold=200
[/side]
[side]
@@ -118,6 +118,9 @@
condition=lose
description=_ "Death of Malin Keshar"
[/objective]
+
+ note= _ "No early finish bonus." + "
+20%" + _" of finishing gold carried over to the next scenario."
[/objectives]
# {SCATTER_IMAGE (terrain=Gg) 3 scenery/oak-leaning.png}
@@ -560,8 +563,10 @@
[/message]
[endlevel]
+ result=victory
bonus=no
- result=continue
+ carryover_add=yes
+ carryover_percentage=20
[/endlevel]
[/event]
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg?rev=29621&r1=29620&r2=29621&view=diff
==============================================================================
---
trunk/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
(original)
+++
trunk/data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
Sun Sep 21 14:48:33 2008
@@ -38,7 +38,7 @@
canrecruit=yes
recruit=Walking Corpse,Vampire Bat,Ghost,Ghoul,Skeleton
Archer,Skeleton,Dark Adept DiD
income=0
- {GOLD 100 80 60}
+ gold=100
fog=yes
shroud=yes
[/side]
@@ -540,6 +540,9 @@
condition=lose
description=_ "Destruction of Mal Keshar"
[/objective]
+
+ note= _ "Early finish bonus." + "
+20%" + _" of finishing gold carried over to the next scenario."
[/objectives]
# Turns are measured from here
@@ -652,6 +655,9 @@
[/filter]
[endlevel]
result=victory
+ bonus=yes
+ carryover_add=yes
+ carryover_percentage=20
[/endlevel]
[/event]
Modified:
trunk/data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg?rev=29621&r1=29620&r2=29621&view=diff
==============================================================================
--- trunk/data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg
(original)
+++ trunk/data/campaigns/Descent_Into_Darkness/scenarios/12_Endless_Night.cfg
Sun Sep 21 14:48:33 2008
@@ -70,6 +70,9 @@
condition=lose
description=_ "Destruction of Mal Keshar"
[/objective]
+
+ note= _ "Early finish bonus." + "
+20%" + _" of finishing gold carried over to the next scenario."
[/objectives]
[if]
@@ -442,7 +445,15 @@
# In-scenario events defined within the prestart event
[event]
- name=victory
+ name=enemies defeated
+
{VARIABLE_OP timesForever add 1}
+
+ [endlevel]
+ result=victory
+ bonus=yes
+ carryover_add=yes
+ carryover_percentage=20
+ [/endlevel]
[/event]
[/scenario]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
