Changeset 10592

Timestamp:

Sep 24, 2015, 1:23:47 PM (9 years ago)

Author:

fvultier

Message:

New Weapon for the towerDefense minigame: The SplitGun, a weapon that shoots one projectile that splits up into multiple projectiles after a specified time, these new projectiles may split up again… The weapon may be used by any Oxonox Spaceship.

Location:

code/branches/towerdefenseFabien

Files:

• data/levels/jump.oxw (modified) (1 diff)
• data/levels/towerDefense.oxw (modified) (6 diffs)
• src/modules/towerdefense/TowerDefense.cc (modified) (4 diffs)
• src/modules/weapons/WeaponsPrereqs.h (modified) (2 diffs)
• src/modules/weapons/projectiles/BillboardProjectile.cc (modified) (1 diff)
• src/modules/weapons/projectiles/BillboardProjectile.h (modified) (1 diff)
• src/modules/weapons/projectiles/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/projectiles/SplitGunProjectile.cc (added)
• src/modules/weapons/projectiles/SplitGunProjectile.h (added)
• src/modules/weapons/weaponmodes/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/weaponmodes/SplitGun.cc (added)
• src/modules/weapons/weaponmodes/SplitGun.h (added)

code/branches/towerdefenseFabien/data/levels/jump.oxw

@@ -256 +256 @@
       </attached>
     </MovableEntity>
-
-    <EventDispatcher>
-      <targets>
-        <EventTarget target=scoreeffect_right />
-        <EventTarget target=scoreeffect_center />
-      </targets>
-      <events>
-        <spawn>
-          <EventFilter>
-            <names>
-              <EventName name=right />
-            </names>
-            <EventListener event=jumpcenter />
-          </EventFilter>
-        </spawn>
-      </events>
-    </EventDispatcher>
-    <EventDispatcher>
-      <targets>
-        <EventTarget target=scoreeffect_left />
-        <EventTarget target=scoreeffect_center />
-      </targets>
-      <events>
-        <spawn>
-          <EventFilter>
-            <names>
-              <EventName name=left />
-            </names>
-            <EventListener event=jumpcenter />
-          </EventFilter>
-        </spawn>
-      </events>
-    </EventDispatcher>
-
+    
   </Scene>
 </Level>

code/branches/towerdefenseFabien/data/levels/towerDefense.oxw

@@ -66 +66 @@
         </links>
         <Weapon>
-          <HsW01 mode=0 munitionpershot=0 muzzleoffset="0,0,-30" damage=2 shielddamage=1 material="Flares/point_lensflare" delay=0/>
+          <HsW01 mode=0 munitionpershot=0 muzzleoffset="0,0,0" damage=2 shielddamage=1 material="Flares/point_lensflare" delay=0/>
         </Weapon>
       </WeaponPack>
@@ -103 +103 @@
         </links>
         <Weapon>          
-          <LightningGun mode=0 munitionpershot=0 muzzleoffset="0,0,-30" damage=2 shielddamage=4 />
+          <LightningGun mode=0 munitionpershot=0 muzzleoffset="0,0,0" damage=2 shielddamage=4 />
         </Weapon>
       </WeaponPack>
     </weapons>
     <attached>
-      <Backlight position="0,-100,0" scale=2.0 colour="0.4, 0.0, 1.0" width=10 length=500 lifetime=0.3 elements=20 trailmaterial="Trail/backlighttrail" material="Examples/Flare" loop=1 />
+      <Backlight position="0,0,0" scale=2.0 colour="0.4, 0.0, 1.0" width=10 length=10 lifetime=0.3 elements=20 trailmaterial="Trail/backlighttrail" material="Examples/Flare" loop=1 />
     </attached>    
   </TowerDefenseTower>
@@ -143 +143 @@
         </links>
         <Weapon>
-          <EnergyDrink mode=0 munitionpershot=0 muzzleoffset="0,0,-30" damage=2 shielddamage=4 />
+          <SplitGun mode=0 munitionpershot=0 damage=9.3 muzzleoffset=" 1.6, 1.3, -2.0" splittime=0.2 numberofsplits=2 numberofchilds=5 spread=0.1 />
         </Weapon>
       </WeaponPack>
@@ -180 +180 @@
         </links>
         <Weapon>
-          <FusionFire mode=0 munitionpershot=0 muzzleoffset="0,0,-30" damage=2 shielddamage=4 />  
+          <RocketFire mode=0 munitionpershot=0 muzzleoffset="0,0,0" damage=2 shielddamage=4 />  
         </Weapon>
       </WeaponPack>
     </weapons>
       <attached>
-      <ParticleSpawner position="0,-100,0" source="Orxonox/sparks" lifetime=3.0 autostart=1 loop=1 />
+      <ParticleSpawner position="0,0,0" source="Orxonox/sparks" lifetime=3.0 autostart=1 loop=1 />
     </attached>
   </TowerDefenseTower>
@@ -220 +220 @@
         </links>
         <Weapon>
-          <LaserFire mode=0 munitionpershot=0 muzzleoffset="0,0,-30" damage=2 shielddamage=4 />  
+          <SimpleRocketFire mode=0 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
         </Weapon>
       </WeaponPack>
@@ -454 +454 @@
     <SpawnPoint team=0 position="0,0,0"/> 
 
-    <Model position="0,0,-1000" pitch=90 lodLevel=1 mesh="TD_S1.mesh" scale=25/>
-    <Model position="0,0,-1000" pitch=90 lodLevel=1 mesh="TD_S2.mesh" scale=25/>
-    <Model position="0,0,-1000" pitch=90 lodLevel=1 mesh="TD_S3.mesh" scale=25/>
-    <Model position="0,0,-1000" pitch=90 lodLevel=1 mesh="TD_S4.mesh" scale=25/>
-    <Model position="0,0,-1000" pitch=90 lodLevel=1 mesh="TD_S5.mesh" scale=25/>
-    <Model position="0,0,-1000" pitch=90 lodLevel=1 mesh="TD_T1.mesh" scale=25/>
-    <Model position="0,0,-1000" pitch=90 lodLevel=1 mesh="TD_T2.mesh" scale=25/>
-    <Model position="0,0,-1000" pitch=90 lodLevel=1 mesh="TD_T3.mesh" scale=25/>
-    <Model position="0,0,-1000" pitch=90 lodLevel=1 mesh="TD_T4.mesh" scale=25/>
-    <Model position="0,0,-1000" pitch=90 lodLevel=1 mesh="TD_T5.mesh" scale=25/>
-    <Model position="0,0,-1000" pitch=90 lodLevel=1 mesh="TD_F1.mesh" scale=25/>
+    <Model position="0,0,10000" lodLevel=1 mesh="TD_S1.mesh" scale=1/>
+    <Model position="0,0,10000" lodLevel=1 mesh="TD_S2.mesh" scale=1/>
+    <Model position="0,0,10000" lodLevel=1 mesh="TD_S3.mesh" scale=1/>
+    <Model position="0,0,10000" lodLevel=1 mesh="TD_S4.mesh" scale=1/>
+    <Model position="0,0,10000" lodLevel=1 mesh="TD_S5.mesh" scale=1/>
+    <Model position="0,0,10000" lodLevel=1 mesh="TD_T1.mesh" scale=1/>
+    <Model position="0,0,10000" lodLevel=1 mesh="TD_T2.mesh" scale=1/>
+    <Model position="0,0,10000" lodLevel=1 mesh="TD_T3.mesh" scale=1/>
+    <Model position="0,0,10000" lodLevel=1 mesh="TD_T4.mesh" scale=1/>
+    <Model position="0,0,10000" lodLevel=1 mesh="TD_T5.mesh" scale=1/>
+    <Model position="0,0,10000" lodLevel=1 mesh="TD_F1.mesh" scale=1/>
 
     <!-- PlayField -->

code/branches/towerdefenseFabien/src/modules/towerdefense/TowerDefense.cc

@@ -81 +81 @@
 #include "chat/ChatManager.h"
 #include "core/CoreIncludes.h"
-/* Part of a temporary hack to allow the player to add towers */
-#include "core/command/ConsoleCommand.h"
-
 
 namespace orxonox
@@ -103 +100 @@
         this->waveSize_ = 0;
         offset_ = Vector3(0,0,10);
-
-        //this->stats_ = new TowerDefensePlayerStats();
     }
 
@@ -178 +173 @@
 
         en1->setTeam(2);
-
-        //orxonox::WeakPtr<WaypointController> controller = new WaypointController(this->center_->getContext());
-        //controller->setControllableEntity(en1);
-        //en1->setController(controller);
 
         WaypointController* controller = (WaypointController*)(en1->getXMLController());
@@ -340 +331 @@
             timeSinceLastSpawn_ = 0.0;
 
-            timeUntilNextWave_ = waveNumber_+10;
+            timeUntilNextWave_ = waveNumber_+20;
             waveSize_ = waveNumber_+5;
         }

code/branches/towerdefenseFabien/src/modules/weapons/WeaponsPrereqs.h

@@ -79 +79 @@
     class BillboardProjectile;
     class LightningGunProjectile;
+    class SplitGunProjectile;
     class ParticleProjectile;
     class Projectile;
@@ -90 +91 @@
     class LaserFire;
     class LightningGun;
+    class SplitGun;
     class RocketFire;
     class SimpleRocketFire;

code/branches/towerdefenseFabien/src/modules/weapons/projectiles/BillboardProjectile.cc

@@ -88 +88 @@
     /**
     @brief
+        Get the material of the BillboardProjectile.
+    @return
+        The material name.
+    */
+    const std::string& BillboardProjectile::getMaterial()
+    {
+        return this->billboard_.getMaterial();
+    }
+
+    /**
+    @brief
         Is called when the visibility of the BillboardProjectile has changed.
     */

code/branches/towerdefenseFabien/src/modules/weapons/projectiles/BillboardProjectile.h

@@ -60 +60 @@
             virtual void setColour(const ColourValue& colour);
             virtual void setMaterial(const std::string& material);
+            virtual const std::string& getMaterial();
             virtual void changedVisibility();
 

code/branches/towerdefenseFabien/src/modules/weapons/projectiles/CMakeLists.txt

@@ -5 +5 @@
   Projectile.cc
   LightningGunProjectile.cc
+  SplitGunProjectile.cc
   Rocket.cc
   SimpleRocket.cc
+  SplitGunProjectile.cc
 )

code/branches/towerdefenseFabien/src/modules/weapons/weaponmodes/CMakeLists.txt

@@ -5 +5 @@
   HsW01.cc
   LightningGun.cc
+  SplitGun.cc
   RocketFire.cc
   SimpleRocketFire.cc