[Fix] #38796 マーフォーク用の rgold_adj を追加。 / Add to rgold_adj for Merfolk.

diff --git a/src/store.c b/src/store.c
index 7223197..d3608dc 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -1918,229 +1918,235 @@ static byte rgold_adj[MAX_RACES][MAX_RACES] =
        /*Hum, HfE, Elf,  Hal, Gno, Dwa, HfO, HfT, Dun, HiE, Barbarian,
         HfOg, HGn, HTn, Cyc, Yek, Klc, Kbd, Nbl, DkE, Drc, Mind Flayer,
         Imp,  Glm, Skl, Zombie, Vampire, Spectre, Fairy, Beastman, Ent,
-        Angel, Demon, Kutar */
+        Angel, Demon, Kutar, Android, Merfolk */
 
        /* Human */
        { 100, 105, 105, 110, 113, 115, 120, 125, 100, 105, 100,
          124, 120, 110, 125, 115, 120, 120, 120, 120, 115, 120,
          115, 105, 125, 125, 125, 125, 105, 120, 105,  95, 140,
-         100, 120, 110, 105 },
+         100, 120, 110, 105, 110 },
 
        /* Half-Elf */
        { 110, 100, 100, 105, 110, 120, 125, 130, 110, 100, 110,
          120, 115, 108, 115, 110, 110, 120, 120, 115, 115, 110,
          120, 110, 110, 110, 120, 110, 100, 125, 100,  95, 140,
-         110, 115, 110, 110 },
+         110, 115, 110, 110, 110 },
 
        /* Elf */
        { 110, 105, 100, 105, 110, 120, 125, 130, 110, 100, 110,
          120, 120, 105, 120, 110, 105, 125, 125, 110, 115, 108,
          120, 115, 110, 110, 120, 110, 100, 125, 100,  95, 140,
-         110, 110, 105, 110 },
+         110, 110, 105, 110, 110 },
 
        /* Halfling */
        { 115, 110, 105,  95, 105, 110, 115, 130, 115, 105, 115,
          125, 120, 120, 125, 115, 110, 120, 120, 120, 115, 115,
          120, 110, 120, 120, 130, 110, 110, 130, 110,  95, 140,
-         115, 120, 105, 115 },
+         115, 120, 105, 115, 105 },
 
        /* Gnome */
        { 115, 115, 110, 105,  95, 110, 115, 130, 115, 110, 115,
          120, 125, 110, 120, 110, 105, 120, 110, 110, 105, 110,
          120, 101, 110, 110, 120, 120, 115, 130, 115,  95, 140,
-         115, 110, 110, 115 },
+         115, 110, 110, 115, 110 },
 
        /* Dwarf */
        { 115, 120, 120, 110, 110,  95, 125, 135, 115, 120, 115,
          125, 140, 130, 130, 120, 115, 115, 115, 135, 125, 120,
          120, 105, 115, 115, 115, 115, 120, 130, 120,  95, 140,
-         115, 110, 115, 115 },
+         115, 110, 115, 115, 120 },
 
        /* Half-Orc */
        { 115, 120, 125, 115, 115, 130, 110, 115, 115, 125, 115,
          110, 110, 120, 110, 120, 125, 115, 115, 110, 120, 110,
          115, 125, 120, 120, 115, 120, 125, 115, 125,  95, 140,
-         115, 110, 115, 115 },
+         115, 110, 115, 115, 125 },
 
        /* Half-Troll */
        { 110, 115, 115, 110, 110, 130, 110, 110, 110, 115, 110,
          110, 115, 120, 110, 120, 120, 110, 110, 110, 115, 110,
          110, 115, 112, 112, 115, 112, 120, 110, 120,  95, 140,
-         110, 110, 115, 110 },
+         110, 110, 115, 110, 130 },
 
        /* Amberite */
        { 100, 105, 105, 110, 113, 115, 120, 125, 100, 105, 100,
          120, 120, 105, 120, 115, 105, 115, 120, 110, 105, 105,
          120, 105, 120, 120, 125, 120, 105, 135, 105,  95, 140,
-         100, 110, 110, 100 },
+         100, 110, 110, 100, 110 },
 
        /* High_Elf */
        { 110, 105, 100, 105, 110, 120, 125, 130, 110, 100, 110,
          125, 125, 101, 120, 115, 110, 115, 125, 110, 110, 110,
          125, 115, 120, 120, 125, 120, 100, 125, 100,  95, 140,
-         110, 110, 105, 110 },
+         110, 110, 105, 110, 110 },
 
        /* Human / Barbarian (copied from human) */
        { 100, 105, 105, 110, 113, 115, 120, 125, 100, 105, 100,
          124, 120, 110, 125, 115, 120, 120, 120, 120, 115, 120,
          115, 105, 125, 125, 130, 125, 115, 120, 115,  95, 140,
-         100, 120, 110, 100 },
+         100, 120, 110, 100, 110 },
 
        /* Half-Ogre: theoretical, copied from half-troll */
        { 110, 115, 115, 110, 110, 130, 110, 110, 110, 115, 110,
          110, 115, 120, 110, 120, 120, 110, 110, 110, 115, 110,
          110, 115, 112, 112, 115, 112, 120, 110, 120,  95, 140,
-         110, 110, 115, 110 },
+         110, 110, 115, 110, 120 },
 
        /* Half-Giant: theoretical, copied from half-troll */
        { 110, 115, 115, 110, 110, 130, 110, 110, 110, 115, 110,
          110, 115, 120, 110, 120, 120, 110, 110, 110, 115, 110,
          110, 115, 112, 112, 115, 112, 130, 120, 130,  95, 140,
-         110, 110, 115, 110 },
+         110, 110, 115, 110, 115 },
 
        /* Half-Titan: theoretical, copied from High_Elf */
        { 110, 105, 100, 105, 110, 120, 125, 130, 110, 100, 110,
          125, 125, 101, 120, 115, 110, 115, 125, 110, 110, 110,
          125, 115, 120, 120, 120, 120, 130, 130, 130,  95, 140,
-         110, 110, 115, 110 },
+         110, 110, 115, 110, 108 },
 
        /* Cyclops: theoretical, copied from half-troll */
        { 110, 115, 115, 110, 110, 130, 110, 110, 110, 115, 110,
          110, 115, 120, 110, 120, 120, 110, 110, 110, 115, 110,
          110, 115, 112, 112, 115, 112, 130, 130, 130,  95, 140,
-         110, 110, 115, 110 },
+         110, 110, 115, 110, 115 },
 
        /* Yeek: theoretical, copied from Half-Orc */
        { 115, 120, 125, 115, 115, 130, 110, 115, 115, 125, 115,
          110, 110, 120, 110, 120, 125, 115, 115, 110, 120, 110,
          115, 125, 120, 120, 120, 120, 130, 130, 130,  95, 140,
-         115, 110, 115, 115 },
+         115, 110, 115, 115, 110 },
 
        /* Klackon: theoretical, copied from Gnome */
        { 115, 115, 110, 105,  95, 110, 115, 130, 115, 110, 115,
          120, 125, 110, 120, 110, 105, 120, 110, 110, 105, 110,
          120, 101, 110, 110, 120, 120, 130, 130, 130,  95, 140,
-         115, 110, 115, 115 },
+         115, 110, 115, 115, 110 },
 
        /* Kobold: theoretical, copied from Half-Orc */
        { 115, 120, 125, 115, 115, 130, 110, 115, 115, 125, 115,
          110, 110, 120, 110, 120, 125, 115, 115, 110, 120, 110,
          115, 125, 120, 120, 120, 120, 130, 130, 130,  95, 140,
-         115, 110, 115, 115 },
+         115, 110, 115, 115, 120 },
 
        /* Nibelung: theoretical, copied from Dwarf */
        { 115, 120, 120, 110, 110,  95, 125, 135, 115, 120, 115,
          125, 140, 130, 130, 120, 115, 115, 115, 135, 125, 120,
          120, 105, 115, 115, 120, 120, 130, 130, 130,  95, 140,
-         115, 135, 115, 115 },
+         115, 135, 115, 115, 120 },
 
        /* Dark Elf */
        { 110, 110, 110, 115, 120, 130, 115, 115, 120, 110, 115,
          115, 115, 116, 115, 120, 120, 115, 115, 101, 110, 110,
          110, 110, 112, 122, 110, 110, 110, 115, 110, 120, 120,
-         110, 101, 115, 110 },
+         110, 101, 115, 110, 115 },
 
        /* Draconian: theoretical, copied from High_Elf */
        { 110, 105, 100, 105, 110, 120, 125, 130, 110, 100, 110,
          125, 125, 101, 120, 115, 110, 115, 125, 110, 110, 110,
          125, 115, 120, 120, 120, 120, 130, 130, 130,  95, 140,
-         110, 110, 115, 110 },
+         110, 110, 115, 110, 115 },
 
        /* Mind Flayer: theoretical, copied from High_Elf */
        { 110, 105, 100, 105, 110, 120, 125, 130, 110, 100, 110,
          125, 125, 101, 120, 115, 110, 115, 125, 110, 110, 110,
          125, 115, 120, 120, 120, 120, 130, 130, 130,  95, 140,
-         110, 110, 115, 110 },
+         110, 110, 115, 110, 110 },
 
        /* Imp: theoretical, copied from High_Elf */
        { 110, 105, 100, 105, 110, 120, 125, 130, 110, 100, 110,
          125, 125, 101, 120, 115, 110, 115, 125, 110, 110, 110,
          125, 115, 120, 120, 120, 120, 130, 130, 130, 120, 120,
-         110, 110, 115, 110 },
+         110, 110, 115, 110, 120 },
 
        /* Golem: theoretical, copied from High_Elf */
        { 110, 105, 100, 105, 110, 120, 125, 130, 110, 100, 110,
          125, 125, 101, 120, 115, 110, 115, 125, 110, 110, 110,
          125, 115, 120, 120, 120, 120, 130, 130, 130,  95, 140,
-         110, 110, 115, 110 },
+         110, 110, 115, 110, 110 },
 
        /* Skeleton: theoretical, copied from half-orc */
        { 115, 120, 125, 115, 115, 130, 110, 115, 115, 125, 115,
          110, 110, 120, 110, 120, 125, 115, 115, 110, 120, 110,
          115, 125, 120, 120, 120, 120, 130, 130, 130, 120, 120,
-         115, 110, 125, 115 },
+         115, 110, 125, 115, 110 },
 
        /* Zombie: Theoretical, copied from half-orc */
        { 115, 120, 125, 115, 115, 130, 110, 115, 115, 125, 115,
          110, 110, 120, 110, 120, 125, 115, 115, 110, 120, 110,
          115, 125, 120, 120, 120, 120, 130, 130, 130, 120, 120,
-         115, 110, 125, 115 },
+         115, 110, 125, 115, 110 },
 
        /* Vampire: Theoretical, copied from half-orc */
        { 115, 120, 125, 115, 115, 130, 110, 115, 115, 125, 115,
          110, 110, 120, 110, 120, 125, 115, 115, 110, 120, 110,
          115, 125, 120, 120, 120, 120, 130, 130, 130, 120, 120,
-         115, 110, 125, 115 },
+         115, 110, 125, 115, 120 },
 
        /* Spectre: Theoretical, copied from half-orc */
        { 115, 120, 125, 115, 115, 130, 110, 115, 115, 125, 115,
          110, 110, 120, 110, 120, 125, 115, 115, 110, 120, 110,
          115, 125, 120, 120, 120, 120, 130, 130, 130, 120, 120,
-         115, 110, 125, 115 },
+         115, 110, 125, 115, 110 },
 
        /* Sprite: Theoretical, copied from half-orc */
        { 115, 120, 125, 115, 115, 130, 110, 115, 115, 125, 115,
          110, 110, 120, 110, 120, 125, 115, 115, 110, 120, 110,
          115, 125, 120, 120, 120, 120, 130, 130, 130,  95, 140,
-         115, 110, 105, 115 },
+         115, 110, 105, 115, 110 },
 
        /* Beastman: Theoretical, copied from half-orc */
        { 115, 120, 125, 115, 115, 130, 110, 115, 115, 125, 115,
          110, 110, 120, 110, 120, 125, 115, 115, 110, 120, 110,
          115, 125, 120, 120, 120, 120, 130, 130, 130,  95, 140,
-         115, 110, 115, 115 },
+         115, 110, 115, 115, 125 },
 
        /* Ent */
        { 110, 105, 100, 105, 110, 120, 125, 130, 110, 100, 110,
          120, 120, 105, 120, 110, 105, 125, 125, 110, 115, 108,
          120, 115, 110, 110, 120, 110, 100, 125, 100,  95, 140,
-         110, 110, 105, 110 },
+         110, 110, 105, 110, 110 },
 
        /* Angel */
        {  95,  95,  95,  95,  95,  95,  95,  95,  95,  95,  95,
           95,  95,  95,  95,  95,  95,  95,  95,  95,  95,  95,
           95,  95,  95,  95,  95,  95,  95,  95,  95,  95, 160,
-          95,  95,  95,  95 },
+          95,  95,  95,  95,  95 },
 
        /* Demon */
        { 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
          140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
          140, 140, 140, 140, 140, 140, 140, 140, 140, 160, 120,
-         140, 140, 140, 140 },
+         140, 140, 140, 140, 140 },
 
        /* Dunadan */
        { 100, 105, 105, 110, 113, 115, 120, 125, 100, 105, 100,
          124, 120, 110, 125, 115, 120, 120, 120, 120, 115, 120,
          115, 105, 125, 125, 125, 125, 105, 120, 105,  95, 140,
-         100, 120, 110, 100 },
+         100, 120, 110, 100, 110 },
 
        /* Shadow Fairy */
        { 110, 110, 110, 115, 120, 130, 115, 115, 120, 110, 115,
          115, 115, 116, 115, 120, 120, 115, 115, 101, 110, 110,
          110, 110, 112, 122, 110, 110, 110, 115, 110, 120, 120,
-         110, 101, 115, 110 },
+         110, 101, 115, 110, 115 },
 
        /* Kutar */
        { 110, 110, 105, 105, 110, 115, 115, 115, 110, 105, 110,
          115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115,
          115, 115, 125, 125, 125, 125, 105, 115, 105,  95, 140,
-         110, 115, 100, 110 },
+         110, 115, 100, 110, 110 },
 
        /* Android */
        { 105, 105, 105, 110, 113, 115, 120, 125, 100, 105, 100,
          124, 120, 110, 125, 115, 120, 120, 120, 120, 115, 120,
          115, 105, 125, 125, 125, 125, 105, 120, 105,  95, 140,
-         100, 120, 110, 100 },
+         100, 120, 110, 100, 110 },
+
+       /* Merfolk */
+       { 110, 110, 110, 105, 110, 120, 125, 130, 110, 110, 110,
+         120, 115, 108, 115, 110, 110, 120, 120, 115, 115, 110,
+         120, 110, 110, 110, 120, 110, 110, 125, 110,  95, 140,
+         110, 115, 110, 110, 100 },
 };