Merge branch 'master' of https://github.com/k21971/EvilHack

Author: saltwaterterrapin

dat/data.base

@@ -5010,6 +5010,9 @@ revenant
 		[ A Game of Thrones, by George R. R. Martin ]
 ~*invisibility
 ~*p'hul
+~*one ring
+~ancient ring
+~lustrous ring
 ring
 * ring
 ring of *
@@ -5041,6 +5044,7 @@ ring of invisibility
 	he laid a hand on the king, murdered him and took hold of the
 	leadership."
 		[ The Republic, by Plato, translated by James Adam ]
+ancient ring
 ring of p'hul
 	Shandiph rose again; his knees were growing tired. "That's all
 	right.  Yes, we already possess one; it was the Ring of P'hul
@@ -5055,6 +5059,19 @@ ring of p'hul
 	by killing the army and ended the war with Orun only by ruining
 	what both sides fought for."
 		[ The Sword of Bheleu, by Lawrence Watt-Evans ]
+lustrous ring
+one ring
+	It began with the forging of the Great Rings.  Three were given to
+	the Elves, immortal, wisest, and fairest of all beings.  Seven to
+	the Dwarf lords, great miners and craftsmen of the mountain halls.
+	And Nine.  Nine Rings were gifted to the race of Men, who above all
+	else, desire power.  For within these Rings was bound the strength
+	and will to govern each race.  But they were all of them deceived,
+	for another Ring was made.  In the land of Mordor, in the fires of
+	Mount Doom, the Dark Lord Sauron forged, in secret, a Master Ring to
+	control all others.  And into this Ring, he poured his cruelty, his
+	malice and his will to dominate all life.  One Ring to rule them all.
+		[ The Fellowship of the Ring, by J.R.R. Tolkien ]
 robe
 	Robes are the only garments, apart from Shirts, ever to have
 	sleeves.  They have three uses:

doc/evilhack-changelog.md

@@ -3375,5 +3375,11 @@ The following changes to date are:
 - Minor monster color changes
 - Add object menu glyphs to inventory in curses mode
 - Fix: names of new ring types when type is known
+- Proper encyclopedia entries/lookup for the artifact rings
+- Fix: Convicts felt guilty when encountering the guard from a gold vault
+- Hobbit pickpockets are always hostile
+- Fix: monster casting summon minion against another monster
+
+
 - Fix: spec_applies didn't consider if target was underwater
 - Fix: monster priests shouldn't wield edged weapons either

src/mcastu.c

@@ -2364,6 +2364,12 @@ int spellnum;
             return;
         }
 
+        /* monster vs monster is suppressed, as summon_minion()
+           currently does not support anything but the player
+           as a target */
+        if (!yours)
+            return;
+
         aligntype = yours ? u.ualign.type : mon_aligntyp(mattk);
         minion = summon_minion(aligntype, FALSE);
         if (minion && canspotmon(minion))
@@ -2620,8 +2626,7 @@ int spellnum;
             shieldeff(mtmp->mx, mtmp->my);
             dmg = (dmg + 1) / 2;
         }
-        /* not canseemon; if you can't see it you don't know it was wounded */
-        if (yours) {
+        if (yours || canseemon(mtmp)) {
             if (dmg <= 5)
                 pline("%s looks itchy!", Monnam(mtmp));
             else if (dmg <= 10)

src/mon.c

@@ -4818,7 +4818,8 @@ boolean via_attack;
                     adjalign(2);
                 }
             } else {
-                if (u.ualign.type != A_NONE) { /* Infidels are supposed to be bad */
+                /* Infidels and Convicts don't feel guilt from this */
+                if (!(u.ualign.type == A_NONE || Role_if(PM_CONVICT))) {
                     if (canspotmon(mtmp))
                         You_feel("guilty.");
                     else

src/monst.c

@@ -577,7 +577,8 @@ NEARDATA struct permonst mons[] = {
         A(ATTK(AT_WEAP, AD_PHYS, 1, 6), ATTK(AT_CLAW, AD_SITM, 0, 0),
           NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
         SIZ(500, 200, MS_HUMANOID, MZ_SMALL), 0, 0, M1_HUMANOID | M1_OMNIVORE,
-        M2_COLLECT, M3_INFRAVISIBLE | M3_INFRAVISION, 0, MH_HOBBIT, 3, CLR_BLACK),
+        M2_COLLECT | M2_HOSTILE, M3_INFRAVISIBLE | M3_INFRAVISION,
+        0, MH_HOBBIT, 3, CLR_BLACK),
     MON("Gollum", S_HUMANOID, LVL(5, 10, 6, 30, -10), (G_NOGEN | G_UNIQ),
         A(ATTK(AT_WEAP, AD_PHYS, 2, 4), ATTK(AT_CLAW, AD_SITM, 0, 0),
           NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),