Commit: 1938b976594bfa4943e8cdbb7a5ed7ece72c678c - hengband (git)

変愚蛮怒のメインリポジトリです

Commit MetaInfo

• Révision: 1938b976594bfa4943e8cdbb7a5ed7ece72c678c (tree)
• l'heure: 2020-02-01 22:28:12
• Auteur: deskull <deskull@user...>
• Commiter: deskull

Message de Log

Merge branch 'feature/Merfolk' into For2.2.2-Refactoring

Change Summary

• modified: src/birth.c
• modified: src/history.c
• modified: src/monster2.c

Modification

--- a/src/birth.c
+++ b/src/birth.c
@@ -156,8 +156,6 @@ static concptr race_jouhou[MAX_RACES] =
 
 "アンドロイドは機械の身体を持つ人工的な存在です。魔法をうまく使うことはできませんが、戦士としては非常に優れています。彼らは他の種族のように経験値を得て成長するということはありません。身体に身につける装備によって成長します。ただし、指輪、アミュレット、光源は成長に影響しません。彼らは毒の耐性を持ち、麻痺知らずで、生命力を吸収されることがありません。また、身体が頑丈なのでACにボーナスを得ます。しかし身体のいたるところに電子回路が組み込まれているため、電撃によって通常よりも大きなダメージを受けてしまいます。彼らは食物からほとんど動力を得られませんが、油を補給する事で動力源を得る事ができます。",
 
-"マーフォーク実装中",
-
 #else
 
 "The human is the base character.  All other races are compared to them.  Humans can choose any class and are average at everything.  Humans tend to go up levels faster than most other races because of their shorter life spans.  No racial adjustments or intrinsics occur to characters choosing human.",
@@ -234,9 +232,13 @@ static concptr race_jouhou[MAX_RACES] =
 
 "An android is a artificial creation with a body of machinery.  They are poor at spell casting, but they make excellent warriors.  They don't acquire experience like other races, but rather gain in power as they attach new equipment to their frame.  Rings, amulets, and lights do not influence growth.  Androids are resistant to poison, can move freely, and are immune to exp-draining attacks.  Moreover, because of their hard metallic bodies, they get a bonus to AC.  Androids have electronic circuits throughout their body and must beware of electric shocks.  They gain very little nutrition from the food of mortals, but they can use flasks of oil as their energy source.",
 
-"Merfolk implementing.",
-
 #endif
+
+_(
+	"マーフォークは人型生物と水棲生物の合いの子たちの総称です。彼らは知的であり、陸上よりも水中での営みに適応している点で共通しています。彼らの真価は水中でこそ発揮されますが、彼らの文明は大抵陸上に長く滞在する何らかの術も有しています。それを失わない限り、陸上でも不自由はないでしょう。また、彼らは致命的な水難にも抗える能力を生まれつき持っています。",
+	"Merfolks are general terms for people of mixed races between humanoids and aquatic habitats. They have in common that they are intelligent and adapt to working underwater rather than on land. Their true value comes in water, but their civilization also has some form of staying longer on land. As long as you do not lose it, there will be no inconvenience on land. They also have the ability to withstand disaster by water."
+),
+
 };
 
 /*! 職業の解説メッセージテーブル */
@@ -1270,7 +1272,6 @@ static void get_history(player_type *creature_ptr)
 	case RACE_HUMAN:
 	case RACE_BARBARIAN:
 	case RACE_DUNADAN:
-	case RACE_MERFOLK:
 	{
 		chart = 1;
 		break;
@@ -1436,6 +1437,11 @@ static void get_history(player_type *creature_ptr)
 		chart = 155;
 		break;
 	}
+	case RACE_MERFOLK:
+	{
+		chart = 170;
+		break;
+	}
 	default:
 	{
 		chart = 0;
@@ -1455,7 +1461,10 @@ static void get_history(player_type *creature_ptr)
 
 
 		/* Access the proper entry in the table */
-		while ((chart != bg[i].chart) || (roll > bg[i].roll)) i++;
+		while ((chart != bg[i].chart) || (roll > bg[i].roll))
+		{
+			i++;
+		}
 
 		/* Acquire the textual history */
 		(void)strcat(buf, bg[i].info);

--- a/src/history.c
+++ b/src/history.c
@@ -1543,7 +1543,6 @@ hist_type bg[] =
 { "as a combat trooper. ", 90, 156, 157, 20 },
 { "as a tool for conquest of the world. ", 100, 156, 157, 10 },
 
-
 { "You have a cat-like appearance", 15, 157, 158, 40 },
 { "You have a dog-like appearance", 30, 157, 158, 30 },
 { "You have a Kutar-like appearance", 45, 157, 158, 20 },
@@ -1558,4 +1557,87 @@ hist_type bg[] =
 { ", and you firmly believe that you are a real one.", 95, 158, 0, 50 },
 { ", and you are almost indistinguishable from a real one.", 100, 158, 0, 100 },
 #endif
+
+#ifdef JP
+{ "あなたはマーフォークの乞食の",			  5, 170, 171,  30 },
+{ "あなたはマーフォークの物あさりの",			  10, 170, 171,  50 },
+{ "あなたはマーフォークのペテン師の",		 15, 170, 171,  70 },
+{ "あなたはマーフォークの平民の",		 60, 170, 171,  90 },
+{ "あなたは川守りの",							 70, 170, 171,  80 },
+{ "あなたはメロウの",							 80, 170, 171,  80 },
+{ "あなたはセルキーの",							 85, 170, 171,  80 },
+{ "あなたはトリトンの",							 90, 170, 171,  80 },
+{ "あなたはマーフォークの交易商人の",			 95, 170, 171, 100 },
+{ "あなたはマーフォークの君主の",				100, 170, 171, 130 },
+{ "何人かの子供のうちの一人です。",      80, 171, 172, 45 },
+{ "一粒種です。",         	 100, 171, 172, 55 },
+#else
+{ "a Merfolk Begger. ",               5 , 171, 172, 30 },
+{ "a Merfolk Looter. ",			  10, 171, 172, 50 },
+{ "a Merfolk Trickster. ",		      15, 171, 172, 70 },
+{ "a Merfolk Citizen. ",		        60, 171, 172,  90 },
+{ "a River Herald. ",							 70, 171, 172,  80 },
+{ "a Merrow. ",							 80, 171, 172,  80 },
+{ "a Selkie. ",							 85, 171, 172,  80 },
+{ "a Triton. ",							 90, 171, 172,  80 },
+{ "a Merfolk Traders. ",			 95, 171, 172, 100 },
+{ "a Merfolk Sovereign. ",				100, 171, 172, 130 },
+{ "You are one of several children of ",      80, 170, 171, 45 },
+{ "You are the only child of ",         	 100, 170, 171, 55 },
+#endif
+
+#ifdef JP
+{ "あなたの下半身は一本の尾で、", 50, 172, 173, 50},
+{ "あなたの下半身は二股の尾で、", 60, 172, 173, 50},
+{ "あなたの下半身は陸上の種族とあまり変わりなく、", 100, 172, 173, 50 },
+#else
+{ "Your lower body is a tail, ", 50, 172, 173, 50 },
+{ "Your lower body are two tails, ", 60, 172, 173, 50 },
+{ "Your lower body is not much different from a land race, ", 100, 172, 173, 50 },
+#endif
+
+
+#ifdef JP
+{ "全身のほとんどが鱗に覆われています。", 20, 173, 174, 50 },
+{ "主に上半身が鱗に覆われています。", 30, 173, 174, 50 },
+{ "主に下半身が鱗に覆われています。", 40, 173, 174, 50 },
+{ "全身の半分が鱗に覆われています。", 60, 173, 174, 50 },
+{ "全身のいくらかが鱗に覆われています。", 80, 173, 174, 50 },
+{ "鱗はほとんど見られません。", 100, 173, 174, 50 },
+#else
+{ "and most of your whole body is covered with scales. ", 20, 173, 174, 50 },
+{ "and mainly your upper body is covered with scales. ", 30, 173, 174, 50 },
+{ "and mainly your lower body is covered with scales. ", 40, 173, 174, 50 },
+{ "and half of your body is covered with scales. ", 60, 173, 174, 50 },
+{ "and some of your body is covered with scales. ", 80, 173, 174, 50 },
+{ "and there are few scales on your body. ", 100, 173, 174, 50 },
+
+#endif
+
+#ifdef JP
+{ "あなたは黒の瞳と",					 20, 174, 175, 50 },
+{ "あなたは緑の瞳と",					 40, 174, 175, 50 },
+{ "あなたは黄色い瞳と",					 60, 174, 175, 50 },
+{ "あなたは青い瞳と",					 80, 174, 175, 50 },
+{ "あなたは赤い瞳と",					100, 174, 175, 50 },
+#else
+{ "You have black eyes, ",				 20, 174, 175, 50 },
+{ "You have green eyes, ",				 40, 174, 175, 50 },
+{ "You have yellow eyes, ",				 60, 174, 175, 50 },
+{ "You have blue eyes, ",				 80, 174, 175, 50 },
+{ "You have red eyes, ",				100, 174, 175, 55 },
+#endif
+
+#ifdef JP
+{ "海藻の様な髪を持っています。",			 25, 175, 0, 50 },
+{ "珊瑚のような角を持っています。",			 50, 175, 0, 50 },
+{ "地上人に似た髪を持っています。",			 75, 175, 0, 50 },
+{ "大きく発達した鰓を持っています。",		100, 175, 0, 50 },
+#else
+{ "hair like seaweed.",			 25, 175, 0, 50 },
+{ "coral-like horns.",			 50, 175, 0, 50 },
+{ "hair similar to land races.",	 75, 175, 0, 50 },
+{ "large gills.",		        100, 175, 0, 50 },
+#endif
+
 };

--- a/src/monster2.c
+++ b/src/monster2.c
@@ -2388,8 +2388,8 @@ static MONRACE_IDX initial_r_appearance(player_type *player_ptr, MONRACE_IDX r_i
 	floor_type *floor_ptr = player_ptr->current_floor_ptr;
 	if (player_ptr->pseikaku == SEIKAKU_CHARGEMAN && !(generate_mode & (PM_MULTIPLY | PM_KAGE)))
 	{
-		if (floor_ptr->base_level == 0 ||
-			(one_in_(5) && my_strchr("hkoptuyAHOPTUVY", r_info[r_idx].d_char))) return MON_ALIEN_JURAL;
+		if ((one_in_(5) || (floor_ptr->base_level == 0) &&
+				!(r_info[r_idx].flags1 & RF1_UNIQUE) && my_strchr("hkoptuyAHLOPTUVY", r_info[r_idx].d_char))) return MON_ALIEN_JURAL;
 	}
 
 	if (!(r_info[r_idx].flags7 & RF7_TANUKI))