コミット: 351 - OpenXOPS (svn)

X operations（XOPS）に非常に近いFPSゲームを制作・リメイクし、成果物をオープンソースとして公開することを目的としたプロジェクトです。

コミットメタ情報

• リビジョン: 351 (tree)
• 日時: 2023-02-07 23:16:27
• 作者: xops-mikan

ログメッセージ

ゾンビの攻撃処理を修正、AIの一部設定値を定数化、人設定パラメーター追加

変更サマリ

• modified: trunk/ai.cpp
• modified: trunk/ai.h
• modified: trunk/parameter.cpp
• modified: trunk/parameter.h

差分

--- trunk/ai.cpp	(revision 350)
+++ trunk/ai.cpp	(revision 351)
@@ -568,36 +568,62 @@
 
 	float atanx, atany, r;
 
-	//自分が手榴弾を持っていれば〜
-	if( weaponid == ID_WEAPON_GRENADE ){
-		if( zombie == false ){
-			float x = posx - tx;
-			float z = posz - tz;
-			float r = x * x + z * z;
-			float scale;
-			if( longattack == false ){ scale = 0.12f; }
-			else{ scale = 0.4f; }
+	//ターゲットの位置を補正
+	if( zombie == true ){		//ゾンビの場合
+		float x = posx - tx;
+		float z = posz - tz;
+		float r = sqrtf(x * x + z * z);
+		float scale;
+		float mx, mz;
 
-			//距離に応じて高さを変える
-			ty += (sqrtf(r) - 200.0f) * scale;
+		if( r > 180.0f ){ r = 180.0f; }		//もしかしたら 1800.0f 上限かも
+
+		//追従性のパラメーターを取得
+		switch( Paraminfo.AItrackability ){
+			case 0: scale = (0.05f * 2); break;
+			case 1: scale = (0.10f * 2); break;
+			case 2: scale = (0.13f * 2); break;
+			case 3: scale = (0.17f * 2); break;
+			default: scale = 0.0f;
 		}
+
+		//敵の移動を見超す
+		EnemyHuman->GetMovePos(&mx, NULL, &mz);
+		tx += mx * r * scale;
+		tz += mz * r * scale;
 	}
-	else{
-		float mx, mz;
-		float scale;
-		EnemyHuman->GetMovePos(&mx, NULL, &mz);
-		if( longattack == false ){ scale = 1.5f; }
+	else{		//ゾンビでない場合
+		//自分が手榴弾を持っていれば〜
+		if( weaponid == ID_WEAPON_GRENADE ){
+			if( zombie == false ){
+				float x = posx - tx;
+				float z = posz - tz;
+				float r = sqrtf(x * x + z * z);
+				float scale;
+				if( longattack == false ){ scale = 0.12f; }
+				else{ scale = 0.4f; }
+
+				//距離に応じて高さを変える
+				ty += (r - AI_CHECKSHORTATTACK_DIST) * scale;
+			}
+		}
 		else{
-			float x = posx - tx;
-			float z = posz - tz;
-			float r = x * x + z * z;
+			float mx, mz;
+			float scale;
+			EnemyHuman->GetMovePos(&mx, NULL, &mz);
+			if( longattack == false ){ scale = 1.5f; }
+			else{
+				float x = posx - tx;
+				float z = posz - tz;
+				float r = sqrtf(x * x + z * z);
 
-			scale = sqrtf(r) * 0.12f;
+				scale = r * 0.12f;
+			}
+
+			//敵の移動を見超す
+			tx += mx * scale;
+			tz += mz * scale;
 		}
-
-		//敵の移動を見超す
-		tx += mx * scale;
-		tz += mz * scale;
 	}
 
 	//目標地点への角度を求める
@@ -784,11 +810,11 @@
 	}
 
 	//距離に応じて近距離・遠距離を切り替える
-	//　200.0fピッタリで設定値維持
-	if( r < 200.0f * 200.0f ){
+	//　※ AI_CHECKSHORTATTACK_DIST ピッタリで設定値維持
+	if( r < AI_CHECKSHORTATTACK_DIST * AI_CHECKSHORTATTACK_DIST ){
 		longattack = false;
 	}
-	if( (r > 200.0f * 200.0f)&&(MoveNavi->GetRun2() == false) ){
+	if( (r > AI_CHECKSHORTATTACK_DIST * AI_CHECKSHORTATTACK_DIST)&&(MoveNavi->GetRun2() == false) ){
 		longattack = true;
 	}
 
@@ -1310,7 +1336,7 @@
 	for(int i=0; i<searchloops; i++){
 		int targetid = GetRand(MAX_HUMAN);
 
-		if( CheckLookEnemy(targetid, A_rx, A_ry, 200.0f, NULL) == true ){
+		if( CheckLookEnemy(targetid, A_rx, A_ry, AI_CHECKSHORTATTACK_DIST, NULL) == true ){
 			longattack = false;
 			return 1;
 		}
@@ -1336,7 +1362,7 @@
 	for(int i=0; i<3; i++){
 		int targetid = GetRand(MAX_HUMAN);
 
-		if( CheckLookEnemy(targetid, A_rx, A_ry, 200.0f, NULL) == true ){
+		if( CheckLookEnemy(targetid, A_rx, A_ry, AI_CHECKSHORTATTACK_DIST, NULL) == true ){
 			longattack = false;
 			return 1;
 		}

--- trunk/ai.h	(revision 350)
+++ trunk/ai.h	(revision 351)
@@ -39,13 +39,14 @@
 #define AI_SEARCH_RY DegreeToRadian(60)		//!< 敵を発見する縦軸角度
 #define AI_ZOMBIEATTACK_ARMRY DegreeToRadian(-15)		//!< ゾンビ攻撃時の腕の角度
 
-#define AI_ARRIVALDIST_PATH 5.0f		//!< パスに到達したと判定する距離
-#define AI_ARRIVALDIST_TRACKING 18.0f	//!< 追尾対象に到達したと判定する距離
+#define AI_ARRIVALDIST_PATH 5.0f			//!< パスに到達したと判定する距離
+#define AI_ARRIVALDIST_TRACKING 18.0f		//!< 追尾対象に到達したと判定する距離
 #define AI_ARRIVALDIST_WALKTRACKING 24.0f	//!< 追尾対象へ（走らずに）歩いて近づく距離
-#define AI_CHECKJUMP_HEIGHT 0.3f		//!< 前にブロックが無いか判定する高さ
-#define AI_CHECKJUMP_DIST 2.0f			//!< 前にブロックが無いか判定する距離
+#define AI_CHECKJUMP_HEIGHT 0.3f			//!< 前にブロックが無いか判定する高さ
+#define AI_CHECKJUMP_DIST 2.0f				//!< 前にブロックが無いか判定する距離
 #define AI_CHECKJUMP2_DIST 10.0f			//!< 前にブロックが無いか判定する距離（優先的な走り）
-#define AI_CHECKBULLET 20.0f			//!< 弾が近くを通ったと判定する距離
+#define AI_CHECKBULLET 20.0f				//!< 弾が近くを通ったと判定する距離
+#define AI_CHECKSHORTATTACK_DIST 200.0f		//!< 近距離攻撃と判定する距離
 
 #ifndef H_LAYERLEVEL
  #define H_LAYERLEVEL 3		//!< Select include file.

--- trunk/parameter.cpp	(revision 350)
+++ trunk/parameter.cpp	(revision 351)
@@ -81,6 +81,7 @@
 	Human[0].model = 5;
 	Human[0].hp = 120;
 	Human[0].AIlevel = 3;
+	Human[0].AItrackability = -1;
 	Human[0].Weapon[0] = 21;
 	Human[0].Weapon[1] = 8;
 	Human[0].type = 0;
@@ -89,6 +90,7 @@
 	Human[1].model = 5;
 	Human[1].hp = 120;
 	Human[1].AIlevel = 3;
+	Human[1].AItrackability = -1;
 	Human[1].Weapon[0] = 21;
 	Human[1].Weapon[1] = 2;
 	Human[1].type = 0;
@@ -97,6 +99,7 @@
 	Human[2].model = 0;
 	Human[2].hp = 110;
 	Human[2].AIlevel = 2;
+	Human[2].AItrackability = -1;
 	Human[2].Weapon[0] = 3;
 	Human[2].Weapon[1] = 6;
 	Human[2].type = 0;
@@ -105,6 +108,7 @@
 	Human[3].model = 0;
 	Human[3].hp = 110;
 	Human[3].AIlevel = 2;
+	Human[3].AItrackability = -1;
 	Human[3].Weapon[0] = 3;
 	Human[3].Weapon[1] = 10;
 	Human[3].type = 0;
@@ -113,6 +117,7 @@
 	Human[4].model = 0;
 	Human[4].hp = 110;
 	Human[4].AIlevel = 2;
+	Human[4].AItrackability = -1;
 	Human[4].Weapon[0] = 3;
 	Human[4].Weapon[1] = 2;
 	Human[4].type = 0;
@@ -121,6 +126,7 @@
 	Human[5].model = 0;
 	Human[5].hp = 110;
 	Human[5].AIlevel = 2;
+	Human[5].AItrackability = -1;
 	Human[5].Weapon[0] = 4;
 	Human[5].Weapon[1] = 7;
 	Human[5].type = 0;
@@ -129,6 +135,7 @@
 	Human[6].model = 0;
 	Human[6].hp = 110;
 	Human[6].AIlevel = 2;
+	Human[6].AItrackability = -1;
 	Human[6].Weapon[0] = 4;
 	Human[6].Weapon[1] = 2;
 	Human[6].type = 0;
@@ -137,6 +144,7 @@
 	Human[7].model = 0;
 	Human[7].hp = 100;
 	Human[7].AIlevel = 3;
+	Human[7].AItrackability = -1;
 	Human[7].Weapon[0] = 4;
 	Human[7].Weapon[1] = 0;
 	Human[7].type = 0;
@@ -145,6 +153,7 @@
 	Human[8].model = 0;
 	Human[8].hp = 110;
 	Human[8].AIlevel = 3;
+	Human[8].AItrackability = -1;
 	Human[8].Weapon[0] = 22;
 	Human[8].Weapon[1] = 14;
 	Human[8].type = 0;
@@ -153,6 +162,7 @@
 	Human[9].model = 5;
 	Human[9].hp = 120;
 	Human[9].AIlevel = 2;
+	Human[9].AItrackability = -1;
 	Human[9].Weapon[0] = 3;
 	Human[9].Weapon[1] = 1;
 	Human[9].type = 0;
@@ -161,6 +171,7 @@
 	Human[10].model = 0;
 	Human[10].hp = 2500;
 	Human[10].AIlevel = 4;
+	Human[10].AItrackability = -1;
 	Human[10].Weapon[0] = 6;
 	Human[10].Weapon[1] = 12;
 	Human[10].type = 1;
@@ -169,6 +180,7 @@
 	Human[11].model = 1;
 	Human[11].hp = 100;
 	Human[11].AIlevel = 1;
+	Human[11].AItrackability = -1;
 	Human[11].Weapon[0] = 18;
 	Human[11].Weapon[1] = 0;
 	Human[11].type = 0;
@@ -177,6 +189,7 @@
 	Human[12].model = 0;
 	Human[12].hp = 100;
 	Human[12].AIlevel = 1;
+	Human[12].AItrackability = -1;
 	Human[12].Weapon[0] = 5;
 	Human[12].Weapon[1] = 0;
 	Human[12].type = 0;
@@ -185,6 +198,7 @@
 	Human[13].model = 0;
 	Human[13].hp = 100;
 	Human[13].AIlevel = 0;
+	Human[13].AItrackability = -1;
 	Human[13].Weapon[0] = 0;
 	Human[13].Weapon[1] = 0;
 	Human[13].type = 0;
@@ -193,6 +207,7 @@
 	Human[14].model = 2;
 	Human[14].hp = 100;
 	Human[14].AIlevel = 1;
+	Human[14].AItrackability = -1;
 	Human[14].Weapon[0] = 3;
 	Human[14].Weapon[1] = 0;
 	Human[14].type = 0;
@@ -201,6 +216,7 @@
 	Human[15].model = 0;
 	Human[15].hp = 100;
 	Human[15].AIlevel = 0;
+	Human[15].AItrackability = -1;
 	Human[15].Weapon[0] = 0;
 	Human[15].Weapon[1] = 0;
 	Human[15].type = 0;
@@ -209,6 +225,7 @@
 	Human[16].model = 0;
 	Human[16].hp = 100;
 	Human[16].AIlevel = 0;
+	Human[16].AItrackability = -1;
 	Human[16].Weapon[0] = 17;
 	Human[16].Weapon[1] = 0;
 	Human[16].type = 0;
@@ -217,6 +234,7 @@
 	Human[17].model = 0;
 	Human[17].hp = 100;
 	Human[17].AIlevel = 1;
+	Human[17].AItrackability = -1;
 	Human[17].Weapon[0] = 17;
 	Human[17].Weapon[1] = 10;
 	Human[17].type = 0;
@@ -225,6 +243,7 @@
 	Human[18].model = 3;
 	Human[18].hp = 90;
 	Human[18].AIlevel = 0;
+	Human[18].AItrackability = -1;
 	Human[18].Weapon[0] = 0;
 	Human[18].Weapon[1] = 0;
 	Human[18].type = 0;
@@ -233,6 +252,7 @@
 	Human[19].model = 0;
 	Human[19].hp = 100;
 	Human[19].AIlevel = 0;
+	Human[19].AItrackability = -1;
 	Human[19].Weapon[0] = 0;
 	Human[19].Weapon[1] = 0;
 	Human[19].type = 0;
@@ -241,6 +261,7 @@
 	Human[20].model = 0;
 	Human[20].hp = 100;
 	Human[20].AIlevel = 0;
+	Human[20].AItrackability = -1;
 	Human[20].Weapon[0] = 0;
 	Human[20].Weapon[1] = 0;
 	Human[20].type = 0;
@@ -249,6 +270,7 @@
 	Human[21].model = 0;
 	Human[21].hp = 100;
 	Human[21].AIlevel = 0;
+	Human[21].AItrackability = -1;
 	Human[21].Weapon[0] = 0;
 	Human[21].Weapon[1] = 0;
 	Human[21].type = 0;
@@ -257,6 +279,7 @@
 	Human[22].model = 1;
 	Human[22].hp = 100;
 	Human[22].AIlevel = 0;
+	Human[22].AItrackability = -1;
 	Human[22].Weapon[0] = 0;
 	Human[22].Weapon[1] = 0;
 	Human[22].type = 0;
@@ -265,6 +288,7 @@
 	Human[23].model = 1;
 	Human[23].hp = 100;
 	Human[23].AIlevel = 0;
+	Human[23].AItrackability = -1;
 	Human[23].Weapon[0] = 0;
 	Human[23].Weapon[1] = 0;
 	Human[23].type = 0;
@@ -273,6 +297,7 @@
 	Human[24].model = 1;
 	Human[24].hp = 100;
 	Human[24].AIlevel = 0;
+	Human[24].AItrackability = -1;
 	Human[24].Weapon[0] = 0;
 	Human[24].Weapon[1] = 0;
 	Human[24].type = 0;
@@ -281,6 +306,7 @@
 	Human[25].model = 1;
 	Human[25].hp = 100;
 	Human[25].AIlevel = 0;
+	Human[25].AItrackability = -1;
 	Human[25].Weapon[0] = 0;
 	Human[25].Weapon[1] = 0;
 	Human[25].type = 0;
@@ -289,6 +315,7 @@
 	Human[26].model = 4;
 	Human[26].hp = 115;
 	Human[26].AIlevel = 2;
+	Human[26].AItrackability = -1;
 	Human[26].Weapon[0] = 5;
 	Human[26].Weapon[1] = 9;
 	Human[26].type = 0;
@@ -297,6 +324,7 @@
 	Human[27].model = 4;
 	Human[27].hp = 115;
 	Human[27].AIlevel = 2;
+	Human[27].AItrackability = -1;
 	Human[27].Weapon[0] = 5;
 	Human[27].Weapon[1] = 12;
 	Human[27].type = 0;
@@ -305,6 +333,7 @@
 	Human[28].model = 4;
 	Human[28].hp = 115;
 	Human[28].AIlevel = 2;
+	Human[28].AItrackability = -1;
 	Human[28].Weapon[0] = 13;
 	Human[28].Weapon[1] = 10;
 	Human[28].type = 0;
@@ -313,6 +342,7 @@
 	Human[29].model = 0;
 	Human[29].hp = 1000;
 	Human[29].AIlevel = 0;
+	Human[29].AItrackability = 1;
 	Human[29].Weapon[0] = 0;
 	Human[29].Weapon[1] = 0;
 	Human[29].type = 2;
@@ -321,6 +351,7 @@
 	Human[30].model = 0;
 	Human[30].hp = 1000;
 	Human[30].AIlevel = 0;
+	Human[30].AItrackability = 3;
 	Human[30].Weapon[0] = 0;
 	Human[30].Weapon[1] = 0;
 	Human[30].type = 2;
@@ -329,6 +360,7 @@
 	Human[31].model = 0;
 	Human[31].hp = 1000;
 	Human[31].AIlevel = 0;
+	Human[31].AItrackability = 0;
 	Human[31].Weapon[0] = 0;
 	Human[31].Weapon[1] = 0;
 	Human[31].type = 2;
@@ -337,6 +369,7 @@
 	Human[32].model = 3;
 	Human[32].hp = 950;
 	Human[32].AIlevel = 0;
+	Human[32].AItrackability = 2;
 	Human[32].Weapon[0] = 0;
 	Human[32].Weapon[1] = 0;
 	Human[32].type = 2;
@@ -345,6 +378,7 @@
 	Human[33].model = 0;
 	Human[33].hp = 100;
 	Human[33].AIlevel = 0;
+	Human[33].AItrackability = -1;
 	Human[33].Weapon[0] = 0;
 	Human[33].Weapon[1] = 0;
 	Human[33].type = 0;
@@ -353,6 +387,7 @@
 	Human[34].model = 1;
 	Human[34].hp = 100;
 	Human[34].AIlevel = 1;
+	Human[34].AItrackability = -1;
 	Human[34].Weapon[0] = 17;
 	Human[34].Weapon[1] = 0;
 	Human[34].type = 0;
@@ -361,6 +396,7 @@
 	Human[35].model = 0;
 	Human[35].hp = 95;
 	Human[35].AIlevel = 1;
+	Human[35].AItrackability = -1;
 	Human[35].Weapon[0] = 17;
 	Human[35].Weapon[1] = 0;
 	Human[35].type = 0;
@@ -369,6 +405,7 @@
 	Human[36].model = 0;
 	Human[36].hp = 100;
 	Human[36].AIlevel = 0;
+	Human[36].AItrackability = -1;
 	Human[36].Weapon[0] = 0;
 	Human[36].Weapon[1] = 0;
 	Human[36].type = 0;
@@ -377,6 +414,7 @@
 	Human[37].model = 1;
 	Human[37].hp = 100;
 	Human[37].AIlevel = 1;
+	Human[37].AItrackability = -1;
 	Human[37].Weapon[0] = 18;
 	Human[37].Weapon[1] = 0;
 	Human[37].type = 0;
@@ -385,6 +423,7 @@
 	Human[38].model = 1;
 	Human[38].hp = 100;
 	Human[38].AIlevel = 1;
+	Human[38].AItrackability = -1;
 	Human[38].Weapon[0] = 6;
 	Human[38].Weapon[1] = 0;
 	Human[38].type = 0;
@@ -393,6 +432,7 @@
 	Human[39].model = 0;
 	Human[39].hp = 105;
 	Human[39].AIlevel = 3;
+	Human[39].AItrackability = -1;
 	Human[39].Weapon[0] = 5;
 	Human[39].Weapon[1] = 20;
 	Human[39].type = 0;
@@ -401,6 +441,7 @@
 	Human[40].model = 1;
 	Human[40].hp = 105;
 	Human[40].AIlevel = 3;
+	Human[40].AItrackability = -1;
 	Human[40].Weapon[0] = 21;
 	Human[40].Weapon[1] = 0;
 	Human[40].type = 0;
@@ -409,6 +450,7 @@
 	Human[41].model = 0;
 	Human[41].hp = 100;
 	Human[41].AIlevel = 0;
+	Human[41].AItrackability = -1;
 	Human[41].Weapon[0] = 0;
 	Human[41].Weapon[1] = 0;
 	Human[41].type = 0;
@@ -417,6 +459,7 @@
 	Human[42].model = 1;
 	Human[42].hp = 100;
 	Human[42].AIlevel = 4;
+	Human[42].AItrackability = -1;
 	Human[42].Weapon[0] = 22;
 	Human[42].Weapon[1] = 0;
 	Human[42].type = 0;

--- trunk/parameter.h	(revision 350)
+++ trunk/parameter.h	(revision 351)
@@ -59,12 +59,13 @@
 //! 人設定用の構造体
 typedef struct
 {
-	int texture;	//!< テクスチャ番号
-	int model;		//!< モデル番号
-	int hp;			//!< 体力
-	int AIlevel;	//!< AIレベル
+	int texture;		//!< テクスチャ番号
+	int model;			//!< モデル番号
+	int hp;				//!< 体力
+	int AIlevel;		//!< AIレベル
+	int AItrackability;	//!< AI攻撃時の追従性（ゾンビのみ）
 	int Weapon[TOTAL_HAVEWEAPON];	//!< 武器
-	int type;		//!< 種類
+	int type;			//!< 種類
 } HumanParameter;
 
 //! 武器設定用の構造体