From 5dfab37c98bd8d7ef5ad2038cadbbce64609a01c Mon Sep 17 00:00:00 2001
From: Argent77 <4519923+Argent77@users.noreply.github.com>
Date: Thu, 21 Nov 2024 17:46:27 +0100
Subject: [PATCH] Fix portrait update for continuous NPCs

- Fixed timing mode of portrait spell resource: timing 9 -> 1
- Removed unused code and spell resource for updating creature colors
---
 EET/EET.tp2              |  30 ++----------------------------
 EET/base/spl/K#COLOR.SPL | Bin 490 -> 0 bytes
 EET/base/spl/K#PORTR.SPL | Bin 298 -> 250 bytes
 3 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 EET/base/spl/K#COLOR.SPL

diff --git a/EET/EET.tp2 b/EET/EET.tp2
index dfbfb01f..1366017b 100644
--- a/EET/EET.tp2
+++ b/EET/EET.tp2
@@ -1908,34 +1908,8 @@ ACTION_DEFINE_ASSOCIATIVE_ARRAY table_EET_portraitID BEGIN
 END
 ACTION_PHP_EACH table_EET_portraitID AS portrait => ID BEGIN
 	COPY ~%MOD_FOLDER%/base/spl/K#PORTR.SPL~ ~override/K#POR%ID%.SPL~
-		WRITE_ASCIIE ~0xae~ ~K#POR%ID%~ #8
-		WRITE_ASCIIE ~0xde~ ~%portrait%M~ #8 //Small portrait
-		WRITE_ASCIIE ~0x10e~ ~%portrait%L~ #8 //Large portrait
-END
-
-//assign NPC colors after resurrection from chunk death
-ACTION_DEFINE_ASSOCIATIVE_ARRAY table_EET_fileID BEGIN
-	"IMOEN" => "IMO"
-	"EDWIN" => "EDW"
-END
-ACTION_PHP_EACH table_EET_fileID AS file => ID BEGIN
-	COPY_EXISTING ~%file%.cre~ ~override~
-		READ_BYTE 0x2c "metal" //Metal Colour Index	9e
-		READ_BYTE 0x2d "minor" //Minor Colour Index
-		READ_BYTE 0x2e "major" //Major Colour Index
-		READ_BYTE 0x2f "skin" //Skin Colour Index
-		READ_BYTE 0x30 "leather" //Leather Colour Index
-		READ_BYTE 0x31 "armor" //Armor Colour Index
-		READ_BYTE 0x32 "hair" //Hair Colour Index
-	BUT_ONLY
-	COPY ~%MOD_FOLDER%/base/spl/K#COLOR.SPL~ ~override/K#COL%ID%.SPL~
-		WRITE_LONG 0x9e "metal"
-		WRITE_LONG 0xce "minor"
-		WRITE_LONG 0xfe "major"
-		WRITE_LONG 0x12e "skin"
-		WRITE_LONG 0x15e "leather"
-		WRITE_LONG 0x18e "armor"
-		WRITE_LONG 0xbe "hair"
+		WRITE_ASCIIE ~0xae~ ~%portrait%M~ #8 //Small portrait
+		WRITE_ASCIIE ~0xde~ ~%portrait%L~ #8 //Large portrait
 END
 
 COPY ~%patch_dir%/spl~ ~override~
diff --git a/EET/base/spl/K#COLOR.SPL b/EET/base/spl/K#COLOR.SPL
deleted file mode 100644
index 301ef37e5962075045b1b9e6e7c92c6840eb3daf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 490
zcmWFz@KFdeR8aU21q?(0MxYuH#s;vNQv_7V$S@14oRNVAt`T7h8(55yfgP-t5vZP>
rfeEgT6U<71^RY2t>Op3bq8?-mDe9R?R1fkkDdw}1s2&t@#F!5N2{INu

diff --git a/EET/base/spl/K#PORTR.SPL b/EET/base/spl/K#PORTR.SPL
index a3438cfeff04072ab8ccf95aa066fbf7a5677d08..2a30e0af87c22cbcaacf2a2087232c4e49af157d 100644
GIT binary patch
delta 59
qcmZ3*^ow!A1X(5q1_nkj%w_<wA%GD~rA*u?InjV+;x8U{6afGeSqc9D

literal 298
zcmWFz@KFdeR8aU21q?87fPsMp#zvzVfqW3g1~AM4Dk=hEMuu5X<%~$?GBQL#O=1Jf
oGBPlO)iMG_9T}ORIzSZ2z7!-rCNrA>p`H^gO`Lj=$;7A!0AxxQW&i*H