Merge branch 'develop'

lib/edit/k_info.txt

@@ -4997,7 +4997,7 @@ W:55:0:0:15:50000
 A:40/16:55/4
 P:0:1d1:0:0:0
 
-N:746:& Death Scythe~ 
+N:746:& Death Scythe~
 G:/:R
 I:22:51:0
 W:70:0:0:350:10000

lib/edit/r_info.txt

@@ -6104,14 +6104,14 @@ S:SLOW | CONF | BO_ACID
 D:A stumpy figure carved from stone, with glittering eyes.
 
 N:399:Disenchanter beast
-G:q:w
+G:q:v
 I:110:30d30:12:60:12:150
 W:25:2:70:250:8000:985
 B:TOUCH:UN_BONUS:1d10
 B:TOUCH:UN_BONUS:1d10
 B:TOUCH:UN_BONUS:1d10
 B:TOUCH:UN_BONUS:1d10
-F:STUPID | WEIRD_MIND | RES_DISE | 
+F:STUPID | WEIRD_MIND | RES_DISE | ATTR_MULTI
 F:RES_ACID | RES_POIS | 
 F:NO_CONF | 
 F:DROP_CORPSE | POS_GAIN_AC
@@ -20292,4 +20292,4 @@ P:SpellStat:Dex
 # r - Red          g - Green          b - Blue          u - Brown
 # d - Dark Gray    W - Light Gray     v - Violet        y - Yellow
 # R - Light Red    G - Light Green    B - Light Blue    U - Light Brown
-#
+#

lib/edit/t0000001.txt

@@ -178,6 +178,11 @@ F:b:BUILDING_1:3:0:0:0:0:NONE:14
 F:b:BUILDING_1:3:0:0:0:0:NONE:25
 F:!:FLOOR:3:0:132:302
 
+# Ring of Archery
+?:[AND [EQU $QUEST14 3] [EQU $CLASS Archer Sniper Ranger] ]
+F:b:BUILDING_1:3:0:0:0:0:NONE:25
+F:!:FLOOR:3:0:132:303
+
 # Another Long Sword
 ?:[AND [EQU $QUEST14 3] [EQU $RACE Death-Sword] ]
 F:b:BUILDING_1:3:0:0:0:0:NONE:25

lib/file/news.txt

@@ -1,5 +1,5 @@
                   ****************************************
-                  **         PosChengband 3.3.4         **
+                  **         PosChengband 3.3.5         **
                   ****************************************
 
           Based on Moria:   Copyright (c) 1985 Robert Alan Koeneke

lib/help/Classes.txt

@@ -836,4 +836,4 @@
 
 
 
-[[[[s|  Automatically generated for PosChengband 3.3.2.
+[[[[s|  Automatically generated for PosChengband 3.3.5.

lib/help/Demigods.txt

@@ -198,4 +198,4 @@
 
 
 
-[[[[s|  Automatically generated for PosChengband 3.3.2.
+[[[[s|  Automatically generated for PosChengband 3.3.5.

lib/help/DragonRealms.txt

@@ -136,4 +136,4 @@
 
 
 
-[[[[s|  Automatically generated for PosChengband 3.3.2.
+[[[[s|  Automatically generated for PosChengband 3.3.5.

lib/help/MonsterRaces.txt

@@ -1040,4 +1040,4 @@
 ***** [b] DragonRealms.txt
 
 
-[[[[s|  Automatically generated for PosChengband 3.3.2.
+[[[[s|  Automatically generated for PosChengband 3.3.5.

lib/help/Personalities.txt

@@ -139,4 +139,4 @@
 
 
 
-[[[[s|  Automatically generated for PosChengband 3.3.2.
+[[[[s|  Automatically generated for PosChengband 3.3.5.

lib/help/Races.txt

@@ -433,6 +433,14 @@
   foliage.
 
 
+***** <Wood-Elf>
+[[[[r|  Wood-Elf
+
+  Wood-Elves are the most common of elves. They prefer the seclusion of thick
+  forests and are unhampered when moving through dense foliage. Their skills
+  with tracking and bow are unsurpassed.
+
+
 ***** <Tables>
 [[[[y|  Table 1 - Race Statistic Bonus Table
 
@@ -477,6 +485,7 @@
   [[[[w|Android       |  +3   -1   -5   +1   +3   +0  108%  +26  200%
   [[[[w|Doppelganger  |  -3   -3   -3   -3   -3   -3   85%  +12  150%
   [[[[w|Centaur       |  +3   -2   +1   +2   +1   +0  103%  +22  190%
+  [[[[w|Wood-Elf      |  -1   +1   +2   +1   -1   +1   97%  +16  125%
 
 
 [[[[y|  Table 2 - Race Skill Bonus Table
@@ -522,9 +531,10 @@
   [[[[w|Android       |   +0    -5    +0    -2    +3   +14    +20   +10     0'
   [[[[w|Doppelganger  |  -20   -20   -20    +5   -10   +10    -20   -20     0'
   [[[[w|Centaur       |   +0    -5    +2    +1    +3    +5    +10   +12     0'
+  [[[[w|Wood-Elf      |   +5    +6    +4    +3    +8   +12     -5   +15    30'
 
 
 ***** [a] Demigods.txt
 
 
-[[[[s|  Automatically generated for PosChengband 3.3.2.
+[[[[s|  Automatically generated for PosChengband 3.3.5.

lib/pref/pickpref.prf

@@ -168,7 +168,6 @@ feanorian
 Iron Spike#@v0
 ?:1
 
-!worthless items
 !potion of apple juice
 #!statue
 #!figurine
@@ -189,4 +188,6 @@ Iron Spike#@v0
 #(unidentified weapons
 ?:1
 
+~special items
+!worthless items
 

lib/pref/xtra-new.prf

@@ -29,7 +29,7 @@ R:0:0/0x90
 R:0:0/0x87
 ?:[EQU $RACE Dunadan]
 R:0:0/0x88
-?:[EQU $RACE High-Elf]
+?:[EQU $RACE High-Elf Wood-Elf]
 R:0:0/0x89
 ?:[EQU $RACE Amberite]
 R:0:0/0x8A

lib/pref/xtra-xxx.prf

@@ -27,7 +27,7 @@ R:0:0/0x8F
 R:0:0/0x87
 ?:[EQU $RACE Amberite]
 R:0:0/0x88
-?:[EQU $RACE High-Elf]
+?:[EQU $RACE High-Elf Wood-Elf]
 R:0:0/0x89
 ?:[EQU $RACE Barbarian]
 R:0:0/0x8A

src/artifact.c

@@ -1679,7 +1679,22 @@ static void random_slay(object_type *o_ptr)
 }
 
 static void get_random_name_aux(char *return_name, object_type *o_ptr, int power)
-{    
+{
+    /* Hack: BIAS_* got converted to bits but the artifact name files still use
+       old values. Fortunately, the bit position in the new constants will 
+       recover the old values.
+       TODO: Change the parser (e.g. N:18:BIAS_WARRIOR -> N:BIAS_WARRIOR)
+       so this doesn't happen again. 
+    */
+    int bias_hack = 0;
+    int temp = artifact_bias;
+
+    while (temp)
+    {
+        temp >>= 1;
+        bias_hack++;
+    }
+
     if (o_ptr->tval == TV_LITE)
     {
         cptr filename;
@@ -1697,7 +1712,7 @@ static void get_random_name_aux(char *return_name, object_type *o_ptr, int power
         default:
             filename = "lite_high.txt";
         }
-        get_rnd_line(filename, artifact_bias, return_name);
+        get_rnd_line(filename, bias_hack, return_name);
     }
     else if (o_ptr->tval == TV_RING)
     {
@@ -1716,7 +1731,7 @@ static void get_random_name_aux(char *return_name, object_type *o_ptr, int power
         default:
             filename = "ring_high.txt";
         }
-        get_rnd_line(filename, artifact_bias, return_name);
+        get_rnd_line(filename, bias_hack, return_name);
     }
     else if (o_ptr->tval == TV_AMULET)
     {
@@ -1735,7 +1750,7 @@ static void get_random_name_aux(char *return_name, object_type *o_ptr, int power
         default:
             filename = "amulet_high.txt";
         }
-        get_rnd_line(filename, artifact_bias, return_name);
+        get_rnd_line(filename, bias_hack, return_name);
     }
     else
     {
@@ -1772,7 +1787,7 @@ static void get_random_name_aux(char *return_name, object_type *o_ptr, int power
             }
         }
 
-        get_rnd_line(filename, artifact_bias, return_name);
+        get_rnd_line(filename, bias_hack, return_name);
     }
 }
 
@@ -3110,6 +3125,7 @@ bool create_named_art_aux(int a_idx, object_type *o_ptr)
     o_ptr->ac = a_ptr->ac;
     o_ptr->dd = a_ptr->dd;
     o_ptr->ds = a_ptr->ds;
+    o_ptr->mult = a_ptr->mult;
     o_ptr->to_a = a_ptr->to_a;
     o_ptr->to_h = a_ptr->to_h;
     o_ptr->to_d = a_ptr->to_d;