Merge branch 'develop'

lib/edit/a_info.txt

@@ -2875,12 +2875,12 @@ E:Your ballista glows black...
 N:272:of the Kamikaze Warrior
 I:36:2:2
 W:50:40:20:80000
-P:2:0d0:10:10:-50
+P:2:0d0:10:10:-20
 F:STR | DEX | DEC_WIS | SPEED | HIDE_TYPE 
 F:SUST_STR | SUST_DEX | HOLD_LIFE | LEVITATION
 F:RES_FIRE | RES_POIS | RES_CONF | RES_SOUND | RES_NETHER | RES_FEAR
 F:NO_MAGIC | WEAPONMASTERY
-E:SPEED_ESSENTIA:25:111
+E:BERSERK:8:100
 E:Your robe glows crimson...
 D:This robe is stained with the the blood of many fallen heros.
 D:So much death. So much destruction. What could cause such a thing?

lib/file/mondeath.txt

@@ -35,7 +35,7 @@ N:880:Wong, Master of Time
 shouts, 'This CAN'T be happening!'
 
 N:921:Internet Exploder
-was deleted.
+was deprecated.
 
 N:931:Caldarm the third
 says, 'I desire peace ... for all people... '

lib/file/monfear.txt

@@ -137,6 +137,7 @@ teleports away.
 N:409:Kharis the Powerslave
 howls, 'Nnnnooo!'
 says, 'I don't want to die, I'm a god, why can't I live on?'
+says, 'In my last hour, I'm a slave to the power of death.'
 curses you.
 
 #N:413:Ulwarth, Son of Ulfang
@@ -189,6 +190,7 @@ wails, 'Help! Murder! Murder!'
 N:616:Kavlax the Many-Headed
 says, 'This is YOUR fault!' and bites itself.
 blames its problems on the head you've managed to kill.
+says, 'Run while you can, I'll breathe inertia next!'
 
 N:628:Malekith the Accursed
 says, 'C'mon! I'm sure we can work this out...'
@@ -243,6 +245,7 @@ N:733:Santa Claus
 sobs, 'Think of the children you'll disappoint!'
 sobs, 'No, Virginia, there isn't... not any more...'
 attempts to buy you off with offers of goodies.
+cries, 'Naughty! You are going on the naughty list!'
 
 #N:738:Khamul the Easterling
 
@@ -265,6 +268,7 @@ screams, 'My God, my God, why hast thou forsaken me?'
 N:766:Ancalagon the Black
 writhes as he spouts acidic blood from many wounds.
 says, 'My friends the Wyrms of Power will get you!'
+says, 'This would be a lot different if this was Sil!'
 
 
 #N:770:Artsi the Champion of Chaos
@@ -299,6 +303,7 @@ howls with pain and fear.
 N:820:Corwin, Lord of Avalon
 says, 'Who am I? Where is here? Why do you attack me?'
 says, 'Let's make it a clean game as Olympics'
+says, 'Something something Champs d'Elysees'
 
 N:773:Brand, Mad Visionary of Amber
 N:789:Bleys, Master of Manipulation
@@ -309,6 +314,7 @@ N:807:Gerard, Strongman of Amber
 N:813:Eric the Usurper
 N:824:Benedict, the Ideal Warrior
 says, 'Do you know the terrors of Amberite blood curse?!'
+says, 'Dammit! I knew I should have brought my Trumps along!'
 
 
 N:825:The Witch-King of Angmar
@@ -346,18 +352,19 @@ N:848:Shub-Niggurath, Black Goat of the Woods
 N:849:Nodens, Lord of the Great Abyss
 N:851:Nyarlathotep, the Crawling Chaos
 N:857:Great Cthulhu
-sobs, 'I'm not bad, I was just born like this!'
+sobs, 'I'm not bad, I was just born this way!'
 gibbers weakly.
 mumbles, 'kill -9 adventurer, kill -9 adventurer', and you say 'No such process'
 oozes greenish blood from many wounds.
-burbles with terror.
+burbles 'kyary pamyu pamyu!'
 
 N:850:Carcharoth, the Jaws of Thirst
 N:846:Fenris Wolf
 N:840:Draugluin, Sire of All Werewolves
 cringes and whimpers.
 says, 'Look, I promise I won't bite the mailman anymore!'
 says, 'Hey, put that rolled-up newspaper down!'
+begins a song of oaths.
 
 N:830:Cantoras, the Skeletal Lord
 N:831:Mephistopheles, Lord of Hell
@@ -379,17 +386,20 @@ N:873:Combat-Echizen
 says shiftlessly, 'Shit...!'
 says shiftlessly, 'Yegg...!'
 says shiftlessly, 'yariyagattana!'
+says 'I knew I should have picked the Mighty personality!'
 
 N:878:Dio Brando
 says, 'This CAN'T be happening! I feel horror?!'
 
 N:880:Wong
 says, 'You are no fool.'
 says, 'What you are doing is pointless.'
+says, 'Two Wongs don't make a Wight!'
 
 N:921:Internet Exploder
 is slow.
 throws off some dorky packets.
+says, 'Can't we just fix this with a patch???'
 
 N:1004:Pip, the Braver from Another World
 says, 'Magic ducks, Cover me. I don't shit hits the fan!'
@@ -421,9 +431,11 @@ pleads, 'Let's make a deal instead. What do you want? Ringil? Vorpal Blade? Harp
 boasts, 'You can kill me, but I will only have my revenge later!'
 pleads, 'Wait! I can tell the RNG to play fair!'
 cries, 'Where's a scroll of teleport level when you need one?'
-cries, 'No fair, players get 23 inventory slots and I get none!'
+cries, 'No fair, players get 26 inventory slots and I get none!'
 whimpers, 'Don't you like this game?'
-whimpers, 'If I die, who will take over Chengband?'
+whimpers, 'If I die, who will take over Poschengband?'
+whimpers, 'But I had this really good idea for a new monster race!'
+whimpers, 'Shit, why did I add fail rates to scrolls of teleportation?'
 
 N:*:Default lines
 says, 'I am too young to die.'

lib/file/monspeak.txt

@@ -252,6 +252,7 @@ says, 'I am watching you everywhere, expect me where you do not perceive me!'
 says, 'Feel my wrath, idle rascal!'
 says, 'I have discovered you, you stupid thief!'
 says, 'Are you still not afraid? You should be!'
+says, 'I should really be shimmering!'
 
 #N:392:Sangahyando of Umbar
 #N:380:Angamaite of Umbar
@@ -269,6 +270,7 @@ concentrates on its wounds.
 concentrates on its body. It starts moving faster.
 teleports away.
 dies.  You see a longsword (5d5).
+dies. You see a Stick (1d77).
 
 N:409:Kharis the Powerslave
 says, 'Open the gates of my hell, I will strike from the grave!'
@@ -313,13 +315,17 @@ N:517:Jurt the Living Trump
 shouts, 'All your fault!'
 shouts, 'Only your death will set things right!'
 says, 'Don't call me clumsy!'
+fingers the stump that was his left ear.
 
 #N:551:Rogrog the Black Troll
 
 N:573:Lord Borel of Hendrake
 says, 'I am Borel, Duke of Hendrake, Master of Arms of the Ways of Hendrake.'
 says, 'You smile at your own cowardice? Stand and fight, bastard!'
 says, 'You aren't a caitiff that throws a cloak?!'
+says, 'I do not want it said that I took unfair advantage of you when I killed you.'
+says, 'Now we shall resolve a matter which has long troubled me.'
+cries, 'Coward! Is this the great warrior of whom I have heard so much?'
 
 #N:595:Father Dagon
 #N:596:Mother Hydra
@@ -481,6 +487,7 @@ N:791:Fiona the Sorceress
 says, 'You should not think me easy to deal with.'
 says, 'You dare to oppose Amber?'
 smiles diabolic.
+dances apocalyptic.
 
 #N:792:Tselakus, the Dreadlord
 
@@ -500,6 +507,7 @@ rush toward you wordlessly.
 N:813:Eric the Usurper
 says, 'I'm going to make you to have the same problem of Corwin.'
 says, 'Curse your daffiness that you make an enemy of a Lord of Amber.'
+says, 'It's true, that uneasy-lies-the-head bit.'
 
 #N:814:Yig, Father of Serpents
 #N:817:Hela, Queen of the Dead
@@ -508,6 +516,8 @@ N:820:Corwin, Lord of Avalon
 says, 'I teach you bite of Grayswandir.'
 throws his cloak.
 says, 'Sorry but I have no time to continue a small fight like this.'
+says, 'death and dreck'
+says, 'This isn't exactly the Olympic Games.'
 
 N:824:Benedict, the Ideal Warrior
 says, 'Back Down. This situation only results in my victory, I know.'
@@ -523,6 +533,8 @@ N:837:Surtur the Giant Fire Demon
 says, 'You cannot get "Orb of Destiny" even if you bring me down into the dust.'
 says, 'Burn out! And turn to dust!'
 says, 'The level 14 valkyrie who came before was storonger than you!'
+says, 'The level 14 samurai who came before was fastorer than you!'
+says, 'Whose idea was Sokoban???'
 
 N:655:Ubbo-Sathla, the Unbegotten Source
 N:695:Zoth-Ommog
@@ -691,6 +703,14 @@ N:1005:Antharom, Magic Master in the Castle of Darkness
 says, 'Go to 14!'
 shouts, 'Remember! Curiosity killed the cat!'
 says, 'Welcome, youth...'
+says, 'Antharom, Ansalom... what's the difference'
+
+N:1014:M. Bison
+shouts, 'PSYCHO CRUSHER'
+says, 'Get lost, you can't compare with my powers!'
+says, 'Anyone who opposes me will be destroyed!'
+says, 'Allow me to usher you to the sulfurous pits of hell!'
+says, 'You were a fool for thinking that your showy moves would work on me!'
 
 N:1029:Baby satan
 magically summons Cyberdemons!
@@ -707,6 +727,7 @@ casts Anti-Magic. You feel your spells are blocked!
 throws a large rock.
 invokes a stasis field.
 casts polymorph other ... You turn into a giant toad!
+says, 'I'm BABY SATAN'
 
 N:1063:lousy, the King of louses
 says, 'You, transform a louse!'
@@ -733,6 +754,9 @@ ponders reading a scroll of *destruction* just to save himself the bother.
 asks, 'How do you like 'No Spells'? There's plenty more where that came from!'
 is ticked off!
 says, 'Have you heard about the new version of Hengband?'
+says, 'Not until the restructure is done!'
+says, 'Modifying this line shouldn't crash anything.'
+says, 'I'm still not adding it as an option!'
 
 N:1095:Monkey Clone
 says, "Monkey see, monkey do!"

lib/file/news.txt

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

src/cmd2.c

@@ -456,7 +456,7 @@ static void chest_death(bool scatter, int y, int x, s16b o_idx)
 
         /* Small chests often drop gold. Wilderness chests almost always
            drop gold. */
-        if ( (!dun_level && (randint0(100) < 95))
+        if ( (!dun_level && (randint0(100) < 75))
           || (small && (randint0(100) < 25)) )
         {
             /* Make some gold */

src/cmd6.c

@@ -762,6 +762,8 @@ static void do_cmd_quaff_potion_aux(int item)
             o_ptr = &o_list[0 - item];
         if (o_ptr->k_idx == q_ptr->k_idx)
             stats_on_notice(o_ptr, o_ptr->number + number);
+        else
+            k_info[q_ptr->k_idx].counts.found += number;
     }
 
     /* Window stuff */

src/defines.h

@@ -18,7 +18,7 @@
 
 #define VER_MAJOR 3
 #define VER_MINOR 4
-#define VER_PATCH 2
+#define VER_PATCH 3
 #define VER_EXTRA 0
 
 /*

src/demigod.c

@@ -103,7 +103,7 @@ static void _demeter_clw_spell(int cmd, variant *res)
         var_set_string(res, "Heals cut and HP a little.");
         break;
     case SPELL_INFO:
-        var_set_string(res, info_damage(p_ptr->lev/12 + 1, 10, 0));
+        var_set_string(res, info_heal(p_ptr->lev/12 + 1, 10, 0));
         break;
     case SPELL_CAST:
         if (p_ptr->pclass == CLASS_BLOOD_MAGE)

src/devices.c

@@ -2789,6 +2789,7 @@ bool effect_try(effect_t *effect)
 
 bool effect_use(effect_t *effect, int boost)
 {
+    device_known = TRUE;
     if (do_effect(effect, SPELL_CAST, boost))
         return TRUE;
     return FALSE;

src/externs.h

@@ -2230,7 +2230,6 @@ extern bool     player_is_monster_king(void);
 extern class_t *priest_get_class_t(void);
 extern class_t *psion_get_class_t(void);
 extern int      psion_backlash_dam(int dam);
-extern bool     psion_check_foresight(void);
 extern void     psion_decrement_counters(void);
 extern void     psion_do_mindspring(int energy);
 extern bool     psion_mon_save_p(int r_idx, int power);
@@ -2243,14 +2242,24 @@ extern bool     psion_backlash(void);
 extern bool     psion_blending(void);
 extern bool     psion_clarity(void);
 extern bool     psion_combat(void);
-extern bool     psion_foresight(void);
 extern bool     psion_mental_fortress(void);
 extern bool     psion_mindspring(void);
 extern bool     psion_shielding(void);
 extern bool     psion_speed(void);
 extern bool     psion_weapon_graft(void);
 extern bool     psion_can_wield(object_type *o_ptr);
 extern bool     psion_check_dispel(void);
+
+extern bool     psion_foresight(void);
+extern bool     psion_check_foresight(void);
+
+extern bool     psion_disruption(void);
+extern bool     psion_check_disruption(int m_idx);
+
+extern bool     psion_drain(void);
+extern int      psion_do_drain(int spell_idx, int dam);
+
+
 extern void     rage_mage_browse_spell(void);
 extern void     rage_mage_gain_spell(void);
 extern class_t *rage_mage_get_class_t(void);

src/files.c

@@ -897,7 +897,7 @@ cptr process_pref_file_expr(char **sp, char *fp)
         }
 
         /* Function: IOR */
-        else if (streq(t, "IOR"))
+        else if (streq(t, "IOR") || streq(t, "OR"))
         {
             v = "0";
             while (*s && (f != b2))

src/init1.c

@@ -5099,7 +5099,7 @@ static cptr process_dungeon_file_expr(char **sp, char *fp)
         }
 
         /* Function: IOR */
-        else if (streq(t, "IOR"))
+        else if (streq(t, "IOR") || streq(t, "OR"))
         {
             v = "0";
             while (*s && (f != b2))

src/melee2.c

@@ -2221,11 +2221,6 @@ static void process_monster(int m_idx)
             teleport_away(m_idx, 5, 0L);
     }
 
-    if (p_ptr->pclass == CLASS_PSION)
-    {                                     /* v------ Ego Whip killed it! */
-        if (psion_process_monster(m_idx)) return;
-    }
-
     if (is_riding_mon)
     {
         if (p_ptr->prace == RACE_MON_RING)
@@ -3843,6 +3838,14 @@ void process_monsters(void)
         /* Use up "some" energy */
         m_ptr->energy_need += ENERGY_NEED();
 
+        /* Process the Psion's Ego Whip first since
+           (a) it may kill the monster, obviating the need for further processing;
+           (b) it should always fire even if (especially if!) the monster is frightened */
+        if (p_ptr->pclass == CLASS_PSION)
+        {                                     /* v------ Ego Whip killed it! */
+            if (psion_process_monster(i)) continue;
+        }
+
         if (m_ptr->mflag2 & MFLAG2_TRIPPED)
         {
             char m_name[80];