[Orxonox-commit 7623] r12216 - in code/branches/Boxhead_FS19/data: defaultConfig levels levels/templates

cwaupoti at orxonox.net cwaupoti at orxonox.net
Thu Mar 21 15:58:39 CET 2019


Author: cwaupoti
Date: 2019-03-21 15:58:39 +0100 (Thu, 21 Mar 2019)
New Revision: 12216

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
Log:
Mouse fixed on horizontal axis, added opponent with halth points, adjusted parameters

Modified: code/branches/Boxhead_FS19/data/defaultConfig/keybindings.ini
===================================================================
--- code/branches/Boxhead_FS19/data/defaultConfig/keybindings.ini	2019-03-21 14:49:39 UTC (rev 12215)
+++ code/branches/Boxhead_FS19/data/defaultConfig/keybindings.ini	2019-03-21 14:58:39 UTC (rev 12216)
@@ -166,6 +166,6 @@
 MouseYPos="scale 1 rotatePitch"
 XNeg="scale 1 rotateYaw"
 XPos="scale -1 rotateYaw"
-YNeg="scale -1 rotatePitch"
-YPos="scale 1 rotatePitch"
+YNeg=
+YPos=
 

Modified: code/branches/Boxhead_FS19/data/levels/Hover.oxw
===================================================================
--- code/branches/Boxhead_FS19/data/levels/Hover.oxw	2019-03-21 14:49:39 UTC (rev 12215)
+++ code/branches/Boxhead_FS19/data/levels/Hover.oxw	2019-03-21 14:58:39 UTC (rev 12216)
@@ -1,3 +1,27 @@
+<?lua
+  include("stats.oxo")
+  include("HUDTemplates3.oxo")
+  include("templates/lodInformation.oxt")
+  include("templates/pickupRepresentationTemplates.oxt")
+
+?>
+
+
+
+<?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")
+
+
+?>
+
 <LevelInfo
  name = "Hover level"
  description = "Level for Minigame Hover"
@@ -27,6 +51,7 @@
 <Level
 plugins = hover
 gametype = Hover
+
 >
   <templates>
     <Template link=lodtemplate_default />
@@ -79,6 +104,22 @@
       spawnclass=HoverShip
       pawndesign=spaceshiphover
     />
+
+    <SpaceShip position="100,20,100" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="200" >
+                                    <templates>
+                                            <Template link=spaceshipghost />
+                                      </templates>
+                                       <controller>
+                                          <WaypointPatrolController alertnessradius=2000 team=1 >
+                                             <waypoints>
+                                              <Model mesh="cube.mesh" scale=0 position="15500,15500,15500" />
+
+                                              </waypoints>
+                                          
+                                          </WaypointPatrolController>
+
+                                       </controller>
+                                  </SpaceShip>
     
   </Scene>
 </Level>

Modified: code/branches/Boxhead_FS19/data/levels/templates/spaceshipGhost.oxt
===================================================================
--- code/branches/Boxhead_FS19/data/levels/templates/spaceshipGhost.oxt	2019-03-21 14:49:39 UTC (rev 12215)
+++ code/branches/Boxhead_FS19/data/levels/templates/spaceshipGhost.oxt	2019-03-21 14:58:39 UTC (rev 12216)
@@ -22,7 +22,7 @@
    rotationThrust    = 25
 
    lift = 1;
-   stallSpeed = 220;
+   stallSpeed = 100;
 
    boostPower            = 30
    boostPowerRate        = 1
@@ -44,12 +44,7 @@
       <Model position="0,0,0" scale=2 yaw=90 pitch=-90 roll=0 mesh="ghost.mesh" />
     </attached>
     <collisionShapes>
-      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
-      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
-      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
-      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
+      <BoxCollisionShape position="0,-2 ,7" halfExtents="7, 4 ,30" />
     </collisionShapes>
     <explosion >
       <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
@@ -63,7 +58,7 @@
       <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
     </explosion>
 <?lua
-  include("../includes/weaponSettingsGhost.oxi")
+  include("../includes/weaponSettingsHover.oxi")
 ?>
   </SpaceShip>
 </Template>
@@ -82,10 +77,10 @@
   <MultiStateEngine
    boostfactor    = 2
 
-   speedfront     = 600
+   speedfront     =  25
    speedback      =  50
    speedleftright =  50
-   speedupdown    =  50
+   speedupdown    =  0
 
    accelerationfront     = 1000
    accelerationbrake     = 300

Modified: code/branches/Boxhead_FS19/data/levels/templates/spaceshipHover.oxt
===================================================================
--- code/branches/Boxhead_FS19/data/levels/templates/spaceshipHover.oxt	2019-03-21 14:49:39 UTC (rev 12215)
+++ code/branches/Boxhead_FS19/data/levels/templates/spaceshipHover.oxt	2019-03-21 14:58:39 UTC (rev 12216)
@@ -26,7 +26,7 @@
    lift = 1;
    stallSpeed = 220;
 
-   boostPower            = 10
+   boostPower            = 30
    boostPowerRate        = 1
    boostRate             = 5
    boostCooldownDuration = 10
@@ -60,7 +60,7 @@
     </explosion>
 
 <?lua
-  include("../includes/weaponSettingsHover.oxi")
+  include("../includes/weaponSettingsHeartAttack.oxi")
 ?>
   </SpaceShip>
 </Template>
@@ -78,16 +78,16 @@
   <MultiStateEngine
    boostfactor    = 2
 
-   speedfront     = 90
-   speedback      =  40
-   speedleftright =  40
-   speedupdown    =  40
+   speedfront     =   90
+   speedback      =   90
+   speedleftright =   90
+   speedupdown    =   0
 
-   accelerationfront     = 500
-   accelerationbrake     = 500
-   accelerationback      =  125
-   accelerationleftright =  125
-   accelerationupdown    =  125
+   accelerationfront     =  500
+   accelerationbrake     =  500
+   accelerationback      =  500
+   accelerationleftright =  500
+   accelerationupdown    =  0
   >
     <EffectContainer condition="not idle">
       <FadingBillboard mainstate=activity active=false scale=0.02 position=" 1.3, 0, 15" colour="1.0, 0.65, 0.2, 1.0" material="Examples/FlareZwei" turnontime=0.5 turnofftime=0.5 />



More information about the Orxonox-commit mailing list