Skip to content

Commit

Permalink
update for skse 2.1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
eeveelo committed Jan 8, 2022
1 parent 7bcb110 commit 30decf7
Show file tree
Hide file tree
Showing 17 changed files with 35 additions and 11 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -15,3 +15,4 @@ SKSE/Plugins/SexLabUtil.iobj
SKSE/Plugins/SexLabUtil.ipdb
SKSE/Plugins/SexLabUtil.lib
SKSE/Plugins/SexLabUtil.pdb
sexlab.code-workspace
2 changes: 1 addition & 1 deletion Readme - SexLab Framework.txt
Expand Up @@ -4,7 +4,7 @@
Skryim SexLab Framework
By Ashal of Loverslab.com

Version 1.64b AE, 2021/11/23
Version 1.64c AE, 2022/01/07

-- Description --------------------------------------------------------------

Expand Down
Binary file modified SKSE/Plugins/PapyrusUtil.dll
Binary file not shown.
Binary file modified SKSE/Plugins/SexLabUtil.dll
Binary file not shown.
Binary file modified scripts/PapyrusUtil.pex
Binary file not shown.
Binary file modified scripts/SexLabUtil.pex
Binary file not shown.
2 changes: 1 addition & 1 deletion scripts/Source/PapyrusUtil.psc
Expand Up @@ -5,7 +5,7 @@ int function GetVersion() global native

; Get version of compiled papyrus scripts which should match return from GetVersion()
int function GetScriptVersion() global
return 42
return 43
endFunction

; ##
Expand Down
4 changes: 2 additions & 2 deletions scripts/Source/SexLabUtil.psc
Expand Up @@ -5,11 +5,11 @@ scriptname SexLabUtil hidden
; ------------------------------------------------------- ;

int function GetVersion() global
return 16401
return 16403
endFunction

string function GetStringVer() global
return "1.64b AE"
return "1.64c AE"
endFunction

bool function SexLabIsActive() global
Expand Down
8 changes: 4 additions & 4 deletions scripts/Source/sslConfigMenu.psc
Expand Up @@ -1057,10 +1057,10 @@ function InstallMenu()
endFunction

function SystemCheckOptions()
AddTextOption("Skyrim Script Extender (2.0.17+)", StringIfElse(Config.CheckSystemPart("SKSE"), "<font color='#00FF00'>ok</font>", "<font color='#FF0000'>X</font>"), OPTION_FLAG_DISABLED)
AddTextOption("Skyrim Script Extender (2.1.5+)", StringIfElse(Config.CheckSystemPart("SKSE"), "<font color='#00FF00'>ok</font>", "<font color='#FF0000'>X</font>"), OPTION_FLAG_DISABLED)
AddTextOption("SexLabUtil.dll SKSE Plugin (1.6+)", StringIfElse(Config.CheckSystemPart("SexLabUtil"), "<font color='#00FF00'>ok</font>", "<font color='#FF0000'>X</font>"), OPTION_FLAG_DISABLED)
AddTextOption("PapyrusUtil.dll SKSE Plugin (3.9+)", StringIfElse(Config.CheckSystemPart("PapyrusUtil"), "<font color='#00FF00'>ok</font>", "<font color='#FF0000'>X</font>"), OPTION_FLAG_DISABLED)
AddTextOption("SKEE64.dll SKSE Plugin (3.4+)", StringIfElse(Config.CheckSystemPart("NiOverride"), "<font color='#00FF00'>ok</font>", "<font color='#0000FF'>?</font>"), OPTION_FLAG_DISABLED)
AddTextOption("PapyrusUtil.dll SKSE Plugin (4.3+)", StringIfElse(Config.CheckSystemPart("PapyrusUtil"), "<font color='#00FF00'>ok</font>", "<font color='#FF0000'>X</font>"), OPTION_FLAG_DISABLED)
; AddTextOption("SKEE64.dll SKSE Plugin (3.4+)", StringIfElse(Config.CheckSystemPart("NiOverride"), "<font color='#00FF00'>ok</font>", "<font color='#0000FF'>?</font>"), OPTION_FLAG_DISABLED)
AddTextOption("FNIS - Fores New Idles in Skyrim (7.0+)", StringIfElse(Config.CheckSystemPart("FNIS"), "<font color='#00FF00'>ok</font>", "<font color='#FF0000'>X</font>"), OPTION_FLAG_DISABLED)
AddTextOption("FNIS For Users Behaviors Generated", StringIfElse(Config.CheckSystemPart("FNISGenerated"), "<font color='#00FF00'>ok</font>", "<font color='#0000FF'>?</font>"), OPTION_FLAG_DISABLED)
AddTextOption("FNIS SexLab Framework Idles", StringIfElse(Config.CheckSystemPart("FNISSexLabFramework"), "<font color='#00FF00'>ok</font>", "<font color='#0000FF'>?</font>"), OPTION_FLAG_DISABLED)
Expand Down Expand Up @@ -1126,7 +1126,7 @@ function AnimationSettings()
AddToggleOptionST("RestrictAggressive","$SSL_RestrictAggressive", Config.RestrictAggressive)
AddToggleOptionST("RestrictSameSex","$SSL_RestrictSameSex", Config.RestrictSameSex)
AddToggleOptionST("RestrictGenderTag","$SSL_RestrictGenderTag", Config.RestrictGenderTag)
AddToggleOptionST("ForceSort","$SSL_ForceSort", Config.ForceSort)
; AddToggleOptionST("ForceSort","$SSL_ForceSort", Config.ForceSort)
AddToggleOptionST("UndressAnimation","$SSL_UndressAnimation", Config.UndressAnimation)
AddToggleOptionST("RedressVictim","$SSL_VictimsRedress", Config.RedressVictim)
AddToggleOptionST("StraponsFemale","$SSL_FemalesUseStrapons", Config.UseStrapons)
Expand Down
23 changes: 23 additions & 0 deletions scripts/Source/sslEffectDebug.psc
Expand Up @@ -28,6 +28,29 @@ endFunction
event OnEffectStart(Actor TargetRef, Actor CasterRef)
SexLab.QuickStart(CasterRef, TargetRef)


; Form UmbraBossQuest = Game.GetFormFromFile(0xBFC, "ccbgssse016-umbra.esm")
; Log("UmbraBossQuest: "+UmbraBossQuest)
; Form Lurker = Game.GetFormFromFile(0x817, "ccpewsse002-armsofchaos.esl")
; Log("Lurker: "+Lurker)

; StorageUtil.SetFormValue(UmbraBossQuest, "test1", Lurker)
; Log("Test 1: "+StorageUtil.GetFormValue(UmbraBossQuest, "test1"))

; StorageUtil.SetFormValue(Lurker, "test2", UmbraBossQuest)
; Log("Test 2: "+StorageUtil.GetFormValue(Lurker, "test2"))

; StorageUtil.FormListAdd(None, "test3", UmbraBossQuest, false)
; StorageUtil.FormListAdd(None, "test3", Lurker, false)
; StorageUtil.FormListAdd(None, "test3", SexLab, false)
; StorageUtil.FormListAdd(None, "test3", TargetRef, false)
; StorageUtil.FormListAdd(None, "test3", none, false)
; form[] listtest = StorageUtil.FormListToArray(None, "test3")
; Log("Test 3: "+listtest)

; int cleaned = StorageUtil.debug_Cleanup()
; Log("Cleaned: "+cleaned)

; MiscUtil.ToggleFreeCamera()

; Log("Result: "+TestList2)
Expand Down
6 changes: 3 additions & 3 deletions scripts/Source/sslSystemConfig.psc
Expand Up @@ -825,7 +825,7 @@ bool function CheckSystemPart(string CheckSystem)
return Quest.GetQuest("SKI_ConfigManagerInstance") != none

elseIf CheckSystem == "SexLabUtil"
return SexLabUtil.GetPluginVersion() >= 16401
return SexLabUtil.GetPluginVersion() >= 16403

elseIf CheckSystem == "PapyrusUtil"
return PapyrusUtil.GetVersion() >= 41
Expand Down Expand Up @@ -859,7 +859,7 @@ bool function CheckSystem()
return false
; Check SKSE install
elseIf !CheckSystemPart("SKSE")
CheckSKSE.Show(2.12)
CheckSKSE.Show(2.15)
return false
; Check SkyUI install - depends on passing SKSE check passing
elseIf !CheckSystemPart("SkyUI")
Expand All @@ -871,7 +871,7 @@ bool function CheckSystem()
return false
; Check PapyrusUtil install - depends on passing SKSE check passing
elseIf !CheckSystemPart("PapyrusUtil")
CheckPapyrusUtil.Show(4.1)
CheckPapyrusUtil.Show(4.3)
return false
; Check FNIS generation - soft fail
; elseIf CheckSystemPart("FNISSexLabFramework")
Expand Down
Binary file modified scripts/sslActorLibrary.pex
Binary file not shown.
Binary file modified scripts/sslConfigMenu.pex
Binary file not shown.
Binary file modified scripts/sslEffectDebug.pex
Binary file not shown.
Binary file modified scripts/sslSystemAlias.pex
Binary file not shown.
Binary file modified scripts/sslSystemConfig.pex
Binary file not shown.
Binary file modified scripts/sslThreadLibrary.pex
Binary file not shown.

0 comments on commit 30decf7

Please sign in to comment.