[Orxonox-commit 1825] r6542 - in code/branches/ppspickups1: data/levels data/levels/includes data/levels/templates src/modules/pickup/items
ebeier at orxonox.net
ebeier at orxonox.net
Wed Mar 17 12:14:43 CET 2010
Author: ebeier
Date: 2010-03-17 12:14:42 +0100 (Wed, 17 Mar 2010)
New Revision: 6542
Added:
code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc
code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h
Modified:
code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi
code/branches/ppspickups1/data/levels/pickup_ppstest.oxw
code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt
code/branches/ppspickups1/src/modules/pickup/items/CMakeLists.txt
Log:
made some changes, testlevel should be ready, SpeedPickup.cc/SpeedPickup.h not yet implemented!!
Modified: code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi
===================================================================
--- code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi 2010-03-17 09:40:31 UTC (rev 6541)
+++ code/branches/ppspickups1/data/levels/includes/pickups_speed.oxi 2010-03-17 11:14:42 UTC (rev 6542)
@@ -1,9 +1,9 @@
<PickupRepresentation
name="SpeedBoost"
- description="Doubles The ship's speed."
- spawnerTemplate="speedboost"
+ description="Speeds up the Ship for a certain time."
+ spawnerTemplate="speedboostpickuprepresentation"
>
<pickup>
- <HealthPickup template="speedboostpickup" />
+ <SpeedPickup template="speedboostpickup" />
</pickup>
</PickupRepresentation>
Modified: code/branches/ppspickups1/data/levels/pickup_ppstest.oxw
===================================================================
--- code/branches/ppspickups1/data/levels/pickup_ppstest.oxw 2010-03-17 09:40:31 UTC (rev 6541)
+++ code/branches/ppspickups1/data/levels/pickup_ppstest.oxw 2010-03-17 11:14:42 UTC (rev 6542)
@@ -1,17 +1,15 @@
<?lua
include("stats.oxo")
include("hudtemplates3.oxo")
-?>
-<?lua
include("templates/spaceship_assff.oxt")
include("templates/spaceship_pirate.oxt")
- include("templates/pickup_representation_templates.oxt")
+ -- include("templates/pickup_representation_templates_speed.oxt")
?>
<Level
- name = "Sample"
- description = "Just a few tests"
+ name = "SpeedPickupTest"
+ description = "Test for the new Speed Pickup"
>
<Scene
ambientlight = "0.8, 0.8, 0.8"
@@ -21,13 +19,13 @@
<?lua
include("includes/pickups_speed.oxi")
?>
-
+<!--
<PickupSpawner position="-100,0,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
<pickup>
- <MetaPickup metaType="drop" />
+ <SpeedPickup template="speedboostpickup" />
</pickup>
</PickupSpawner>
-
+-->
<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" />
<SpawnPoint position="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
</Scene>
Modified: code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt
===================================================================
--- code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt 2010-03-17 09:40:31 UTC (rev 6541)
+++ code/branches/ppspickups1/data/levels/templates/pickup_representation_templates_speed.oxt 2010-03-17 11:14:42 UTC (rev 6542)
@@ -1,4 +1,4 @@
-<Template name=speedboostRepresentation>
+<Template name=speedboostpickupRepresentation>
<PickupRepresentation>
<spawner-representation>
<StaticEntity>
@@ -14,11 +14,12 @@
</PickupRepresentation>
</Template>
-<Template name=speedboost>
+<Template name="speedboostpickup">
<SpeedPickup
- health = 10
- healthType = "limited"
+ speedAddition = "0"
+ speedMultiplier = "2"
+ duration = "10"
activationType = "immediate"
durationType = "once"
/>
-</Template>
\ No newline at end of file
+</Template>
Modified: code/branches/ppspickups1/src/modules/pickup/items/CMakeLists.txt
===================================================================
--- code/branches/ppspickups1/src/modules/pickup/items/CMakeLists.txt 2010-03-17 09:40:31 UTC (rev 6541)
+++ code/branches/ppspickups1/src/modules/pickup/items/CMakeLists.txt 2010-03-17 11:14:42 UTC (rev 6542)
@@ -1,4 +1,8 @@
ADD_SOURCE_FILES(PICKUP_SRC_FILES
+
HealthPickup.cc
+
+ SpeedPickup.cc
MetaPickup.cc
+
)
Added: code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc
===================================================================
--- code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc (rev 0)
+++ code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.cc 2010-03-17 11:14:42 UTC (rev 6542)
@@ -0,0 +1,28 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Damian 'Mozork' Frick
+ * Co-authors:
+ * ...
+ *
+ * TODO: Implement...
+ */
Added: code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h
===================================================================
--- code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h (rev 0)
+++ code/branches/ppspickups1/src/modules/pickup/items/SpeedPickup.h 2010-03-17 11:14:42 UTC (rev 6542)
@@ -0,0 +1,28 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Damian 'Mozork' Frick
+ * Co-authors:
+ * ...
+ *
+ * TODO: Implement...
+ */
More information about the Orxonox-commit
mailing list