Merge pull request #14 from wingzero0/master

調了一些參數

Author: Chun-Yi

AIControl.cpp

@@ -42,9 +42,6 @@ void AIControl::PlayAction(int skip){
 }
 void AIControl::moveTowardLyubu() {
 	for (int i = 0;i< this->npcStateMachineList.size(); i++){
-		if (this->npcStateMachineList[i]->state == STATEDIE){
-		
-		}
 		if (npcStateMachineList[i]->CanBeControl() == FALSE){
 			continue;
 		}
@@ -121,11 +118,21 @@ void AIControl::moveTowardLyubu() {
 			//sprintf(debug, "%s distance = %f\n",debug,distance);
 			srand ( time(NULL) + i);
 			float rate = rand() % 100;
-			if (rate > GUARD_RATE) {
-				npcStateMachineList[i]->AppendAttackCode(NORMAL_ATT);
-			}
-			else {
-				npcStateMachineList[i]->CharacterSetGuard();
+			if (this->npcStateMachineList[i] == this->bossStateMachine){
+				if (rate > GUARD_RATE ) {
+					npcStateMachineList[i]->AppendAttackCode(NORMAL_ATT);
+					npcStateMachineList[i]->AppendAttackCode(NORMAL_ATT);
+					npcStateMachineList[i]->AppendAttackCode(HEAVY_ATT);
+				}else{
+					npcStateMachineList[i]->CharacterSetGuard();
+				}
+			}else {
+				if (rate > GUARD_RATE * 2) {
+					npcStateMachineList[i]->AppendAttackCode(NORMAL_ATT);
+				}
+				else{
+					npcStateMachineList[i]->CharacterSetIdle();
+				}
 			}
 		}
 		else {

Data/DozonAction.txt

@@ -1,10 +1,11 @@
 Run	Run
 CombatIdle	CombatIdle
 N1	AttackL1
-N2	AttackL1
-N3	AttackL2
-N4	AttackH
+N2	AttackL2
+N3	AttackH
 H1	AttackH
+H2	AttackH
+H3	HeavyAttack
 HeavyDamage	DamageH
 LightDamage	DamageL
 Die	Die

Data/Robber02Action.txt

@@ -5,6 +5,7 @@ N2	NormalAttack1
 N3	NormalAttack2
 N4	HeavyAttack1
 H1	HeavyAttack1
-HeavyDamage	Damage2
-LightDamage	Damage1
-Die	Dead
+HeavyDamage	Damage1
+LightDamage	Damage2
+Die	Dead
+Guard	Dead

GameControl.cpp

@@ -3,7 +3,7 @@
 
 #define FLOAT_ERROR 0.001
 #define MOVE_LENGTH 10.0
-#define CAM_MIN_HIGHT 115.0f
+#define CAM_MIN_HIGHT 80.0f
 #define CAM_MAX_HIGHT 300.0f
 extern char debug[1024];
 extern OBJECTid tID;