From 32f505e96029ebeaa178a3f3c76a45acf55f0dd8 Mon Sep 17 00:00:00 2001 From: Stijn Buys <ingar@osirion.org> Date: Tue, 12 Jul 2011 14:36:06 +0000 Subject: Removed complex flag from the ini files. --- base/ini/ships.ini | 18 ------------------ base/ini/zones/anara.ini | 1 - base/ini/zones/antwerp.ini | 1 - base/ini/zones/finnmark.ini | 1 - base/ini/zones/ghant.ini | 10 +--------- base/ini/zones/khorsand.ini | 3 --- base/ini/zones/kiana.ini | 8 -------- base/ini/zones/kor_telos.ini | 1 - base/ini/zones/kronenbaden.ini | 1 - base/ini/zones/race.ini | 5 ----- 10 files changed, 1 insertion(+), 48 deletions(-) diff --git a/base/ini/ships.ini b/base/ini/ships.ini index 50be4e9..fdf5fb0 100644 --- a/base/ini/ships.ini +++ b/base/ini/ships.ini @@ -52,8 +52,6 @@ name=Micron Vector template=ship_small ; 3d model file name, can be a .map or a .ase file model=maps/merchant/vector -; enable collision model -complex=true ; dealer price price=12500 @@ -89,7 +87,6 @@ name=Micron Scalar template=ship_small model=maps/merchant/scalar jumpdrive=yes -complex=true price=15000 @@ -113,7 +110,6 @@ name=Micron Matrix template=ship_medium model=maps/merchant/matrix jumpdrive=yes -complex=true price=95000 @@ -174,7 +170,6 @@ name=Mining Surveyor template=ship_small model=maps/miners/surveyor jumpdrive=no -complex=true price=10000 cargo=5 @@ -191,7 +186,6 @@ name=Mining Defender template=ship_small model=maps/miners/defender jumpdrive=no -complex=true price=7000 cargo=2 @@ -208,7 +202,6 @@ name=Archer template=ship_small model=maps/mercenary/archer jumpdrive=no -complex=true price=20000 cargo=15 @@ -227,7 +220,6 @@ name=Longbow template=ship_medium model=maps/mercenary/longbow jumpdrive=no -complex=true price=45000 @@ -252,7 +244,6 @@ template=ship_medium model=maps/mercenary/pod price=15000 cargo = 10 -complex=true ; technical specifications thrust = 4 @@ -272,7 +263,6 @@ template=ship_medium model=maps/mercenary/talon price=22500 cargo=10 -complex=true thrust=4.4 impulse=20 @@ -311,7 +301,6 @@ label=custodian name=Custodian template=ship_battleship model=maps/colonial/custodian -complex=true jumpdrive=yes dock=yes price=750000 @@ -332,7 +321,6 @@ template=ship_small model=maps/colonial/sharkan price=8500 cargo=5 -complex=true thrust = 2 impulse = 10 @@ -350,7 +338,6 @@ template=ship_small model=maps/colonial/tiger price=13000 cargo=7 -complex=true thrust = 1.9 impulse = 9.95 @@ -365,7 +352,6 @@ template=ship_medium model=maps/colonial/lancer price=23000 cargo=16 -complex=true thrust = 4.1 impulse = 20 @@ -544,7 +530,6 @@ template=ship_small model=maps/lindblade/winsor thrust=2 impulse=4 -complex=true strafe=0.5 turn=12 roll=11 @@ -755,7 +740,6 @@ model=maps/pirate/raider jumpdrive=no price=25500 cargo=5 -complex=yes thrust = 3.9 impulse = 20 @@ -790,7 +774,6 @@ name=Rapier Beam Array template=ship_frigate model=maps/pirate/beamarray jumpdrive=yes -complex=yes price=95000 cargo=90 @@ -816,7 +799,6 @@ jumpdrive=yes dock=yes price=1500000 cargo=7000 -complex=yes thrust=55.6 impulse=280 diff --git a/base/ini/zones/anara.ini b/base/ini/zones/anara.ini index 6ee7921..18fba2e 100644 --- a/base/ini/zones/anara.ini +++ b/base/ini/zones/anara.ini @@ -23,7 +23,6 @@ label=galileo_outpost name=Galileo Outpost model=maps/independent/researchstation faction=research -complex=true location=128 768 32 diff --git a/base/ini/zones/antwerp.ini b/base/ini/zones/antwerp.ini index 36ab221..6d8eec5 100644 --- a/base/ini/zones/antwerp.ini +++ b/base/ini/zones/antwerp.ini @@ -74,7 +74,6 @@ label=buccaneers model=maps/pirate/base_large name=Buccaneers Den faction=pirates -complex=yes location=-768 1460 -256 radius=20 diff --git a/base/ini/zones/finnmark.ini b/base/ini/zones/finnmark.ini index b9e838a..59cec87 100644 --- a/base/ini/zones/finnmark.ini +++ b/base/ini/zones/finnmark.ini @@ -133,7 +133,6 @@ location=-584 896 0 model=maps/colonial/jumpgate yaw=0 faction=colonies -complex=true [station] label=jumpgate_construction diff --git a/base/ini/zones/ghant.ini b/base/ini/zones/ghant.ini index b60ae9d..978ad62 100644 --- a/base/ini/zones/ghant.ini +++ b/base/ini/zones/ghant.ini @@ -77,9 +77,7 @@ location=-192 -704 32 yaw=45 ; this is the default base where new players are docked default=yes -; allow complex collision -complex=yes - +; entity radius radius=8 ; info text info=Alexandria outpost serves as a commercial and entertainment centre for the Ghant system. Because of its remote location, it is also a popular transit zone for more shady operations, giving birth to its nickname Queen of the Wasteland. @@ -138,8 +136,6 @@ model=maps/colonial/alexandria_storage faction=colonies location=-176 -720 32 yaw=45 -complex=yes - [entity] label=alexandria_storage2 @@ -148,7 +144,6 @@ model=maps/colonial/alexandria_storage faction=colonies location=-172 -720 32 yaw=45 -complex=yes ; ------------------------------------------------------------------ ; BATTLESHIP CUSTODIAN @@ -210,7 +205,6 @@ model=maps/colonial/regula location=-128 928 -32 color=0.4 0.7 0 yaw=225 -complex=yes info=Regula station is the headquarters of the local niobium mining operation. [ship] @@ -241,7 +235,6 @@ name=Storage tanks model=maps/colonial/regula_storage location=-122 928 -32 color=0.4 0.7 0 -complex=yes ; ------------------------------------------------------------------ ; KRONENBADEN JUMPGATE @@ -261,7 +254,6 @@ yaw=270 label=ikarus name=Ikarus satellite model=maps/colonial/ikarus -complex=true faction=militia location=64 -16 0 yaw=120 diff --git a/base/ini/zones/khorsand.ini b/base/ini/zones/khorsand.ini index 7628781..b7f4fc7 100644 --- a/base/ini/zones/khorsand.ini +++ b/base/ini/zones/khorsand.ini @@ -38,7 +38,6 @@ model=maps/colonial/regula location=-448 -96 -12 color=0.7 0.7 0 yaw=225 -complex=yes info=Kerman station is the main niobium refinery in the border worlds. [ship] @@ -73,7 +72,6 @@ name=Storage tanks model=maps/colonial/regula_storage location=-448 -86 -12 color=0.9 0.9 0.1 -complex=yes [entity] label=kerman_storage2 @@ -82,4 +80,3 @@ model=maps/colonial/regula_storage location=-448 -106 -12 yaw=180 color=0.9 0.9 0.1 -complex=yes diff --git a/base/ini/zones/kiana.ini b/base/ini/zones/kiana.ini index 5ecbe93..3bdce42 100644 --- a/base/ini/zones/kiana.ini +++ b/base/ini/zones/kiana.ini @@ -91,7 +91,6 @@ name=Tsu-Khan Starscraper model=maps/tsukhan/civilian_starscraper faction=tsukhan_civilians location=-128 -128 12 -complex=yes radius=10 [entity] @@ -100,7 +99,6 @@ name=Tsu-Khan Starscraper model=maps/tsukhan/civilian_starscraper faction=tsukhan_civilians location=-128 -160 12 -complex=yes radius=10 [entity] @@ -109,7 +107,6 @@ name=Tsu-Khan Starscraper model=maps/tsukhan/civilian_starscraper faction=tsukhan_civilians location=-128 -192 12 -complex=yes radius=10 [entity] @@ -118,7 +115,6 @@ name=Tsu-Khan Starscraper model=maps/tsukhan/civilian_starscraper faction=tsukhan_civilians location=-160 -128 12 -complex=yes radius=10 [entity] @@ -127,7 +123,6 @@ name=Tsu-Khan Starscraper model=maps/tsukhan/civilian_starscraper faction=tsukhan_civilians location=-160 -160 12 -complex=yes radius=10 [entity] @@ -136,7 +131,6 @@ name=Tsu-Khan Starscraper model=maps/tsukhan/civilian_starscraper faction=tsukhan_civilians location=-160 -192 12 -complex=yes radius=10 [entity] @@ -145,7 +139,6 @@ name=Tsu-Khan Starscraper model=maps/tsukhan/civilian_starscraper faction=tsukhan_civilians location=32 128 0 -complex=yes radius=10 [entity] @@ -154,7 +147,6 @@ name=Tsu-Khan Starscraper model=maps/tsukhan/civilian_starscraper faction=tsukhan_civilians location=128 72 -32 -complex=yes radius=10 ; ------------------------------------------------------------------ diff --git a/base/ini/zones/kor_telos.ini b/base/ini/zones/kor_telos.ini index 8e3fd54..df25b86 100644 --- a/base/ini/zones/kor_telos.ini +++ b/base/ini/zones/kor_telos.ini @@ -23,7 +23,6 @@ faction=derelict location=4096 4096 0 roll=45 radius=100000000 -complex=yes [planet] label=corthio diff --git a/base/ini/zones/kronenbaden.ini b/base/ini/zones/kronenbaden.ini index df244dd..1277f63 100644 --- a/base/ini/zones/kronenbaden.ini +++ b/base/ini/zones/kronenbaden.ini @@ -71,7 +71,6 @@ location=1380 356 8 model=maps/colonial/jumpgate yaw=180 faction=colonies -complex=true [station] label=jumpgate_construction diff --git a/base/ini/zones/race.ini b/base/ini/zones/race.ini index 0d25bf0..7f0cd30 100644 --- a/base/ini/zones/race.ini +++ b/base/ini/zones/race.ini @@ -14,7 +14,6 @@ model=maps/race/checkpoint location=64 0 0 yaw=180 color=.5 .5 .5 -complex=true [checkpoint] label=checkpoint1 @@ -22,7 +21,6 @@ name=Checkpoint 1 model=maps/race/checkpoint location=96 0 0 yaw=180 -complex=true [checkpoint] label=checkpoint2 @@ -30,7 +28,6 @@ name=Checkpoint 2 model=maps/race/checkpoint location=128 0 4 yaw=180 -complex=true [checkpoint] label=checkpoint3 @@ -38,7 +35,6 @@ name=Checkpoint 3 model=maps/race/checkpoint location=138 -10 4 yaw=135 -complex=true [checkpoint] label=checkpoint4 @@ -46,5 +42,4 @@ name=Race Finish model=maps/race/checkpoint location=138 -28 4 yaw=90 -complex=true -- cgit v1.2.3