From b16bf8cd82db7ca1a715c26c43098e8bc45ff428 Mon Sep 17 00:00:00 2001
From: ketmar <ketmar@ketmar.no-ip.org>
Date: Thu, 6 Feb 2025 07:37:30 +0000
Subject: [PATCH] more priest fixes (some default params for Florea and Terra)

FossilOrigin-Name: d1f1ac9ac206d31c6d7d87280cae1c95d0cf308f17c9b8e61d6ff1ae1340a7c1
---
 .../maingame/chars/humans/priests/exiledpriest.dat | 22 ++++++++++++++++++++++
 script/maingame/chars/humans/priests/priest.dat    |  3 ++-
 script/maingame/chars/humans/priests/terra.dat     | 14 ++++++++++++++
 src/game/characters/humans/priests/base_priest.cpp |  4 ++--
 src/game/characters/humans/priests/terra.cpp       |  3 ++-
 5 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/script/maingame/chars/humans/priests/exiledpriest.dat b/script/maingame/chars/humans/priests/exiledpriest.dat
index c9d8230..57025f2 100644
--- a/script/maingame/chars/humans/priests/exiledpriest.dat
+++ b/script/maingame/chars/humans/priests/exiledpriest.dat
@@ -1,6 +1,28 @@
 exiledpriest
 {
   IsAbstract = true;
+  CanRead = true;
+  Adjective = "exiled";
+  NameSingular = "priest";
+  CanBeCloned = false;
+  TamingDifficulty = NO_TAMING;
+  MoveType = WALK|SWIM;
+  IsAbstract = true;
+  Inventory == potion { Times = 2; SecondaryMaterial = ANTIDOTE_LIQUID; }
+  FriendlyReplies :=
+  {
+    "\"May @Gd be with you.\"",
+    "\"Bless thee, child.\"",
+    "@Dd smiles at you in a comforting manner.";
+  }
+  HostileReplies :=
+  {
+    "\"Die, infidel!\"",
+    "\"Divine wrath upon thee!\"",
+    "\"Thou shalt pay for thy sins!\"",
+    "\"I shall punish you in the name of @Gd.\"",
+    "\"Sinner! My hands shall pour Divine Wrath upon thee!\"";
+  }
 
   Config SILVA;
   {
diff --git a/script/maingame/chars/humans/priests/priest.dat b/script/maingame/chars/humans/priests/priest.dat
index 131af67..b1eacc3 100644
--- a/script/maingame/chars/humans/priests/priest.dat
+++ b/script/maingame/chars/humans/priests/priest.dat
@@ -18,7 +18,8 @@ priest
     "\"Die, infidel!\"",
     "\"Divine wrath upon thee!\"",
     "\"Thou shalt pay for thy sins!\"",
-    "\"I shall punish you in the name of @Gd.\"";
+    "\"I shall punish you in the name of @Gd.\"",
+    "\"Sinner! My hands shall pour Divine Wrath upon thee!\"";
   }
 
   Config CLEPTIA;
diff --git a/script/maingame/chars/humans/priests/terra.dat b/script/maingame/chars/humans/priests/terra.dat
index 2f8dc4d..793cb77 100644
--- a/script/maingame/chars/humans/priests/terra.dat
+++ b/script/maingame/chars/humans/priests/terra.dat
@@ -51,4 +51,18 @@ terra
     "\"I am bound by sacred oaths to protect this shrine with my life. I remained behind when Tweraifians buried the entrance to hide this place from Attnam.\"";
   }
   DeathMessage = "@Dd dies, whispering: \"I'm sorry! I failed you, Silva.\"";
+
+  CanRead = true;
+  CanBeCloned = false;
+  TamingDifficulty = NO_TAMING;
+  MoveType = WALK|SWIM;
+  Inventory == potion { Times = 2; SecondaryMaterial = ANTIDOTE_LIQUID; }
+  HostileReplies :=
+  {
+    "\"Die, infidel!\"",
+    "\"Divine wrath upon thee!\"",
+    "\"Thou shalt pay for thy sins!\"",
+    "\"I shall punish you in the name of @Gd.\"",
+    "\"Sinner! My hands shall pour Divine Wrath upon thee!\"";
+  }
 }
diff --git a/src/game/characters/humans/priests/base_priest.cpp b/src/game/characters/humans/priests/base_priest.cpp
index 9401cca..1ba2145 100644
--- a/src/game/characters/humans/priests/base_priest.cpp
+++ b/src/game/characters/humans/priests/base_priest.cpp
@@ -30,8 +30,8 @@ void priest::GetAICommand () {
 //==========================================================================
 truth priest::PriestHealingService () {
   if (GetRelation(PLAYER) == HOSTILE) {
-    ADD_MESSAGE("\"Sinner! My hands shall pour Divine Wrath upon thee!\"");
-    return true;
+    //ADD_MESSAGE("\"Sinner! My hands shall pour Divine Wrath upon thee!\"");
+    return false;
   }
 
   truth res = false;
diff --git a/src/game/characters/humans/priests/terra.cpp b/src/game/characters/humans/priests/terra.cpp
index a82d520..f977814 100644
--- a/src/game/characters/humans/priests/terra.cpp
+++ b/src/game/characters/humans/priests/terra.cpp
@@ -94,7 +94,8 @@ void terra::BeTalkedTo () {
 
     HasBeenSpokenTo = true;
   } else if (game::GetFreedomStoryState() == 2 && GetRelation(PLAYER) != HOSTILE) {
-    priest::BeTalkedTo(); // in case player also needs a cure, before the tip (below) to grant it wont be ignored
+    //priest::BeTalkedTo(); // in case player also needs a cure, before the tip (below) to grant it wont be ignored
+    PriestHealingService(); // in case player also needs a cure, before the tip (below) to grant it wont be ignored
     ADD_MESSAGE("\"You bested her, I see! Now hurry back to the village, and Attnam shall threaten us no more.\"");
   } else {
     priest::BeTalkedTo();
-- 
2.11.4.GIT