変愚蛮怒のメインリポジトリです
修订版 | 7f3050269a21eb393160651fd5afc5495600be5f (tree) |
---|---|
时间 | 2019-02-14 23:21:01 |
作者 | Deskull <deskull@user...> |
Commiter | Deskull |
[Fix] #38796 マーフォーク用の rgold_adj を追加。 / Add to rgold_adj for Merfolk.
@@ -1918,229 +1918,235 @@ static byte rgold_adj[MAX_RACES][MAX_RACES] = | ||
1918 | 1918 | /*Hum, HfE, Elf, Hal, Gno, Dwa, HfO, HfT, Dun, HiE, Barbarian, |
1919 | 1919 | HfOg, HGn, HTn, Cyc, Yek, Klc, Kbd, Nbl, DkE, Drc, Mind Flayer, |
1920 | 1920 | Imp, Glm, Skl, Zombie, Vampire, Spectre, Fairy, Beastman, Ent, |
1921 | - Angel, Demon, Kutar */ | |
1921 | + Angel, Demon, Kutar, Android, Merfolk */ | |
1922 | 1922 | |
1923 | 1923 | /* Human */ |
1924 | 1924 | { 100, 105, 105, 110, 113, 115, 120, 125, 100, 105, 100, |
1925 | 1925 | 124, 120, 110, 125, 115, 120, 120, 120, 120, 115, 120, |
1926 | 1926 | 115, 105, 125, 125, 125, 125, 105, 120, 105, 95, 140, |
1927 | - 100, 120, 110, 105 }, | |
1927 | + 100, 120, 110, 105, 110 }, | |
1928 | 1928 | |
1929 | 1929 | /* Half-Elf */ |
1930 | 1930 | { 110, 100, 100, 105, 110, 120, 125, 130, 110, 100, 110, |
1931 | 1931 | 120, 115, 108, 115, 110, 110, 120, 120, 115, 115, 110, |
1932 | 1932 | 120, 110, 110, 110, 120, 110, 100, 125, 100, 95, 140, |
1933 | - 110, 115, 110, 110 }, | |
1933 | + 110, 115, 110, 110, 110 }, | |
1934 | 1934 | |
1935 | 1935 | /* Elf */ |
1936 | 1936 | { 110, 105, 100, 105, 110, 120, 125, 130, 110, 100, 110, |
1937 | 1937 | 120, 120, 105, 120, 110, 105, 125, 125, 110, 115, 108, |
1938 | 1938 | 120, 115, 110, 110, 120, 110, 100, 125, 100, 95, 140, |
1939 | - 110, 110, 105, 110 }, | |
1939 | + 110, 110, 105, 110, 110 }, | |
1940 | 1940 | |
1941 | 1941 | /* Halfling */ |
1942 | 1942 | { 115, 110, 105, 95, 105, 110, 115, 130, 115, 105, 115, |
1943 | 1943 | 125, 120, 120, 125, 115, 110, 120, 120, 120, 115, 115, |
1944 | 1944 | 120, 110, 120, 120, 130, 110, 110, 130, 110, 95, 140, |
1945 | - 115, 120, 105, 115 }, | |
1945 | + 115, 120, 105, 115, 105 }, | |
1946 | 1946 | |
1947 | 1947 | /* Gnome */ |
1948 | 1948 | { 115, 115, 110, 105, 95, 110, 115, 130, 115, 110, 115, |
1949 | 1949 | 120, 125, 110, 120, 110, 105, 120, 110, 110, 105, 110, |
1950 | 1950 | 120, 101, 110, 110, 120, 120, 115, 130, 115, 95, 140, |
1951 | - 115, 110, 110, 115 }, | |
1951 | + 115, 110, 110, 115, 110 }, | |
1952 | 1952 | |
1953 | 1953 | /* Dwarf */ |
1954 | 1954 | { 115, 120, 120, 110, 110, 95, 125, 135, 115, 120, 115, |
1955 | 1955 | 125, 140, 130, 130, 120, 115, 115, 115, 135, 125, 120, |
1956 | 1956 | 120, 105, 115, 115, 115, 115, 120, 130, 120, 95, 140, |
1957 | - 115, 110, 115, 115 }, | |
1957 | + 115, 110, 115, 115, 120 }, | |
1958 | 1958 | |
1959 | 1959 | /* Half-Orc */ |
1960 | 1960 | { 115, 120, 125, 115, 115, 130, 110, 115, 115, 125, 115, |
1961 | 1961 | 110, 110, 120, 110, 120, 125, 115, 115, 110, 120, 110, |
1962 | 1962 | 115, 125, 120, 120, 115, 120, 125, 115, 125, 95, 140, |
1963 | - 115, 110, 115, 115 }, | |
1963 | + 115, 110, 115, 115, 125 }, | |
1964 | 1964 | |
1965 | 1965 | /* Half-Troll */ |
1966 | 1966 | { 110, 115, 115, 110, 110, 130, 110, 110, 110, 115, 110, |
1967 | 1967 | 110, 115, 120, 110, 120, 120, 110, 110, 110, 115, 110, |
1968 | 1968 | 110, 115, 112, 112, 115, 112, 120, 110, 120, 95, 140, |
1969 | - 110, 110, 115, 110 }, | |
1969 | + 110, 110, 115, 110, 130 }, | |
1970 | 1970 | |
1971 | 1971 | /* Amberite */ |
1972 | 1972 | { 100, 105, 105, 110, 113, 115, 120, 125, 100, 105, 100, |
1973 | 1973 | 120, 120, 105, 120, 115, 105, 115, 120, 110, 105, 105, |
1974 | 1974 | 120, 105, 120, 120, 125, 120, 105, 135, 105, 95, 140, |
1975 | - 100, 110, 110, 100 }, | |
1975 | + 100, 110, 110, 100, 110 }, | |
1976 | 1976 | |
1977 | 1977 | /* High_Elf */ |
1978 | 1978 | { 110, 105, 100, 105, 110, 120, 125, 130, 110, 100, 110, |
1979 | 1979 | 125, 125, 101, 120, 115, 110, 115, 125, 110, 110, 110, |
1980 | 1980 | 125, 115, 120, 120, 125, 120, 100, 125, 100, 95, 140, |
1981 | - 110, 110, 105, 110 }, | |
1981 | + 110, 110, 105, 110, 110 }, | |
1982 | 1982 | |
1983 | 1983 | /* Human / Barbarian (copied from human) */ |
1984 | 1984 | { 100, 105, 105, 110, 113, 115, 120, 125, 100, 105, 100, |
1985 | 1985 | 124, 120, 110, 125, 115, 120, 120, 120, 120, 115, 120, |
1986 | 1986 | 115, 105, 125, 125, 130, 125, 115, 120, 115, 95, 140, |
1987 | - 100, 120, 110, 100 }, | |
1987 | + 100, 120, 110, 100, 110 }, | |
1988 | 1988 | |
1989 | 1989 | /* Half-Ogre: theoretical, copied from half-troll */ |
1990 | 1990 | { 110, 115, 115, 110, 110, 130, 110, 110, 110, 115, 110, |
1991 | 1991 | 110, 115, 120, 110, 120, 120, 110, 110, 110, 115, 110, |
1992 | 1992 | 110, 115, 112, 112, 115, 112, 120, 110, 120, 95, 140, |
1993 | - 110, 110, 115, 110 }, | |
1993 | + 110, 110, 115, 110, 120 }, | |
1994 | 1994 | |
1995 | 1995 | /* Half-Giant: theoretical, copied from half-troll */ |
1996 | 1996 | { 110, 115, 115, 110, 110, 130, 110, 110, 110, 115, 110, |
1997 | 1997 | 110, 115, 120, 110, 120, 120, 110, 110, 110, 115, 110, |
1998 | 1998 | 110, 115, 112, 112, 115, 112, 130, 120, 130, 95, 140, |
1999 | - 110, 110, 115, 110 }, | |
1999 | + 110, 110, 115, 110, 115 }, | |
2000 | 2000 | |
2001 | 2001 | /* Half-Titan: theoretical, copied from High_Elf */ |
2002 | 2002 | { 110, 105, 100, 105, 110, 120, 125, 130, 110, 100, 110, |
2003 | 2003 | 125, 125, 101, 120, 115, 110, 115, 125, 110, 110, 110, |
2004 | 2004 | 125, 115, 120, 120, 120, 120, 130, 130, 130, 95, 140, |
2005 | - 110, 110, 115, 110 }, | |
2005 | + 110, 110, 115, 110, 108 }, | |
2006 | 2006 | |
2007 | 2007 | /* Cyclops: theoretical, copied from half-troll */ |
2008 | 2008 | { 110, 115, 115, 110, 110, 130, 110, 110, 110, 115, 110, |
2009 | 2009 | 110, 115, 120, 110, 120, 120, 110, 110, 110, 115, 110, |
2010 | 2010 | 110, 115, 112, 112, 115, 112, 130, 130, 130, 95, 140, |
2011 | - 110, 110, 115, 110 }, | |
2011 | + 110, 110, 115, 110, 115 }, | |
2012 | 2012 | |
2013 | 2013 | /* Yeek: theoretical, copied from Half-Orc */ |
2014 | 2014 | { 115, 120, 125, 115, 115, 130, 110, 115, 115, 125, 115, |
2015 | 2015 | 110, 110, 120, 110, 120, 125, 115, 115, 110, 120, 110, |
2016 | 2016 | 115, 125, 120, 120, 120, 120, 130, 130, 130, 95, 140, |
2017 | - 115, 110, 115, 115 }, | |
2017 | + 115, 110, 115, 115, 110 }, | |
2018 | 2018 | |
2019 | 2019 | /* Klackon: theoretical, copied from Gnome */ |
2020 | 2020 | { 115, 115, 110, 105, 95, 110, 115, 130, 115, 110, 115, |
2021 | 2021 | 120, 125, 110, 120, 110, 105, 120, 110, 110, 105, 110, |
2022 | 2022 | 120, 101, 110, 110, 120, 120, 130, 130, 130, 95, 140, |
2023 | - 115, 110, 115, 115 }, | |
2023 | + 115, 110, 115, 115, 110 }, | |
2024 | 2024 | |
2025 | 2025 | /* Kobold: theoretical, copied from Half-Orc */ |
2026 | 2026 | { 115, 120, 125, 115, 115, 130, 110, 115, 115, 125, 115, |
2027 | 2027 | 110, 110, 120, 110, 120, 125, 115, 115, 110, 120, 110, |
2028 | 2028 | 115, 125, 120, 120, 120, 120, 130, 130, 130, 95, 140, |
2029 | - 115, 110, 115, 115 }, | |
2029 | + 115, 110, 115, 115, 120 }, | |
2030 | 2030 | |
2031 | 2031 | /* Nibelung: theoretical, copied from Dwarf */ |
2032 | 2032 | { 115, 120, 120, 110, 110, 95, 125, 135, 115, 120, 115, |
2033 | 2033 | 125, 140, 130, 130, 120, 115, 115, 115, 135, 125, 120, |
2034 | 2034 | 120, 105, 115, 115, 120, 120, 130, 130, 130, 95, 140, |
2035 | - 115, 135, 115, 115 }, | |
2035 | + 115, 135, 115, 115, 120 }, | |
2036 | 2036 | |
2037 | 2037 | /* Dark Elf */ |
2038 | 2038 | { 110, 110, 110, 115, 120, 130, 115, 115, 120, 110, 115, |
2039 | 2039 | 115, 115, 116, 115, 120, 120, 115, 115, 101, 110, 110, |
2040 | 2040 | 110, 110, 112, 122, 110, 110, 110, 115, 110, 120, 120, |
2041 | - 110, 101, 115, 110 }, | |
2041 | + 110, 101, 115, 110, 115 }, | |
2042 | 2042 | |
2043 | 2043 | /* Draconian: theoretical, copied from High_Elf */ |
2044 | 2044 | { 110, 105, 100, 105, 110, 120, 125, 130, 110, 100, 110, |
2045 | 2045 | 125, 125, 101, 120, 115, 110, 115, 125, 110, 110, 110, |
2046 | 2046 | 125, 115, 120, 120, 120, 120, 130, 130, 130, 95, 140, |
2047 | - 110, 110, 115, 110 }, | |
2047 | + 110, 110, 115, 110, 115 }, | |
2048 | 2048 | |
2049 | 2049 | /* Mind Flayer: theoretical, copied from High_Elf */ |
2050 | 2050 | { 110, 105, 100, 105, 110, 120, 125, 130, 110, 100, 110, |
2051 | 2051 | 125, 125, 101, 120, 115, 110, 115, 125, 110, 110, 110, |
2052 | 2052 | 125, 115, 120, 120, 120, 120, 130, 130, 130, 95, 140, |
2053 | - 110, 110, 115, 110 }, | |
2053 | + 110, 110, 115, 110, 110 }, | |
2054 | 2054 | |
2055 | 2055 | /* Imp: theoretical, copied from High_Elf */ |
2056 | 2056 | { 110, 105, 100, 105, 110, 120, 125, 130, 110, 100, 110, |
2057 | 2057 | 125, 125, 101, 120, 115, 110, 115, 125, 110, 110, 110, |
2058 | 2058 | 125, 115, 120, 120, 120, 120, 130, 130, 130, 120, 120, |
2059 | - 110, 110, 115, 110 }, | |
2059 | + 110, 110, 115, 110, 120 }, | |
2060 | 2060 | |
2061 | 2061 | /* Golem: theoretical, copied from High_Elf */ |
2062 | 2062 | { 110, 105, 100, 105, 110, 120, 125, 130, 110, 100, 110, |
2063 | 2063 | 125, 125, 101, 120, 115, 110, 115, 125, 110, 110, 110, |
2064 | 2064 | 125, 115, 120, 120, 120, 120, 130, 130, 130, 95, 140, |
2065 | - 110, 110, 115, 110 }, | |
2065 | + 110, 110, 115, 110, 110 }, | |
2066 | 2066 | |
2067 | 2067 | /* Skeleton: theoretical, copied from half-orc */ |
2068 | 2068 | { 115, 120, 125, 115, 115, 130, 110, 115, 115, 125, 115, |
2069 | 2069 | 110, 110, 120, 110, 120, 125, 115, 115, 110, 120, 110, |
2070 | 2070 | 115, 125, 120, 120, 120, 120, 130, 130, 130, 120, 120, |
2071 | - 115, 110, 125, 115 }, | |
2071 | + 115, 110, 125, 115, 110 }, | |
2072 | 2072 | |
2073 | 2073 | /* Zombie: Theoretical, copied from half-orc */ |
2074 | 2074 | { 115, 120, 125, 115, 115, 130, 110, 115, 115, 125, 115, |
2075 | 2075 | 110, 110, 120, 110, 120, 125, 115, 115, 110, 120, 110, |
2076 | 2076 | 115, 125, 120, 120, 120, 120, 130, 130, 130, 120, 120, |
2077 | - 115, 110, 125, 115 }, | |
2077 | + 115, 110, 125, 115, 110 }, | |
2078 | 2078 | |
2079 | 2079 | /* Vampire: Theoretical, copied from half-orc */ |
2080 | 2080 | { 115, 120, 125, 115, 115, 130, 110, 115, 115, 125, 115, |
2081 | 2081 | 110, 110, 120, 110, 120, 125, 115, 115, 110, 120, 110, |
2082 | 2082 | 115, 125, 120, 120, 120, 120, 130, 130, 130, 120, 120, |
2083 | - 115, 110, 125, 115 }, | |
2083 | + 115, 110, 125, 115, 120 }, | |
2084 | 2084 | |
2085 | 2085 | /* Spectre: Theoretical, copied from half-orc */ |
2086 | 2086 | { 115, 120, 125, 115, 115, 130, 110, 115, 115, 125, 115, |
2087 | 2087 | 110, 110, 120, 110, 120, 125, 115, 115, 110, 120, 110, |
2088 | 2088 | 115, 125, 120, 120, 120, 120, 130, 130, 130, 120, 120, |
2089 | - 115, 110, 125, 115 }, | |
2089 | + 115, 110, 125, 115, 110 }, | |
2090 | 2090 | |
2091 | 2091 | /* Sprite: Theoretical, copied from half-orc */ |
2092 | 2092 | { 115, 120, 125, 115, 115, 130, 110, 115, 115, 125, 115, |
2093 | 2093 | 110, 110, 120, 110, 120, 125, 115, 115, 110, 120, 110, |
2094 | 2094 | 115, 125, 120, 120, 120, 120, 130, 130, 130, 95, 140, |
2095 | - 115, 110, 105, 115 }, | |
2095 | + 115, 110, 105, 115, 110 }, | |
2096 | 2096 | |
2097 | 2097 | /* Beastman: Theoretical, copied from half-orc */ |
2098 | 2098 | { 115, 120, 125, 115, 115, 130, 110, 115, 115, 125, 115, |
2099 | 2099 | 110, 110, 120, 110, 120, 125, 115, 115, 110, 120, 110, |
2100 | 2100 | 115, 125, 120, 120, 120, 120, 130, 130, 130, 95, 140, |
2101 | - 115, 110, 115, 115 }, | |
2101 | + 115, 110, 115, 115, 125 }, | |
2102 | 2102 | |
2103 | 2103 | /* Ent */ |
2104 | 2104 | { 110, 105, 100, 105, 110, 120, 125, 130, 110, 100, 110, |
2105 | 2105 | 120, 120, 105, 120, 110, 105, 125, 125, 110, 115, 108, |
2106 | 2106 | 120, 115, 110, 110, 120, 110, 100, 125, 100, 95, 140, |
2107 | - 110, 110, 105, 110 }, | |
2107 | + 110, 110, 105, 110, 110 }, | |
2108 | 2108 | |
2109 | 2109 | /* Angel */ |
2110 | 2110 | { 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, |
2111 | 2111 | 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, |
2112 | 2112 | 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 160, |
2113 | - 95, 95, 95, 95 }, | |
2113 | + 95, 95, 95, 95, 95 }, | |
2114 | 2114 | |
2115 | 2115 | /* Demon */ |
2116 | 2116 | { 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, |
2117 | 2117 | 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, |
2118 | 2118 | 140, 140, 140, 140, 140, 140, 140, 140, 140, 160, 120, |
2119 | - 140, 140, 140, 140 }, | |
2119 | + 140, 140, 140, 140, 140 }, | |
2120 | 2120 | |
2121 | 2121 | /* Dunadan */ |
2122 | 2122 | { 100, 105, 105, 110, 113, 115, 120, 125, 100, 105, 100, |
2123 | 2123 | 124, 120, 110, 125, 115, 120, 120, 120, 120, 115, 120, |
2124 | 2124 | 115, 105, 125, 125, 125, 125, 105, 120, 105, 95, 140, |
2125 | - 100, 120, 110, 100 }, | |
2125 | + 100, 120, 110, 100, 110 }, | |
2126 | 2126 | |
2127 | 2127 | /* Shadow Fairy */ |
2128 | 2128 | { 110, 110, 110, 115, 120, 130, 115, 115, 120, 110, 115, |
2129 | 2129 | 115, 115, 116, 115, 120, 120, 115, 115, 101, 110, 110, |
2130 | 2130 | 110, 110, 112, 122, 110, 110, 110, 115, 110, 120, 120, |
2131 | - 110, 101, 115, 110 }, | |
2131 | + 110, 101, 115, 110, 115 }, | |
2132 | 2132 | |
2133 | 2133 | /* Kutar */ |
2134 | 2134 | { 110, 110, 105, 105, 110, 115, 115, 115, 110, 105, 110, |
2135 | 2135 | 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, |
2136 | 2136 | 115, 115, 125, 125, 125, 125, 105, 115, 105, 95, 140, |
2137 | - 110, 115, 100, 110 }, | |
2137 | + 110, 115, 100, 110, 110 }, | |
2138 | 2138 | |
2139 | 2139 | /* Android */ |
2140 | 2140 | { 105, 105, 105, 110, 113, 115, 120, 125, 100, 105, 100, |
2141 | 2141 | 124, 120, 110, 125, 115, 120, 120, 120, 120, 115, 120, |
2142 | 2142 | 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 }, | |
2144 | 2150 | }; |
2145 | 2151 | |
2146 | 2152 |