Merge pull request #10 from wingzero0/master

please fix the attack bug

Author: Chun-Yi

ActorStateMachine.cpp

@@ -30,7 +30,7 @@ ActorStateMachine::ActorStateMachine(ACTORid character, char * ActionFilename){
 }
 
 BOOL ActorStateMachine::initLife(){
-	this->life = 100;
+	this->life = (int) MAX_LIFE;
 
 	FnScene scene;
 	scene.Object(sID);
@@ -124,10 +124,10 @@ int ActorStateMachine::ChangeState(ActorState s, BOOL forceSet){
 			FnActor actor;
 			actor.Object(this->character);
 			actor.MoveForward(-MOVE_LENGTH,TRUE, FALSE, 0.0, TRUE);
-			//this->SetNewAction("LightDamage");
+			this->SetNewAction("LightDamage");
 			this->currentAttackIndex = 0;
 			this->lastAttackIndex = 0;
-			this->SetNewAction("HeavyDamage");
+			//this->SetNewAction("HeavyDamage");
 		}else if (s == STATEDIE){
 			this->SetNewAction("Die");
 		}
@@ -278,7 +278,11 @@ BOOL ActorStateMachine::UpdateEffectiveAttack(){
 	return FALSE;
 }
 
-int ActorStateMachine::AttackEnemy(float enemyPos[3]){
+int ActorStateMachine::AttackEnemy(float enemyPos[3], BOOL *beOutShot){
+	// beOutShot is a parameter
+	if (beOutShot != NULL){
+		*beOutShot = FALSE;
+	}
 	// the return value is the attack power
 	return FALSE;
 }
@@ -290,17 +294,15 @@ void ActorStateMachine::TakeDamage(float damage, BOOL beShot, float *attackerPos
 	float dir[3];
 	actor.GetWorldPosition(pos);
 	actor.GetWorldDirection(dir, NULL);
-	if (attackerPos !=NULL){
+	if (beShot == TRUE && attackerPos !=NULL){
 		float newDir[3];
 		newDir[0] = attackerPos[0] - pos[0];
 		newDir[1] = attackerPos[1] - pos[1];
 		newDir[2] = 0.0f;
 		actor.SetWorldDirection(newDir,NULL);
-		if (beShot == TRUE){
-			actor.MoveForward(-OUTSHOT_DIS,TRUE, FALSE, 0.0, TRUE);
-		}else{
-			actor.MoveForward(-1.0f,TRUE, FALSE, 0.0, TRUE);
-		}
+		//if (beShot == TRUE){
+			//actor.MoveForward(-OUTSHOT_DIS,TRUE, FALSE, 0.0, TRUE);
+		//}
 		actor.SetWorldDirection(dir,NULL);
 	}
 	this->life -= damage;

ActorStateMachine.h

@@ -19,8 +19,8 @@ typedef int ActorState;
 #define ULTIMATE_ATT 2
 typedef int ATTACK_CODE;
 
-#define OUTSHOT_DIS 100.0
-#define MAX_LIFE 100.0
+#define OUTSHOT_DIS 200.0
+#define MAX_LIFE 1000.0
 
 // actor free meaning it can do anything by the controller.
 // actor stay meaning that it can't be move beacuse of being attacked.
@@ -60,7 +60,7 @@ class ActorStateMachine
 	BOOL AppendAttackCode(ATTACK_CODE code);
 	virtual BOOL PlayAction(int skip);
 	BOOL CheckEffectiveAttack();
-	virtual int AttackEnemy(float enemyPos[3]);
+	virtual int AttackEnemy(float enemyPos[3], BOOL *beOutShot = NULL); // beOutShot will be assgin a value after the call
 	virtual void TakeDamage(float damage, BOOL beShot, float* attackerPos);
 };
 

BattleRoom.cpp

@@ -81,18 +81,18 @@ void BattleRoom::PerformAttack(){
 
 		FnActor npc;
 		float nPos[3];
-		
+		int beOutShot; 
 		for (int i= 0;i< this->AreanList.size();i++){
 			ACTORid tmpid = AreanList[i]->character;
 			if (playerHitMap.find(tmpid) == playerHitMap.end()){
 				npc.Object(tmpid);
 				npc.GetWorldPosition(nPos);
-				int attackPower = this->playerStateMachine->AttackEnemy(nPos);
+				int attackPower = this->playerStateMachine->AttackEnemy(nPos, &beOutShot);
 				if (attackPower > 0 ){
 					// get a new victim;
 					sprintf(debug, "%s new victim\n",debug);
 					if ( this->AreanList[i]->state != STATEDIE){
-						this->AreanList[i]->TakeDamage(attackPower, TRUE, pPos);
+						this->AreanList[i]->TakeDamage(attackPower, beOutShot, pPos);
 						//this->AreanList[i]->ChangeState(STATEDAMAGE,TRUE);
 					}
 					this->playerHitMap[tmpid] = TRUE;

Data/Robber02Action.txt

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

LyubuStateMachine.cpp

@@ -49,9 +49,9 @@ void LyubuStateMachine::setAttackState(void) {	//set var attackState
 	attackState = TRUE;
 }
 */
+
 BOOL LyubuStateMachine::PlayAttackAction(int skip){
-	//duplicate with parrent's PlayAttackAction
-	//this function can be removed (in future);
+	// the difference from parent function is that this function contain the sound fx
 	FnActor actor;
 	actor.Object(this->character);
 	ACTIONid actionID;
@@ -127,9 +127,17 @@ BOOL LyubuStateMachine::UpdateEffectiveAttack(){
 	actor.Object(this->character);
 	float frame = actor.QueryCurrentFrame(0);
 	//sprintf(debug, "%s frame:%lf\n", debug, frame );
-	if (this->attackKeyQueue[currentAttackIndex] == HEAVY_ATT){
+	if (this->attackKeyQueue[currentAttackIndex] == ULTIMATE_ATT){
+		if (frame > 20.0){
+			this->newAttack = TRUE;
+			this->effectiveAttack =	TRUE;
+		}
+	}else if (this->attackKeyQueue[currentAttackIndex] == HEAVY_ATT){
 		if (frame > 20.0){
 			this->effectiveAttack =	TRUE;
+		}else if (frame > 50.0){
+			this->newAttack = TRUE;
+			this->effectiveAttack =	TRUE;
 		}
 	}else if (this->currentAttackIndex > 0){
 		if (frame > 10.0){
@@ -141,13 +149,14 @@ BOOL LyubuStateMachine::UpdateEffectiveAttack(){
 	return FALSE;
 }
 
-int LyubuStateMachine::AttackEnemy(float enemyPos[3]){
+int LyubuStateMachine::AttackEnemy(float enemyPos[3], BOOL *beOutShot){
 	// the return value is the attack power
 	FnActor actor;
 	actor.Object(this->character);
 	float attackerPos[3], attackerDir[3];
 	actor.GetWorldPosition(attackerPos);
 	actor.GetWorldDirection(attackerDir,NULL);
+	float frame = actor.QueryCurrentFrame(0);
 
 	float dist = 0.0;
 	for (int i = 0;i< 3;i++){
@@ -169,11 +178,23 @@ int LyubuStateMachine::AttackEnemy(float enemyPos[3]){
 	}
 	cosine = dotProduct / sqrt(length);
 	//sprintf(debug, "%s cosine = %lf\n",debug,cosine);
+
+	if (this->attackKeyQueue[currentAttackIndex] == HEAVY_ATT || currentAttackIndex == MAXATTACK -1){
+		*beOutShot = TRUE;
+	}else {
+		*beOutShot = FALSE;
+	}
+
 	if (this->currentAttackIndex == 0){
 		if (this->attackKeyQueue[currentAttackIndex] == ULTIMATE_ATT){
-			sprintf(debug, "%s attack power = %d\n",debug,10);
-			return 10;
-		}else if (cosine > 0.8){
+			if (frame > 100){ // almost finish attack
+				*beOutShot = TRUE;
+				sprintf(debug, "%s attack power = %d\n",debug,10);
+				return 10;
+			}
+			sprintf(debug, "%s attack power = %d\n",debug,1);
+			return 1;
+		}else if (cosine > 0.8){ // normal or heavy attack, only attack the front side enemy
 			sprintf(debug, "%s attack power = %d\n",debug,1);
 			return 1;
 		}

LyubuStateMachine.h

@@ -13,7 +13,7 @@ class LyubuStateMachine :
 	virtual ~LyubuStateMachine(void);
 	LyubuStateMachine(ACTORid character, char *ActionFilename);
 	virtual BOOL PlayAttackAction(int skip);
-	int AttackEnemy(float enemyPos[3]);
+	virtual int AttackEnemy(float enemyPos[3], BOOL *beOutShot = NULL);
 protected:
 	virtual BOOL UpdateEffectiveAttack();
 	AUDIOid audioN1;