Changeset 11444 for code/branches/Presentation_FS17

Timestamp:

May 30, 2017, 2:58:20 PM (8 years ago)

Author:

patricwi

Message:

merged Boss Level

Location:

code/branches/Presentation_FS17

Files:

• . (modified) (1 prop)
• data/levels/Endurancefinal.oxw (modified) (1 diff)
• data/levels/FinalBossFS17.oxw (copied) (copied from code/branches/Boss_FS17/data/levels/FinalBossFS17.oxw)
• data/levels/includes/BossSpawnWeaponSetting.oxi (copied) (copied from code/branches/Boss_FS17/data/levels/includes/BossSpawnWeaponSetting.oxi)
• data/levels/includes/weaponSettingsEscort.oxi (modified) (2 diffs)
• data/levels/shieldTest.oxw (modified) (2 diffs)
• data/levels/templates/Bossship.oxt (copied) (copied from code/branches/Boss_FS17/data/levels/templates/Bossship.oxt)
• data/levels/templates/Bossspawnship.oxt (copied) (copied from code/branches/Boss_FS17/data/levels/templates/Bossspawnship.oxt)
• src/modules/weapons/weaponmodes/IceGun.cc (modified) (1 diff)
• src/orxonox/items/PartDestructionEvent.cc (modified) (2 diffs)

code/branches/Presentation_FS17/data/levels/Endurancefinal.oxw

@@ -37 +37 @@
       </templates>
     </ModularSpaceShip>
+
+    <StaticEntity position="0,-10000,0" direction="0,-1,0" collisionType=static mass=100000 friction=0.01 >
+    <attached> 
+        <Model position="0,0,0" mesh="cube.mesh" scale3D="10000,10000,1000" /> 
+    </attached> 
+    <collisionShapes> 
+        <BoxCollisionShape position="0,0,0" halfExtents="10000,10000,1000" /> 
+    </collisionShapes> 
+</StaticEntity>
+
+
+    
     
   </Scene>

code/branches/Presentation_FS17/data/levels/includes/weaponSettingsEscort.oxi

@@ -14 +14 @@
         </links>
         <Weapon>
-          <HsW01 mode=0 munitionpershot=1 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam2.mesh" />
+          <!--<HsW01 mode=0 munitionpershot=1 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam2.mesh" /> -->
+          <IceGun mode=0 munitionpershot=1 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam2.mesh" />
         </Weapon>
         <Weapon>
@@ -28 +29 @@
     <munition>
       <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=7.5/>
+      
     </munition>

code/branches/Presentation_FS17/data/levels/shieldTest.oxw

@@ -9 +9 @@
   include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceshipImmTest.oxt")
+  include("templates/spaceshipAssff.oxt")
   include("templates/lodInformation.oxt")
 ?>
@@ -61 +61 @@
       for i = 1, 10, 1 do
     ?>
-      <SpawnPoint position="<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipimmtest />
+      <SpawnPoint position="<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
     <?lua end ?>
 

code/branches/Presentation_FS17/src/modules/weapons/weaponmodes/IceGun.cc

@@ -51 +51 @@
         RegisterObject(IceGun);
 
-        // Default values
+        // Default val
         this->reloadTime_ = 1.0f;
         this->damage_ = 0.0f;

code/branches/Presentation_FS17/src/orxonox/items/PartDestructionEvent.cc

@@ -69 +69 @@
         XMLPortParam(PartDestructionEvent, "value", setEventValue, getEventValue, xmlelement, mode).defaultValues(0);
         XMLPortParam(PartDestructionEvent, "message", setMessage, getMessage, xmlelement, mode).defaultValues("NULL");
+        //MLPortPAram(PartDestructionEvent, "spawn", setSpawn, getSpawn, xmlelement, mode).defaultValues("NULL");
 
         /*
@@ -100 +101 @@
             case TargetParam::shieldhealth:
                 this->parent_->getParent()->setShieldHealth(operate(this->parent_->getParent()->getShieldHealth()));
+                break;
+            case TargetParam::maxshieldhealth:
+                this->parent_->getParent()->setMaxShieldHealth(operate(this->parent_->getParent()->getMaxShieldHealth()));
                 break;
             case TargetParam::boostpower: