From c939e889e9f7defd0354de0429c683f83c0c92e0 Mon Sep 17 00:00:00 2001
From: Jordan Irwin <antumdeluge@gmail.com>
Date: Thu, 12 Oct 2023 23:29:56 -0700
Subject: [PATCH] Set herald NPC outfit using current resources

https://sourceforge.net/p/arianne/bugs/4267/
---
 data/sprites/npc/TOREMOVE.txt                | 3 +++
 src/games/stendhal/server/script/Herald.java | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 data/sprites/npc/TOREMOVE.txt

diff --git a/data/sprites/npc/TOREMOVE.txt b/data/sprites/npc/TOREMOVE.txt
new file mode 100644
index 00000000000..3d2dbc5a2d1
--- /dev/null
+++ b/data/sprites/npc/TOREMOVE.txt
@@ -0,0 +1,3 @@
+The following images can be removed after 1.45:
+
+- heraldnpc.png
diff --git a/src/games/stendhal/server/script/Herald.java b/src/games/stendhal/server/script/Herald.java
index 976287d75be..3eb843fbd12 100644
--- a/src/games/stendhal/server/script/Herald.java
+++ b/src/games/stendhal/server/script/Herald.java
@@ -1,5 +1,5 @@
 /***************************************************************************
- *                   (C) Copyright 2003-2013 - Stendhal                    *
+ *                   (C) Copyright 2003-2023 - Stendhal                    *
  ***************************************************************************
  ***************************************************************************
  *                                                                         *
@@ -18,6 +18,7 @@
 import org.apache.log4j.Logger;
 
 import games.stendhal.common.Direction;
+import games.stendhal.common.constants.SkinColor;
 import games.stendhal.common.grammar.Grammar;
 import games.stendhal.common.parser.Sentence;
 import games.stendhal.server.core.engine.SingletonRepository;
@@ -441,7 +442,10 @@ public void createDialog() {
 			}
 		};
 		zone.assignRPObjectID(npc);
-		npc.setEntityClass("heraldnpc");
+		npc.setOutfit("body=0,head=0,eyes=26,hair=8,dress=977,hat=8");
+		npc.setOutfitColor("skin", SkinColor.LIGHT);
+		npc.setOutfitColor("hair", 0xe66e38);
+		npc.setOutfitColor("hat", 0x5b5b5b);
 		npc.setPosition(x, y);
 		npc.initHP(100);
 		npc.setDirection(Direction.LEFT);