From 3b2d3eabedb983a149f7ab9715c2a8c5499eadaf Mon Sep 17 00:00:00 2001
From: Pasi Kallinen <paxed@alt.org>
Date: Thu, 7 Dec 2023 17:40:15 +0200
Subject: [PATCH] Change wolf, werewolf, and warg colors

There were 6 brown 'd' monsters; move wolf and werewolf to grey,
and warg to black, as those colors had no canines.

The wolf tiles are already greyish; changed warg tile to be
slightly darker.
---
 doc/fixes3-7-0.txt     |  1 +
 include/monsters.h     |  6 ++---
 win/share/monsters.txt | 56 +++++++++++++++++++++---------------------
 3 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt
index c32cb82ca..3496a777b 100644
--- a/doc/fixes3-7-0.txt
+++ b/doc/fixes3-7-0.txt
@@ -1318,6 +1318,7 @@ spellbooks weight 50 units but Book of the Dead only 20, and novels only 1;
 	the Book of the Dead has been changed to 50 and novels to 10
 save and restore hero tracks, increase track length
 change vrock and hezrou from red to green, adjust vrock tile to have green
+change wolf and werewolf to grey, warg to black
 
 
 Fixes to 3.7.0-x General Problems Exposed Via git Repository
diff --git a/include/monsters.h b/include/monsters.h
index d2138d26e..18dcb3a03 100644
--- a/include/monsters.h
+++ b/include/monsters.h
@@ -235,13 +235,13 @@
           NO_ATTK),
         SIZ(500, 250, MS_BARK, MZ_MEDIUM), 0, 0,
         M1_ANIMAL | M1_NOHANDS | M1_CARNIVORE, M2_HOSTILE, M3_INFRAVISIBLE,
-        6, CLR_BROWN, WOLF),
+        6, CLR_GRAY, WOLF),
     MON("werewolf", S_DOG, LVL(5, 12, 4, 20, -7), (G_NOGEN | G_NOCORPSE),
         A(ATTK(AT_BITE, AD_WERE, 2, 6), NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK,
           NO_ATTK),
         SIZ(500, 250, MS_BARK, MZ_MEDIUM), MR_POISON, 0,
         M1_NOHANDS | M1_POIS | M1_REGEN | M1_CARNIVORE,
-        M2_NOPOLY | M2_WERE | M2_HOSTILE, M3_INFRAVISIBLE, 7, CLR_BROWN,
+        M2_NOPOLY | M2_WERE | M2_HOSTILE, M3_INFRAVISIBLE, 7, CLR_GRAY,
         WEREWOLF),
     MON("winter wolf cub", S_DOG, LVL(5, 12, 4, 0, -5),
         (G_NOHELL | G_GENO | G_SGROUP | 2),
@@ -255,7 +255,7 @@
           NO_ATTK),
         SIZ(850, 350, MS_BARK, MZ_MEDIUM), 0, 0,
         M1_ANIMAL | M1_NOHANDS | M1_CARNIVORE, M2_HOSTILE, M3_INFRAVISIBLE,
-        8, CLR_BROWN, WARG),
+        8, CLR_BLACK, WARG),
     MON("winter wolf", S_DOG, LVL(7, 12, 4, 20, 0), (G_NOHELL | G_GENO | 1),
         A(ATTK(AT_BITE, AD_PHYS, 2, 6), ATTK(AT_BREA, AD_COLD, 2, 6), NO_ATTK,
           NO_ATTK, NO_ATTK, NO_ATTK),
diff --git a/win/share/monsters.txt b/win/share/monsters.txt
index 53fa551af..0d3341f82 100644
--- a/win/share/monsters.txt
+++ b/win/share/monsters.txt
@@ -923,39 +923,39 @@ Z = (195, 195, 195)
 # tile 46 (warg,male)
 {
   ................
-  ...P..P....PP...
-  ...P.PP......P..
-  ..PPPP.......P.A
-  ..N.NPP......P.A
-  .P..PPPPP....P.A
-  PPPPDPPPPPPPPPAA
-  DPPNDPPPPPPPPPAA
-  ..DDDPPPPPPPPPAA
-  PNDNP.PPPPPPPPAA
-  .PPPPAPPPPAPP.A.
-  ...PAAPPAAAAPPAA
-  ...PAAP.AAAAP.A.
-  .PPPAAPAAAAAPAA.
-  ....PPPAA.PPPA..
+  ...P..0....P0...
+  ...0.0P......0..
+  ..0P0P.......P.A
+  ..N.N0P......0.A
+  .P..0P0P0....P.A
+  P0P0D0P0P0P0P0AA
+  DP0NDP0P0P0P0PAA
+  ..DDD0P0P0P0P0AA
+  0NDN0.0P0P0P0PAA
+  .0P0PAP0P0A0P.A.
+  ...PAA0PAAAA0PAA
+  ...0AAP.AAAAP.A.
+  .P0PAA0AAAAA0AA.
+  ....P0PAA.P0PA..
   ................
 }
 # tile 47 (warg,female)
 {
   ................
-  ...P..P.....P...
-  ...P.PP......P..
-  ..PPPP.......P.A
-  ..N.NPP......P.A
-  .P..PPPPP....P.A
-  PPPPDPPPPPPPPPAA
-  DPPNDPPPPPPPPPAA
-  ..DDDPPPPPPPPPAA
-  PNDNP.PPPPPPPPAA
-  .PPPPAPPPPAPP.A.
-  ...PAAPPAAAAPPAA
-  ...PAAP.AAAAP.A.
-  .PPPAAPAAAAAPAA.
-  ....PPPAA.PPPA..
+  ...P..0.....P...
+  ...0.0P......0..
+  ..0P0P.......P.A
+  ..N.N0P......0.A
+  .P..0P0P0....P.A
+  P0P0D0P0P0P0P0AA
+  DP0NDP0P0P0P0PAA
+  ..DDD0P0P0P0P0AA
+  0NDN0.0P0P0P0PAA
+  .0P0PAP0P0A0P.A.
+  ...PAA0PAAAA0PAA
+  ...0AAP.AAAAP.A.
+  .P0PAA0AAAAA0AA.
+  ....P0PAA.P0PA..
   ................
 }
 # tile 48 (winter wolf,male)