Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/base/ini
diff options
context:
space:
mode:
authorEvan Goers <mega@osirion.org>2011-07-07 23:36:12 +0000
committerEvan Goers <mega@osirion.org>2011-07-07 23:36:12 +0000
commit11c05dbc1b5a5f8ea4fbc2b8199fbb7ca43a75e5 (patch)
tree9d7d87f74a1b04da36c95c20ee7da4db0546d226 /base/ini
parent5602cd26d315aaf9f04dfb16712984054d9b001a (diff)
Fixed factions in tsukhan zones.
Diffstat (limited to 'base/ini')
-rw-r--r--base/ini/zones/alpha_kosiya.ini14
-rw-r--r--base/ini/zones/gamma_kosiya.ini4
-rw-r--r--base/ini/zones/kiana.ini38
3 files changed, 28 insertions, 28 deletions
diff --git a/base/ini/zones/alpha_kosiya.ini b/base/ini/zones/alpha_kosiya.ini
index 8d99214..e44e778 100644
--- a/base/ini/zones/alpha_kosiya.ini
+++ b/base/ini/zones/alpha_kosiya.ini
@@ -40,7 +40,7 @@ location=768 -424 0
[jumpgate]
label=jumpgate_gammakosiya
target=gamma_kosiya:jumpgate_alphakosiya
-faction=tsukhan
+faction=tsukhan_military
location=768 -432 0
yaw=180
@@ -52,7 +52,7 @@ location=-1024 480 0
[jumpgate]
label=jumpgate_kiana
target=kiana:jumpgate_alphakosiya
-faction=tsukhan
+faction=tsukhan_military
location=-1024 476 0
yaw=-90
@@ -71,33 +71,33 @@ rotationspeed=1
ship=ravager
label=battleship_kt56
name=Battleship K-T56
-faction=tsukhan
+faction=tsukhan_military
location=512 -480 0
[entity]
ship=ravager
label=battleship_kt73
name=Battleship K-T73
-faction=tsukhan
+faction=tsukhan_military
location=512 -424 0
[entity]
ship=ravager
label=battleship_kt22
name=Battleship K-T22
-faction=tsukhan
+faction=tsukhan_military
location=512 -458 -16
[entity]
ship=ravager
label=battleship_kt66
name=Battleship K-T66
-faction=tsukhan
+faction=tsukhan_military
location=496 -436 16
[entity]
ship=ravager
label=battleship_kt52
name=Battleship K-T52
-faction=tsukhan
+faction=tsukhan_military
location=384 -384 0
diff --git a/base/ini/zones/gamma_kosiya.ini b/base/ini/zones/gamma_kosiya.ini
index 24a7174..a04bfa9 100644
--- a/base/ini/zones/gamma_kosiya.ini
+++ b/base/ini/zones/gamma_kosiya.ini
@@ -14,12 +14,12 @@ location=0 0 0
[jumpgate]
label=jumpgate_alphakosiya
target=alpha_kosiya:jumpgate_gammakosiya
-faction=tsukhan
+faction=tsukhan_military
location=512 -1040 0
[jumpgate]
label=jumpgate_kiana
target=kiana:jumpgate_gammakosiya
-faction=tsukhan
+faction=tsukhan_military
location=-480 1024 0
yaw=180
diff --git a/base/ini/zones/kiana.ini b/base/ini/zones/kiana.ini
index f7a6ec6..5ecbe93 100644
--- a/base/ini/zones/kiana.ini
+++ b/base/ini/zones/kiana.ini
@@ -49,7 +49,7 @@ texture=planets/kiana
label=tsukhan_central
name=Tsu-Khan Central
model=maps/tsukhan/tsukhan_central
-faction=tsukhan
+faction=tsukhan_civilians
location=-128 -64 12
radius=20
default=yes
@@ -76,7 +76,7 @@ default=yes
label=tsukhan_generator
name=M-L13
texture=structures/generator
-faction=tsukhan
+faction=tsukhan_civilians
location=-128 -64 12
radius=8
rotationspeed=0
@@ -89,7 +89,7 @@ showonmap=false
label=civilian_starscraper01
name=Tsu-Khan Starscraper
model=maps/tsukhan/civilian_starscraper
-faction=tsukhan
+faction=tsukhan_civilians
location=-128 -128 12
complex=yes
radius=10
@@ -98,7 +98,7 @@ radius=10
label=civilian_starscraper02
name=Tsu-Khan Starscraper
model=maps/tsukhan/civilian_starscraper
-faction=tsukhan
+faction=tsukhan_civilians
location=-128 -160 12
complex=yes
radius=10
@@ -107,7 +107,7 @@ radius=10
label=civilian_starscraper03
name=Tsu-Khan Starscraper
model=maps/tsukhan/civilian_starscraper
-faction=tsukhan
+faction=tsukhan_civilians
location=-128 -192 12
complex=yes
radius=10
@@ -116,7 +116,7 @@ radius=10
label=civilian_starscraper04
name=Tsu-Khan Starscraper
model=maps/tsukhan/civilian_starscraper
-faction=tsukhan
+faction=tsukhan_civilians
location=-160 -128 12
complex=yes
radius=10
@@ -125,7 +125,7 @@ radius=10
label=civilian_starscraper05
name=Tsu-Khan Starscraper
model=maps/tsukhan/civilian_starscraper
-faction=tsukhan
+faction=tsukhan_civilians
location=-160 -160 12
complex=yes
radius=10
@@ -134,7 +134,7 @@ radius=10
label=civilian_starscraper06
name=Tsu-Khan Starscraper
model=maps/tsukhan/civilian_starscraper
-faction=tsukhan
+faction=tsukhan_civilians
location=-160 -192 12
complex=yes
radius=10
@@ -143,7 +143,7 @@ radius=10
label=civilian_starscraper07
name=Tsu-Khan Starscraper
model=maps/tsukhan/civilian_starscraper
-faction=tsukhan
+faction=tsukhan_civilians
location=32 128 0
complex=yes
radius=10
@@ -152,7 +152,7 @@ radius=10
label=civilian_starscraper08
name=Tsu-Khan Starscraper
model=maps/tsukhan/civilian_starscraper
-faction=tsukhan
+faction=tsukhan_civilians
location=128 72 -32
complex=yes
radius=10
@@ -164,42 +164,42 @@ radius=10
label=civilian_housing1
name=Tsu-Khan Civilian Housing
model=maps/tsukhan/civilian_housing
-faction=tsukhan
+faction=tsukhan_civilians
location=-96 -56 12
[entity]
label=civilian_housing2
name=Tsu-Khan Civilian Housing
model=maps/tsukhan/civilian_housing
-faction=tsukhan
+faction=tsukhan_civilians
location=-96 -56 11
[entity]
label=civilian_housing3
name=Tsu-Khan Civilian Housing
model=maps/tsukhan/civilian_housing
-faction=tsukhan
+faction=tsukhan_civilians
location=-96 -55 10
[entity]
label=civilian_housing4
name=Tsu-Khan Civilian Housing
model=maps/tsukhan/civilian_housing
-faction=tsukhan
+faction=tsukhan_civilians
location=-96 -55 12
[entity]
label=civilian_housing6
name=Tsu-Khan Civilian Housing
model=maps/tsukhan/civilian_housing
-faction=tsukhan
+faction=tsukhan_civilians
location=-96 -55 11
[entity]
label=civilian_housing6
name=Tsu-Khan Civilian Housing
model=maps/tsukhan/civilian_housing
-faction=tsukhan
+faction=tsukhan_civilians
location=-96 -56 10
; ------------------------------------------------------------------
@@ -209,7 +209,7 @@ location=-96 -56 10
ship=ravager
label=battleship_kt98
name=Battleship K-T98
-faction=tsukhan
+faction=tsukhan_military
location=256 16 16
[ship]
@@ -229,12 +229,12 @@ location=256 16 16
[jumpgate]
label=jumpgate_alphakosiya
target=alpha_kosiya:jumpgate_kiana
-faction=tsukhan
+faction=tsukhan_military
location=320 18 16
yaw=180
[jumpgate]
label=jumpgate_gammakosiya
target=gamma_kosiya:jumpgate_kiana
-faction=tsukhan
+faction=tsukhan_military
location=16 768 0