Author: zookeeper
Date: Fri Sep 26 19:33:39 2008
New Revision: 29697
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29697&view=rev
Log:
Fixed various carryover and scenario ending issues in SoF.
Modified:
trunk/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
trunk/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg
trunk/data/campaigns/Sceptre_of_Fire/scenarios/2t_In_the_Dwarven_City.cfg
trunk/data/campaigns/Sceptre_of_Fire/scenarios/3t_The_Council_Regathers.cfg
trunk/data/campaigns/Sceptre_of_Fire/scenarios/4t_The_Jeweler.cfg
trunk/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
trunk/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
trunk/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_of_Outriders.cfg
Modified:
trunk/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg?rev=29697&r1=29696&r2=29697&view=diff
==============================================================================
--- trunk/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
(original)
+++ trunk/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
Fri Sep 26 19:33:39 2008
@@ -528,11 +528,7 @@
[/event]
[event]
- name=die
-
- [filter]
- id=Glildur
- [/filter]
+ name=enemies defeated
[if]
[variable]
Modified: trunk/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg?rev=29697&r1=29696&r2=29697&view=diff
==============================================================================
--- trunk/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg
(original)
+++ trunk/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg Fri
Sep 26 19:33:39 2008
@@ -620,6 +620,17 @@
[/event]
[event]
+ name=enemies defeated
+
+ [endlevel]
+ result=victory
+ bonus=yes
+ carryover_percentage=20
+ carryover_add=yes
+ [/endlevel]
+ [/event]
+
+ [event]
name=die
[filter]
id=Baglur
Modified:
trunk/data/campaigns/Sceptre_of_Fire/scenarios/2t_In_the_Dwarven_City.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Sceptre_of_Fire/scenarios/2t_In_the_Dwarven_City.cfg?rev=29697&r1=29696&r2=29697&view=diff
==============================================================================
--- trunk/data/campaigns/Sceptre_of_Fire/scenarios/2t_In_the_Dwarven_City.cfg
(original)
+++ trunk/data/campaigns/Sceptre_of_Fire/scenarios/2t_In_the_Dwarven_City.cfg
Fri Sep 26 19:33:39 2008
@@ -17,6 +17,7 @@
canrecruit=yes
controller=human
recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Guardsman
+ gold=0
[/side]
[side]
@@ -239,7 +240,10 @@
message= _ "Who the devil are you? Well, you seem to be with
Rugnur... follow him north."
[/message]
[endlevel]
- result=continue
+ result=victory
+ bonus=no
+ carryover_percentage=100
+ carryover_add=yes
[/endlevel]
[/event]
[/scenario]
Modified:
trunk/data/campaigns/Sceptre_of_Fire/scenarios/3t_The_Council_Regathers.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Sceptre_of_Fire/scenarios/3t_The_Council_Regathers.cfg?rev=29697&r1=29696&r2=29697&view=diff
==============================================================================
--- trunk/data/campaigns/Sceptre_of_Fire/scenarios/3t_The_Council_Regathers.cfg
(original)
+++ trunk/data/campaigns/Sceptre_of_Fire/scenarios/3t_The_Council_Regathers.cfg
Fri Sep 26 19:33:39 2008
@@ -17,6 +17,7 @@
canrecruit=yes
controller=human
recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Guardsman,Gryphon
Rider
+ gold=0
[/side]
[side]
@@ -237,7 +238,7 @@
type=Dwarvish Runesmith
x,y=10,8
side=1
- id=Kinan # wmllint: ignore
+ id=Kinan # wmllint: ignore
name= _ "Kinan"
[modifications]
{TRAIT_LOYAL}
@@ -248,7 +249,7 @@
type=Dwarvish Runesmith
x,y=12,6
side=1
- id=Rynan # wmllint: ignore
+ id=Rynan # wmllint: ignore
name= _ "Rynan"
[modifications]
{TRAIT_LOYAL}
@@ -270,7 +271,10 @@
message= _ "M' 'u!"
[/message]
[endlevel]
- result=continue
+ result=victory
+ bonus=no
+ carryover_percentage=100
+ carryover_add=yes
[/endlevel]
[/event]
[/scenario]
Modified: trunk/data/campaigns/Sceptre_of_Fire/scenarios/4t_The_Jeweler.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Sceptre_of_Fire/scenarios/4t_The_Jeweler.cfg?rev=29697&r1=29696&r2=29697&view=diff
==============================================================================
--- trunk/data/campaigns/Sceptre_of_Fire/scenarios/4t_The_Jeweler.cfg (original)
+++ trunk/data/campaigns/Sceptre_of_Fire/scenarios/4t_The_Jeweler.cfg Fri Sep
26 19:33:39 2008
@@ -17,7 +17,6 @@
canrecruit=yes
controller=human
recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Guardsman,Gryphon
Rider
- team_name=same
gold=0
[/side]
@@ -29,7 +28,6 @@
canrecruit=yes
profile=portraits/durstorn.png
recruit=Dwarvish Fighter
- team_name=same
[/side]
{STARTING_VILLAGES 2 20}
@@ -297,6 +295,7 @@
[/kill]
[endlevel]
result=victory
+ bonus=no
carryover_percentage=100
carryover_add=yes
[/endlevel]
Modified:
trunk/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg?rev=29697&r1=29696&r2=29697&view=diff
==============================================================================
---
trunk/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
(original)
+++
trunk/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
Fri Sep 26 19:33:39 2008
@@ -530,6 +530,8 @@
[endlevel]
result=victory
bonus=no
+ carryover_percentage=20
+ carryover_add=yes
[/endlevel]
[/else]
[/if]
@@ -708,6 +710,8 @@
[endlevel]
result=victory
bonus=no
+ carryover_percentage=20
+ carryover_add=yes
[/endlevel]
[/else]
[/if]
@@ -761,6 +765,8 @@
[endlevel]
result=victory
bonus=no
+ carryover_percentage=20
+ carryover_add=yes
[/endlevel]
[/else]
[/if]
@@ -769,6 +775,17 @@
[/event]
[event]
+ name=enemies defeated
+
+ [endlevel]
+ result=victory
+ bonus=yes
+ carryover_percentage=20
+ carryover_add=yes
+ [/endlevel]
+ [/event]
+
+ [event]
name=die
[filter]
id=Durstorn
Modified: trunk/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg?rev=29697&r1=29696&r2=29697&view=diff
==============================================================================
--- trunk/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
(original)
+++ trunk/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg Fri
Sep 26 19:33:39 2008
@@ -509,6 +509,17 @@
[/event]
[event]
+ name=enemies defeated
+
+ [endlevel]
+ result=victory
+ bonus=yes
+ carryover_percentage=20
+ carryover_add=yes
+ [/endlevel]
+ [/event]
+
+ [event]
name=victory
[unstore_unit]
Modified:
trunk/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_of_Outriders.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_of_Outriders.cfg?rev=29697&r1=29696&r2=29697&view=diff
==============================================================================
--- trunk/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_of_Outriders.cfg
(original)
+++ trunk/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_of_Outriders.cfg
Fri Sep 26 19:33:39 2008
@@ -22,6 +22,7 @@
recruit=
shroud=yes
fog=yes
+ gold=0
income=-2
village_gold=0
[/side]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
