Changeset 11898 for code/branches

Timestamp:

Apr 23, 2018, 1:10:23 PM (7 years ago)

Author:

dreherm

Message:

Improved player

Location:

code/branches/3DPacman_FS18

Files:

• data/levels/3DPacman.oxw (modified) (5 diffs)
• data/levels/templates/PacmanGelb.oxt (modified) (2 diffs)
• src/modules/CMakeLists.txt (modified) (1 diff)
• src/modules/pacman (added)
• src/modules/pacman/CMakeLists.txt (added)
• src/modules/pacman/Pacman.cc (added)
• src/modules/pacman/Pacman.h (added)
• src/modules/pacman/PacmanGelb.cc (added)
• src/modules/pacman/PacmanGelb.h (added)
• src/modules/pacman/PacmanGhost.cc (added)
• src/modules/pacman/PacmanGhost.h (added)
• src/modules/pacman/PacmanPointSphere.cc (added)
• src/modules/pacman/PacmanPointSphere.h (added)
• src/modules/pacman/PacmanPrereqs.h (added)

code/branches/3DPacman_FS18/data/levels/3DPacman.oxw

@@ -17 +17 @@
 
 <Level>
+
   <templates>
     <Template link=lodtemplate_default />
@@ -30 +31 @@
     <SpawnPoint team=0 position="0,10,245" lookat="0,0,0" spawnclass=PacmanGelb pawndesign=PacmanGelb />
 
-
-<PacmanGhost position="215,10,220" resetposition="215,10,220">
+<PacmanGhost position="215,10,245" resetposition="215,10,220">
     <attached>
         <Model position="0,0,0" mesh="PacmanGhostRed.mesh" scale="5" />
@@ -37 +37 @@
 </PacmanGhost>
 
-<PacmanGhost position="215,10,220" resetposition="215,10,220">
+<PacmanGhost position="215,10,245" resetposition="215,10,220">
     <attached>
         <Model position="0,0,0" mesh="PacmanGhostBlue.mesh" scale="5" />
@@ -43 +43 @@
 </PacmanGhost>
 
-<PacmanGhost position="215,10,220" resetposition="215,10,220">
+<PacmanGhost position="215,10,245" resetposition="215,10,220">
     <attached>
         <Model position="0,0,0" mesh="PacmanGhostOrange.mesh" scale="5" />
@@ -49 +49 @@
 </PacmanGhost>
 
-<PacmanGhost position="215,10,220" resetposition="215,10,220">
+<PacmanGhost position="215,10,245" resetposition="215,10,220">
     <attached>
         <Model position="0,0,0" mesh="PacmanGhostPink.mesh" scale="5" />

code/branches/3DPacman_FS18/data/levels/templates/PacmanGelb.oxt

@@ -55 +55 @@
       <BoxCollisionShape position="0,     0,-12" halfExtents="4  , 4 ,7" />
     </collisionShapes>
-    <explosion>
-      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
-      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
-      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
 
-      <ExplosionPart mesh="explosionparts/escort_part_1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
-      <ExplosionPart mesh="explosionparts/escort_part_2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
-      <ExplosionPart mesh="explosionparts/escort_part_3.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
-      <ExplosionPart mesh="explosionparts/escort_part_4.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
-      <ExplosionPart mesh="explosionparts/escort_part_5.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
-      <ExplosionPart mesh="explosionparts/escort_part_6.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
-    </explosion>
 <?lua
   include("../includes/weaponSettingsEscort.oxi")
@@ -85 +74 @@
    boostfactor    = 1.0
 
-   speedfront     = 100
-   speedback      =  70
-   speedleftright =  5
-   speedupdown    =  70
+   speedfront     = 50
+   speedback      = 20
+   speedleftright =  1
+   speedupdown    =  1
 
    defEngineSndNormal = "sounds/Engine_low.ogg"
    defEngineSndBoost = "sounds/Engine_high.ogg"
 
-   accelerationfront     = 50
-   accelerationbrake     = 50
-   accelerationback      =  50
+   accelerationfront     = 500
+   accelerationbrake     = 5
+   accelerationback      =  500
    accelerationleftright =  5
-   accelerationupdown    =  50
+   accelerationupdown    =  5
   >
     <EffectContainer condition="idle">

code/branches/3DPacman_FS18/src/modules/CMakeLists.txt

@@ -49 +49 @@
 ADD_SUBDIRECTORY(asteroids2D)
 ADD_SUBDIRECTORY(flappyorx)
-ADD_SUBDIRECTORY(Pacman)
+ADD_SUBDIRECTORY(pacman)