[Orxonox-commit 5439] r10102 - in code/branches/weaponupdateHS14/data/levels: . templates
flsueess at orxonox.net
flsueess at orxonox.net
Wed Oct 29 16:00:10 CET 2014
Author: flsueess
Date: 2014-10-29 16:00:09 +0100 (Wed, 29 Oct 2014)
New Revision: 10102
Added:
code/branches/weaponupdateHS14/data/levels/templates/ss_tube01.oxt
Modified:
code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw
code/branches/weaponupdateHS14/data/levels/pirateAttack.oxw
Log:
oxt file f?\195?\188r spacestation erstellt, bestehende level files angepasst
Modified: code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw
===================================================================
--- code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw 2014-10-29 14:31:05 UTC (rev 10101)
+++ code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw 2014-10-29 15:00:09 UTC (rev 10102)
@@ -43,14 +43,38 @@
<?lua
include("includes/pickups.oxi")
?>
+
+ <!-- my ships -->
<Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0,1.0,1.0,0.5" specular="1.0, 0.9, 0.9, 1.0"/>
<SpawnPoint team=1 position="3000,0,0" lookat="4000,-1000,-1000" spawnclass=SpaceShip pawndesign=spaceshipescort />
<!--6000,2000,500-->
-
+
+ <SpaceShip
+ template = "spaceshipassff"
+ team = "1"
+ position = "2830,20,50"
+ orientation = "1,200,0,0"
+ health = "200"
+ initialhealth = "200"
+ maxhealth = "200"
+ shieldhealth = "50"
+ initialshieldhealth = "50"
+ maxshieldhealth = "50"
+ shieldabsorption = "0.8"
+ reloadrate = "1"
+ reloadwaittime = "1"
+ name = "Tanis1"
+ radarname = "Light-Destroyer" >
+ <attached>
+ <DockingTarget name="spaceShip" />
+ <DistanceTriggerBeacon name="bcnSpaceShip" />
+ </attached>
+ </SpaceShip>
+
+
-
<StaticEntity position = "2800,0,0" mass=10000 collisionType=static >
<attached>
<Model mesh="HydroHarvester.mesh" mass=10 position="0,0,0" scale=50 />
@@ -153,7 +177,8 @@
</Dock>
- <!-- Enemy ship -->
+ <!-- Enemy ships -->
+
<SpaceShip
template = "HeavyCruiser"
team = "0"
@@ -170,44 +195,76 @@
reloadwaittime = "1"
name = "Tanis1"
radarname = "Tanis Cruiser" >
- <attached>
- <DockingTarget name="spaceShip" />
- <DistanceTriggerBeacon name="bcnSpaceShip" />
- </attached>
- </SpaceShip>
+ </SpaceShip>
- <SpaceShip
+
+ <!-- <SpaceShip
template = "spaceshippirate"
team = "0"
position = "4800,-200,-1200"
orientation = "1,200,0,0"
- health = "2000"
- initialhealth = "2000"
- maxhealth = "2000"
- shieldhealth = "200"
- initialshieldhealth = "200"
- maxshieldhealth = "200"
+ health = "200"
+ initialhealth = "200"
+ maxhealth = "200"
+ shieldhealth = "50"
+ initialshieldhealth = "50"
+ maxshieldhealth = "50"
shieldabsorption = "0.8"
reloadrate = "1"
reloadwaittime = "1"
name = "Tanis1"
- radarname = "Pirate" >
+ radarname = "Pirate1" >
<controller>
<AIController team=0/>
</controller>
+
</SpaceShip>
+
+ <SpaceShip
+ template = "spaceshippirate"
+ team = "0"
+ position = "4800,-220,-1200"
+ orientation = "1,200,0,0"
+ health = "200"
+ initialhealth = "200"
+ maxhealth = "200"
+ shieldhealth = "50"
+ initialshieldhealth = "50"
+ maxshieldhealth = "50"
+ shieldabsorption = "0.8"
+ reloadrate = "1"
+ reloadwaittime = "1"
+ name = "Tanis1"
+ radarname = "Pirate2" >
+
+ <controller>
+ <AIController team=0/>
+ </controller>
+
+ </SpaceShip>
+ -->
-
-
-
<!-- SpaceStation
The station can either be hidden outside of the skybox, within the hull of the space station if it is big enough or within a planet.
Complex spacestations can be placed very far away from the spaceship so it is rendered at low resolution while the player uses the space ship.
-->
- <StaticEntity position="0,-20000,0" direction="0,-1,0" collisionType=static mass=100000 friction=0.01 pitch=-90>
+<StaticEntity position="2800,-500,0" direction="0,-1,0" collisionType=static mass=100000 friction=0.01 pitch=-90>
+<attached>
+
+<Model position="0,0,0" mesh="cube.mesh" scale3D="50,50,50" />
+
+</attached>
+</StaticEntity>
+
+<Model position="0,0,0" mesh="cube.mesh" scale3D="10000,10,10" />
+<Model position="0,0,0" mesh="cube.mesh" scale3D="10,10000,10" />
+<Model position="0,0,0" mesh="cube.mesh" scale3D="10,10,10000" />
+
+
+<StaticEntity position="0,-20000,0" direction="0,-1,0" collisionType=static mass=100000 friction=0.01 pitch=-90>
<attached>
<Model position="0,0,0" mesh="ss_tube.mesh" scale3D="100,100,100" />
<Model position="500,0,0" mesh="ss_tube.mesh" scale3D="100,100,100" />
Modified: code/branches/weaponupdateHS14/data/levels/pirateAttack.oxw
===================================================================
--- code/branches/weaponupdateHS14/data/levels/pirateAttack.oxw 2014-10-29 14:31:05 UTC (rev 10101)
+++ code/branches/weaponupdateHS14/data/levels/pirateAttack.oxw 2014-10-29 15:00:09 UTC (rev 10102)
@@ -402,7 +402,7 @@
</EventDispatcher>
<!--Change spawnoint end-->
- <!-- pirates -->
+ <!-- pirates >
<?lua
for i = 1,1, 1
do
Added: code/branches/weaponupdateHS14/data/levels/templates/ss_tube01.oxt
===================================================================
--- code/branches/weaponupdateHS14/data/levels/templates/ss_tube01.oxt (rev 0)
+++ code/branches/weaponupdateHS14/data/levels/templates/ss_tube01.oxt 2014-10-29 15:00:09 UTC (rev 10102)
@@ -0,0 +1,21 @@
+<Template name=ss_tube01>
+
+<MovableEntity position="0,0,0">
+<attached>
+
+<Model position="0,0,0" yaw=0 pitch=180 roll=0 scale=4 mesh="bsBody.mesh" />
+
+</attached>
+ <collisionShapes>
+ <BoxCollisionShape position="0,8,17" halfExtents="8,10,10" />
+ <BoxCollisionShape position="0,0,22" halfExtents="18, 2, 10" />
+ <BoxCollisionShape position="0,0,9" halfExtents="12, 2, 20" />
+ <BoxCollisionShape position="0,0,-18" halfExtents="6, 2, 18" />
+
+ </collisionShapes>
+
+ <Model position="0,0,0" mesh="cube.mesh" scale3D="1000,1000,1000" />
+
+</MovableEntity>
+
+</Template>
\ No newline at end of file
More information about the Orxonox-commit
mailing list