From 5fef0394cc7e71b4659fc352edfba14e88d6635f Mon Sep 17 00:00:00 2001 From: Mythos_Ruler Date: Sat, 28 Jul 2012 17:44:39 +0000 Subject: [PATCH] Fixed music. :) This was SVN commit r12216. --- binaries/data/mods/public/civs/athen.json | 5 ++--- binaries/data/mods/public/civs/brit.json | 2 +- binaries/data/mods/public/civs/cart.json | 6 ++---- binaries/data/mods/public/civs/celt.json | 2 +- binaries/data/mods/public/civs/gaul.json | 2 +- binaries/data/mods/public/civs/hele.json | 3 +-- binaries/data/mods/public/civs/iber.json | 4 ++-- binaries/data/mods/public/civs/mace.json | 2 +- binaries/data/mods/public/civs/pers.json | 3 +-- binaries/data/mods/public/civs/rome.json | 4 +--- binaries/data/mods/public/civs/spart.json | 3 +-- binaries/data/mods/public/civs/theb.json | 3 +-- binaries/data/mods/public/gui/common/music.js | 6 +++--- 13 files changed, 18 insertions(+), 27 deletions(-) diff --git a/binaries/data/mods/public/civs/athen.json b/binaries/data/mods/public/civs/athen.json index c819c8380a..dea4b16c2e 100644 --- a/binaries/data/mods/public/civs/athen.json +++ b/binaries/data/mods/public/civs/athen.json @@ -4,9 +4,8 @@ "Emblem":"session/portraits/emblems/emblem_athenians.png", "History":"The Athenians were famed for their philosophy, democracy, and artistic achievement. They were also good warriors, with a naval tradition, and an energetic populace.", "Music":[ - {"File":"Athens_Early_Peace.ogg", "Type":"peace"}, - {"File":"hellenes_peace_1.ogg", "Type":"peace"}, - {"File":"hellenic_battle_2.ogg", "Type":"battle"} + {"File":"Harvest_Festival.ogg", "Type":"peace"}, + {"File":"Forging_a_City-State.ogg", "Type":"peace"} ], "Factions": [ diff --git a/binaries/data/mods/public/civs/brit.json b/binaries/data/mods/public/civs/brit.json index 8329c9daa3..98b8bc77d6 100644 --- a/binaries/data/mods/public/civs/brit.json +++ b/binaries/data/mods/public/civs/brit.json @@ -5,7 +5,7 @@ "History": "The tribes of the British Isles.", "Music":[ {"File":"Highland_Mist.ogg", "Type":"peace"}, - {"File":"celtic_peace_1.ogg", "Type":"peace"} + {"File":"Celtic_Pride.ogg", "Type":"peace"} ], "Factions": [ diff --git a/binaries/data/mods/public/civs/cart.json b/binaries/data/mods/public/civs/cart.json index 14c78da337..64ee79f249 100644 --- a/binaries/data/mods/public/civs/cart.json +++ b/binaries/data/mods/public/civs/cart.json @@ -4,10 +4,8 @@ "Emblem": "session/portraits/emblems/emblem_carthaginians.png", "History": "Carthage was founded in either 814 B.C. or 813 B.C. by a Tyrian Princess named Elissa or Dido. The culture spanned over seven hundred years. In 146 B.C., Carthage (the center of civilsation) was brought to its knees by the Romans. They are probably best known for the usage of elephants in battle. Not only did they ferry them across the Mediterranean, but they were also taken through the alps for a sly attack from the north of Rome. The Carthaginians were most active in the 4th and 3rd centuries B.C. Some famous Carthaginians were: Hamilcar Barca (who fought in the First Punic War), his son Hannibal Barca, and Maharbal (Hannibal's cavalry commander). Some famous battles were: Acragas in 406 B.C., Zama in 202 B.C., and the Siege of Carthage 148-146 B.C.", "Music":[ - {"File":"carthage_peace_2.ogg", "Type":"peace"}, - {"File":"carthage_peace_1.ogg", "Type":"peace"}, - {"File":"carthaginian_battle_1.ogg", "Type":"battle"}, - {"File":"carthaginian_battle_2.ogg", "Type":"battle"} + {"File":"Mediterranean_Waves.ogg", "Type":"peace"}, + {"File":"Peaks_of_Atlas.ogg", "Type":"peace"} ], "Factions": [ diff --git a/binaries/data/mods/public/civs/celt.json b/binaries/data/mods/public/civs/celt.json index 9810d4c5bb..51961c7391 100644 --- a/binaries/data/mods/public/civs/celt.json +++ b/binaries/data/mods/public/civs/celt.json @@ -6,7 +6,7 @@ "Music":[ {"File":"Highland_Mist.ogg", "Type":"peace"}, {"File":"The_Road_Ahead.ogg", "Type":"peace"}, - {"File":"celtic_peace_1.ogg", "Type":"peace"} + {"File":"Celtic_Pride.ogg", "Type":"peace"} ], "Factions": [ diff --git a/binaries/data/mods/public/civs/gaul.json b/binaries/data/mods/public/civs/gaul.json index 0d7dc5d91c..51548b1227 100644 --- a/binaries/data/mods/public/civs/gaul.json +++ b/binaries/data/mods/public/civs/gaul.json @@ -5,7 +5,7 @@ "History": "The Celts of mainland Europe.", "Music":[ {"File":"The_Road_Ahead.ogg", "Type":"peace"}, - {"File":"celtic_peace_1.ogg", "Type":"peace"} + {"File":"Celtic_Pride.ogg", "Type":"peace"} ], "Factions": [ diff --git a/binaries/data/mods/public/civs/hele.json b/binaries/data/mods/public/civs/hele.json index ea9adbac8d..753f5a9527 100644 --- a/binaries/data/mods/public/civs/hele.json +++ b/binaries/data/mods/public/civs/hele.json @@ -4,8 +4,7 @@ "Emblem":"session/portraits/emblems/emblem_hellenes.png", "History":"The Hellenes were a people famous today for their architecture, fighting ability, and culture. The Hellenic peoples of the Dorian, Ionian, and Aeolian tribes swept into modern day Greece from 3000 B.C. to around 1100 B.C. in successive waves that eventually supplanted the previously established cultures of Mycenae and Minoan Crete. They were most active during the period of colonization that took place in the 7th and 6th centuries B.C., the Greco-Persian Wars (499-449 B.C.), the Peloponnesian War (431-404 B.C.), and the conquests of Alexander the Great (4th Century B.C.). Their civilization would endure until their final absorption by Rome in 146 B.C.", "Music":[ - {"File":"hellenes_peace_1.ogg", "Type":"peace"}, - {"File":"hellenic_battle_2.ogg", "Type":"battle"} + {"File":"Forging_a_City-State.ogg", "Type":"peace"} ], "Factions": [ diff --git a/binaries/data/mods/public/civs/iber.json b/binaries/data/mods/public/civs/iber.json index 81fad6f9a2..da5dcf6db6 100644 --- a/binaries/data/mods/public/civs/iber.json +++ b/binaries/data/mods/public/civs/iber.json @@ -4,8 +4,8 @@ "Emblem": "session/portraits/emblems/emblem_iberians.png", "History": "No one really knows when the Iberians appeared as a people, though first contact with them came in 1100 B.C. with the establishment of a trading post by the Phoenicians. They were a relatively peaceful culture, and when they fought it fighting in other's battles as mercenaries. When they fought their won battle, they proved tenacious when Rome sought to take their land and freedom away from them. Yet, the Iberians were put in submission once and for all by the Romans in 18 B.C.", "Music":[ - {"File":"An Old Warhorse Goes to Pasture.ogg", "Type":"peace"}, - {"File":"iberian_peace_1.ogg", "Type":"peace"} + {"File":"An_old_Warhorse_goes_to_Pasture.ogg", "Type":"peace"}, + {"File":"Harsh_Lands_Rugged_People.ogg", "Type":"peace"} ], "Factions": [ diff --git a/binaries/data/mods/public/civs/mace.json b/binaries/data/mods/public/civs/mace.json index 2aae7e9f3c..f4e9307cd4 100644 --- a/binaries/data/mods/public/civs/mace.json +++ b/binaries/data/mods/public/civs/mace.json @@ -4,7 +4,7 @@ "Emblem":"session/portraits/emblems/emblem_macedonians.png", "History":"The Macedonians were famed for their conquests and energetic monarchs.", "Music":[ - {"File":"Macedonia_Early_Peace.ogg", "Type":"peace"}, + {"File":"Rise_of_Macedon.ogg", "Type":"peace"}, {"File":"In_the_Shadow_of_Olympus.ogg", "Type":"peace"} ], "Factions": diff --git a/binaries/data/mods/public/civs/pers.json b/binaries/data/mods/public/civs/pers.json index dbbd92271f..2415d3d3c3 100644 --- a/binaries/data/mods/public/civs/pers.json +++ b/binaries/data/mods/public/civs/pers.json @@ -5,8 +5,7 @@ "History": "The Persians originally came from beyond the Zargos Mountains and moved into what is now Iran sometime in the first millennium B.C. They began their rise to power when Cyrus the Great led a revolt against the Median Empire, he would go on to conquer everything he possibly could. By the time of his death in 529 B.C. Cyrus had created the greatest empire thus far seen in the ancient world. In 0 A.D. we will cover the Achaemenid dynasty of Persia, this dynasty was ended by the conquests of Alexander the Great starting with the Greek victory the Battle of Granicus in 334 B.C.", "Music":[ {"File":"Eastern_Dreams.ogg", "Type":"peace"}, - {"File":"Sands_of_Time.ogg", "Type":"peace"}, - {"File":"persian_battle_1.ogg", "Type":"battle"} + {"File":"Sands_of_Time.ogg", "Type":"peace"} ], "Factions": [ diff --git a/binaries/data/mods/public/civs/rome.json b/binaries/data/mods/public/civs/rome.json index 0ff84a94ff..391befe20c 100644 --- a/binaries/data/mods/public/civs/rome.json +++ b/binaries/data/mods/public/civs/rome.json @@ -5,9 +5,7 @@ "History": "The Romans controlled the largest empire of the ancient world. Rising from a group of villages to controlling an empire stretching from southern Scotland to the Sahara Desert, Rome remained one of the strongest nations on earth for almost 800 years. Initially Rome controlled Italy, but after three wars with Carthage began to expand in all directions. At its peak, Rome's empire contained over 60 million inhabitants, one quarter of the Earth's population at that time. But this massive empire soon became too large to control and barbarians began swarming into the Empire. The 300 years before the fall of Rome in 476 A.D. were mostly spent trying to keep the ever-increasing flood of migrant barbarians back behind the Rhine and Danube rivers.", "Music":[ {"File":"Juno_Protect_You.ogg", "Type":"peace"}, - {"File":"Elysian_Fields.ogg", "Type":"peace"}, - {"File":"roman_battle_1.ogg", "Type":"battle"}, - {"File":"roman_defeat_1.ogg", "Type":"defeat"} + {"File":"Elysian_Fields.ogg", "Type":"peace"} ], "Factions": [ diff --git a/binaries/data/mods/public/civs/spart.json b/binaries/data/mods/public/civs/spart.json index f33c89197b..f193754a64 100644 --- a/binaries/data/mods/public/civs/spart.json +++ b/binaries/data/mods/public/civs/spart.json @@ -5,8 +5,7 @@ "History":"Sparta, or Lacedaemon, was a prominent city-state in ancient Greece, situated on the banks of the River Eurotas in Laconia, in south-eastern Peloponnese. It emerged as a political entity around the 10th century BC, when the invading Dorians subjugated the local, non-Dorian population. From c. 650 BC it rose to become the dominant military land-power in ancient Greece. Given its military pre-eminence, Sparta was recognized as the overall leader of the combined Greek forces during the Greco-Persian Wars. Between 431 and 404 BC, Sparta was the principal enemy of Athens during the Peloponnesian Wars, from which it emerged victorious, though at great cost. Sparta's defeat by Thebes in the Battle of Leuctra in 371 BC ended Sparta's prominent role in Greece. However, it maintained its political independence until the Roman conquest of Greece in 146 BC.", "Music":[ {"File":"Helen_Leaves_Sparta.ogg", "Type":"peace"}, - {"File":"hellenes_peace_1.ogg", "Type":"peace"}, - {"File":"hellenic_battle_2.ogg", "Type":"battle"} + {"File":"Forging_a_City-State.ogg", "Type":"peace"} ], "Factions": [ diff --git a/binaries/data/mods/public/civs/theb.json b/binaries/data/mods/public/civs/theb.json index b9c6b82cf7..fa2ec28bd1 100644 --- a/binaries/data/mods/public/civs/theb.json +++ b/binaries/data/mods/public/civs/theb.json @@ -4,8 +4,7 @@ "Emblem":"session/portraits/emblems/emblem_thebans.png", "History":"The great power of Central Greece and leader of the Boeotian confederacy, Thebes is a force to be reckoned with. It is a major rival of ancient Athens, and sided with the Persians during the 480 BC invasion under Xerxes. Theban forces ended the power of Sparta at the Battle of Leuctra in 371 BC under the command of Epaminondas. The Sacred Band of Thebes (an elite military unit) famously fell at the battle of Chaeronea in 338 BC against Philip II and Alexander the Great. Prior to its destruction by Alexander in 335 BC, Thebes was a major force in Greek history, and was the most dominant city-state at the time of the Macedonian conquest of Greece.", "Music":[ - {"File":"hellenes_peace_1.ogg", "Type":"peace"}, - {"File":"hellenic_battle_2.ogg", "Type":"battle"} + {"File":"Forging_a_City-State.ogg", "Type":"peace"} ], "Factions": [ diff --git a/binaries/data/mods/public/gui/common/music.js b/binaries/data/mods/public/gui/common/music.js index fc4621c222..f742719858 100644 --- a/binaries/data/mods/public/gui/common/music.js +++ b/binaries/data/mods/public/gui/common/music.js @@ -30,11 +30,11 @@ function Music() }; this.tracks = { - MENU: ["main_menu.ogg"], + MENU: ["Honor_Bound.ogg"], PEACE: [], BATTLE: [], - VICTORY : ["Victory_Track.ogg"], - DEFEAT : ["gen_loss_track.ogg"], + VICTORY : ["You_are_Victorious!.ogg"], + DEFEAT : ["Dried_Tears.ogg"], DEFEAT_CUE : ["gen_loss_cue.ogg"] };