Changeset 11933 for code/branches

Timestamp:

May 3, 2018, 3:45:20 PM (7 years ago)

Author:

dreherm

Message:

Afraid Ghosts

Location:

code/branches/3DPacman_FS18

Files:

• data/levels/3DPacman.oxw (modified) (2 diffs)
• src/modules/pacman/Pacman.cc (modified) (2 diffs)
• src/modules/pacman/Pacman.h (modified) (2 diffs)
• src/modules/pacman/PacmanGhost.cc (modified) (2 diffs)
• src/modules/pacman/PacmanGhost.h (modified) (1 diff)
• src/modules/pacman/PacmanPointAfraid.cc (added)
• src/modules/pacman/PacmanPointAfraid.h (added)

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

@@ -59 +59 @@
 </PacmanGhost>
 
+
+
+
+
+<PacmanGhost position="0,-20,0" >
+    <attached>
+        <Model position="0,0,0" mesh="PacmanGhostAfraid.mesh" scale="5" />
+    </attached>
+</PacmanGhost>
+
+<PacmanPointAfraid position="215,10,195">
+    <attached>
+        <Model position="0,0,0" mesh="PacmanPointAfraid.mesh" scale="5" />
+    </attached>
+</PacmanPointAfraid>
+
+
+
+
 <!-- POINTS -->
 <PacmanPointSphere position="0,10,0">
@@ -78 +97 @@
 </PacmanPointSphere>
 
+<PacmanPointAfraid position="215,10,195">
+    <attached>
+        <Model position="0,0,0" mesh="PacmanPointAfraid.mesh" scale="5" />
+    </attached>
+</PacmanPointAfraid>
 
 <!-- Map -->

code/branches/3DPacman_FS18/src/modules/pacman/Pacman.cc

@@ -96 +96 @@
         }
 
+        for(PacmanPointAfraid* next : ObjectList<PacmanPointAfraid>()){
+            if(collis(next->getPosition(), currentPosition)){
+                setAfraid();
+            }
+        }
+
     }
 
@@ -106 +112 @@
 
     void Pacman::catched(){
+
+    if(!afraid) {
         if(!lives) this->end();
         --lives;
         this->posreset();
+        }
+    else{
+
+        for(int nrghost = 0; nrghost<3; ++nrghost){
+        bcolli = collis(ghosts[nrghost]->getPosition(), currentPosition);
+        if(bcolli) ghosts[nrghost]->resetGhost();
+        bcolli = false;
+        }
+      }
+    }
+
+    void setAfraid(){
+        afraid = true;
     } 
 

code/branches/3DPacman_FS18/src/modules/pacman/Pacman.h

@@ -39 +39 @@
 #include "PacmanGhost.h"
 #include "PacmanPointSphere.h"
+#include "PacmanPointAfraid.h"
 #include "Highscore.h"
 //#include "PlayerInfo.h"
@@ -95 +96 @@
             int totallevelpoint = 3;
             //bool firstGame;
+            bool afraid = false;
+            float timer = 0;
             
        private:

code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.cc

@@ -417 +417 @@
 
     void PacmanGhost::move(float dt, Vector3 actuelposition, Vector3 velocity){
-        this->setPosition(Vector3(actuelposition.x+20*velocity.x*dt,10,actuelposition.z+20*velocity.z*dt));
+        if(!dontmove)
+            this->setPosition(Vector3(actuelposition.x+20*velocity.x*dt,10,actuelposition.z+20*velocity.z*dt));
     }
 
@@ -423 +424 @@
        if((abs(one.x - other.x)<0.5) && (abs(one.z - other.z)<0.5)) return true;
         return false;
+    }
+
+    void changemovability(){
+        if(dontmove){
+         dontmove = false;}
+        else{
+         dontmove = true;   
+        }
     }
 

code/branches/3DPacman_FS18/src/modules/pacman/PacmanGhost.h

@@ -58 +58 @@
 
             bool findpos(Vector3 one, Vector3 other);      
-
+            void changemovability();
 
         private:
+            bool dontmove = false;
             bool ismoving = false;
             int decision = 0; //Gives the random which way information to the ghost.