diff --git a/Simple Prostitution/Meshes/Actors/Character/FaceGenData/FaceGeom/mrt_SimpleProstitution.esp/00000831.NIF b/Simple Prostitution/Meshes/Actors/Character/FaceGenData/FaceGeom/mrt_SimpleProstitution.esp/00000831.NIF index 4ba06c8..c4f5ef4 100644 Binary files a/Simple Prostitution/Meshes/Actors/Character/FaceGenData/FaceGeom/mrt_SimpleProstitution.esp/00000831.NIF and b/Simple Prostitution/Meshes/Actors/Character/FaceGenData/FaceGeom/mrt_SimpleProstitution.esp/00000831.NIF differ diff --git a/Simple Prostitution/Scripts/Source/zzzmrt_sp_ddi_interface.psc b/Simple Prostitution/Scripts/Source/zzzmrt_sp_ddi_interface.psc index 64b9b3a..8f5dc8a 100644 --- a/Simple Prostitution/Scripts/Source/zzzmrt_sp_ddi_interface.psc +++ b/Simple Prostitution/Scripts/Source/zzzmrt_sp_ddi_interface.psc @@ -72,12 +72,12 @@ function PlayerLoadsGame(Bool bForce = False) bChecked = True endfunction -Int Function iAddRandomKeyToActor(ObjectReference akRef, Int aiNum = 1) +Int Function iAddRandomDDKeyToRef(ObjectReference akRef, Int aiNum = 1) return 0 endfunction state Installed - Int Function iAddRandomKeyToActor(ObjectReference akRef, Int aiNum = 1) - return zzzmrt_sp_int_ddi._iAddRandomKeyToActor(akRef, ddkeys, aiNum) + Int Function iAddRandomDDKeyToRef(ObjectReference akRef, Int aiNum = 1) + return zzzmrt_sp_int_ddi._iAddRandomKeyToRef(akRef, ddkeys, aiNum) endfunction endState \ No newline at end of file diff --git a/Simple Prostitution/Scripts/Source/zzzmrt_sp_int_ddi.psc b/Simple Prostitution/Scripts/Source/zzzmrt_sp_int_ddi.psc index 5cabf5e..a1b53cc 100644 --- a/Simple Prostitution/Scripts/Source/zzzmrt_sp_int_ddi.psc +++ b/Simple Prostitution/Scripts/Source/zzzmrt_sp_int_ddi.psc @@ -1,7 +1,7 @@ Scriptname zzzmrt_sp_int_ddi Hidden -Int function _iAddRandomKeyToActor(ObjectReference akRef, Form[] akeyArr, Int aiNum = 1) Global +Int function _iAddRandomKeyToRef(ObjectReference akRef, Form[] akeyArr, Int aiNum = 1) Global if (aiNum < 1) || (akeyArr.Length < 1) return 0 endif diff --git a/Simple Prostitution/Scripts/Source/zzzmrt_sp_main_qst_script.psc b/Simple Prostitution/Scripts/Source/zzzmrt_sp_main_qst_script.psc index d1ef58f..6107f9b 100644 --- a/Simple Prostitution/Scripts/Source/zzzmrt_sp_main_qst_script.psc +++ b/Simple Prostitution/Scripts/Source/zzzmrt_sp_main_qst_script.psc @@ -345,7 +345,7 @@ Float function getBaseVersion() endfunction Float function getCurrentVersion() - return getBaseVersion() + 0.21 + return getBaseVersion() + 0.22 endfunction Function persuade(Float fSpeechSkillMult) @@ -1895,7 +1895,7 @@ Bool function GetDibellanRewards(Int aiMessage=0, Int aiButton=0) DibelOfferMenu_InsufficientMark.Show(fDDKeyCost as Int, iMarkCount) aiMessage = 0 elseif DibelOfferMenu_Confirm_DDKey.Show(fDDKeyCost as Int, fDDKeyIncrement as Int) == 0 - int iTotal = DDI_Interface.iAddRandomKeyToActor(player, fDDKeyIncrement as Int) + int iTotal = DDI_Interface.iAddRandomDDKeyToRef(player, fDDKeyIncrement as Int) if iTotal > 0 MCMScript.iTotalDDKeyRecieved += iTotal player.removeItem(dibelMark, fDDKeyCost as Int) diff --git a/Simple Prostitution/Scripts/Source/zzzmrt_sp_utility.psc b/Simple Prostitution/Scripts/Source/zzzmrt_sp_utility.psc index 18bf558..e88906c 100644 --- a/Simple Prostitution/Scripts/Source/zzzmrt_sp_utility.psc +++ b/Simple Prostitution/Scripts/Source/zzzmrt_sp_utility.psc @@ -131,3 +131,31 @@ Bool Function bSucessCalculator(float fSuccessPercent, int iRounds = 1) Global endWhile return False EndFunction + + +Int function iAddRandomItemToRef(ObjectReference akRef, Form[] akItemArr, Int aiTotalToAdd = 1) Global + {Adds random forms from an array to an objectreference and returns how many added.} + if (aiTotalToAdd < 1) || (akItemArr.Length < 1) + return 0 + endif + Int iResult = 0 + Int iTotalItems = akItemArr.Length + Int[] itemNumToAdd = utility.createIntArray(iTotalItems, 0) + Int jIndex + Int iIndex = 0 + while iIndex < aiTotalToAdd + jIndex = Utility.RandomInt(0, iTotalItems - 1) + itemNumToAdd[jIndex] = itemNumToAdd[jIndex] + 1 + iIndex += 1 + endWhile + iIndex = iTotalItems + While iIndex > 0 + iIndex -= 1 + jIndex = itemNumToAdd[iIndex] + if akItemArr[iIndex] && jIndex > 0 + akRef.Additem(akItemArr[iIndex], jIndex) + iResult += jIndex + endif + EndWhile + return iResult +EndFunction diff --git a/Simple Prostitution/Scripts/zzzmrt_sp_ddi_interface.pex b/Simple Prostitution/Scripts/zzzmrt_sp_ddi_interface.pex index 89a09a9..2749fcb 100644 Binary files a/Simple Prostitution/Scripts/zzzmrt_sp_ddi_interface.pex and b/Simple Prostitution/Scripts/zzzmrt_sp_ddi_interface.pex differ diff --git a/Simple Prostitution/Scripts/zzzmrt_sp_int_ddi.pex b/Simple Prostitution/Scripts/zzzmrt_sp_int_ddi.pex index 28660ee..42d7567 100644 Binary files a/Simple Prostitution/Scripts/zzzmrt_sp_int_ddi.pex and b/Simple Prostitution/Scripts/zzzmrt_sp_int_ddi.pex differ diff --git a/Simple Prostitution/Scripts/zzzmrt_sp_main_qst_script.pex b/Simple Prostitution/Scripts/zzzmrt_sp_main_qst_script.pex index 37a086c..1cb8496 100644 Binary files a/Simple Prostitution/Scripts/zzzmrt_sp_main_qst_script.pex and b/Simple Prostitution/Scripts/zzzmrt_sp_main_qst_script.pex differ diff --git a/Simple Prostitution/Scripts/zzzmrt_sp_mcm_qst_script.pex b/Simple Prostitution/Scripts/zzzmrt_sp_mcm_qst_script.pex index 9581777..8dbcf87 100644 Binary files a/Simple Prostitution/Scripts/zzzmrt_sp_mcm_qst_script.pex and b/Simple Prostitution/Scripts/zzzmrt_sp_mcm_qst_script.pex differ diff --git a/Simple Prostitution/Scripts/zzzmrt_sp_utility.pex b/Simple Prostitution/Scripts/zzzmrt_sp_utility.pex index 95c7f76..e97c072 100644 Binary files a/Simple Prostitution/Scripts/zzzmrt_sp_utility.pex and b/Simple Prostitution/Scripts/zzzmrt_sp_utility.pex differ diff --git a/Simple Prostitution/Textures/Actors/Character/FaceGenData/FaceTint/mrt_SimpleProstitution.esp/00000831.dds b/Simple Prostitution/Textures/Actors/Character/FaceGenData/FaceTint/mrt_SimpleProstitution.esp/00000831.dds index 6614338..65f131d 100644 Binary files a/Simple Prostitution/Textures/Actors/Character/FaceGenData/FaceTint/mrt_SimpleProstitution.esp/00000831.dds and b/Simple Prostitution/Textures/Actors/Character/FaceGenData/FaceTint/mrt_SimpleProstitution.esp/00000831.dds differ diff --git a/Simple Prostitution/Textures/Actors/Character/FaceGenData/FaceTint/mrt_SimpleProstitution.esp/00000831.tga b/Simple Prostitution/Textures/Actors/Character/FaceGenData/FaceTint/mrt_SimpleProstitution.esp/00000831.tga index 5153120..6c8da6a 100644 Binary files a/Simple Prostitution/Textures/Actors/Character/FaceGenData/FaceTint/mrt_SimpleProstitution.esp/00000831.tga and b/Simple Prostitution/Textures/Actors/Character/FaceGenData/FaceTint/mrt_SimpleProstitution.esp/00000831.tga differ