Author: cazfi
Date: Sat Mar 8 22:47:47 2014
New Revision: 24636
URL: http://svn.gna.org/viewcvs/freeciv?rev=24636&view=rev
Log:
Added music styles equivalent to supplied rulesets, all having the chart
similar to their city styles.
See patch #4545
Modified:
trunk/data/alien/styles.ruleset
trunk/data/civ1/styles.ruleset
trunk/data/civ2/styles.ruleset
trunk/data/civ2civ3/styles.ruleset
trunk/data/classic/styles.ruleset
trunk/data/experimental/styles.ruleset
trunk/data/multiplayer/styles.ruleset
Modified: trunk/data/alien/styles.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/styles.ruleset?rev=24636&r1=24635&r2=24636&view=diff
==============================================================================
--- trunk/data/alien/styles.ruleset (original)
+++ trunk/data/alien/styles.ruleset Sat Mar 8 22:47:47 2014
@@ -38,7 +38,6 @@
;
; */ <-- avoid gettext warnings
-; Fallback music style for any nation that has nothing else
-[musicstyle_generic]
+[musicstyle_human]
music_peaceful = "music_peace"
music_combat = "music_combat"
Modified: trunk/data/civ1/styles.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/styles.ruleset?rev=24636&r1=24635&r2=24636&view=diff
==============================================================================
--- trunk/data/civ1/styles.ruleset (original)
+++ trunk/data/civ1/styles.ruleset Sat Mar 8 22:47:47 2014
@@ -53,7 +53,90 @@
;
; */ <-- avoid gettext warnings
-; Fallback music style for any nation that has nothing else
-[musicstyle_generic]
-music_peaceful = "music_peace"
-music_combat = "music_combat"
+[musicstyle_european]
+music_peaceful = "music_european_peace"
+music_combat = "music_european_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "European", "Player"
+ }
+
+[musicstyle_classical]
+music_peaceful = "music_classical_peace"
+music_combat = "music_classical_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Classical", "Player"
+ }
+
+[musicstyle_tropical]
+music_peaceful = "music_tropical_peace"
+music_combat = "music_tropical_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Tropical", "Player"
+ }
+
+[musicstyle_asian]
+music_peaceful = "music_asian_peace"
+music_combat = "music_asian_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Asian", "Player"
+ }
+
+[musicstyle_babylonian]
+music_peaceful = "music_babylonian_peace"
+music_combat = "music_babylonian_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Babylonian", "Player"
+ }
+
+[musicstyle_celtic]
+music_peaceful = "music_celtic_peace"
+music_combat = "music_celtic_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Celtic", "Player"
+ }
+
+[musicstyle_renaissance]
+music_peaceful = "music_renaissance_peace"
+music_combat = "music_renaissance_combat"
+reqs =
+ { "type", "name", "range"
+ "Tech", "University", "Player"
+ }
+
+[musicstyle_industrial]
+music_peaceful = "music_industrial_peace"
+music_combat = "music_industrial_combat"
+reqs =
+ { "type", "name", "range"
+ "Tech", "Railroad", "Player"
+ }
+
+[musicstyle_electricage]
+music_peaceful = "music_electricage_peace"
+music_combat = "music_electricage_combat"
+reqs =
+ { "type", "name", "range"
+ "Tech", "Automobile", "Player"
+ }
+
+[musicstyle_modern]
+music_peaceful = "music_modern_peace"
+music_combat = "music_modern_combat"
+reqs =
+ { "type", "name", "range"
+ "Tech", "Rocketry", "Player"
+ }
+
+[musicstyle_postmodern]
+music_peaceful = "music_postmodern_peace"
+music_combat = "music_postmodern_combat"
+reqs =
+ { "type", "name", "range"
+ "Tech", "Superconductors", "Player"
+ }
Modified: trunk/data/civ2/styles.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/styles.ruleset?rev=24636&r1=24635&r2=24636&view=diff
==============================================================================
--- trunk/data/civ2/styles.ruleset (original)
+++ trunk/data/civ2/styles.ruleset Sat Mar 8 22:47:47 2014
@@ -53,7 +53,90 @@
;
; */ <-- avoid gettext warnings
-; Fallback music style for any nation that has nothing else
-[musicstyle_generic]
-music_peaceful = "music_peace"
-music_combat = "music_combat"
+[musicstyle_european]
+music_peaceful = "music_european_peace"
+music_combat = "music_european_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "European", "Player"
+ }
+
+[musicstyle_classical]
+music_peaceful = "music_classical_peace"
+music_combat = "music_classical_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Classical", "Player"
+ }
+
+[musicstyle_tropical]
+music_peaceful = "music_tropical_peace"
+music_combat = "music_tropical_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Tropical", "Player"
+ }
+
+[musicstyle_asian]
+music_peaceful = "music_asian_peace"
+music_combat = "music_asian_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Asian", "Player"
+ }
+
+[musicstyle_babylonian]
+music_peaceful = "music_babylonian_peace"
+music_combat = "music_babylonian_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Babylonian", "Player"
+ }
+
+[musicstyle_celtic]
+music_peaceful = "music_celtic_peace"
+music_combat = "music_celtic_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Celtic", "Player"
+ }
+
+[musicstyle_renaissance]
+music_peaceful = "music_renaissance_peace"
+music_combat = "music_renaissance_combat"
+reqs =
+ { "type", "name", "range"
+ "Tech", "University", "Player"
+ }
+
+[musicstyle_industrial]
+music_peaceful = "music_industrial_peace"
+music_combat = "music_industrial_combat"
+reqs =
+ { "type", "name", "range"
+ "Tech", "Railroad", "Player"
+ }
+
+[musicstyle_electricage]
+music_peaceful = "music_electricage_peace"
+music_combat = "music_electricage_combat"
+reqs =
+ { "type", "name", "range"
+ "Tech", "Automobile", "Player"
+ }
+
+[musicstyle_modern]
+music_peaceful = "music_modern_peace"
+music_combat = "music_modern_combat"
+reqs =
+ { "type", "name", "range"
+ "Tech", "Rocketry", "Player"
+ }
+
+[musicstyle_postmodern]
+music_peaceful = "music_postmodern_peace"
+music_combat = "music_postmodern_combat"
+reqs =
+ { "type", "name", "range"
+ "Tech", "Superconductors", "Player"
+ }
Modified: trunk/data/civ2civ3/styles.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/styles.ruleset?rev=24636&r1=24635&r2=24636&view=diff
==============================================================================
--- trunk/data/civ2civ3/styles.ruleset (original)
+++ trunk/data/civ2civ3/styles.ruleset Sat Mar 8 22:47:47 2014
@@ -53,7 +53,82 @@
;
; */ <-- avoid gettext warnings
-; Fallback music style for any nation that has nothing else
-[musicstyle_generic]
-music_peaceful = "music_peace"
-music_combat = "music_combat"
+[musicstyle_european]
+music_peaceful = "music_european_peace"
+music_combat = "music_european_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "European", "Player"
+ }
+
+[musicstyle_classical]
+music_peaceful = "music_classical_peace"
+music_combat = "music_classical_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Classical", "Player"
+ }
+
+[musicstyle_tropical]
+music_peaceful = "music_tropical_peace"
+music_combat = "music_tropical_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Tropical", "Player"
+ }
+
+[musicstyle_asian]
+music_peaceful = "music_asian_peace"
+music_combat = "music_asian_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Asian", "Player"
+ }
+
+[musicstyle_babylonian]
+music_peaceful = "music_babylonian_peace"
+music_combat = "music_babylonian_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Babylonian", "Player"
+ }
+
+[musicstyle_celtic]
+music_peaceful = "music_celtic_peace"
+music_combat = "music_celtic_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Celtic", "Player"
+ }
+
+[musicstyle_industrial]
+music_peaceful = "music_industrial_peace"
+music_combat = "music_industrial_combat"
+reqs =
+ { "type", "name", "range"
+ "Tech", "Railroad", "Player"
+ }
+
+[musicstyle_electricage]
+music_peaceful = "music_electricage_peace"
+music_combat = "music_electricage_combat"
+reqs =
+ { "type", "name", "range"
+ "Tech", "Automobile", "Player"
+ }
+
+[musicstyle_modern]
+music_peaceful = "music_modern_peace"
+music_combat = "music_modern_combat"
+reqs =
+ { "type", "name", "range"
+ "Tech", "Rocketry", "Player"
+ }
+
+[musicstyle_postmodern]
+music_peaceful = "music_postmodern_peace"
+music_combat = "music_postmodern_combat"
+reqs =
+ { "type", "name", "range"
+ "Tech", "Superconductors", "Player"
+ }
Modified: trunk/data/classic/styles.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/styles.ruleset?rev=24636&r1=24635&r2=24636&view=diff
==============================================================================
--- trunk/data/classic/styles.ruleset (original)
+++ trunk/data/classic/styles.ruleset Sat Mar 8 22:47:47 2014
@@ -54,7 +54,82 @@
;
; */ <-- avoid gettext warnings
-; Fallback music style for any nation that has nothing else
-[musicstyle_generic]
-music_peaceful = "music_peace"
-music_combat = "music_combat"
+[musicstyle_european]
+music_peaceful = "music_european_peace"
+music_combat = "music_european_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "European", "Player"
+ }
+
+[musicstyle_classical]
+music_peaceful = "music_classical_peace"
+music_combat = "music_classical_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Classical", "Player"
+ }
+
+[musicstyle_tropical]
+music_peaceful = "music_tropical_peace"
+music_combat = "music_tropical_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Tropical", "Player"
+ }
+
+[musicstyle_asian]
+music_peaceful = "music_asian_peace"
+music_combat = "music_asian_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Asian", "Player"
+ }
+
+[musicstyle_babylonian]
+music_peaceful = "music_babylonian_peace"
+music_combat = "music_babylonian_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Babylonian", "Player"
+ }
+
+[musicstyle_celtic]
+music_peaceful = "music_celtic_peace"
+music_combat = "music_celtic_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Celtic", "Player"
+ }
+
+[musicstyle_industrial]
+music_peaceful = "music_industrial_peace"
+music_combat = "music_industrial_combat"
+reqs =
+ { "type", "name", "range"
+ "Tech", "Railroad", "Player"
+ }
+
+[musicstyle_electricage]
+music_peaceful = "music_electricage_peace"
+music_combat = "music_electricage_combat"
+reqs =
+ { "type", "name", "range"
+ "Tech", "Automobile", "Player"
+ }
+
+[musicstyle_modern]
+music_peaceful = "music_modern_peace"
+music_combat = "music_modern_combat"
+reqs =
+ { "type", "name", "range"
+ "Tech", "Rocketry", "Player"
+ }
+
+[musicstyle_postmodern]
+music_peaceful = "music_postmodern_peace"
+music_combat = "music_postmodern_combat"
+reqs =
+ { "type", "name", "range"
+ "Tech", "Superconductors", "Player"
+ }
Modified: trunk/data/experimental/styles.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/styles.ruleset?rev=24636&r1=24635&r2=24636&view=diff
==============================================================================
--- trunk/data/experimental/styles.ruleset (original)
+++ trunk/data/experimental/styles.ruleset Sat Mar 8 22:47:47 2014
@@ -53,7 +53,82 @@
;
; */ <-- avoid gettext warnings
-; Fallback music style for any nation that has nothing else
-[musicstyle_generic]
-music_peaceful = "music_peace"
-music_combat = "music_combat"
+[musicstyle_european]
+music_peaceful = "music_european_peace"
+music_combat = "music_european_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "European", "Player"
+ }
+
+[musicstyle_classical]
+music_peaceful = "music_classical_peace"
+music_combat = "music_classical_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Classical", "Player"
+ }
+
+[musicstyle_tropical]
+music_peaceful = "music_tropical_peace"
+music_combat = "music_tropical_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Tropical", "Player"
+ }
+
+[musicstyle_asian]
+music_peaceful = "music_asian_peace"
+music_combat = "music_asian_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Asian", "Player"
+ }
+
+[musicstyle_babylonian]
+music_peaceful = "music_babylonian_peace"
+music_combat = "music_babylonian_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Babylonian", "Player"
+ }
+
+[musicstyle_celtic]
+music_peaceful = "music_celtic_peace"
+music_combat = "music_celtic_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Celtic", "Player"
+ }
+
+[musicstyle_industrial]
+music_peaceful = "music_industrial_peace"
+music_combat = "music_industrial_combat"
+reqs =
+ { "type", "name", "range"
+ "Tech", "Railroad", "Player"
+ }
+
+[musicstyle_electricage]
+music_peaceful = "music_electricage_peace"
+music_combat = "music_electricage_combat"
+reqs =
+ { "type", "name", "range"
+ "Tech", "Automobile", "Player"
+ }
+
+[musicstyle_modern]
+music_peaceful = "music_modern_peace"
+music_combat = "music_modern_combat"
+reqs =
+ { "type", "name", "range"
+ "Tech", "Rocketry", "Player"
+ }
+
+[musicstyle_postmodern]
+music_peaceful = "music_postmodern_peace"
+music_combat = "music_postmodern_combat"
+reqs =
+ { "type", "name", "range"
+ "Tech", "Superconductors", "Player"
+ }
Modified: trunk/data/multiplayer/styles.ruleset
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/styles.ruleset?rev=24636&r1=24635&r2=24636&view=diff
==============================================================================
--- trunk/data/multiplayer/styles.ruleset (original)
+++ trunk/data/multiplayer/styles.ruleset Sat Mar 8 22:47:47 2014
@@ -53,7 +53,82 @@
;
; */ <-- avoid gettext warnings
-; Fallback music style for any nation that has nothing else
-[musicstyle_generic]
-music_peaceful = "music_peace"
-music_combat = "music_combat"
+[musicstyle_european]
+music_peaceful = "music_european_peace"
+music_combat = "music_european_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "European", "Player"
+ }
+
+[musicstyle_classical]
+music_peaceful = "music_classical_peace"
+music_combat = "music_classical_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Classical", "Player"
+ }
+
+[musicstyle_tropical]
+music_peaceful = "music_tropical_peace"
+music_combat = "music_tropical_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Tropical", "Player"
+ }
+
+[musicstyle_asian]
+music_peaceful = "music_asian_peace"
+music_combat = "music_asian_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Asian", "Player"
+ }
+
+[musicstyle_babylonian]
+music_peaceful = "music_babylonian_peace"
+music_combat = "music_babylonian_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Babylonian", "Player"
+ }
+
+[musicstyle_celtic]
+music_peaceful = "music_celtic_peace"
+music_combat = "music_celtic_combat"
+reqs =
+ { "type", "name", "range"
+ "Style", "Celtic", "Player"
+ }
+
+[musicstyle_industrial]
+music_peaceful = "music_industrial_peace"
+music_combat = "music_industrial_combat"
+reqs =
+ { "type", "name", "range"
+ "Tech", "Railroad", "Player"
+ }
+
+[musicstyle_electricage]
+music_peaceful = "music_electricage_peace"
+music_combat = "music_electricage_combat"
+reqs =
+ { "type", "name", "range"
+ "Tech", "Automobile", "Player"
+ }
+
+[musicstyle_modern]
+music_peaceful = "music_modern_peace"
+music_combat = "music_modern_combat"
+reqs =
+ { "type", "name", "range"
+ "Tech", "Rocketry", "Player"
+ }
+
+[musicstyle_postmodern]
+music_peaceful = "music_postmodern_peace"
+music_combat = "music_postmodern_combat"
+reqs =
+ { "type", "name", "range"
+ "Tech", "Superconductors", "Player"
+ }
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
