[Orxonox-commit 7668] r12261 - in code/branches/Boxhead_FS19: data/levels data/levels/includes data/levels/templates src/modules/hover src/modules/weapons/projectiles

[cwaupoti at orxonox.net]

Author: cwaupoti
Date: 2019-03-28 16:51:14 +0100 (Thu, 28 Mar 2019)
New Revision: 12261

Modified:
   code/branches/Boxhead_FS19/data/levels/Hover.oxw
   code/branches/Boxhead_FS19/data/levels/includes/weaponSettingsHover.oxi
   code/branches/Boxhead_FS19/data/levels/templates/spaceshipGhost.oxt
   code/branches/Boxhead_FS19/data/levels/templates/spaceshipHover.oxt
   code/branches/Boxhead_FS19/src/modules/hover/Hover.h
   code/branches/Boxhead_FS19/src/modules/weapons/projectiles/IceGunProjectile.cc
Log:
created HoverGun, but file is not working yet

Modified: code/branches/Boxhead_FS19/data/levels/Hover.oxw
===================================================================
--- code/branches/Boxhead_FS19/data/levels/Hover.oxw	2019-03-28 14:49:58 UTC (rev 12260)
+++ code/branches/Boxhead_FS19/data/levels/Hover.oxw	2019-03-28 15:51:14 UTC (rev 12261)
@@ -9,18 +9,17 @@
 
 
 <?lua
-  include("HUDTemplates3.oxo")
-  include("templates/spaceshipSwallow.oxt")
-  include("templates/spaceshipPirate.oxt")
+  
   include("templates/spaceshipEscort.oxt")
-  include("templates/spaceshipGhost.oxt")
-  include("templates/spaceshipCollateralDamage.oxt")
-  include("templates/spaceshipAssff.oxt")
-  include("templates/spaceshipAssff2.oxt")
-  include("templates/spaceshipTransporter.oxt")
-
-
 ?>
+<!-- include("HUDTemplates3.oxo") -->
+  <!-- include("templates/spaceshipSwallow.oxt") -->
+  <!-- include("templates/spaceshipPirate.oxt") -->
+  <!-- include("templates/spaceshipEscort.oxt") -->
+  <!-- include("templates/spaceshipCollateralDamage.oxt") -->
+  <!-- include("templates/spaceshipAssff.oxt") -->
+  <!-- include("templates/spaceshipAssff2.oxt") -->
+  <!-- include("templates/spaceshipTransporter.oxt") -->
 
 <LevelInfo
  name = "Hover level"
@@ -36,7 +35,7 @@
 ?>
 
 <?lua
-  include("templates/spaceshipPirate.oxt")
+  include("templates/spaceshipGhost.oxt")
   include("templates/spaceshipHover.oxt")
   include("overlays/HoverHUD.oxo")
 ?>
@@ -44,7 +43,7 @@
 <?lua
 MAZE_NUM_CELLS = 10
 MAZE_CELL_SIZE = 100
-MAZE_CELL_HEIGHT = 30
+MAZE_CELL_HEIGHT = 100
 MAZE_SIZE = MAZE_NUM_CELLS*MAZE_CELL_SIZE
 ?>
 
@@ -107,7 +106,7 @@
 
     <SpaceShip position="100,20,100" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="200" >
                                     <templates>
-                                            <Template link=spaceshipghost />
+                                            <Template link=spaceshiphover />
                                       </templates>
                                        <controller>
                                           <WaypointPatrolController alertnessradius=2000 team=1 >

Modified: code/branches/Boxhead_FS19/data/levels/includes/weaponSettingsHover.oxi
===================================================================
--- code/branches/Boxhead_FS19/data/levels/includes/weaponSettingsHover.oxi	2019-03-28 14:49:58 UTC (rev 12260)
+++ code/branches/Boxhead_FS19/data/levels/includes/weaponSettingsHover.oxi	2019-03-28 15:51:14 UTC (rev 12261)
@@ -1,6 +1,6 @@
 <weaponslots>
-  <WeaponSlot position="-3,2,-3" />
-  <WeaponSlot position=" 3,2,-3" />
+  <WeaponSlot position="-3,3, 3" />
+  <WeaponSlot position=" 3,3, 3" />
 </weaponslots>
 <weaponsets>
   <WeaponSet firemode=0 />
@@ -13,10 +13,10 @@
       <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
     </links>
     <Weapon>
-      <IceGun mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam2.mesh" />
+      <HoverGun mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam2.mesh" />
     </Weapon>
     <Weapon>
-      <IceGun mode=0 munitionpershot=0 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="LaserBeam2.mesh" />
+      <HoverGun mode=0 munitionpershot=0 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="LaserBeam2.mesh" />
     </Weapon>
   </WeaponPack>
   <WeaponPack>

Modified: code/branches/Boxhead_FS19/data/levels/templates/spaceshipGhost.oxt
===================================================================
--- code/branches/Boxhead_FS19/data/levels/templates/spaceshipGhost.oxt	2019-03-28 14:49:58 UTC (rev 12260)
+++ code/branches/Boxhead_FS19/data/levels/templates/spaceshipGhost.oxt	2019-03-28 15:51:14 UTC (rev 12261)
@@ -58,7 +58,7 @@
       <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     </explosion>
 <?lua
-  include("../includes/weaponSettingsHover.oxi")
+  include("../includes/weaponSettingsGhost.oxi")
 ?>
   </SpaceShip>
 </Template>

Modified: code/branches/Boxhead_FS19/data/levels/templates/spaceshipHover.oxt
===================================================================
--- code/branches/Boxhead_FS19/data/levels/templates/spaceshipHover.oxt	2019-03-28 14:49:58 UTC (rev 12260)
+++ code/branches/Boxhead_FS19/data/levels/templates/spaceshipHover.oxt	2019-03-28 15:51:14 UTC (rev 12261)
@@ -60,7 +60,7 @@
     </explosion>
 
 <?lua
-  include("../includes/weaponSettingsHeartAttack.oxi")
+  include("../includes/weaponSettingsHover.oxi")
 ?>
   </SpaceShip>
 </Template>

Modified: code/branches/Boxhead_FS19/src/modules/hover/Hover.h
===================================================================
--- code/branches/Boxhead_FS19/src/modules/hover/Hover.h	2019-03-28 14:49:58 UTC (rev 12260)
+++ code/branches/Boxhead_FS19/src/modules/hover/Hover.h	2019-03-28 15:51:14 UTC (rev 12261)
@@ -26,7 +26,7 @@
  *
  */
 
-/**
+/**f
     @file Hover.h
     @brief Gametype. For more information see .cc file
     @ingroup Hover

Modified: code/branches/Boxhead_FS19/src/modules/weapons/projectiles/IceGunProjectile.cc
===================================================================
--- code/branches/Boxhead_FS19/src/modules/weapons/projectiles/IceGunProjectile.cc	2019-03-28 14:49:58 UTC (rev 12260)
+++ code/branches/Boxhead_FS19/src/modules/weapons/projectiles/IceGunProjectile.cc	2019-03-28 15:51:14 UTC (rev 12261)
@@ -59,7 +59,7 @@
         this->setFreezeFactor(0.5);
 
         Model* model = new Model(this->getContext());
-        model->setMeshSource("IceBolt.mesh");
+        model->setMeshSource("laserbeam.mesh");
         model->setScale(15.0);
         this->attach(model);
         model->setPosition(Vector3(0,0,0));