diff --git a/Enderal - Forgotten Stories.esm b/Enderal - Forgotten Stories.esm index 83498f79..bd8052ad 100644 Binary files a/Enderal - Forgotten Stories.esm and b/Enderal - Forgotten Stories.esm differ diff --git a/Skyrim.esm b/Skyrim.esm index cd4a8da0..156f2549 100644 Binary files a/Skyrim.esm and b/Skyrim.esm differ diff --git a/interface/exported/hudmenu.gfx b/interface/exported/hudmenu.gfx new file mode 100644 index 00000000..fcf3acd8 --- /dev/null +++ b/interface/exported/hudmenu.gfx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aad45ec8060665514c758733baacfd55d46044ed5117fcf449aa89ddb888b1bd +size 169886 diff --git a/meshes/armor/nightingale/m/cowl_0.nif b/meshes/armor/nightingale/m/cowl_0.nif new file mode 100644 index 00000000..caeb00f1 --- /dev/null +++ b/meshes/armor/nightingale/m/cowl_0.nif @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:350b7c281da60630d34fc954a15741f12db527c3c7d3f22390c69c48669ad89a +size 66746 diff --git a/meshes/armor/nightingale/m/cowl_1.nif b/meshes/armor/nightingale/m/cowl_1.nif new file mode 100644 index 00000000..f5e2f2b1 --- /dev/null +++ b/meshes/armor/nightingale/m/cowl_1.nif @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:beb608eca15d7bf5881e04e53f8f5a873b93bf06716c4421c4b48feb0998e2f0 +size 66746 diff --git a/meshes/enderal/forgottenstories/armor/rhalata/voice/sithis armour - female mask 02_0.nif b/meshes/enderal/forgottenstories/armor/rhalata/voice/sithis armour - female mask 02_0.nif index f35708a9..d585394e 100644 --- a/meshes/enderal/forgottenstories/armor/rhalata/voice/sithis armour - female mask 02_0.nif +++ b/meshes/enderal/forgottenstories/armor/rhalata/voice/sithis armour - female mask 02_0.nif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c12fea6a607806dd8e597609447912aec2720c016ec0ff468f0562afaa23053 -size 65404 +oid sha256:f2ef9a210275b084f346574e3e23dc8d6d5b2a1d82ce1ed283e645944869c917 +size 65464 diff --git a/meshes/enderal/forgottenstories/armor/rhalata/voice/sithis armour - female mask 02_1.nif b/meshes/enderal/forgottenstories/armor/rhalata/voice/sithis armour - female mask 02_1.nif index 42824fce..90706c93 100644 --- a/meshes/enderal/forgottenstories/armor/rhalata/voice/sithis armour - female mask 02_1.nif +++ b/meshes/enderal/forgottenstories/armor/rhalata/voice/sithis armour - female mask 02_1.nif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:320251d55c06b8dfc86ccdaf6fb92d90071229177d93a54d027785849179349c -size 65404 +oid sha256:fd8dbf6cf254df8ec46477ed33a5f29fc7bb6a4e6bd03cece6dc386d82fd381f +size 65466 diff --git a/meshes/enderal/forgottenstories/rhalata/acolyt/f/cowl_0.nif b/meshes/enderal/forgottenstories/rhalata/acolyt/f/cowl_0.nif new file mode 100644 index 00000000..78596dd6 --- /dev/null +++ b/meshes/enderal/forgottenstories/rhalata/acolyt/f/cowl_0.nif @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:720c76524acd9c03b6a540ba3920e3897a05cad7c100196bff156558331a9dbb +size 70541 diff --git a/meshes/enderal/forgottenstories/rhalata/acolyt/f/cowl_1.nif b/meshes/enderal/forgottenstories/rhalata/acolyt/f/cowl_1.nif new file mode 100644 index 00000000..0dd837d3 --- /dev/null +++ b/meshes/enderal/forgottenstories/rhalata/acolyt/f/cowl_1.nif @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72d34b87bce1dd1ce05686ec2cb8492d49289a1d8b3db6b8e4a736765ac142fa +size 70659 diff --git a/meshes/enderal/forgottenstories/rhalata/voice/m/cowl_0.nif b/meshes/enderal/forgottenstories/rhalata/voice/m/cowl_0.nif new file mode 100644 index 00000000..b6970902 --- /dev/null +++ b/meshes/enderal/forgottenstories/rhalata/voice/m/cowl_0.nif @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc54a92b4e239acbd0752605817152c6342c9259fcc670900de69d4dec219d5f +size 66699 diff --git a/meshes/enderal/forgottenstories/rhalata/voice/m/cowl_1.nif b/meshes/enderal/forgottenstories/rhalata/voice/m/cowl_1.nif new file mode 100644 index 00000000..616c205d --- /dev/null +++ b/meshes/enderal/forgottenstories/rhalata/voice/m/cowl_1.nif @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d897e0409c392360321233a736f31824484cd7036290d098aa8f14d2220c3a4 +size 66699 diff --git a/meshes/enderal/landscape/trees/nico/common reed/commonreed.nif b/meshes/enderal/landscape/trees/nico/common reed/commonreed.nif index 4ee6bfb0..7d129698 100644 --- a/meshes/enderal/landscape/trees/nico/common reed/commonreed.nif +++ b/meshes/enderal/landscape/trees/nico/common reed/commonreed.nif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e8b742d3420eccff0c4dc2f6d15d3983feead564279a9317213631e0eab0cde -size 9221 +oid sha256:1fd6b580a8dd0b8db6d6d0a5fe75a54f00026f37250ed3e269ad23209261dfcc +size 4981 diff --git a/meshes/enderal/landscape/trees/nico/crystal trees/crystalbush01.nif b/meshes/enderal/landscape/trees/nico/crystal trees/crystalbush01.nif index dc79843f..c7aa0781 100644 --- a/meshes/enderal/landscape/trees/nico/crystal trees/crystalbush01.nif +++ b/meshes/enderal/landscape/trees/nico/crystal trees/crystalbush01.nif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c656eb0d27074c9dd4a1e63c344610518d4b4879aca9acb999080d33f11dad61 -size 64439 +oid sha256:6e3930966bbd4a7bc0bd942b074b8a348ecd52f6f40c57263a9c9bb7914abbc0 +size 32888 diff --git a/meshes/enderal/landscape/trees/nico/crystal trees/crystalbush02.nif b/meshes/enderal/landscape/trees/nico/crystal trees/crystalbush02.nif index 10ba8432..80e1fec6 100644 --- a/meshes/enderal/landscape/trees/nico/crystal trees/crystalbush02.nif +++ b/meshes/enderal/landscape/trees/nico/crystal trees/crystalbush02.nif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae0772eea8863e1ae6fa5081bf28fb67c77ec69ec963d38e1a2f2ee5ef3d8ca7 -size 99233 +oid sha256:444ab1da679804951c278147937b7a0abb078b0f6cc7a0cae8dffe1cc269c464 +size 50162 diff --git a/meshes/enderal/landscape/trees/nico/crystal trees/crystalbush03.nif b/meshes/enderal/landscape/trees/nico/crystal trees/crystalbush03.nif index 00faadd7..e6aeafc2 100644 --- a/meshes/enderal/landscape/trees/nico/crystal trees/crystalbush03.nif +++ b/meshes/enderal/landscape/trees/nico/crystal trees/crystalbush03.nif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e370bfd8a6a7965877cb610607ccec0f620069c4e5361f85905aa458ebd4f54 -size 43091 +oid sha256:0242159c00e0b8f5c4adffa789892f8afb7268f0775f4741267b6b4629d50c90 +size 21340 diff --git a/meshes/enderal/landscape/trees/nico/crystal trees/crystaltree01.nif b/meshes/enderal/landscape/trees/nico/crystal trees/crystaltree01.nif index 8eee909e..4af9acad 100644 --- a/meshes/enderal/landscape/trees/nico/crystal trees/crystaltree01.nif +++ b/meshes/enderal/landscape/trees/nico/crystal trees/crystaltree01.nif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d22789a3da37ab310ada001ba758d4678088f3be986a5873c7357ad2e0c247a -size 465398 +oid sha256:718d4505594913fdf7615f4fe67c8864d3d6537c5949f35e233d761dae8b8200 +size 508744 diff --git a/meshes/enderal/landscape/trees/nico/crystal trees/crystaltree02.nif b/meshes/enderal/landscape/trees/nico/crystal trees/crystaltree02.nif index 2601bafa..7588f71e 100644 --- a/meshes/enderal/landscape/trees/nico/crystal trees/crystaltree02.nif +++ b/meshes/enderal/landscape/trees/nico/crystal trees/crystaltree02.nif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5e60b64fa09ac6366a40ac921d476e1ce581a8d3beae8ca79e7785605819e2a -size 465395 +oid sha256:6a21361693e7bd40cab3aa5587b83b5eefd83b3c89254267bca657be4cd5313c +size 508749 diff --git a/meshes/enderal/landscape/trees/nico/crystal trees/crystaltree03.nif b/meshes/enderal/landscape/trees/nico/crystal trees/crystaltree03.nif index 5dea9890..46a8267d 100644 --- a/meshes/enderal/landscape/trees/nico/crystal trees/crystaltree03.nif +++ b/meshes/enderal/landscape/trees/nico/crystal trees/crystaltree03.nif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:269ee5da8e0ee1bc53f57349120b86ea638bdd9681558ee9d80263bb93ccd82e -size 465447 +oid sha256:d2db6e2570409b7bd6c7477b9443f169765d66c341f895c7f78f98e5b51459b6 +size 508809 diff --git a/meshes/enderal/landscape/trees/nico/heartlandbush05.nif b/meshes/enderal/landscape/trees/nico/heartlandbush05.nif index 9bc9a46b..4df042c7 100644 --- a/meshes/enderal/landscape/trees/nico/heartlandbush05.nif +++ b/meshes/enderal/landscape/trees/nico/heartlandbush05.nif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a05cfe3789b9a4f79079d547ffbfe9482531a1697e3e162bff0da09bdb566bb4 -size 137047 +oid sha256:e225c15838fadaefc57f4825b7b4d857ef6c71c22ab8208071c143889d05b055 +size 67376 diff --git a/meshes/enderal/landscape/trees/nico/heartlandbush07.nif b/meshes/enderal/landscape/trees/nico/heartlandbush07.nif index 7e88597e..960d96e5 100644 --- a/meshes/enderal/landscape/trees/nico/heartlandbush07.nif +++ b/meshes/enderal/landscape/trees/nico/heartlandbush07.nif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1f0e4ddfc839309207492c98d6d1ee96ffec05259099a08d47aa9b38122c78d -size 101167 +oid sha256:cb2cfd8301d2036f846e8491660ad3bfd0dcfb72605bfae1085b063193d537fa +size 51287 diff --git a/meshes/enderal/landscape/trees/nico/whispertreebranchpile.nif b/meshes/enderal/landscape/trees/nico/whispertreebranchpile.nif index 58303fe5..9b9e862d 100644 --- a/meshes/enderal/landscape/trees/nico/whispertreebranchpile.nif +++ b/meshes/enderal/landscape/trees/nico/whispertreebranchpile.nif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b49d0e4478b1195e0970add5ae16cccf4e7aa6195f12e580ce16c091bbb6aa24 -size 71597 +oid sha256:7bcaf0a7b2fc6298f6d62266e862051afa9d266a30a4846cec55abec9e8dc3e0 +size 36207 diff --git a/meshes/enderal/landscape/trees/nico/whispertreebranchpile02.nif b/meshes/enderal/landscape/trees/nico/whispertreebranchpile02.nif index 826b60f7..12761b4e 100644 --- a/meshes/enderal/landscape/trees/nico/whispertreebranchpile02.nif +++ b/meshes/enderal/landscape/trees/nico/whispertreebranchpile02.nif @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4174728f3c1cfa0609698a12e6a9f97338d3d79354d6cf5ed6c3616c219218fb -size 76427 +oid sha256:1abe6662de6da57f068a4c91a34bd815fb3de76d35a563808120638130bd7571 +size 38357 diff --git a/scripts/_00e_nq_bounty01_targetscript.pex b/scripts/_00e_nq_bounty01_targetscript.pex index 138105e8..f8531190 100644 Binary files a/scripts/_00e_nq_bounty01_targetscript.pex and b/scripts/_00e_nq_bounty01_targetscript.pex differ diff --git a/scripts/source/_00e_nq_bounty01_targetscript.psc b/scripts/source/_00e_nq_bounty01_targetscript.psc index 0556344e..140dbb14 100644 --- 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 diff --git a/strings/enderal - forgotten stories_chinese.strings b/strings/enderal - forgotten stories_chinese.strings index 1198a886..9cc8fbb3 100644 Binary files a/strings/enderal - forgotten stories_chinese.strings and b/strings/enderal - forgotten stories_chinese.strings differ diff --git a/strings/enderal - forgotten stories_english.dlstrings b/strings/enderal - forgotten stories_english.dlstrings index f90ef632..96536828 100644 Binary files a/strings/enderal - forgotten stories_english.dlstrings and b/strings/enderal - forgotten stories_english.dlstrings differ diff --git a/strings/enderal - forgotten stories_english.ilstrings b/strings/enderal - forgotten stories_english.ilstrings index 26c619cd..0ab54fa3 100644 Binary files a/strings/enderal - forgotten stories_english.ilstrings and b/strings/enderal - forgotten stories_english.ilstrings differ diff --git a/strings/enderal - forgotten stories_english.strings b/strings/enderal - forgotten stories_english.strings index 2c8cc1dc..1eedc6f1 100644 Binary files a/strings/enderal - forgotten stories_english.strings and b/strings/enderal - forgotten stories_english.strings differ diff --git a/strings/enderal - forgotten stories_french.strings b/strings/enderal - forgotten stories_french.strings index 961cddbf..ad0abbee 100644 Binary files a/strings/enderal - forgotten stories_french.strings and b/strings/enderal - forgotten stories_french.strings differ diff --git a/strings/enderal - forgotten stories_german.strings b/strings/enderal - forgotten stories_german.strings index a526f1dc..c658ebe1 100644 Binary files a/strings/enderal - forgotten stories_german.strings and b/strings/enderal - forgotten stories_german.strings differ diff --git a/strings/enderal - forgotten stories_italian.strings b/strings/enderal - forgotten stories_italian.strings index 91f08f4c..3c9cddeb 100644 Binary files a/strings/enderal - forgotten stories_italian.strings and b/strings/enderal - forgotten stories_italian.strings differ diff --git a/strings/enderal - forgotten stories_japanese.strings b/strings/enderal - forgotten stories_japanese.strings index c5f10c98..1d855f79 100644 Binary files a/strings/enderal - forgotten stories_japanese.strings and b/strings/enderal - forgotten stories_japanese.strings differ diff --git a/strings/enderal - forgotten stories_korean.strings b/strings/enderal - forgotten stories_korean.strings index 3eb2857e..5826700c 100644 Binary files a/strings/enderal - forgotten stories_korean.strings and b/strings/enderal - forgotten stories_korean.strings differ diff --git a/strings/enderal - forgotten stories_russian.strings b/strings/enderal - forgotten stories_russian.strings index 86d78251..3fbebdd8 100644 Binary files a/strings/enderal - forgotten stories_russian.strings and b/strings/enderal - forgotten stories_russian.strings differ diff --git a/strings/enderal - forgotten stories_spanish.ilstrings b/strings/enderal - forgotten stories_spanish.ilstrings index 8e717dfb..233ab8eb 100644 Binary files a/strings/enderal - forgotten stories_spanish.ilstrings and b/strings/enderal - forgotten stories_spanish.ilstrings differ diff --git a/strings/enderal - forgotten stories_spanish.strings b/strings/enderal - forgotten stories_spanish.strings index 204419a9..2b340d9e 100644 Binary files a/strings/enderal - forgotten stories_spanish.strings and b/strings/enderal - forgotten stories_spanish.strings differ diff --git a/textures/actors/character/facegendata/facetint/skyrim.esm/00018fbe.dds b/textures/actors/character/facegendata/facetint/skyrim.esm/00018fbe.dds index 9f0cb777..93a888b2 100644 --- a/textures/actors/character/facegendata/facetint/skyrim.esm/00018fbe.dds +++ b/textures/actors/character/facegendata/facetint/skyrim.esm/00018fbe.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be9b65b72a72a642a55e25324ffda2aaf0733f94c26d9be69e05d6aaeac001bd -size 43832 +oid sha256:acbaf84a69443c29f3867f758b9471637779628588aecb655ff5df2f452485de +size 349700 diff --git a/textures/actors/character/facegendata/facetint/skyrim.esm/0014be90.dds b/textures/actors/character/facegendata/facetint/skyrim.esm/0014be90.dds index 4353f2a0..25bdda25 100644 --- a/textures/actors/character/facegendata/facetint/skyrim.esm/0014be90.dds +++ b/textures/actors/character/facegendata/facetint/skyrim.esm/0014be90.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6284322f3258def1e5700f0e0e1ba22bb2d35ab82ebf374cbd9344ad5e18d3e2 +oid sha256:2c754dcd5c1a065d40bf5e386b9c5dc9be74592cd7e7bdf91881e63915668439 size 349700 diff --git a/textures/armor/nightingale/f/nightingalearmorcapef.dds b/textures/armor/nightingale/f/nightingalearmorcapef.dds new file mode 100644 index 00000000..a1c9dddd --- /dev/null +++ b/textures/armor/nightingale/f/nightingalearmorcapef.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3d8d69656a6336647feb7a904a624fa0a1522f5ce6ffe509d6816a277d7e835 +size 1398256 diff --git a/textures/armor/nightingale/m/nightingalearmorcapem.dds b/textures/armor/nightingale/m/nightingalearmorcapem.dds new file mode 100644 index 00000000..c999855e --- /dev/null +++ b/textures/armor/nightingale/m/nightingalearmorcapem.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d5f79f0ce220662e320b047585cee87bf000df5f0b4b07413ea84c6c2f25af2 +size 1398256 diff --git a/textures/armor/nightingale/m/nightingalearmorcapesorrow.dds b/textures/armor/nightingale/m/nightingalearmorcapesorrow.dds new file mode 100644 index 00000000..1b93770a --- /dev/null +++ b/textures/armor/nightingale/m/nightingalearmorcapesorrow.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d66ed149f19d6052d48a857d2356b53497b28ad5d5f9647a09af577c7db55b3c +size 699192 diff --git a/textures/enderal/actors/calia/calia_warpaint.dds b/textures/enderal/actors/calia/calia_warpaint.dds index 70ab4481..f47f202c 100644 --- a/textures/enderal/actors/calia/calia_warpaint.dds +++ b/textures/enderal/actors/calia/calia_warpaint.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb911973a24f2d37ad3b33d43b82a8faa708d6d07a5bfebf5ab8880b5c05d998 -size 43832 +oid sha256:da607bf6b199c3251ec51440b41bbfdde6ec006d36f9c41b2cc08b231605d0a0 +size 699192