[Orxonox-commit 5835] r10495 - in code/branches/clangenb: data/levels data/levels/includes src/modules/weapons/projectiles

[maxima at orxonox.net]

Author: maxima
Date: 2015-05-27 10:07:27 +0200 (Wed, 27 May 2015)
New Revision: 10495

Added:
   code/branches/clangenb/data/levels/clangenb.oxw
Modified:
   code/branches/clangenb/data/levels/includes/weaponSettingsAssff.oxi
   code/branches/clangenb/src/modules/weapons/projectiles/Rocket.cc
Log:
small changes

Added: code/branches/clangenb/data/levels/clangenb.oxw
===================================================================
--- code/branches/clangenb/data/levels/clangenb.oxw	                        (rev 0)
+++ code/branches/clangenb/data/levels/clangenb.oxw	2015-05-27 08:07:27 UTC (rev 10495)
@@ -0,0 +1,55 @@
+<LevelInfo
+ name = "Empty level"
+ description = "A level with absolutely nothing in it."
+ tags = "test"
+ screenshot = "emptylevel.png"
+/>
+
+<?lua
+  include("stats.oxo")
+  include("HUDTemplates3.oxo")
+  include("templates/lodInformation.oxt")
+?>
+
+<?lua
+  include("templates/spaceshipAssff2.oxt")
+  include("templates/spaceshipPirate.oxt")
+  include("templates/spaceshipHeartAttack.oxt")
+?>
+
+<Level>
+  <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"/>
+    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipHeartAttack />
+    <SpaceShip position="0,2000,200" lookat="0,0,0" name="movingtarget" radarname="Pirate">
+                            <events>
+                                <visibility>
+                                    <EventListener event="boxtrigger4" />
+                                </visibility>
+                            </events>
+                    <templates>
+                      <Template link=spaceshippirate />
+                    </templates>
+                    <controller>
+                      <WaypointController team=1>
+                         <waypoints>
+                          <Model mesh="cube.mesh" scale=8 position="  0,1700,-200" />
+                          <Model mesh="cube.mesh" scale=8 position="  0,1700,-700" />
+                          <Model mesh="cube.mesh" scale=8 position="500,1700,-700" />
+                          <Model mesh="cube.mesh" scale=8 position="500,1700,-200" />
+                       </waypoints>
+                    </WaypointController>
+                  </controller>
+                </SpaceShip>
+  </Scene>
+</Level>
+

Modified: code/branches/clangenb/data/levels/includes/weaponSettingsAssff.oxi
===================================================================
--- code/branches/clangenb/data/levels/includes/weaponSettingsAssff.oxi	2015-05-27 07:18:06 UTC (rev 10494)
+++ code/branches/clangenb/data/levels/includes/weaponSettingsAssff.oxi	2015-05-27 08:07:27 UTC (rev 10495)
@@ -39,9 +39,7 @@
           <LightningGun mode=1 muzzleoffset="0,0,0" damage=23 />
         </Weapon>
         <Weapon>
-          <!--SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 /-->
-	  <LaserFire mode=2 muzzleoffset="5,5,0" damage=30 shielddamage=20 />
-	  <FusionFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
+          <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>

Modified: code/branches/clangenb/src/modules/weapons/projectiles/Rocket.cc
===================================================================
--- code/branches/clangenb/src/modules/weapons/projectiles/Rocket.cc	2015-05-27 07:18:06 UTC (rev 10494)
+++ code/branches/clangenb/src/modules/weapons/projectiles/Rocket.cc	2015-05-27 08:07:27 UTC (rev 10495)
@@ -73,7 +73,7 @@
 
             // Create rocket model
             Model* model = new Model(this->getContext());
-            model->setMeshSource("can.mesh");
+            model->setMeshSource("rocket.mesh");
             model->scale(0.7f);
             this->attach(model);