2.0.3

2021-10-06 00:41:20 +02:00 · 2021-10-06 00:41:20 +02:00 · 5ca1e9ee3d
commit 5ca1e9ee3d
parent ff427737c7
42 changed files with 64 additions and 36 deletions
--- a/Stories.esm
+++ b/Stories.esm
--- a/Skyrim.esm
+++ b/Skyrim.esm
--- a/interface/exported/hudmenu.gfx
+++ b/interface/exported/hudmenu.gfx
--- a/meshes/armor/nightingale/m/cowl_0.nif
+++ b/meshes/armor/nightingale/m/cowl_0.nif
--- a/meshes/armor/nightingale/m/cowl_1.nif
+++ b/meshes/armor/nightingale/m/cowl_1.nif
--- a/meshes/enderal/forgottenstories/armor/rhalata/voice/sithis
+++ b/meshes/enderal/forgottenstories/armor/rhalata/voice/sithis
--- a/meshes/enderal/forgottenstories/armor/rhalata/voice/sithis
+++ b/meshes/enderal/forgottenstories/armor/rhalata/voice/sithis
--- a/meshes/enderal/forgottenstories/rhalata/acolyt/f/cowl_0.nif
+++ b/meshes/enderal/forgottenstories/rhalata/acolyt/f/cowl_0.nif
--- a/meshes/enderal/forgottenstories/rhalata/acolyt/f/cowl_1.nif
+++ b/meshes/enderal/forgottenstories/rhalata/acolyt/f/cowl_1.nif
--- a/meshes/enderal/forgottenstories/rhalata/voice/m/cowl_0.nif
+++ b/meshes/enderal/forgottenstories/rhalata/voice/m/cowl_0.nif
--- a/meshes/enderal/forgottenstories/rhalata/voice/m/cowl_1.nif
+++ b/meshes/enderal/forgottenstories/rhalata/voice/m/cowl_1.nif
--- a/meshes/enderal/landscape/trees/nico/common
+++ b/meshes/enderal/landscape/trees/nico/common
--- a/meshes/enderal/landscape/trees/nico/crystal
+++ b/meshes/enderal/landscape/trees/nico/crystal
--- a/meshes/enderal/landscape/trees/nico/crystal
+++ b/meshes/enderal/landscape/trees/nico/crystal
--- a/meshes/enderal/landscape/trees/nico/crystal
+++ b/meshes/enderal/landscape/trees/nico/crystal
--- a/meshes/enderal/landscape/trees/nico/crystal
+++ b/meshes/enderal/landscape/trees/nico/crystal
--- a/meshes/enderal/landscape/trees/nico/crystal
+++ b/meshes/enderal/landscape/trees/nico/crystal
--- a/meshes/enderal/landscape/trees/nico/crystal
+++ b/meshes/enderal/landscape/trees/nico/crystal
--- a/meshes/enderal/landscape/trees/nico/heartlandbush05.nif
+++ b/meshes/enderal/landscape/trees/nico/heartlandbush05.nif
--- a/meshes/enderal/landscape/trees/nico/heartlandbush07.nif
+++ b/meshes/enderal/landscape/trees/nico/heartlandbush07.nif
--- a/meshes/enderal/landscape/trees/nico/whispertreebranchpile.nif
+++ b/meshes/enderal/landscape/trees/nico/whispertreebranchpile.nif
--- a/meshes/enderal/landscape/trees/nico/whispertreebranchpile02.nif
+++ b/meshes/enderal/landscape/trees/nico/whispertreebranchpile02.nif
--- a/scripts/_00e_nq_bounty01_targetscript.pex
+++ b/scripts/_00e_nq_bounty01_targetscript.pex
--- a/scripts/source/_00e_nq_bounty01_targetscript.psc
+++ b/scripts/source/_00e_nq_bounty01_targetscript.psc
@ -38,11 +38,9 @@ Event OnCombatStateChanged(Actor akTarget, int aeCombatState)
 			BlameSpellKeyword = Game.GetFormFromFile(0x0005BD16, "Skyrim.esm") as Keyword
 		EndIf

-		If akTarget == PlayerRef || akTarget.HasKeyword(_00E_PlayerSummonedCreature) || akTarget.GetFactionReaction(PlayerRef) == 2 || akTarget.HasEffectKeyword(BlameSpellKeyword)
-			If finished == False ; Just in case
-				finished = True
-				GetActorRef().GetActorBase().SetEssential(False)
-			EndIf
+		If akTarget == PlayerRef || akTarget.IsPlayerTeammate() || akTarget.HasKeyword(_00E_PlayerSummonedCreature) || akTarget.GetFactionReaction(PlayerRef) == 2 || akTarget.HasEffectKeyword(BlameSpellKeyword)
+			finished = True
+			GetActorRef().GetActorBase().SetEssential(False)
 		EndIf
 	EndIf
 EndEvent
--- a/stories_chinese.strings
+++ b/stories_chinese.strings
--- a/stories_english.dlstrings
+++ b/stories_english.dlstrings
--- a/stories_english.ilstrings
+++ b/stories_english.ilstrings
--- a/stories_english.strings
+++ b/stories_english.strings
--- a/stories_french.strings
+++ b/stories_french.strings
--- a/stories_german.strings
+++ b/stories_german.strings
--- a/stories_italian.strings
+++ b/stories_italian.strings
--- a/stories_japanese.strings
+++ b/stories_japanese.strings
--- a/stories_korean.strings
+++ b/stories_korean.strings
--- a/stories_russian.strings
+++ b/stories_russian.strings
--- a/stories_spanish.ilstrings
+++ b/stories_spanish.ilstrings
--- a/stories_spanish.strings
+++ b/stories_spanish.strings
--- a/textures/actors/character/facegendata/facetint/skyrim.esm/00018fbe.dds
+++ b/textures/actors/character/facegendata/facetint/skyrim.esm/00018fbe.dds
--- a/textures/actors/character/facegendata/facetint/skyrim.esm/0014be90.dds
+++ b/textures/actors/character/facegendata/facetint/skyrim.esm/0014be90.dds
--- a/textures/armor/nightingale/f/nightingalearmorcapef.dds
+++ b/textures/armor/nightingale/f/nightingalearmorcapef.dds
--- a/textures/armor/nightingale/m/nightingalearmorcapem.dds
+++ b/textures/armor/nightingale/m/nightingalearmorcapem.dds
--- a/textures/armor/nightingale/m/nightingalearmorcapesorrow.dds
+++ b/textures/armor/nightingale/m/nightingalearmorcapesorrow.dds
--- a/textures/enderal/actors/calia/calia_warpaint.dds
+++ b/textures/enderal/actors/calia/calia_warpaint.dds