Merge branch 'develop'

tiduslaugh · Jun 22, 2014 · c01acee · c01acee
2 parents f989084 + 0b315ff
commit c01acee
Show file tree

Hide file tree

Showing 30 changed files with 824 additions and 461 deletions.
diff --git a/lib/edit/e_info.txt b/lib/edit/e_info.txt
@@ -909,12 +909,10 @@ F:SLAY_EVIL | BLESSED | FULL_NAME
 
 N:300:RING:of Protection
 W:10:*:1
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_COLD | IGNORE_ELEC
 
 N:301:RING:& Elemental Ring
 W:20:*:1
 F:FULL_NAME
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_COLD | IGNORE_ELEC
 
 N:302:RING:of Combat
 W:20:*:1
@@ -926,7 +924,6 @@ F:HIDE_TYPE
 
 N:304:RING:(Defender)
 W:70:*:2
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_COLD | IGNORE_ELEC
 
 N:305:RING:of Wizardry
 W:50:*:2
@@ -942,7 +939,6 @@ F:STEALTH | RES_COLD | RES_POIS | RES_NETHER | FREE_ACT | SEE_INVIS | XTRA_H_RES
 F:STR | INT | DEC_WIS | DEX | DEC_CON | CHR
 F:VULN_LITE | RANDOM_CURSE2 | DEC_LIFE | DRAIN_EXP | HEAVY_CURSE
 F:HIDE_TYPE | SHOW_MODS
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_COLD | IGNORE_ELEC
 
 ###############
 ### Amulets ###
@@ -955,11 +951,9 @@ F:FULL_NAME
 N:321:AMULET:& Elemental Charm
 W:10:*:2
 F:FULL_NAME
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_COLD | IGNORE_ELEC
 
 N:322:AMULET:(Defender)
 W:80:*:16
-F:IGNORE_ACID | IGNORE_FIRE | IGNORE_COLD | IGNORE_ELEC
 
 N:323:AMULET:& Sacred Pendant
 W:30:*:2
@@ -980,7 +974,6 @@ N:327:AMULET:& Torc of the Hero
 W:40:*:16
 F:FREE_ACT | SEE_INVIS | SUST_STR | SUST_DEX |
 F:RES_FEAR | REGEN | SH_FIRE | HIDE_TYPE | FULL_NAME |
-F:IGNORE_ACID | IGNORE_ELEC | IGNORE_FIRE | IGNORE_COLD
 
 N:328:AMULET:of Devotion
 W:40:*:3

diff --git a/lib/edit/t0000001.txt b/lib/edit/t0000001.txt
@@ -117,6 +117,11 @@ F:!:FLOOR:3:0:126
 F:b:BUILDING_1:3:0:0:0:0:NONE:14
 F:!:FLOOR:3:0:55
 
+# War Hammer
+?:[AND [EQU $QUEST1 3] [EQU $RACE Angel] ]
+F:b:BUILDING_1:3:0:0:0:0:NONE:14
+F:!:FLOOR:3:0:55
+
 # Short Bow
 ?:[AND [EQU $QUEST1 3] [EQU $CLASS Archer] ]
 F:b:BUILDING_1:3:0:0:0:0:NONE:14
@@ -937,6 +942,16 @@ F:@:FLOOR:3:0:0:0:117
 F:a:BUILDING_0:3
 F:@:FLOOR:3:0:0:0:15
 
+# Aule
+?:[AND [EQU $QUEST27 3] [EQU $RACE Angel] [EQU [MOD $RANDOM27 5] 0] ]
+F:a:BUILDING_0:3
+F:@:FLOOR:3:0:0:0:117
+
+# Palantir
+?:[AND [EQU $QUEST27 3] [EQU $RACE Angel] [GEQ [MOD $RANDOM27 5] 1] ]
+F:a:BUILDING_0:3
+F:@:FLOOR:3:0:0:0:15
+
 ##########################################################################
 # Bard
 # Harp of Maglor

diff --git a/lib/file/amulet_med.txt b/lib/file/amulet_med.txt
@@ -6,7 +6,7 @@ of Dazzling
 'Cruciform'
 of Protection
 'Precious Protection'
-Talisman
+'Talisman'
 of Lore
 of Nobility
 of The Fair Maiden

diff --git a/lib/file/news.txt b/lib/file/news.txt
@@ -1,5 +1,5 @@
                   ****************************************
-                  **         PosChengband 3.3.3         **
+                  **         PosChengband 3.3.4         **
                   ****************************************
 
           Based on Moria:   Copyright (c) 1985 Robert Alan Koeneke

diff --git a/src/autopick.c b/src/autopick.c
@@ -1742,7 +1742,7 @@ static void autopick_delayed_alter_aux(int item)
         char o_name[MAX_NLEN];
         bool msg = FALSE;
 
-        stats_on_destroy(o_ptr, o_ptr->number);
+        stats_on_p_destroy(o_ptr, o_ptr->number);
 
         if (prace_is_(RACE_MON_JELLY))
             jelly_eat_object(o_ptr);

diff --git a/src/birth.c b/src/birth.c
@@ -2805,6 +2805,7 @@ void player_outfit(void)
     case RACE_ZOMBIE:
     case RACE_SPECTRE:
     case RACE_MON_GOLEM:
+    case RACE_MON_SWORD:
         _birth_object(TV_STAFF, SV_STAFF_NOTHING, 1);
         break;