[Orxonox-commit 7674] r12267 - in code/branches/Boxhead_FS19: data/defaultConfig data/levels data/levels/templates src/modules/hover

[kofrey at orxonox.net]

Author: kofrey
Date: 2019-04-04 14:25:56 +0200 (Thu, 04 Apr 2019)
New Revision: 12267

Modified:
   code/branches/Boxhead_FS19/data/defaultConfig/keybindings.ini
   code/branches/Boxhead_FS19/data/levels/Hover.oxw
   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.cc
   code/branches/Boxhead_FS19/src/modules/hover/HoverWall.cc
Log:
working version

Modified: code/branches/Boxhead_FS19/data/defaultConfig/keybindings.ini
===================================================================
--- code/branches/Boxhead_FS19/data/defaultConfig/keybindings.ini	2019-04-04 11:48:18 UTC (rev 12266)
+++ code/branches/Boxhead_FS19/data/defaultConfig/keybindings.ini	2019-04-04 12:25:56 UTC (rev 12267)
@@ -166,6 +166,6 @@
 MouseYPos="scale 1 rotatePitch"
 XNeg="scale 1 rotateYaw"
 XPos="scale -1 rotateYaw"
-YNeg=
-YPos=
+YNeg="scale -1 rotatePitch"
+YPos="scale 1 rotatePitch"
 

Modified: code/branches/Boxhead_FS19/data/levels/Hover.oxw
===================================================================
--- code/branches/Boxhead_FS19/data/levels/Hover.oxw	2019-04-04 11:48:18 UTC (rev 12266)
+++ code/branches/Boxhead_FS19/data/levels/Hover.oxw	2019-04-04 12:25:56 UTC (rev 12267)
@@ -1,17 +1,3 @@
-<?lua
-  include("stats.oxo")
-  include("HUDTemplates3.oxo")
-  include("templates/lodInformation.oxt")
-  include("templates/pickupRepresentationTemplates.oxt")
-
-?>
-
-
-
-<?lua
-  
-  include("templates/spaceshipEscort.oxt")
-?>
 <!-- include("HUDTemplates3.oxo") -->
   <!-- include("templates/spaceshipSwallow.oxt") -->
   <!-- include("templates/spaceshipPirate.oxt") -->
@@ -40,6 +26,38 @@
   include("overlays/HoverHUD.oxo")
 ?>
 
+
+
+
+
+
+
+
+ <?lua
+  include("stats.oxo")
+  include("HUDTemplates3.oxo")
+  include("templates/lodInformation.oxt")
+  include("templates/pickupRepresentationTemplates.oxt")
+
+?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 <?lua
 MAZE_NUM_CELLS = 10
 MAZE_CELL_SIZE = 100
@@ -51,6 +69,7 @@
 plugins = hover
 gametype = Hover
 
+
 >
   <templates>
     <Template link=lodtemplate_default />

Modified: code/branches/Boxhead_FS19/data/levels/templates/spaceshipGhost.oxt
===================================================================
--- code/branches/Boxhead_FS19/data/levels/templates/spaceshipGhost.oxt	2019-04-04 11:48:18 UTC (rev 12266)
+++ code/branches/Boxhead_FS19/data/levels/templates/spaceshipGhost.oxt	2019-04-04 12:25:56 UTC (rev 12267)
@@ -6,29 +6,20 @@
    spawnparticleduration  = 3
    explosionchunks        = 6
 
-   health            = 30
-   maxhealth         = 50
-   initialhealth     = 30
+   health            = 100
+   maxhealth         = 100
+   initialhealth     = 100
+  
 
-   shieldhealth        = 100
-   initialshieldhealth = 100
-   maxshieldhealth     = 150
-   shieldabsorption    = 0.9
-   shieldrechargerate  = 3
-   shieldrechargewaittime = 0.0
-
-   primaryThrust     = 600
-   auxilaryThrust    = 30
+   primaryThrust     = 25
+   auxilaryThrust    = 25
    rotationThrust    = 25
 
    lift = 1;
    stallSpeed = 100;
 
-   boostPower            = 30
-   boostPowerRate        = 1
-   boostRate             = 5
-   boostCooldownDuration = 15
 
+
    shakeFrequency = 20
    shakeAmplitude = 6
 
@@ -57,10 +48,10 @@
       <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
       <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     </explosion>
-<?lua
+<!-- <?lua
   include("../includes/weaponSettingsGhost.oxi")
 ?>
-  </SpaceShip>
+ -->  </SpaceShip>
 </Template>
 
 <Template name=spaceshipghostcameras defaults=0>
@@ -77,7 +68,7 @@
   <MultiStateEngine
    boostfactor    = 2
 
-   speedfront     =  25
+   speedfront     =  50
    speedback      =  50
    speedleftright =  50
    speedupdown    =  0
@@ -86,7 +77,7 @@
    accelerationbrake     = 300
    accelerationback      =  100
    accelerationleftright =  100
-   accelerationupdown    =  100
+   accelerationupdown    =  0
   >
     <EffectContainer condition="normal or boost">
       <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.6, 3, 6" colour="0.0, 0.0, 0.0, 0.5" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />

Modified: code/branches/Boxhead_FS19/data/levels/templates/spaceshipHover.oxt
===================================================================
--- code/branches/Boxhead_FS19/data/levels/templates/spaceshipHover.oxt	2019-04-04 11:48:18 UTC (rev 12266)
+++ code/branches/Boxhead_FS19/data/levels/templates/spaceshipHover.oxt	2019-04-04 12:25:56 UTC (rev 12267)
@@ -19,7 +19,7 @@
 
    primaryThrust     = 200
    auxilaryThrust    = 30
-   rotationThrust    = 25
+   rotationThrust    = 20
 
    jumpBoost = 90
 

Modified: code/branches/Boxhead_FS19/src/modules/hover/Hover.cc
===================================================================
--- code/branches/Boxhead_FS19/src/modules/hover/Hover.cc	2019-04-04 11:48:18 UTC (rev 12266)
+++ code/branches/Boxhead_FS19/src/modules/hover/Hover.cc	2019-04-04 12:25:56 UTC (rev 12267)
@@ -38,7 +38,9 @@
 #include "HoverFlag.h"
 #include "MazeGenerator.h"
 #include "core/CoreIncludes.h"
+    
 
+
 namespace orxonox
 {
     RegisterUnloadableClass(Hover);

Modified: code/branches/Boxhead_FS19/src/modules/hover/HoverWall.cc
===================================================================
--- code/branches/Boxhead_FS19/src/modules/hover/HoverWall.cc	2019-04-04 11:48:18 UTC (rev 12266)
+++ code/branches/Boxhead_FS19/src/modules/hover/HoverWall.cc	2019-04-04 12:25:56 UTC (rev 12267)
@@ -1,4 +1,4 @@
-/*
+    /*
  *   ORXONOX - the hottest 3D action shooter ever to exist
  *                    > www.orxonox.net <
  *