Merge branch 'master' of [email protected]:wingzero0/GameProgramming.git into ai

Author: unknown

BattleRoom.cpp

@@ -35,8 +35,10 @@ void BattleRoom::RefreshArena(){
 		if (this->CheckDistanceAndState(playerPos, npcPos, 
 				this->playerStateMachine->state, this->npcStateMachineList[i]->state ) == TRUE){
 			this->JoinArena( this->npcStateMachineList[i] );
+			this->npcStateMachineList[i]->ChangeState(STATEATTACK,TRUE);
 		}
 	}
+	//sprintf(debug, "%s npc state machine list size = %d\n",debug,this->npcStateMachineList.size());
 	this->PerformAttack();
 }
 
@@ -72,19 +74,19 @@ void BattleRoom::PerformAttack(){
 		actor.Object(this->playerStateMachine->character);
 		float pPos[3];
 		float pDir[3];
-		actor.GetWorldDirection(NULL,pDir);
+		//float pUDir[3];
+		actor.GetWorldDirection(pDir,NULL);
 		actor.GetWorldPosition(pPos);
 
 		FnActor npc;
 		float nPos[3];
 
 		for (int i= 0;i< this->AreanList.size();i++){
 			ACTORid tmpid = AreanList[i]->character;
-			npc.Object(tmpid);
-			npc.GetWorldPosition(nPos);
-
-			if (this->AttackCheck(pDir, pPos, nPos, BATTLE_RADIUS / 2) == TRUE){// lyubu attack area is the half of Battle raidus
-				if (playerHitMap.find(tmpid) == playerHitMap.end()){
+			if (playerHitMap.find(tmpid) == playerHitMap.end()){
+				npc.Object(tmpid);
+				npc.GetWorldPosition(nPos);
+				if (this->AttackCheck(pDir, pPos, nPos, BATTLE_RADIUS / 1.5) == TRUE){// lyubu attack area is the half of Battle raidus
 					// get a new victim;
 					sprintf(debug, "%s new victim\n",debug);
 					if ( this->AreanList[i]->state != STATEDIE){
@@ -98,5 +100,29 @@ void BattleRoom::PerformAttack(){
 }
 
 BOOL BattleRoom::AttackCheck(float attackerDir[3], float attackerPos[3], float vitimPos[3], float attackRange){
-	return TRUE;// for test
+	float dist = 0.0;
+	for (int i = 0;i< 3;i++){
+		dist += (attackerPos[i] - vitimPos[i]) * (attackerPos[i] - vitimPos[i]);
+	}
+	//sprintf(debug, "%s dist = %lf\n",debug,dist);
+	if ( dist >= attackRange){
+		return FALSE;
+	}
+	float cosine,dotProduct;
+	//float v[3];
+	dotProduct = 0.0;
+	for (int i = 0;i< 3;i++){
+		dotProduct += (vitimPos[i] - attackerPos[i]) * attackerDir[i];
+	}
+	float length = 0.0;
+	for (int i = 0;i< 3;i++){
+		length += (vitimPos[i] - attackerPos[i])* (vitimPos[i] - attackerPos[i]);
+	}
+	cosine = dotProduct / length;
+	//sprintf(debug, "%s cosine = %lf\n",debug,cosine);
+	if (cosine >= 0){
+		return TRUE;
+	}else{
+		return FALSE;
+	}
 }

Data/Lyubu.txt

@@ -0,0 +1,18 @@
+   Actions 17
+      Run            for running
+      CombatIdle     idle pose for combat
+      NormalAttack1  standard attack no. 1
+      NormalAttack2  standard attack no. 2
+      NormalAttack3  standard attack no. 3
+      NormalAttack4  standard attack no. 4
+      HeavyAttack1   heavy attack no. 1
+      HeavyAttack2   heavy attack no. 2
+      HeavyAttack3   heavy attack no. 3
+      HeavyDamaged   damage pose after attacked
+      RightDamaged   damage pose after attacked from right side
+      LeftDamaged    damage pose after attacked from left side
+      Die            for dying
+      Idle           idle
+      Walk           for walking
+      guard          defense from attacks
+      UltimateAttack ultimate attack

Data/Robber02Action.txt

@@ -0,0 +1,9 @@
+Run	Run
+CombatIdle	CombatIdle
+N1	NormalAttack1
+N2	NormalAttack2 H1	HeavyAttack1
+
+HeavyDamage Damage1
+LightDamage	Damage2
+
+Die	Dead   

Data/donzo.txt

@@ -0,0 +1,11 @@
+   Actions 10
+      CombatIdle   idle for combats
+      AttackL1     attack pose no. 1
+      AttackL2     attack pose no. 2
+      DamageL      damage pose for attacking (low damage)
+      DamageH      damage pose for attacking (high damage)
+      Run          for running
+      AttackH      heavy attack
+      Defance      defense pose
+      Die          die pose
+      HeavyAttack  another heavy attack

Data/robber02.txt

@@ -0,0 +1,11 @@
+   Actions 10
+      CombatIdle     idle pose for combats
+      MoveRight      move to right
+      MoveLeft       move to left
+      NormalAttack1  attack pose no. 1
+      NormalAttack2  attack pose no. 2
+      HeavyAttack1   heavy attack
+      Damage1        damage pose no. 1
+      Damage2        damage pose no. 2
+      Dead           for dying
+      Run            for running

LyubuStateMachine.cpp

@@ -90,11 +90,13 @@ BOOL LyubuStateMachine::UpdateEffectiveAttack(){
 	actor.Object(this->character);
 	float frame = actor.QueryCurrentFrame(0);
 	//sprintf(debug, "%s frame:%lf\n", debug, frame );
-	if (this->currentAttackIndex > 0 || this->attackKeyQueue[currentAttackIndex] == HEAVY_ATT){
+	if (this->attackKeyQueue[currentAttackIndex]){
+		if (frame > 20.0){
+			this->effectiveAttack =	TRUE;
+		}
+	}else if (this->currentAttackIndex > 0){
 		if (frame > 10.0){
 			this->effectiveAttack =	TRUE;
-		}else{
-			this->effectiveAttack = FALSE;
 		}
 	}else{
 		this->effectiveAttack =	TRUE;

Main.cpp

@@ -23,7 +23,7 @@ SCENEid sID;
 OBJECTid nID, cID, lID;
 OBJECTid tID;
 ACTORid lyubu;
-ACTORid donzo;
+ACTORid donzo, robber;
 KeyboardControl *kc;
 AIControl *npc;
 BattleRoom *bRoom;
@@ -266,8 +266,43 @@ BOOL initNPC(){
 		sprintf(debug, "%s play action failed\n", debug);
 	}
 
+	robber = scene.LoadActor("Robber02");
+	if (robber == FAILED_ID){
+		return FALSE;
+	}
+	FnActor actor_robber;
+	actor_robber.Object(robber);
+	float pos_robber[3];
+	pos_robber[0] = 3569.0;
+	pos_robber[1] = -3010;
+	pos_robber[2] = 100;
+	actor_robber.SetPosition(pos_robber);
+
+	flag = actor_robber.PutOnTerrain(tID,FALSE,0.0);
+
+	if (flag == FALSE){
+		sprintf(debug, "%s put on fail\n", debug);
+		return FALSE;
+	}
+	// set donzo idle action
+	ACTIONid idleID_robber = actor_robber.GetBodyAction(NULL,"CombatIdle");
+	
+	//actor.MakeCurrentAction(0,NULL,idleID,0.0,TRUE);
+	//if (actor.MakeCurrentAction(0,NULL,FAILED_ID) == FAILED_ID){
+	if (actor_robber.MakeCurrentAction(0,NULL,idleID_robber) == FAILED_ID){
+		sprintf(debug, "%s make current fail\n", debug);
+	}else{
+		sprintf(debug, "%s make action success\n", debug);
+	}
+	
+	if (actor_robber.Play(0,START, 0.0, FALSE,TRUE) == FALSE){
+		sprintf(debug, "%s play action failed\n", debug);
+	}
+
+
 	npc = new AIControl();
 	npc->AddNPC(donzo,"Data\\DozonAction.txt");
+	npc->AddNPC(robber,"Data\\Robber02Action.txt");
 	return TRUE;
 }