diff options
| author | Stijn Buys <ingar@osirion.org> | 2012-12-07 08:41:24 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2012-12-07 08:41:24 +0000 |
| commit | 9f94cecb99a8cbf079ce252698d48ce098e23be4 (patch) | |
| tree | b8a5477557682a3d86dd73f2bbaa58efbb045ec7 /base/ini/factions.ini | |
| parent | 22644543a1b3e5ca6faf75e777a08891ba2b54fe (diff) | |
Renamed 'independent' faction to 'neutral',
added 'rogue', 'merchants' and 'mercenaries' factions,
added zone files for Praetorian space and surrounding star systems,
updated the Caledonia system.
Diffstat (limited to 'base/ini/factions.ini')
| -rw-r--r-- | base/ini/factions.ini | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/base/ini/factions.ini b/base/ini/factions.ini index 9fe0a39..569fcda 100644 --- a/base/ini/factions.ini +++ b/base/ini/factions.ini @@ -20,6 +20,19 @@ name=Colonial Militia color=100 100 230 colorsecond=192 192 40 +; used to indicate neutral space +[faction] +label=neutral +name=Neutral +color=0.7 0.7 0.9 +colorsecond=0.7 0.8 0.95 + +; used to indicate rogue space +[faction] +label=rogue +name=Rogue +color=0.5 0.5 0.5 + [faction] ; faction label label=lindblade @@ -35,6 +48,7 @@ colorsecond=0.75 0.35 0 label=praetoria ; faction full name name=House Praetoria +color=217 131 0 [faction] label=miners @@ -49,15 +63,13 @@ colorsecond=152 166 169 color=106 95 87 [faction] -label=independent -name=Independent -color=0.7 0.7 0.9 -colorsecond=0.7 0.8 0.95 - -[faction] label=mercenaries name=Mercenaries Guild +[factiom] +label=merchants +name=Merchants Association + [faction] label=pirates name=Pirates |