diff --git a/Golden Sickle faction fix.esp b/Golden Sickle faction fix.esp new file mode 100644 index 00000000..2f93e83a Binary files /dev/null and b/Golden Sickle faction fix.esp differ diff --git a/scripts/_00e_nq_g_04_functions.pex b/scripts/_00e_nq_g_04_functions.pex index 07c2112a..66b021dc 100644 Binary files a/scripts/_00e_nq_g_04_functions.pex and b/scripts/_00e_nq_g_04_functions.pex differ diff --git a/scripts/_00e_nq_g_05_functions.pex b/scripts/_00e_nq_g_05_functions.pex index 2a17adf0..445b56db 100644 Binary files a/scripts/_00e_nq_g_05_functions.pex and b/scripts/_00e_nq_g_05_functions.pex differ diff --git a/scripts/qf_nq_g_01_00132d97.pex b/scripts/qf_nq_g_01_00132d97.pex index 30de7077..aa49be5b 100644 Binary files a/scripts/qf_nq_g_01_00132d97.pex and b/scripts/qf_nq_g_01_00132d97.pex differ diff --git a/scripts/tif__00139d66.pex b/scripts/tif__00139d66.pex index 8e61c0ab..c3f95e5d 100644 Binary files a/scripts/tif__00139d66.pex and b/scripts/tif__00139d66.pex differ diff --git a/scripts/tif__0013cf75.pex b/scripts/tif__0013cf75.pex index a81ae490..dd4ad798 100644 Binary files a/scripts/tif__0013cf75.pex and b/scripts/tif__0013cf75.pex differ diff --git a/scripts/tif__0013cfa5.pex b/scripts/tif__0013cfa5.pex index de7fc97a..bf4cc14b 100644 Binary files a/scripts/tif__0013cfa5.pex and b/scripts/tif__0013cfa5.pex differ diff --git a/source/scripts/_00e_nq_g_04_functions.psc b/source/scripts/_00e_nq_g_04_functions.psc index fffa1fb2..7fb0c362 100644 --- a/source/scripts/_00e_nq_g_04_functions.psc +++ b/source/scripts/_00e_nq_g_04_functions.psc @@ -175,6 +175,3 @@ Scene Property NQ_G_04_SC03_DijaamEncounter Auto ;marker ObjectReference Property _00E_NQ_G_04_DijaamTeleportForSceneMarker Auto ObjectReference Property _00E_NQ_G_04_DijaamTeleportToTavernMarker Auto - -;for guild rank, called by TIF__00139D66 -Faction Property ArkHaendlergilde Auto diff --git a/source/scripts/_00e_nq_g_05_functions.psc b/source/scripts/_00e_nq_g_05_functions.psc index b1b4d65d..cda96289 100644 --- a/source/scripts/_00e_nq_g_05_functions.psc +++ b/source/scripts/_00e_nq_g_05_functions.psc @@ -125,10 +125,8 @@ EndFunction Function RemovePlayerFromSickle() - PlayerREF.RemoveFromFaction(ArkHaendlergilde) - PlayerREF.RemoveFromFaction(ArkKontorFaction) - ArkHaendlergilde.SetPlayerExpelled() - ArkKontorFaction.SetPlayerExpelled() + PlayerREF.RemoveFromFaction(ArkHaendlergildePlayer) + ArkHaendlergildePlayer.SetPlayerExpelled() EndFunction @@ -290,8 +288,7 @@ Scene Property NQ_G_05_SC02_CellarTalk Auto Scene Property NQ_G_05_SC03_DijaamTalk Auto ;for guild rank -Faction Property ArkHaendlergilde Auto -Faction Property ArkKontorFaction Auto +Faction Property ArkHaendlergildePlayer Auto ;sound for dooropen when messenger is teleported Sound Property DRSWoodSingleLight02OpenM Auto diff --git a/source/scripts/qf_nq_g_01_00132d97.psc b/source/scripts/qf_nq_g_01_00132d97.psc index 59f99cfe..1f7498dd 100644 --- a/source/scripts/qf_nq_g_01_00132d97.psc +++ b/source/scripts/qf_nq_g_01_00132d97.psc @@ -61,8 +61,7 @@ _00E_NQ_G_01_Functions kmyQuest = __temp as _00E_NQ_G_01_Functions ;BEGIN CODE SetObjectiveCompleted(10) kmyQuest.FinishQuest() -Game.GetPlayer().SetFactionRank(ArkHaendlergilde, 0) -Game.GetPlayer().SetFactionRank(ArkKontorFaction, 0) +Game.GetPlayer().SetFactionRank(ArkHaendlergildePlayer, 0) ;END CODE EndFunction ;END FRAGMENT @@ -77,5 +76,4 @@ EndFunction ;END FRAGMENT CODE - Do not edit anything between this and the begin comment -Faction Property ArkHaendlergilde Auto -Faction Property ArkKontorFaction Auto +Faction Property ArkHaendlergildePlayer Auto diff --git a/source/scripts/tif__00139d66.psc b/source/scripts/tif__00139d66.psc index b8dacbec..49c1c0a6 100644 --- a/source/scripts/tif__00139d66.psc +++ b/source/scripts/tif__00139d66.psc @@ -16,7 +16,7 @@ Function Fragment_0(ObjectReference akSpeakerRef) Actor akSpeaker = akSpeakerRef as Actor ;BEGIN CODE NQ_G_04.RemoveContract() -NQ_G_04.PlayerRef.SetFactionRank(NQ_G_04.ArkHaendlergilde, 1) +(Game.GetForm(0x14) as Actor).SetFactionRank(ArkHaendlergildePlayer, 1) ;END CODE EndFunction ;END FRAGMENT @@ -24,3 +24,4 @@ EndFunction ;END FRAGMENT CODE - Do not edit anything between this and the begin comment _00E_NQ_G_04_Functions Property NQ_G_04 Auto +Faction Property ArkHaendlergildePlayer Auto diff --git a/source/scripts/tif__0013cf75.psc b/source/scripts/tif__0013cf75.psc index 1c6e11a2..f45b99f6 100644 --- a/source/scripts/tif__0013cf75.psc +++ b/source/scripts/tif__0013cf75.psc @@ -6,7 +6,7 @@ Scriptname TIF__0013CF75 Extends TopicInfo Hidden Function Fragment_0(ObjectReference akSpeakerRef) Actor akSpeaker = akSpeakerRef as Actor ;BEGIN CODE -If PlayerREF.IsInFaction(ArkHaendlergilde) +If PlayerREF.IsInFaction(ArkHaendlergildePlayer) GetOwningQuest().SetCurrentStageID(25) Else GetOwningQuest().SetCurrentStageID(100) @@ -19,4 +19,4 @@ EndFunction Actor Property PlayerRef Auto -Faction Property ArkHaendlergilde Auto +Faction Property ArkHaendlergildePlayer Auto diff --git a/source/scripts/tif__0013cfa5.psc b/source/scripts/tif__0013cfa5.psc index e6400926..d3a7e13a 100644 --- a/source/scripts/tif__0013cfa5.psc +++ b/source/scripts/tif__0013cfa5.psc @@ -6,7 +6,7 @@ Scriptname TIF__0013CFA5 Extends TopicInfo Hidden Function Fragment_0(ObjectReference akSpeakerRef) Actor akSpeaker = akSpeakerRef as Actor ;BEGIN CODE -If PlayerREF.IsInFaction(ArkHaendlergilde) +If PlayerREF.IsInFaction(ArkHaendlergildePlayer) GetOwningQuest().SetCurrentStageID(25) Else GetOwningQuest().SetCurrentStageID(100) @@ -19,4 +19,4 @@ EndFunction Actor Property PlayerRef Auto -Faction Property ArkHaendlergilde Auto +Faction Property ArkHaendlergildePlayer Auto