Merge pull request #13 from trantorLiu/master

好了

Author: wingzero0

AIControl.cpp

@@ -67,14 +67,16 @@ void AIControl::moveTowardLyubu() {
 
 		//sprintf(debug, "%s x = %f y = %f z = %f\n",debug, lyubuPos[0], lyubuPos[1], lyubuPos[2]);
 
-		if (distance > ATTACK_DISTANCE && distance < KEEP_TRACK_DISTANCE) {
+		if (distance > ATTACK_DISTANCE && ((npcStateMachineList[i] == this->bossStateMachine && distance < BOSS_KEEP_TRACK_DISTANCE) || distance < KEEP_TRACK_DISTANCE)) {
 			//turn toward lyubu
 			float newFDir[3], normalize, offset;
-			srand ( time(NULL) );
-			offset = rand() % NPC_MOVE_OFFSET + 1;
-			lyubuPos[0] += offset;
-			lyubuPos[1] += offset;
-			lyubuPos[2] += offset;
+			if (npcStateMachineList[i] != this->bossStateMachine) {
+				srand ( time(NULL) + i);
+				offset = rand() % NPC_MOVE_OFFSET + 1;
+				lyubuPos[0] += offset;
+				lyubuPos[1] += offset;
+				lyubuPos[2] += offset;
+			}
 
 			newFDir[0] = lyubuPos[0] - npcPos[0];
 			newFDir[1] = lyubuPos[1] - npcPos[1];
@@ -117,7 +119,14 @@ void AIControl::moveTowardLyubu() {
 			npc.SetWorldDirection(newFDir, npcUDir);
 
 			//sprintf(debug, "%s distance = %f\n",debug,distance);
-			npcStateMachineList[i]->AppendAttackCode(NORMAL_ATT);
+			srand ( time(NULL) + i);
+			float rate = rand() % 100;
+			if (rate > GUARD_RATE) {
+				npcStateMachineList[i]->AppendAttackCode(NORMAL_ATT);
+			}
+			else {
+				npcStateMachineList[i]->CharacterSetGuard();
+			}
 		}
 		else {
 			npcStateMachineList[i]->CharacterSetIdle();

AIControl.h

@@ -4,9 +4,12 @@
 #include <vector>
 
 #define MOVE_DISTANCE 5
-#define KEEP_TRACK_DISTANCE 1500
+#define KEEP_TRACK_DISTANCE 800
+#define BOSS_KEEP_TRACK_DISTANCE 2000
 #define ATTACK_DISTANCE 100
-#define NPC_MOVE_OFFSET 100
+#define NPC_MOVE_OFFSET 150
+#define GUARD_RATE 40
+
 
 //class AIControl :
 	//public GameControl

Data/npcPos.txt

@@ -1,3 +1,13 @@
-3889 -3418
 3842 -3381
-3926 -3257
+3926 -3257
+3051 -2530
+2861 -2600
+975  -2879
+3481 -4299
+3112 -3761
+101  -2011
+-754 -2286
+-883 -2132
+-619 -2256
+-617 -2256
+-706 -2176

Main.cpp

@@ -249,8 +249,8 @@ BOOL initNPC(){
 	FnActor actor;
 	actor.Object(donzo);
 	float pos[3];
-	pos[0] = 3569.0;
-	pos[1] = -3010;
+	pos[0] = -909;
+	pos[1] = -2300;
 	pos[2] = 100;
 	actor.SetPosition(pos);
 
@@ -292,6 +292,9 @@ BOOL initNPC(){
 			sprintf(debug, "%s Robber02 load fail\n", debug);
 			return FALSE;
 		}
+		else {
+			sprintf(debug, "%s Robber02 load success\n", debug);
+		}
 
 		actor_robbers[i].Object(robbers[i]);
 		actor_robbers[i].SetPosition(pos_robber);