[Orxonox-commit 4570] r9242 - in code/branches/captureTheFlag: . data/levels data/levels/includes data/levels/templates data/overlays src/modules
landauf at orxonox.net
landauf at orxonox.net
Thu May 24 21:24:58 CEST 2012
Author: landauf
Date: 2012-05-24 21:24:58 +0200 (Thu, 24 May 2012)
New Revision: 9242
Removed:
code/branches/captureTheFlag/.project
code/branches/captureTheFlag/data/levels/includes/towerWeaponSettings.oxi
code/branches/captureTheFlag/data/levels/templates/tower.oxt
code/branches/captureTheFlag/data/levels/towerDefense.oxw
code/branches/captureTheFlag/data/overlays/towerdefenseHUD.oxo
code/branches/captureTheFlag/src/modules/towerdefense/
Log:
reverted accidental changes from r9241
Deleted: code/branches/captureTheFlag/.project
===================================================================
--- code/branches/captureTheFlag/.project 2012-05-24 18:49:19 UTC (rev 9241)
+++ code/branches/captureTheFlag/.project 2012-05-24 19:24:58 UTC (rev 9242)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>Orxonox-Source at newlevel2012</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
Deleted: code/branches/captureTheFlag/data/levels/includes/towerWeaponSettings.oxi
===================================================================
--- code/branches/captureTheFlag/data/levels/includes/towerWeaponSettings.oxi 2012-05-24 18:49:19 UTC (rev 9241)
+++ code/branches/captureTheFlag/data/levels/includes/towerWeaponSettings.oxi 2012-05-24 19:24:58 UTC (rev 9242)
@@ -1,55 +0,0 @@
- <weaponslots>
- <WeaponSlot position="-15.0,-1.5,0" />
- <WeaponSlot position=" 15.0,-1.5,0" />
- <WeaponSlot position=" 0, 0,0" />
- </weaponslots>
- <weaponsets>
- <WeaponSet firemode=0 />
- <WeaponSet firemode=1 />
- <WeaponSet firemode=2 />
- <WeaponSet firemode=3 />
- </weaponsets>
- <weapons>
- <WeaponPack>
- <links>
- <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
- <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
- <DefaultWeaponmodeLink firemode=2 weaponmode=2 />
- <DefaultWeaponmodeLink firemode=3 weaponmode=3 />
- </links>
- <Weapon>
- <attached>
- <Model mesh="LightningGun.mesh" pitch="100" roll="90" yaw="90" position="0,-1.3,200" scale=1/>
- <Model mesh="LightningGun-s.mesh" pitch="78" roll="90" yaw="90" position="0.2,-1.3,200" scale=1 />
- <Model mesh="hs-w01_reduced.mesh" roll="45" pitch="-76" yaw="-45" position="-1.5,1,200" scale=10 />
- </attached>
- <HsW01 mode=0 munitionpershot=0 delay=0.005 damage=31.4159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
- <HsW01 mode=0 munitionpershot=0 delay=0 damage=314.159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
- <LightningGun mode=1 muzzleoffset="0,0,0" damage=3.14159 shielddamage=20 />
- </Weapon>
-
- <Weapon>
- <attached>
- <Model mesh="LightningGun.mesh" pitch="103" roll="90" yaw="90" position="0,-1.35,0" />
- <Model mesh="LightningGun-s.mesh" pitch="103" roll="90" yaw="90" position="0.2,-1.35,0" />
- <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-104" yaw="-90" position="0,1.3,0.3" scale=0.6 />
- </attached>
- <HsW01 mode=0 munitionpershot=0 delay=0 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />
- <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" />
- <LightningGun mode=1 muzzleoffset="0,0,0" damage=23 />
- </Weapon>
- <Weapon>
- <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
- <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
- </Weapon>
-
- </WeaponPack>
- <WeaponPack>
- <links>
- <DefaultWeaponmodeLink firemode=1 weaponmode=0 />
- </links>
- <!--Weapon>
- <EnergyDrink mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare"muzzleoffset="2,-0.2,-1" />
- </Weapon-->
- </WeaponPack>
- </weapons>
\ No newline at end of file
Deleted: code/branches/captureTheFlag/data/levels/templates/tower.oxt
===================================================================
--- code/branches/captureTheFlag/data/levels/templates/tower.oxt 2012-05-24 18:49:19 UTC (rev 9241)
+++ code/branches/captureTheFlag/data/levels/templates/tower.oxt 2012-05-24 19:24:58 UTC (rev 9242)
@@ -1,37 +0,0 @@
-<Template name=tower>
- <Tower
-
-
- explosionchunks = 6
-
- reloadrate = 3
- reloadwaittime = 1
-
- collisionType = "dynamic"
- team = 2
-
-
- >
- <controller>
- <WaypointPatrolController alertnessradius=1000 team=5>
- <waypoints>
- <Model mesh="cube.mesh" scale=0 position=" 700, 200, 100" />
- </waypoints>
- </WaypointPatrolController>
- </controller>
-
-
- <attached>
- <Model position="0,0,0" scale=45 mesh="Tower.mesh" />
- </attached>
-
- <!--collisionShapes>
-
- </collisionShapes-->
-
-<?lua
- include("../includes/towerWeaponSettings.oxi")
-?>
- </Tower>
-</Template>
-
Deleted: code/branches/captureTheFlag/data/levels/towerDefense.oxw
===================================================================
--- code/branches/captureTheFlag/data/levels/towerDefense.oxw 2012-05-24 18:49:19 UTC (rev 9241)
+++ code/branches/captureTheFlag/data/levels/towerDefense.oxw 2012-05-24 19:24:58 UTC (rev 9242)
@@ -1,140 +0,0 @@
-<!-- TODO: Update the level's image-->
-
-<!-- See TowerDefenseReadme.txt for Information on this file -->
-
-<LevelInfo
- name = "Tower Defense"
- description = "Defend your Spacestation from incoming waves."
- tags = "gametype"
- screenshot = "emptylevel.png"
-/>
-
-<?lua
- include("stats.oxo")
- include("HUDTemplates3.oxo")
- include("towerdefenseHUD.oxo")
- include("templates/lodInformation.oxt")
-?>
-
-<?lua
- include("templates/spaceshipAssff.oxt")
- include("templates/spaceshipPirate.oxt")
- include("templates/tower.oxt")
-?>
-
-<!-- Specify the position of the camera -->
-<Template name=centerpointmarkcamera defaults=0>
- <Pawn>
- <camerapositions>
- <CameraPosition position="0,0,1500"/>
- </camerapositions>
- </Pawn>
-</Template>
-
-<!-- Loads a mesh to mark the center-->
-<Template name=centerpointmark>
- <Pawn camerapositiontemplate=centerpointmarkcamera>
- <attached>
- <Model position="0,0,0" mesh="cylinder.mesh" scale3D="1,1,1" /> <!-- the camera is attached to this -->
- </attached>
- </Pawn>
-</Template>
-
-
-<!-- Template for a tower EDIT: new towertemplate is included with "templates/tower" -->
-<!--Template name=towertemplate>
- <Tower>
- <attached>
- <Model position="0,0,0" scale=0.25 mesh="Tower_ME.mesh" />
- </attached>
- </Tower>
-</Template-->
-
-
-
-
-
-<Level gametype = "TowerDefense">
- <templates>
- <Template link=lodtemplate_default />
- </templates>
-
- <?lua include("includes/notifications.oxi") ?>
-
- <Scene
- ambientlight = "0.8, 0.8, 0.8"
- skybox = "Orxonox/Starbox"
- >
-
- <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
-
- <!-- Spawns the camera, attached to a crate -->
- <SpawnPoint team=0 position="0,0,0" spawnclass=Pawn pawndesign=centerpointmark />
- <!--TeamSpawnPoint team=1 position="-7,7,4" direction="-1,0,0" roll=90 yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff /-->
-
- <!--SpawnPoint team=1 position="0,0,10" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff /-->
- <!--SpawnPoint team=0 position="0,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff /-->
-
- <SpaceShip position="-700,-500, 100" lookat="0,0,0" scale=3 team=1 >
- <templates>
- <Template link=spaceshipassff />
- </templates>
- <controller>
- <WaypointController accuracy=60>
- <waypoints>
- <!-- 1,3 10,3 10,11, 13,11 -->
- <Model mesh="cube.mesh" scale=0 position="-700,-500, 150" />
- <Model mesh="cube.mesh" scale=0 position=" 200,-500, 150" />
- <Model mesh="cube.mesh" scale=0 position=" 200, 300, 150" />
- <Model mesh="cube.mesh" scale=0 position=" 500, 300, 150" />
- <Model mesh="cube.mesh" scale=0 position=" 500, 700, 150" />
- </waypoints>
- </WaypointController>
- </controller>
- </SpaceShip>
-
-
- <!--invisible entity to attach towers to, since playfield is static and towers are dynamic-->
- <StaticEntity position=0,0,0>
-
- <attached>
- <Model position="-50,-50,0" mesh="Playfield_ME.mesh" scale=80 />
- <!-- Base -->
- <Model position="500,700,100" mesh="sphere.mesh" scale=80 />
- <!--Model position="0,0,0" mesh="crate.mesh" scale3D="3,3,3" /--> <!-- Only temporary needed to help align the collisionshape -->
- <!-- This was used to mark the playfield, let's let it be here for now -->
- <!--Model position="-8,8,0" mesh="crate.mesh" scale3D="0.3,0.3,0.3" /-->
- <!--Model position="-8,-8,0" mesh="crate.mesh" scale3D="0.3,0.3,0.3" /-->
- <!--Model position="8,-8,0" mesh="crate.mesh" scale3D="0.3,0.3,0.3" /-->
- <!--Model position="8,8,0" mesh="crate.mesh" scale3D="0.3,0.3,0.3" /-->
- </attached>
- <collisionShapes> <!-- The collisionshape forbids other worldentities that have a collisionShape to fly through it.
-
- TODO: Find correct size for the collisionshape; since a collisionShape is invisible
- I added the crate wich currently has the same dimensions as the collisionshape.
- You have to adjust the crate's scale3D as well as the collisionshape's halfExtens to
- find the proper shape. -->
- <BoxCollisionShape position="0,0,0" halfExtents="400,400,100" />
- </collisionShapes>
- </StaticEntity>
-
-
-
-
- <!-- PlayField -->
- <TowerDefenseCenterpoint
- name=towerdefensecenter
- width=16
- height=16
- tileScale=100
- towerTemplate=tower
- position="0,0,0"
- direction="0,0,0"
- collisionType=dynamic
- mass=100000>
-
- </TowerDefenseCenterpoint>
-
- </Scene>
-</Level>
-
Deleted: code/branches/captureTheFlag/data/overlays/towerdefenseHUD.oxo
===================================================================
--- code/branches/captureTheFlag/data/overlays/towerdefenseHUD.oxo 2012-05-24 18:49:19 UTC (rev 9241)
+++ code/branches/captureTheFlag/data/overlays/towerdefenseHUD.oxo 2012-05-24 19:24:58 UTC (rev 9242)
@@ -1,16 +0,0 @@
-<Template name="TowerDefenseHUD">
- <OverlayGroup name="TowerDefenseHUD" scale = "1, 1">
- <OverlayText
- position = "0.05, 0.05"
- pickpoint = "0.0, 0.0"
- font = "ShareTechMono"
- textsize = 0.05
- colour = "1.0, 1.0, 1.0, 1.0"
- align = "left"
-
- caption = "Hello World"
- />
-
-
- </OverlayGroup>
-</Template>
More information about the Orxonox-commit
mailing list