• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revision7f3050269a21eb393160651fd5afc5495600be5f (tree)
Time2019-02-14 23:21:01
AuthorDeskull <deskull@user...>
CommiterDeskull

Log Message

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

Change Summary

Incremental Difference

--- a/src/store.c
+++ b/src/store.c
@@ -1918,229 +1918,235 @@ static byte rgold_adj[MAX_RACES][MAX_RACES] =
19181918 /*Hum, HfE, Elf, Hal, Gno, Dwa, HfO, HfT, Dun, HiE, Barbarian,
19191919 HfOg, HGn, HTn, Cyc, Yek, Klc, Kbd, Nbl, DkE, Drc, Mind Flayer,
19201920 Imp, Glm, Skl, Zombie, Vampire, Spectre, Fairy, Beastman, Ent,
1921- Angel, Demon, Kutar */
1921+ Angel, Demon, Kutar, Android, Merfolk */
19221922
19231923 /* Human */
19241924 { 100, 105, 105, 110, 113, 115, 120, 125, 100, 105, 100,
19251925 124, 120, 110, 125, 115, 120, 120, 120, 120, 115, 120,
19261926 115, 105, 125, 125, 125, 125, 105, 120, 105, 95, 140,
1927- 100, 120, 110, 105 },
1927+ 100, 120, 110, 105, 110 },
19281928
19291929 /* Half-Elf */
19301930 { 110, 100, 100, 105, 110, 120, 125, 130, 110, 100, 110,
19311931 120, 115, 108, 115, 110, 110, 120, 120, 115, 115, 110,
19321932 120, 110, 110, 110, 120, 110, 100, 125, 100, 95, 140,
1933- 110, 115, 110, 110 },
1933+ 110, 115, 110, 110, 110 },
19341934
19351935 /* Elf */
19361936 { 110, 105, 100, 105, 110, 120, 125, 130, 110, 100, 110,
19371937 120, 120, 105, 120, 110, 105, 125, 125, 110, 115, 108,
19381938 120, 115, 110, 110, 120, 110, 100, 125, 100, 95, 140,
1939- 110, 110, 105, 110 },
1939+ 110, 110, 105, 110, 110 },
19401940
19411941 /* Halfling */
19421942 { 115, 110, 105, 95, 105, 110, 115, 130, 115, 105, 115,
19431943 125, 120, 120, 125, 115, 110, 120, 120, 120, 115, 115,
19441944 120, 110, 120, 120, 130, 110, 110, 130, 110, 95, 140,
1945- 115, 120, 105, 115 },
1945+ 115, 120, 105, 115, 105 },
19461946
19471947 /* Gnome */
19481948 { 115, 115, 110, 105, 95, 110, 115, 130, 115, 110, 115,
19491949 120, 125, 110, 120, 110, 105, 120, 110, 110, 105, 110,
19501950 120, 101, 110, 110, 120, 120, 115, 130, 115, 95, 140,
1951- 115, 110, 110, 115 },
1951+ 115, 110, 110, 115, 110 },
19521952
19531953 /* Dwarf */
19541954 { 115, 120, 120, 110, 110, 95, 125, 135, 115, 120, 115,
19551955 125, 140, 130, 130, 120, 115, 115, 115, 135, 125, 120,
19561956 120, 105, 115, 115, 115, 115, 120, 130, 120, 95, 140,
1957- 115, 110, 115, 115 },
1957+ 115, 110, 115, 115, 120 },
19581958
19591959 /* Half-Orc */
19601960 { 115, 120, 125, 115, 115, 130, 110, 115, 115, 125, 115,
19611961 110, 110, 120, 110, 120, 125, 115, 115, 110, 120, 110,
19621962 115, 125, 120, 120, 115, 120, 125, 115, 125, 95, 140,
1963- 115, 110, 115, 115 },
1963+ 115, 110, 115, 115, 125 },
19641964
19651965 /* Half-Troll */
19661966 { 110, 115, 115, 110, 110, 130, 110, 110, 110, 115, 110,
19671967 110, 115, 120, 110, 120, 120, 110, 110, 110, 115, 110,
19681968 110, 115, 112, 112, 115, 112, 120, 110, 120, 95, 140,
1969- 110, 110, 115, 110 },
1969+ 110, 110, 115, 110, 130 },
19701970
19711971 /* Amberite */
19721972 { 100, 105, 105, 110, 113, 115, 120, 125, 100, 105, 100,
19731973 120, 120, 105, 120, 115, 105, 115, 120, 110, 105, 105,
19741974 120, 105, 120, 120, 125, 120, 105, 135, 105, 95, 140,
1975- 100, 110, 110, 100 },
1975+ 100, 110, 110, 100, 110 },
19761976
19771977 /* High_Elf */
19781978 { 110, 105, 100, 105, 110, 120, 125, 130, 110, 100, 110,
19791979 125, 125, 101, 120, 115, 110, 115, 125, 110, 110, 110,
19801980 125, 115, 120, 120, 125, 120, 100, 125, 100, 95, 140,
1981- 110, 110, 105, 110 },
1981+ 110, 110, 105, 110, 110 },
19821982
19831983 /* Human / Barbarian (copied from human) */
19841984 { 100, 105, 105, 110, 113, 115, 120, 125, 100, 105, 100,
19851985 124, 120, 110, 125, 115, 120, 120, 120, 120, 115, 120,
19861986 115, 105, 125, 125, 130, 125, 115, 120, 115, 95, 140,
1987- 100, 120, 110, 100 },
1987+ 100, 120, 110, 100, 110 },
19881988
19891989 /* Half-Ogre: theoretical, copied from half-troll */
19901990 { 110, 115, 115, 110, 110, 130, 110, 110, 110, 115, 110,
19911991 110, 115, 120, 110, 120, 120, 110, 110, 110, 115, 110,
19921992 110, 115, 112, 112, 115, 112, 120, 110, 120, 95, 140,
1993- 110, 110, 115, 110 },
1993+ 110, 110, 115, 110, 120 },
19941994
19951995 /* Half-Giant: theoretical, copied from half-troll */
19961996 { 110, 115, 115, 110, 110, 130, 110, 110, 110, 115, 110,
19971997 110, 115, 120, 110, 120, 120, 110, 110, 110, 115, 110,
19981998 110, 115, 112, 112, 115, 112, 130, 120, 130, 95, 140,
1999- 110, 110, 115, 110 },
1999+ 110, 110, 115, 110, 115 },
20002000
20012001 /* Half-Titan: theoretical, copied from High_Elf */
20022002 { 110, 105, 100, 105, 110, 120, 125, 130, 110, 100, 110,
20032003 125, 125, 101, 120, 115, 110, 115, 125, 110, 110, 110,
20042004 125, 115, 120, 120, 120, 120, 130, 130, 130, 95, 140,
2005- 110, 110, 115, 110 },
2005+ 110, 110, 115, 110, 108 },
20062006
20072007 /* Cyclops: theoretical, copied from half-troll */
20082008 { 110, 115, 115, 110, 110, 130, 110, 110, 110, 115, 110,
20092009 110, 115, 120, 110, 120, 120, 110, 110, 110, 115, 110,
20102010 110, 115, 112, 112, 115, 112, 130, 130, 130, 95, 140,
2011- 110, 110, 115, 110 },
2011+ 110, 110, 115, 110, 115 },
20122012
20132013 /* Yeek: theoretical, copied from Half-Orc */
20142014 { 115, 120, 125, 115, 115, 130, 110, 115, 115, 125, 115,
20152015 110, 110, 120, 110, 120, 125, 115, 115, 110, 120, 110,
20162016 115, 125, 120, 120, 120, 120, 130, 130, 130, 95, 140,
2017- 115, 110, 115, 115 },
2017+ 115, 110, 115, 115, 110 },
20182018
20192019 /* Klackon: theoretical, copied from Gnome */
20202020 { 115, 115, 110, 105, 95, 110, 115, 130, 115, 110, 115,
20212021 120, 125, 110, 120, 110, 105, 120, 110, 110, 105, 110,
20222022 120, 101, 110, 110, 120, 120, 130, 130, 130, 95, 140,
2023- 115, 110, 115, 115 },
2023+ 115, 110, 115, 115, 110 },
20242024
20252025 /* Kobold: theoretical, copied from Half-Orc */
20262026 { 115, 120, 125, 115, 115, 130, 110, 115, 115, 125, 115,
20272027 110, 110, 120, 110, 120, 125, 115, 115, 110, 120, 110,
20282028 115, 125, 120, 120, 120, 120, 130, 130, 130, 95, 140,
2029- 115, 110, 115, 115 },
2029+ 115, 110, 115, 115, 120 },
20302030
20312031 /* Nibelung: theoretical, copied from Dwarf */
20322032 { 115, 120, 120, 110, 110, 95, 125, 135, 115, 120, 115,
20332033 125, 140, 130, 130, 120, 115, 115, 115, 135, 125, 120,
20342034 120, 105, 115, 115, 120, 120, 130, 130, 130, 95, 140,
2035- 115, 135, 115, 115 },
2035+ 115, 135, 115, 115, 120 },
20362036
20372037 /* Dark Elf */
20382038 { 110, 110, 110, 115, 120, 130, 115, 115, 120, 110, 115,
20392039 115, 115, 116, 115, 120, 120, 115, 115, 101, 110, 110,
20402040 110, 110, 112, 122, 110, 110, 110, 115, 110, 120, 120,
2041- 110, 101, 115, 110 },
2041+ 110, 101, 115, 110, 115 },
20422042
20432043 /* Draconian: theoretical, copied from High_Elf */
20442044 { 110, 105, 100, 105, 110, 120, 125, 130, 110, 100, 110,
20452045 125, 125, 101, 120, 115, 110, 115, 125, 110, 110, 110,
20462046 125, 115, 120, 120, 120, 120, 130, 130, 130, 95, 140,
2047- 110, 110, 115, 110 },
2047+ 110, 110, 115, 110, 115 },
20482048
20492049 /* Mind Flayer: theoretical, copied from High_Elf */
20502050 { 110, 105, 100, 105, 110, 120, 125, 130, 110, 100, 110,
20512051 125, 125, 101, 120, 115, 110, 115, 125, 110, 110, 110,
20522052 125, 115, 120, 120, 120, 120, 130, 130, 130, 95, 140,
2053- 110, 110, 115, 110 },
2053+ 110, 110, 115, 110, 110 },
20542054
20552055 /* Imp: theoretical, copied from High_Elf */
20562056 { 110, 105, 100, 105, 110, 120, 125, 130, 110, 100, 110,
20572057 125, 125, 101, 120, 115, 110, 115, 125, 110, 110, 110,
20582058 125, 115, 120, 120, 120, 120, 130, 130, 130, 120, 120,
2059- 110, 110, 115, 110 },
2059+ 110, 110, 115, 110, 120 },
20602060
20612061 /* Golem: theoretical, copied from High_Elf */
20622062 { 110, 105, 100, 105, 110, 120, 125, 130, 110, 100, 110,
20632063 125, 125, 101, 120, 115, 110, 115, 125, 110, 110, 110,
20642064 125, 115, 120, 120, 120, 120, 130, 130, 130, 95, 140,
2065- 110, 110, 115, 110 },
2065+ 110, 110, 115, 110, 110 },
20662066
20672067 /* Skeleton: theoretical, copied from half-orc */
20682068 { 115, 120, 125, 115, 115, 130, 110, 115, 115, 125, 115,
20692069 110, 110, 120, 110, 120, 125, 115, 115, 110, 120, 110,
20702070 115, 125, 120, 120, 120, 120, 130, 130, 130, 120, 120,
2071- 115, 110, 125, 115 },
2071+ 115, 110, 125, 115, 110 },
20722072
20732073 /* Zombie: Theoretical, copied from half-orc */
20742074 { 115, 120, 125, 115, 115, 130, 110, 115, 115, 125, 115,
20752075 110, 110, 120, 110, 120, 125, 115, 115, 110, 120, 110,
20762076 115, 125, 120, 120, 120, 120, 130, 130, 130, 120, 120,
2077- 115, 110, 125, 115 },
2077+ 115, 110, 125, 115, 110 },
20782078
20792079 /* Vampire: Theoretical, copied from half-orc */
20802080 { 115, 120, 125, 115, 115, 130, 110, 115, 115, 125, 115,
20812081 110, 110, 120, 110, 120, 125, 115, 115, 110, 120, 110,
20822082 115, 125, 120, 120, 120, 120, 130, 130, 130, 120, 120,
2083- 115, 110, 125, 115 },
2083+ 115, 110, 125, 115, 120 },
20842084
20852085 /* Spectre: Theoretical, copied from half-orc */
20862086 { 115, 120, 125, 115, 115, 130, 110, 115, 115, 125, 115,
20872087 110, 110, 120, 110, 120, 125, 115, 115, 110, 120, 110,
20882088 115, 125, 120, 120, 120, 120, 130, 130, 130, 120, 120,
2089- 115, 110, 125, 115 },
2089+ 115, 110, 125, 115, 110 },
20902090
20912091 /* Sprite: Theoretical, copied from half-orc */
20922092 { 115, 120, 125, 115, 115, 130, 110, 115, 115, 125, 115,
20932093 110, 110, 120, 110, 120, 125, 115, 115, 110, 120, 110,
20942094 115, 125, 120, 120, 120, 120, 130, 130, 130, 95, 140,
2095- 115, 110, 105, 115 },
2095+ 115, 110, 105, 115, 110 },
20962096
20972097 /* Beastman: Theoretical, copied from half-orc */
20982098 { 115, 120, 125, 115, 115, 130, 110, 115, 115, 125, 115,
20992099 110, 110, 120, 110, 120, 125, 115, 115, 110, 120, 110,
21002100 115, 125, 120, 120, 120, 120, 130, 130, 130, 95, 140,
2101- 115, 110, 115, 115 },
2101+ 115, 110, 115, 115, 125 },
21022102
21032103 /* Ent */
21042104 { 110, 105, 100, 105, 110, 120, 125, 130, 110, 100, 110,
21052105 120, 120, 105, 120, 110, 105, 125, 125, 110, 115, 108,
21062106 120, 115, 110, 110, 120, 110, 100, 125, 100, 95, 140,
2107- 110, 110, 105, 110 },
2107+ 110, 110, 105, 110, 110 },
21082108
21092109 /* Angel */
21102110 { 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
21112111 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
21122112 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 160,
2113- 95, 95, 95, 95 },
2113+ 95, 95, 95, 95, 95 },
21142114
21152115 /* Demon */
21162116 { 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
21172117 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140,
21182118 140, 140, 140, 140, 140, 140, 140, 140, 140, 160, 120,
2119- 140, 140, 140, 140 },
2119+ 140, 140, 140, 140, 140 },
21202120
21212121 /* Dunadan */
21222122 { 100, 105, 105, 110, 113, 115, 120, 125, 100, 105, 100,
21232123 124, 120, 110, 125, 115, 120, 120, 120, 120, 115, 120,
21242124 115, 105, 125, 125, 125, 125, 105, 120, 105, 95, 140,
2125- 100, 120, 110, 100 },
2125+ 100, 120, 110, 100, 110 },
21262126
21272127 /* Shadow Fairy */
21282128 { 110, 110, 110, 115, 120, 130, 115, 115, 120, 110, 115,
21292129 115, 115, 116, 115, 120, 120, 115, 115, 101, 110, 110,
21302130 110, 110, 112, 122, 110, 110, 110, 115, 110, 120, 120,
2131- 110, 101, 115, 110 },
2131+ 110, 101, 115, 110, 115 },
21322132
21332133 /* Kutar */
21342134 { 110, 110, 105, 105, 110, 115, 115, 115, 110, 105, 110,
21352135 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115,
21362136 115, 115, 125, 125, 125, 125, 105, 115, 105, 95, 140,
2137- 110, 115, 100, 110 },
2137+ 110, 115, 100, 110, 110 },
21382138
21392139 /* Android */
21402140 { 105, 105, 105, 110, 113, 115, 120, 125, 100, 105, 100,
21412141 124, 120, 110, 125, 115, 120, 120, 120, 120, 115, 120,
21422142 115, 105, 125, 125, 125, 125, 105, 120, 105, 95, 140,
2143- 100, 120, 110, 100 },
2143+ 100, 120, 110, 100, 110 },
2144+
2145+ /* Merfolk */
2146+ { 110, 110, 110, 105, 110, 120, 125, 130, 110, 110, 110,
2147+ 120, 115, 108, 115, 110, 110, 120, 120, 115, 115, 110,
2148+ 120, 110, 110, 110, 120, 110, 110, 125, 110, 95, 140,
2149+ 110, 115, 110, 110, 100 },
21442150 };
21452151
21462152
Show on old repository browser