0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove uneeded VICTORY_AND_DEFEAT_MUSIC macro, and fix a whitespace glitch.

Browse source
This commit is contained in:
Eric S. Raymond 2008-10-30 20:16:07 +00:00
parent 04379fa8d9
commit dcbc274671
65 changed files with 9 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/campaigns/An_Orcish_Incursion/scenarios/1_Defend_the_Forest.cfg
View file

@ -13,7 +13,6 @@
next_scenario=2_Assassins
{DEFAULT_SCHEDULE}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC elvish-theme.ogg knolls.ogg}
{EXTRA_SCENARIO_MUSIC wanderer.ogg}
{EXTRA_SCENARIO_MUSIC nr-sad.ogg}

1
data/campaigns/An_Orcish_Incursion/scenarios/2_Assassins.cfg
View file

@ -13,7 +13,6 @@
next_scenario=3_Wasteland
{DEFAULT_SCHEDULE}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC northerners.ogg underground.ogg}
{EXTRA_SCENARIO_MUSIC battle.ogg}
{EXTRA_SCENARIO_MUSIC frantic.ogg}

1
data/campaigns/An_Orcish_Incursion/scenarios/3_Wasteland.cfg
View file

@ -14,7 +14,6 @@
{DEFAULT_SCHEDULE}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC revelation.ogg elvish-theme.ogg}
{EXTRA_SCENARIO_MUSIC knolls.ogg}
{EXTRA_SCENARIO_MUSIC nunc_dimittis.ogg}

1
data/campaigns/An_Orcish_Incursion/scenarios/4_Valley_of_Trolls.cfg
View file

@ -13,7 +13,6 @@
next_scenario=5_Linaera_the_Quick
{DEFAULT_SCHEDULE}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC breaking_the_chains.ogg the-danferous-symphony.orgg}
{EXTRA_SCENARIO_MUSIC wanderer.ogg}
{EXTRA_SCENARIO_MUSIC underground.ogg}

1
data/campaigns/An_Orcish_Incursion/scenarios/5_Linaera_the_Quick.cfg
View file

@ -13,7 +13,6 @@
next_scenario=6_A_Detour_through_the_Swamp
{DEFAULT_SCHEDULE}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC wanderer.ogg knolls.ogg}
{EXTRA_SCENARIO_MUSIC heroes_rite.ogg}
{EXTRA_SCENARIO_MUSIC traveling_minstrels.ogg}

1
data/campaigns/An_Orcish_Incursion/scenarios/6_A_Detour_through_the_Swamp.cfg
View file

@ -12,7 +12,6 @@
{DEFAULT_SCHEDULE}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC the_deep_path.ogg underground_ogg}
{EXTRA_SCENARIO_MUSIC vengeful.ogg}
{EXTRA_SCENARIO_MUSIC revelation.ogg}

1
data/campaigns/An_Orcish_Incursion/scenarios/7_Showdown.cfg
View file

@ -12,7 +12,6 @@
{DEFAULT_SCHEDULE}
{VICTORY_AND_DEFEAT_MUSIC}
{SCENARIO_MUSIC the_city_falls.ogg}
{EXTRA_SCENARIO_MUSIC vengeful.ogg}
{EXTRA_SCENARIO_MUSIC battle.ogg}

1
data/campaigns/Descent_Into_Darkness/scenarios/01_Saving_Parthyn.cfg
View file

@ -9,7 +9,6 @@
victory_when_enemies_defeated=no
{DEFAULT_SCHEDULE}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC the_city_falls.ogg northerners.ogg}
{EXTRA_SCENARIO_MUSIC loyalists.ogg}
{EXTRA_SCENARIO_MUSIC battle.ogg}

1
data/campaigns/Descent_Into_Darkness/scenarios/02_Peaceful_Valley.cfg
View file

@ -14,7 +14,6 @@
{SECOND_WATCH}
{DAWN}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC wanderer.ogg elvish-theme.ogg}
{EXTRA_SCENARIO_MUSIC knolls.ogg}
{EXTRA_SCENARIO_MUSIC revelation.ogg}

1
data/campaigns/Descent_Into_Darkness/scenarios/03_A_Haunting_in_Winter.cfg
View file

@ -9,7 +9,6 @@
{TURNS 36 34 32}
{UNDERGROUND}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC the_deep_path.ogg knalgan_theme.ogg}
{EXTRA_SCENARIO_MUSIC underground.ogg}
{EXTRA_SCENARIO_MUSIC legends_of_the_north.ogg}

1
data/campaigns/Descent_Into_Darkness/scenarios/04_Beginning_of_the_Revenge.cfg
View file

@ -14,7 +14,6 @@
{MORNING}
{AFTERNOON}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC revelation.ogg vengeful.ogg}
{EXTRA_SCENARIO_MUSIC nunc_dimittis.ogg}
{EXTRA_SCENARIO_MUSIC knalgan_theme.ogg}

1
data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg
View file

@ -14,7 +14,6 @@
{SECOND_WATCH}
{DAWN}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC northerners.ogg battle.ogg}
{EXTRA_SCENARIO_MUSIC the_city_falls.ogg}
{EXTRA_SCENARIO_MUSIC the_dangerous_symphony.ogg}

1
data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
View file

@ -9,7 +9,6 @@
victory_when_enemies_defeated=no
{DEFAULT_SCHEDULE}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC breaking_the_chains.ogg the_city_falls.ogg}
{EXTRA_SCENARIO_MUSIC knolls.ogg}
{EXTRA_SCENARIO_MUSIC elvish-theme.ogg}

1
data/campaigns/Descent_Into_Darkness/scenarios/07_A_Small_Favor.cfg
View file

@ -9,7 +9,6 @@
victory_when_enemies_defeated=no
{FIRST_WATCH}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC underground.ogg elvish-theme.ogg}
{EXTRA_SCENARIO_MUSIC wanderer.ogg}
{EXTRA_SCENARIO_MUSIC elf-land.ogg}

1
data/campaigns/Descent_Into_Darkness/scenarios/08_A_Small_Favor2.cfg
View file

@ -8,7 +8,6 @@
{TURNS 30 27 25}
victory_when_enemies_defeated=no
{VICTORY_AND_DEFEAT_MUSIC}
{SCENARIO_MUSIC loyalists.ogg}
{EXTRA_SCENARIO_MUSIC the_king_is_dead.ogg}
{EXTRA_SCENARIO_MUSIC breaking_the_chains.ogg}

1
data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg
View file

@ -9,7 +9,6 @@
victory_when_enemies_defeated=no
{UNDERGROUND}
{VICTORY_AND_DEFEAT_MUSIC}
{SCENARIO_MUSIC underground.ogg}
{EXTRA_SCENARIO_MUSIC loyalists.ogg}
{EXTRA_SCENARIO_MUSIC wanderer.ogg}

1
data/campaigns/Descent_Into_Darkness/scenarios/10_Alone_at_Last.cfg
View file

@ -14,7 +14,6 @@
{MORNING}
{AFTERNOON}
{VICTORY_AND_DEFEAT_MUSIC}
{SCENARIO_MUSIC breaking_the_chains.ogg}
{EXTRA_SCENARIO_MUSIC vengeful.ogg}
{EXTRA_SCENARIO_MUSIC battle.ogg}

1
data/campaigns/Descent_Into_Darkness/scenarios/11_Descent_into_Darkness.cfg
View file

@ -7,7 +7,6 @@
map_data="{campaigns/Descent_Into_Darkness/maps/Descent_into_darkness.map}"
turns=-1
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC the_city_falls.ogg the_deep_path.ogg}
{EXTRA_SCENARIO_MUSIC the_king_is_dead.ogg}
{EXTRA_SCENARIO_MUSIC revelation.ogg}

1
data/campaigns/Eastern_Invasion/scenarios/01.The_Outpost.cfg
View file

@ -7,7 +7,6 @@
turns=16
{DEFAULT_SCHEDULE}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC knolls.ogg loyalists.ogg}
{EXTRA_SCENARIO_MUSIC nunc_dimittis.ogg}
{EXTRA_SCENARIO_MUSIC the_dangerous_symphony.ogg}

1
data/campaigns/Eastern_Invasion/scenarios/02.The_Escape_Tunnel.cfg
View file

@ -7,7 +7,6 @@
{TURNS 26 24 22}
{UNDERGROUND}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC the_city_falls.ogg underground.ogg}
{EXTRA_SCENARIO_MUSIC frantic.ogg}
{EXTRA_SCENARIO_MUSIC revelation.ogg}

1
data/campaigns/Eastern_Invasion/scenarios/03.An_Unexpected_Appearance.cfg
View file

@ -8,7 +8,6 @@
{DEFAULT_SCHEDULE}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC breaking_the_chains.ogg vengeful.ogg}
{EXTRA_SCENARIO_MUSIC the_king_is_dead.ogg}
{EXTRA_SCENARIO_MUSIC wanderer.ogg}

1
data/campaigns/Eastern_Invasion/scenarios/04a.An_Elven_Alliance.cfg
View file

@ -8,7 +8,6 @@
{DEFAULT_SCHEDULE}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC elf-land.ogg elvish-theme.ogg}
{EXTRA_SCENARIO_MUSIC traveling_minstrels.ogg}
{EXTRA_SCENARIO_MUSIC revelation.ogg}

1
data/campaigns/Eastern_Invasion/scenarios/04b.The_Undead_Border_Patrol.cfg
View file

@ -7,7 +7,6 @@
{DEFAULT_SCHEDULE}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC legends_of_the_north.ogg the_dangerous_symphony.ogg}
{EXTRA_SCENARIO_MUSIC the_city_falls.ogg}
{EXTRA_SCENARIO_MUSIC vengeful.ogg}

1
data/campaigns/Eastern_Invasion/scenarios/04c.Mal-Ravanals_Capital.cfg
View file

@ -17,7 +17,6 @@
next_scenario=Northern_Outpost
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC underground.ogg the_deep_path.ogg}
{EXTRA_SCENARIO_MUSIC heroes_rite.ogg}
{EXTRA_SCENARIO_MUSIC underground.ogg}

1
data/campaigns/Eastern_Invasion/scenarios/05.Northern_Outpost.cfg
View file

@ -8,7 +8,6 @@
victory_when_enemies_defeated=no
{DEFAULT_MUSIC_PLAYLIST}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC traveling_minstrels.ogg loyalists.ogg}
{EXTRA_SCENARIO_MUSIC battle.ogg}
{EXTRA_SCENARIO_MUSIC legends_of_the_north.ogg}

1
data/campaigns/Eastern_Invasion/scenarios/06.Two_Paths.cfg
View file

@ -8,7 +8,6 @@
{DEFAULT_SCHEDULE}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC elvish-theme.ogg wanderer.ogg}
{EXTRA_SCENARIO_MUSIC nunc_dimittis.ogg}
{EXTRA_SCENARIO_MUSIC frantic.ogg}

1
data/campaigns/Eastern_Invasion/scenarios/07a.The_Crossing.cfg
View file

@ -8,7 +8,6 @@
{DEFAULT_SCHEDULE}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC northerners.ogg the_dangerous_symphony.ogg}
{EXTRA_SCENARIO_MUSIC the_king_is_dead.ogg}
{EXTRA_SCENARIO_MUSIC the_city_falls.ogg}

1
data/campaigns/Eastern_Invasion/scenarios/09.Training_the_Ogres.cfg
View file

@ -8,7 +8,6 @@
{TURNS 4 5 6}
{DEFAULT_SCHEDULE}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC breaking_the_chains.ogg knolls.ogg}
{EXTRA_SCENARIO_MUSIC revelation.ogg}
{EXTRA_SCENARIO_MUSIC traveling_minstrels.ogg}

1
data/campaigns/Eastern_Invasion/scenarios/10.Xenophobia.cfg
View file

@ -6,7 +6,6 @@
{TURNS 40 36 32}
next_scenario=Lake
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC elvish-theme.ogg knalgan_theme.ogg}
{EXTRA_SCENARIO_MUSIC northerners.ogg}
{EXTRA_SCENARIO_MUSIC elf-land.ogg}

1
data/campaigns/Eastern_Invasion/scenarios/12.Captured.cfg
View file

@ -8,7 +8,6 @@
{TURNS 50 40 30}
{UNDERGROUND}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC northerners.ogg the_deep_path.ogg}
{EXTRA_SCENARIO_MUSIC breaking_the_chains.ogg}
{EXTRA_SCENARIO_MUSIC underground.ogg}

1
data/campaigns/Eastern_Invasion/scenarios/13.Evacuation.cfg
View file

@ -8,7 +8,6 @@
{DEFAULT_SCHEDULE}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC vengeful.ogg legends_of_the_north.ogg}
{EXTRA_SCENARIO_MUSIC frantic.ogg}
{EXTRA_SCENARIO_MUSIC northerners.ogg}

1
data/campaigns/Eastern_Invasion/scenarios/14.The_Drowned_Plains.cfg
View file

@ -8,7 +8,6 @@
{DEFAULT_SCHEDULE}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC heroes_rite.ogg underground.ogg}
{EXTRA_SCENARIO_MUSIC knolls.ogg}
{EXTRA_SCENARIO_MUSIC the_king_is_dead.ogg}

1
data/campaigns/Eastern_Invasion/scenarios/15.Approaching_Weldyn.cfg
View file

@ -6,7 +6,6 @@
turns=24
next_scenario=Throne
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC loyalists.ogg frantic.ogg}
{EXTRA_SCENARIO_MUSIC vengeful.ogg}
{EXTRA_SCENARIO_MUSIC knalgan_theme.ogg}

1
data/campaigns/Eastern_Invasion/scenarios/17.Weldyn_Under_Attack.cfg
View file

@ -25,7 +25,6 @@
{DAWN}
{DAWN}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC the_city_falls.ogg loyalists.ogg}
{EXTRA_SCENARIO_MUSIC vengeful.ogg}
{EXTRA_SCENARIO_MUSIC battle.ogg}

1
data/campaigns/Eastern_Invasion/scenarios/18a.The_Duel.cfg
View file

@ -8,7 +8,6 @@
{DEFAULT_SCHEDULE}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC underground.ogg the_deep_path.ogg}
{EXTRA_SCENARIO_MUSIC the_dangerous_symphony.ogg}
{EXTRA_SCENARIO_MUSIC legends_of_the_north.ogg}

1
data/campaigns/Eastern_Invasion/scenarios/18b.Weldyn_Besieged.cfg
View file

@ -8,7 +8,6 @@
{DEFAULT_SCHEDULE}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC loyalists.ogg the_city_falls.ogg}
{EXTRA_SCENARIO_MUSIC the_deep_path.ogg}
{EXTRA_SCENARIO_MUSIC battle.ogg}

BIN
data/campaigns/Legend_of_Wesmere/images/story/shadows.jpeg
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 50 KiB

1
data/campaigns/Legend_of_Wesmere/scenarios/01_The_Uprooting.cfg
View file

@ -8,7 +8,6 @@
{INTRO_AND_SCENARIO_MUSIC elf-land.ogg breaking_the_chains.ogg}
{EXTRA_SCENARIO_MUSIC elvish-theme.ogg}
{EXTRA_SCENARIO_MUSIC nunc_dimittis.ogg}
{VICTORY_AND_DEFEAT_MUSIC}
{DEFAULT_SCHEDULE}
{STARTING_VILLAGES 2 50}

1
data/campaigns/Legend_of_Wesmere/scenarios/02_Hostile_mountains.cfg
View file

@ -8,7 +8,6 @@
{INTRO_AND_SCENARIO_MUSIC nr-sad.ogg knolls.ogg}
{EXTRA_SCENARIO_MUSIC traveling_minstrels.ogg}
{EXTRA_SCENARIO_MUSIC legends_of_the_north.ogg}
{VICTORY_AND_DEFEAT_MUSIC}
{DEFAULT_SCHEDULE}

1
data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg
View file

@ -13,7 +13,6 @@
{INTRO_AND_SCENARIO_MUSIC northerners.ogg elvish-theme.ogg}
{EXTRA_SCENARIO_MUSIC the_city_falls.ogg}
{EXTRA_SCENARIO_MUSIC wanderer.ogg}
{VICTORY_AND_DEFEAT_MUSIC}
{DEFAULT_SCHEDULE}

1
data/campaigns/Legend_of_Wesmere/scenarios/04_Elvish_Treasury.cfg
View file

@ -13,7 +13,6 @@
{INTRO_AND_SCENARIO_MUSIC frantic.ogg vengeful.ogg}
{EXTRA_SCENARIO_MUSIC knalgan_theme.ogg}
{EXTRA_SCENARIO_MUSIC knolls.ogg}
{VICTORY_AND_DEFEAT_MUSIC}
next_scenario=05_Saurian_Treasury
[story]

1
data/campaigns/Legend_of_Wesmere/scenarios/05_Saurian_Treasury.cfg
View file

@ -11,7 +11,6 @@
{INTRO_AND_SCENARIO_MUSIC frantic.ogg the_dangerous_symphony.ogg}
{EXTRA_SCENARIO_MUSIC knalgan_theme.ogg}
{EXTRA_SCENARIO_MUSIC the_city_falls.ogg}
{VICTORY_AND_DEFEAT_MUSIC}
[story]
# music=underground.ogg

1
data/campaigns/Legend_of_Wesmere/scenarios/06_Acquaintance_in_Need.cfg
View file

@ -11,7 +11,6 @@
# TODO find new songs for this scenario
{INTRO_AND_SCENARIO_MUSIC frantic.ogg vengeful.ogg}
{EXTRA_SCENARIO_MUSIC knalgan_theme.ogg}
{VICTORY_AND_DEFEAT_MUSIC}
[story]
# music=underground.ogg

1
data/campaigns/Legend_of_Wesmere/scenarios/07_Elves_last_stand.cfg
View file

@ -9,7 +9,6 @@
{TURNS 35 30 25}
{DEFAULT_MUSIC_PLAYLIST}
{VICTORY_AND_DEFEAT_MUSIC}
{STARTING_VILLAGES 2 99}
{STARTING_VILLAGES 3 15}

1
data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_hunters.cfg
View file

@ -13,7 +13,6 @@
# TODO find new music files
{INTRO_AND_SCENARIO_MUSIC northerners.ogg elvish-theme.ogg}
{EXTRA_SCENARIO_MUSIC wanderer.ogg}
{VICTORY_AND_DEFEAT_MUSIC}
next_scenario=10_Cliffs_of_Thoria
[story]

1
data/campaigns/Legend_of_Wesmere/scenarios/10_Cliffs_of_Thoria.cfg
View file

@ -10,7 +10,6 @@
#TODO find some musik
{INTRO_AND_SCENARIO_MUSIC traveling_minstrels.ogg wanderer.ogg}
{EXTRA_SCENARIO_MUSIC legends_of_the_north.ogg}
{VICTORY_AND_DEFEAT_MUSIC}
#victory_when_enemies_defeated=no

1
data/campaigns/Legend_of_Wesmere/scenarios/11_Battle_of_the_book.cfg
View file

@ -10,7 +10,6 @@
{INTRO_AND_SCENARIO_MUSIC frantic.ogg the_dangerous_symphony.ogg}
{EXTRA_SCENARIO_MUSIC battle.ogg}
{EXTRA_SCENARIO_MUSIC nunc_dimittis.ogg}
{VICTORY_AND_DEFEAT_MUSIC}
[story]
[part]

1
data/campaigns/Legend_of_Wesmere/scenarios/14_Human_Alliance.cfg
View file

@ -22,7 +22,6 @@
{INTRO_AND_SCENARIO_MUSIC revelation.ogg loyalists.ogg}
{EXTRA_SCENARIO_MUSIC the_city_falls.ogg}
{EXTRA_SCENARIO_MUSIC knolls.ogg}
{VICTORY_AND_DEFEAT_MUSIC}
next_scenario=15_The_Treaty
[story]

1
data/campaigns/Legend_of_Wesmere/scenarios/16_The_Chief_must_die.cfg
View file

@ -9,7 +9,6 @@
{INTRO_AND_SCENARIO_MUSIC love_theme.ogg the_city_falls.ogg}
{EXTRA_SCENARIO_MUSIC the_dangerous_symphony.ogg}
{EXTRA_SCENARIO_MUSIC vengeful.ogg}
{VICTORY_AND_DEFEAT_MUSIC}
{STARTING_VILLAGES 3 50}

1
data/campaigns/Legend_of_Wesmere/scenarios/17_Breaking_the_siege.cfg
View file

@ -11,7 +11,6 @@
{INTRO_AND_SCENARIO_MUSIC revelation.ogg elvish-theme.ogg}
{EXTRA_SCENARIO_MUSIC traveling_minstrels.ogg}
{EXTRA_SCENARIO_MUSIC nunc_dimittis.ogg}
{VICTORY_AND_DEFEAT_MUSIC}
{NORTH_ELVES_VILLAGES}

1
data/campaigns/Legend_of_Wesmere/scenarios/19_Costly_Revenge.cfg
View file

@ -8,7 +8,6 @@
# TODO find better music
{INTRO_AND_SCENARIO_MUSIC northerners.ogg elvish-theme.ogg}
{EXTRA_SCENARIO_MUSIC wanderer.ogg}
{VICTORY_AND_DEFEAT_MUSIC}
{DEFAULT_SCHEDULE}

1
data/campaigns/Legend_of_Wesmere/scenarios/21_Elvish_Assassins.cfg
View file

@ -20,7 +20,6 @@
{INTRO_AND_SCENARIO_MUSIC revelation.ogg the_dangerous_symphony.ogg}
{EXTRA_SCENARIO_MUSIC the_king_is_dead.ogg}
{EXTRA_SCENARIO_MUSIC nr-sad.ogg}
{VICTORY_AND_DEFEAT_MUSIC}
{DEFAULT_SCHEDULE}

1
data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg
View file

@ -16,7 +16,6 @@
# TODO find better music
{INTRO_AND_SCENARIO_MUSIC northerners.ogg elvish-theme.ogg}
{EXTRA_SCENARIO_MUSIC wanderer.ogg}
{VICTORY_AND_DEFEAT_MUSIC}
next_scenario=23_End_of_War
[story]

1
data/campaigns/Liberty/scenarios/01_The_Raid.cfg
View file

@ -8,7 +8,6 @@
next_scenario=civil_disobedience
victory_when_enemies_defeated=no
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC "knolls.ogg" "northerners.ogg"}
{EXTRA_SCENARIO_MUSIC "the_king_is_dead.ogg"}
{EXTRA_SCENARIO_MUSIC "frantic.ogg"}

1
data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg
View file

@ -13,7 +13,6 @@
{DAWN}
{MORNING}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC "traveling_minstrels.ogg" "loyalists.ogg"}
{EXTRA_SCENARIO_MUSIC "battle.ogg"}
{EXTRA_SCENARIO_MUSIC "loyalists.ogg"}

1
data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg
View file

@ -8,7 +8,6 @@
{TURNS 35 30 25}
{DEFAULT_SCHEDULE}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC elvish-theme.ogg traveling_minstrels.ogg}
{EXTRA_SCENARIO_MUSIC "wanderer.ogg"}
{EXTRA_SCENARIO_MUSIC "knalgan_theme.ogg"}

1
data/campaigns/Liberty/scenarios/04_Unlawful_Orders.cfg
View file

@ -8,7 +8,6 @@
{TURNS 30 22 16}
{DEFAULT_SCHEDULE}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC "knolls.ogg" "the_city_falls.ogg"}
{EXTRA_SCENARIO_MUSIC "the_dangerous_symphony.ogg"}
{EXTRA_SCENARIO_MUSIC "legends_of_the_north.ogg"}

1
data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg
View file

@ -14,7 +14,6 @@
lawful_bonus=-25
[/time]
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC wanderer.ogg underground.ogg}
{EXTRA_SCENARIO_MUSIC revelation.ogg}
{EXTRA_SCENARIO_MUSIC nunc_dimittis.ogg}

1
data/campaigns/Liberty/scenarios/06_The_Gray_Woods.cfg
View file

@ -13,7 +13,6 @@
{DUSK}
{FIRST_WATCH}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC "underground.ogg" "the_deep_path.ogg"}
{EXTRA_SCENARIO_MUSIC "elvish-theme.ogg"}
{EXTRA_SCENARIO_MUSIC "revelation.ogg"}

1
data/campaigns/Liberty/scenarios/07_The_Hunters.cfg
View file

@ -13,7 +13,6 @@
{MORNING}
{AFTERNOON}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC breaking_the_chains.ogg vengeful.ogg}
{EXTRA_SCENARIO_MUSIC battle.ogg}
{EXTRA_SCENARIO_MUSIC legends_of_the_north.ogg}

1
data/campaigns/Liberty/scenarios/08_Glory.cfg
View file

@ -13,7 +13,6 @@
{DAWN}
{MORNING}
{VICTORY_AND_DEFEAT_MUSIC}
{INTRO_AND_SCENARIO_MUSIC heroes_rite.ogg loyalists.ogg}
{EXTRA_SCENARIO_MUSIC vengeful.ogg}
{EXTRA_SCENARIO_MUSIC the_city_falls.ogg}

2
data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg
View file

@ -25,8 +25,6 @@
{MORNING}
{AFTERNOON}
{VICTORY_AND_DEFEAT_MUSIC}
victory_when_enemies_defeated=no
turns=40

8
data/core/macros/deprecated-utils.cfg
View file

@ -14,6 +14,14 @@
#enddef
#wmllint: markcheck on
#define VICTORY_AND_DEFEAT_MUSIC
# This macro was totally unnecessary. Remove in 1.5.7
[deprecated_message]
message=_ "VICTORY_AND_DEFEAT_MUSIC is unecessary and can be removed."
[/deprecated_message]
#enddef
#
# Deprecate these in favor of the {NEW,OLD}_{JOURNEY,BATTLE,REST} maxros.
# That way we can restyle the markers without breaking content.

48
data/core/macros/sound-utils.cfg
View file

@ -277,54 +277,6 @@
[/event]
#enddef
#define VICTORY_AND_DEFEAT_MUSIC
# This wires the defeat and victory music into scenarios
[event]
name=victory
{RANDOM 0..1}
[if]
[variable]
name=random
greater_than=0
[/variable]
[then]
[music]
name=victory.ogg
play_once=yes
[/music]
[/then]
[else]
[music]
name=victory2.ogg
play_once=yes
[/music]
[/else]
[/if]
[/event]
[event]
name=defeat
{RANDOM 0..1}
[if]
[variable]
name=random
greater_than=0
[/variable]
[then]
[music]
name=defeat.ogg
play_once=yes
[/music]
[/then]
[else]
[music]
name=defeat2.ogg
play_once=yes
[/music]
[/else]
[/if]
[/event]
#enddef
#define INCIDENTAL_MUSIC MUSIC
# To be played immediately to mark an incident,
# but not appended to the scenario playlist.

2
data/core/macros/utils.cfg
View file

@ -723,4 +723,4 @@
[/while]
{CLEAR_VARIABLE unit_type_table,unit_type_table_i,possible_unit_locations}
#enddef
#enddef