From 72aae0f182414da7d7a5c01f9fb16cf9e9943787 Mon Sep 17 00:00:00 2001 From: isathar Date: Thu, 15 Jul 2021 17:31:18 -0400 Subject: [PATCH] 1.03 - removed debug function calls --- Changelog.txt | 71 +++++++++++++++++++ .../Quest/QF_PackAnimalManagerQuest.psc | 0 .../TIF_PackAnimalManager_DismissAnimal.psc | 0 .../TIF_PackAnimalManager_FollowDistance.psc | 0 .../TIF_PackAnimalManager_Follow_1.psc | 0 .../TIF_PackAnimalManager_OffloadAt.psc | 0 .../TIF_PackAnimalManager_SetAggressive.psc | 0 .../TIF_PackAnimalManager_SetHome.psc | 0 .../TIF_PackAnimalManager_SetProtected.psc | 0 .../TIF_PackAnimalManager_ShowStats.psc | 0 .../TIF_PackAnimalManager_StartEquip.psc | 0 .../TIF_PackAnimalManager_TrackingReqs.psc | 0 .../TIF_PackAnimalManager_Trade_1.psc | 0 .../TIF_PackAnimalManager_WaitAt.psc | 0 .../TIF_PackAnimalManager_Wait_1.psc | 0 .../PPAAnimalArmorScript.psc | 0 .../PPAAnimalGuardAliasScript.psc | 0 .../PPAAnimalImplantScript.psc | 0 .../PPAPackAnimalActorScript.psc | 23 +++--- .../PPAPackAnimalBeaconScript.psc | 0 .../PPAPackAnimalContainerScript.psc | 0 .../PPAPackAnimalCraftingObject.psc | 0 .../PPAPackAnimalEquipItemScript.psc | 6 +- .../PPAPackAnimalExtraSlotScript.psc | 0 .../PPAPackAnimalGuardAssigner.psc | 3 - .../PPAPackAnimalManagerQuestScript.psc | 47 +++++++----- .../PPAPackAnimalOrderScript.psc | 0 .../PPAPackAnimalSpawnerScript.psc | 8 --- .../PPAPackAnimalTranqScript.psc | 6 +- .../PPAPackAnimalWSConvertScript.psc | 17 +---- .../PPATamingPerkUpgradeScript.psc | 0 .../TERM_PackAnimalConfig_CheatPackLimit.psc | 0 .../TERM_PackAnimalConfig_DeleteDead.psc | 0 .../TERM_PackAnimalConfig_PartyLimit.psc | 0 .../TERM_PackAnimalConfig_PerkReqs.psc | 0 .../TERM_PackAnimalConfig_ProtectedGuards.psc | 0 .../TERM_PackAnimalConfig_ToggleFreeCheat.psc | 0 .../TERM_PackAnimalConfig_ToggleSurvival.psc | 0 .../TERM_PackAnimalConfig_ToggleWaitInt.psc | 0 .../TERM_PackAnimalConfing_MaxWaitTime.psc | 0 40 files changed, 125 insertions(+), 56 deletions(-) create mode 100644 Changelog.txt rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/Fragments/Quest/QF_PackAnimalManagerQuest.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_DismissAnimal.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_FollowDistance.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_Follow_1.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_OffloadAt.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_SetAggressive.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_SetHome.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_SetProtected.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_ShowStats.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_StartEquip.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_TrackingReqs.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_Trade_1.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_WaitAt.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_Wait_1.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/PPAAnimalArmorScript.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/PPAAnimalGuardAliasScript.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/PPAAnimalImplantScript.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/PPAPackAnimalActorScript.psc (97%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/PPAPackAnimalBeaconScript.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/PPAPackAnimalContainerScript.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/PPAPackAnimalCraftingObject.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/PPAPackAnimalEquipItemScript.psc (95%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/PPAPackAnimalExtraSlotScript.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/PPAPackAnimalGuardAssigner.psc (95%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/PPAPackAnimalManagerQuestScript.psc (95%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/PPAPackAnimalOrderScript.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/PPAPackAnimalSpawnerScript.psc (93%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/PPAPackAnimalTranqScript.psc (86%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/PPAPackAnimalWSConvertScript.psc (83%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/PPATamingPerkUpgradeScript.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_CheatPackLimit.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_DeleteDead.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_PartyLimit.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_PerkReqs.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_ProtectedGuards.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_ToggleFreeCheat.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_ToggleSurvival.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_ToggleWaitInt.psc (100%) rename {Data/Scripts/Source/User => Papyrus}/PersonalPackAnimals/Terminal/TERM_PackAnimalConfing_MaxWaitTime.psc (100%) diff --git a/Changelog.txt b/Changelog.txt new file mode 100644 index 0000000..4b83345 --- /dev/null +++ b/Changelog.txt @@ -0,0 +1,71 @@ +1.03: + - removed debug function calls, replaced some with messages + - recompiled all the scripts in Release mode + - XB1 release + +1.02: + - saved the plugin with the current CK version, repackaged everything. + +1.01: + Fixes: + - the leveling system should now actually do something + - renamed and moved used armor slots to match community standards + - new slots are '41 - [A] Torso' for packs, '46 - Headband' for implants, and '50 - Neck' for collars + - default animal races' morph + armor race settings now carry over to pack animal races - for a future update + - increased idle chatter min + max times for pack animal races + - (testing) minor tweak to AI packages as an attempted fix for pack animals disappearing in some instances + - pack mirelurks should allow interaction now (woops) + - fixed the dog pack addon's skinning + - tracking should work more consistently now + Gameplay Tweaks: + - increased capture chances for all animals (all sources) + - capture chance is now influenced by Animal Friend, Wasteland Whisperer, and Luck (maximum +22%) + - removed XP reward for killing pack animals (maybe...?) + - pack dogs can no longer open doors + - pack animals now use the standard follower command interface + Misc: + - converted most debug text to message format - still a few more left + - added crafting menu display objects for pack animals + - base work for vicious dogs and FEV hounds for a future update + - base work for Far Harbor + Nuka World DLC support + - the tracking quest is back to being listed as a side quest instead of misc objectives + - improved compatibility with game start by not starting the manager quest until an animal trainer is built + +1.00: + completely rebuilt the mod with the creation kit + +0.9: + - increased pack brahmin speed + - configuration is now handled by a holotape + - pack animal aggression can now be configured + - added the option to make pack animals essential + - pack animals are now protected/essential when spawned while the option is enabled + - lowered script update time to every 30 minutes game time (from an hour) to work around pathing issues + - added cheat 'equipment' for carry weight and speed + - (probably) fixed settlers randomly attacking your pack animals + - added the option to track pack animals when they die + - cleaned up + optimized scripts (somewhat) + - preparations to allow default game animals to be managed by the mod + +0.62: + - fixed uninstall script stalling until pack animals are deleted. + - fixed uninstall/reset procedure to properly clear tracked pack animals and reset the count variable + - fixed brahmin health being set to 5.0 when arriving at settlements they were sent to (facepalm) + - edited dead cleanup to allow for more than one body to be marked for delete per hour + - pack brahmin sandboxing behavior should now be identical to default workshop brahmin behavior + +0.61: + fixed reversed Wait on Player Enter Interior option + +0.6: + - removed broken default/alternate follow AI + - added a toggle to allow pack animals to follow the player into buildings + - added "(player name)'s " to pack animal names + - tracking targets now display the target's name in preparation for additional animal types in a future release + - fixed packs not being properly removed from the interaction menu + - fixed most instances of pack animals getting stuck while travelling + - replaced most of the scripted debug text with message forms + +0.5: + initial release + diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/Fragments/Quest/QF_PackAnimalManagerQuest.psc b/Papyrus/PersonalPackAnimals/Fragments/Quest/QF_PackAnimalManagerQuest.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/Fragments/Quest/QF_PackAnimalManagerQuest.psc rename to Papyrus/PersonalPackAnimals/Fragments/Quest/QF_PackAnimalManagerQuest.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_DismissAnimal.psc b/Papyrus/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_DismissAnimal.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_DismissAnimal.psc rename to Papyrus/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_DismissAnimal.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_FollowDistance.psc b/Papyrus/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_FollowDistance.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_FollowDistance.psc rename to Papyrus/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_FollowDistance.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_Follow_1.psc b/Papyrus/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_Follow_1.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_Follow_1.psc rename to Papyrus/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_Follow_1.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_OffloadAt.psc b/Papyrus/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_OffloadAt.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_OffloadAt.psc rename to Papyrus/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_OffloadAt.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_SetAggressive.psc b/Papyrus/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_SetAggressive.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_SetAggressive.psc rename to Papyrus/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_SetAggressive.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_SetHome.psc b/Papyrus/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_SetHome.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_SetHome.psc rename to Papyrus/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_SetHome.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_SetProtected.psc b/Papyrus/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_SetProtected.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_SetProtected.psc rename to Papyrus/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_SetProtected.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_ShowStats.psc b/Papyrus/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_ShowStats.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_ShowStats.psc rename to Papyrus/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_ShowStats.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_StartEquip.psc b/Papyrus/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_StartEquip.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_StartEquip.psc rename to Papyrus/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_StartEquip.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_TrackingReqs.psc b/Papyrus/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_TrackingReqs.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_TrackingReqs.psc rename to Papyrus/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_TrackingReqs.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_Trade_1.psc b/Papyrus/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_Trade_1.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_Trade_1.psc rename to Papyrus/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_Trade_1.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_WaitAt.psc b/Papyrus/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_WaitAt.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_WaitAt.psc rename to Papyrus/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_WaitAt.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_Wait_1.psc b/Papyrus/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_Wait_1.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_Wait_1.psc rename to Papyrus/PersonalPackAnimals/Fragments/TIF_PackAnimalManager_Wait_1.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/PPAAnimalArmorScript.psc b/Papyrus/PersonalPackAnimals/PPAAnimalArmorScript.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/PPAAnimalArmorScript.psc rename to Papyrus/PersonalPackAnimals/PPAAnimalArmorScript.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/PPAAnimalGuardAliasScript.psc b/Papyrus/PersonalPackAnimals/PPAAnimalGuardAliasScript.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/PPAAnimalGuardAliasScript.psc rename to Papyrus/PersonalPackAnimals/PPAAnimalGuardAliasScript.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/PPAAnimalImplantScript.psc b/Papyrus/PersonalPackAnimals/PPAAnimalImplantScript.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/PPAAnimalImplantScript.psc rename to Papyrus/PersonalPackAnimals/PPAAnimalImplantScript.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalActorScript.psc b/Papyrus/PersonalPackAnimals/PPAPackAnimalActorScript.psc similarity index 97% rename from Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalActorScript.psc rename to Papyrus/PersonalPackAnimals/PPAPackAnimalActorScript.psc index bbfcca3..9cee6ea 100644 --- a/Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalActorScript.psc +++ b/Papyrus/PersonalPackAnimals/PPAPackAnimalActorScript.psc @@ -10,6 +10,7 @@ Group PackAnimalStats FormList Property pPossibleSkins auto Const mandatory {list of possible skin items for this animal} + EndGroup Group PackAnimalFood @@ -25,6 +26,12 @@ Group PackAnimalFood {chance increase per hour of becoming aggressive when not fed} EndGroup +Message Property pMsgFollowNear auto const mandatory +Message Property pMsgFollowFar auto const mandatory +Message Property pMsgNoPack auto const mandatory +Message Property pMsgStillHungry auto const mandatory +Message Property pMsgStuffed auto const mandatory + PersonalPackanimals:PPAPackAnimalManagerQuestScript Property pManagerQuest auto Const mandatory {link to pack animal manager quest} @@ -108,7 +115,7 @@ Event OnInit() RegisterForCustomEvent(pManagerQuest, "PackAnimalTickEvent") RegisterForCustomEvent(pManagerQuest, "UpgradePackCapacityEvent") - ;debug.notification("Pack animal initialized") + EndEvent ;/add inventory filter/; @@ -447,10 +454,10 @@ Function ToggleFollowDistance() ActorValue tempVal = Game.GetCommonProperties().FollowerDistance if GetValue(tempVal) > 0.0 SetValue(tempVal, 0.0) - debug.notification("near") + pMsgFollowNear.Show() else SetValue(tempVal, 1.0) - debug.notification("far") + pMsgFollowFar.Show() endIf EndFunction @@ -469,7 +476,7 @@ Function OpenPackInventory(int menuVar) if PackContainer_Storage.GetCurCapacity() > 0 PackContainer_Storage.Activate(Game.GetPlayer()) else - debug.notification("no pack of this type") + pMsgNoPack.Show() endIf endIf elseif menuVar == 1 @@ -477,7 +484,7 @@ Function OpenPackInventory(int menuVar) if PackContainer_Ammo.GetCurCapacity() > 0 PackContainer_Ammo.Activate(Game.GetPlayer()) else - debug.notification("no pack of this type") + pMsgNoPack.Show() endIf endIf elseif menuVar == 2 @@ -485,7 +492,7 @@ Function OpenPackInventory(int menuVar) if PackContainer_Delivery.GetCurCapacity() > 0 PackContainer_Delivery.Activate(Game.GetPlayer()) else - debug.notification("no pack of this type") + pMsgNoPack.Show() endIf endIf endIf @@ -517,9 +524,9 @@ Function FeedPackAnimal(int iFoodType = 0) endIf fNextFeedingTime = fCurTime + (fFoodVal * fHourMultiplier) if fCurTime - fNextFeedingTime >= fFeedingInterval - debug.notification("Your pack animal is still hungry") + pMsgStillHungry.Show() else - debug.notification("Your pack animal is full") + pMsgStuffed.Show() endIf EndFunction diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalBeaconScript.psc b/Papyrus/PersonalPackAnimals/PPAPackAnimalBeaconScript.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalBeaconScript.psc rename to Papyrus/PersonalPackAnimals/PPAPackAnimalBeaconScript.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalContainerScript.psc b/Papyrus/PersonalPackAnimals/PPAPackAnimalContainerScript.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalContainerScript.psc rename to Papyrus/PersonalPackAnimals/PPAPackAnimalContainerScript.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalCraftingObject.psc b/Papyrus/PersonalPackAnimals/PPAPackAnimalCraftingObject.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalCraftingObject.psc rename to Papyrus/PersonalPackAnimals/PPAPackAnimalCraftingObject.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalEquipItemScript.psc b/Papyrus/PersonalPackAnimals/PPAPackAnimalEquipItemScript.psc similarity index 95% rename from Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalEquipItemScript.psc rename to Papyrus/PersonalPackAnimals/PPAPackAnimalEquipItemScript.psc index 75b1ab9..5646ab6 100644 --- a/Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalEquipItemScript.psc +++ b/Papyrus/PersonalPackAnimals/PPAPackAnimalEquipItemScript.psc @@ -24,6 +24,8 @@ Group ModStats {keyword to check if actor is a pack animal} EndGroup +Message Property pFailedMessage auto Const mandatory + Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldContainer) @@ -44,7 +46,7 @@ Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldCo endIf endIf else - debug.notification("wrong animal type") + pFailedMessage.Show() endIf endIf else @@ -58,7 +60,7 @@ Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldCo animalActor.AttachMod(pNullMod) endIf else - debug.notification("wrong animal type") + pFailedMessage.Show() endIf endIf endIf diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalExtraSlotScript.psc b/Papyrus/PersonalPackAnimals/PPAPackAnimalExtraSlotScript.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalExtraSlotScript.psc rename to Papyrus/PersonalPackAnimals/PPAPackAnimalExtraSlotScript.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalGuardAssigner.psc b/Papyrus/PersonalPackAnimals/PPAPackAnimalGuardAssigner.psc similarity index 95% rename from Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalGuardAssigner.psc rename to Papyrus/PersonalPackAnimals/PPAPackAnimalGuardAssigner.psc index ff8c50d..e3f9eff 100644 --- a/Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalGuardAssigner.psc +++ b/Papyrus/PersonalPackAnimals/PPAPackAnimalGuardAssigner.psc @@ -54,12 +54,9 @@ function AssignActorCustom(WorkshopNPCScript newActor) endIf tempScript.ClearDialogueTarget() else - debug.notification("no animal ref at " + i) i += 1 endIf endWhile - else - debug.notification("no quest script") endIf utility.wait(2.0) diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalManagerQuestScript.psc b/Papyrus/PersonalPackAnimals/PPAPackAnimalManagerQuestScript.psc similarity index 95% rename from Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalManagerQuestScript.psc rename to Papyrus/PersonalPackAnimals/PPAPackAnimalManagerQuestScript.psc index 6e1c883..a889ef8 100644 --- a/Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalManagerQuestScript.psc +++ b/Papyrus/PersonalPackAnimals/PPAPackAnimalManagerQuestScript.psc @@ -201,6 +201,19 @@ Group ErrorMessages EndGroup +Group DebugMessages + Message Property pDebugCountActive auto Const mandatory + Message Property pDebugCountDead auto Const mandatory + Message Property pDebugCountIdle auto Const mandatory + Message Property pDebugCountTracked auto Const mandatory + Message Property pDebugCountLured auto Const mandatory + Message Property pDebugCountGuards auto Const mandatory + Message Property pDebugCountTrappers auto Const mandatory + Message Property pDebugCountGuardQueue auto Const mandatory + Message Property pDebugCountTrapperQueue auto Const mandatory + Message Property pDebugCountInstituteQueue auto Const mandatory +EndGroup + Message Property pModInstalledMessage auto Const mandatory {mod installation message/prompt} @@ -374,10 +387,10 @@ Function AddToProductionQueue(int iOrderType, int iAnimalType, float fProdTime, if iOrderType == 0 ProductionQueue_Trappers.Add(newProd) - debug.notification("new trapper queue count: " + ProductionQueue_Trappers.length) + pDebugCountTrapperQueue.Show(ProductionQueue_Trappers.length) else ProductionQueue_Institute.Add(newProd) - debug.notification("new institute queue count: " + ProductionQueue_Institute.length) + pDebugCountInstituteQueue.Show(ProductionQueue_Institute.length) endIf EndFunction @@ -396,7 +409,7 @@ Function ProductionTick() pOrderFailedMsg_Trapper.Show() endIf ProductionQueue_Trappers.Remove(0) - debug.notification("new queue count: " + ProductionQueue_Trappers.length) + pDebugCountTrapperQueue.Show(ProductionQueue_Trappers.length) endIf endIf ;/institute/; @@ -405,7 +418,7 @@ Function ProductionTick() pOrderSuccessMsg_Institute.Show() CreateAnimalFromData(ProductionQueue_Institute[0].iProdType, Utility.RandomInt(0,1), Utility.RandomInt(0, (pMaxSkinsPerType[ProductionQueue_Trappers[0].iProdType] - 1)), Game.GetPlayer() as ObjectReference) ProductionQueue_Institute.Remove(0) - debug.notification("new queue count: " + ProductionQueue_Trappers.length) + pDebugCountInstituteQueue.Show(ProductionQueue_Institute.length) endIf endIf EndFunction @@ -556,7 +569,7 @@ Function AddPackAnimal(ObjectReference tempRef) int tempCount = pActivePackAnimalsRC.GetCount() pCurNumPackAnimals.SetValue(tempCount as float) self.UpdateCurrentInstanceGlobal(pCurNumPackAnimals) - debug.notification("active count: " + pActivePackAnimalsRC.GetCount()) + pDebugCountActive.Show(pActivePackAnimalsRC.GetCount()) EndFunction @@ -577,7 +590,7 @@ Function RemovePackAnimal(ObjectReference tempRef, bool bDelete = false) int tempCount = pActivePackAnimalsRC.GetCount() pCurNumPackAnimals.SetValue(tempCount as float) self.UpdateCurrentInstanceGlobal(pCurNumPackAnimals) - debug.notification("active count: " + tempCount) + pDebugCountActive.Show(tempCount) ObjectReference guardRef = tempRef.GetLinkedRef(pGuardLinkKW) if guardRef as bool @@ -650,7 +663,7 @@ Function AddDeadPackAnimal(ObjectReference tempRef) endIf endIf - debug.notification("dead count: " + pDeadPackAnimalsRC.GetCount()) + pDebugCountDead.Show(pDeadPackAnimalsRC.GetCount()) EndFunction Function RemoveDeadPackAnimal(ObjectReference tempRef) @@ -666,7 +679,7 @@ Function RemoveDeadPackAnimal(ObjectReference tempRef) SetObjectiveDisplayed(iObjective_TrackDead, False, True) endIf endIf - debug.notification("dead count: " + pDeadPackAnimalsRC.GetCount()) + pDebugCountDead.Show(pDeadPackAnimalsRC.GetCount()) EndFunction int Function GetAnimalCount_Dead() @@ -709,7 +722,7 @@ Function AddToTrackedActive(Actor tempRef) endIf int tempCount = pTrackedPackAnimalsRC.GetCount() - debug.notification("tracked count: " + pTrackedPackAnimalsRC.GetCount()) + pDebugCountTracked.Show(pTrackedPackAnimalsRC.GetCount()) EndFunction Function RemoveFromTrackedActive(Actor tempRef) @@ -723,7 +736,7 @@ Function RemoveFromTrackedActive(Actor tempRef) endIf int tempCount = pTrackedPackAnimalsRC.GetCount() - debug.notification("tracked count: " + pTrackedPackAnimalsRC.GetCount()) + pDebugCountTracked.Show(pTrackedPackAnimalsRC.GetCount()) EndFunction int Function GetAnimalCount_Tracked() @@ -736,14 +749,14 @@ Function AddToTrackedIdle(Actor tempRef) if pIdlePackAnimalsRC.Find(tempRef) < 0 pIdlePackAnimalsRC.AddRef(tempRef) endIf - debug.notification("idle count: " + pIdlePackAnimalsRC.GetCount()) + pDebugCountIdle.Show(pIdlePackAnimalsRC.GetCount()) EndFunction Function RemoveFromTrackedIdle(Actor tempRef) if pIdlePackAnimalsRC.Find(tempRef) > -1 pIdlePackAnimalsRC.RemoveRef(tempRef) endIf - debug.notification("idle count: " + pIdlePackAnimalsRC.GetCount()) + pDebugCountIdle.Show(pIdlePackAnimalsRC.GetCount()) EndFunction int Function GetAnimalCount_Idle() @@ -951,14 +964,14 @@ Function AssignTrapper(ObjectReference newTrapper) if pTrapperNPCsRC.Find(newTrapper) < 0 pTrapperNPCsRC.AddRef(newTrapper) endIf - debug.notification("trapper count: " + pTrapperNPCsRC.GetCount()) + pDebugCountTrappers.Show(pTrapperNPCsRC.GetCount()) EndFunction Function UnassignTrapper(ObjectReference oldTrapper) if pTrapperNPCsRC.Find(oldTrapper) > -1 pTrapperNPCsRC.RemoveRef(oldTrapper) endIf - debug.notification("trapper count: " + pTrapperNPCsRC.GetCount()) + pDebugCountTrappers.Show(pTrapperNPCsRC.GetCount()) EndFunction int Function GetTrapperAliasCount() @@ -985,14 +998,14 @@ Function AssignPackAnimalGuard(ObjectReference tempGuard) if pGuardNPCsRC.Find(tempGuard) < 0 pGuardNPCsRC.AddRef(tempGuard) endIf - debug.notification("guard count: " + pGuardNPCsRC.GetCount()) + pDebugCountGuards.Show(pGuardNPCsRC.GetCount()) EndFunction Function UnassignAnimalGuard(ObjectReference tempGuard) if pGuardNPCsRC.Find(tempGuard) > -1 pGuardNPCsRC.RemoveRef(tempGuard) endIf - debug.notification("guard count: " + pGuardNPCsRC.GetCount()) + pDebugCountGuards.Show(pGuardNPCsRC.GetCount()) EndFunction int Function GetAnimalGuardCount() @@ -1037,7 +1050,7 @@ Function AddLuredAnimals(ObjectReference lureRef, float fLureChance, int iMaxLur i += 1 endWhile endIf - debug.notification("lured count: " + pLuredAnimals.GetCount()) + pDebugCountLured.Show(pLuredAnimals.GetCount()) EndFunction Function ClearLuredAnimals() diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalOrderScript.psc b/Papyrus/PersonalPackAnimals/PPAPackAnimalOrderScript.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalOrderScript.psc rename to Papyrus/PersonalPackAnimals/PPAPackAnimalOrderScript.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalSpawnerScript.psc b/Papyrus/PersonalPackAnimals/PPAPackAnimalSpawnerScript.psc similarity index 93% rename from Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalSpawnerScript.psc rename to Papyrus/PersonalPackAnimals/PPAPackAnimalSpawnerScript.psc index 7794b57..5002fe9 100644 --- a/Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalSpawnerScript.psc +++ b/Papyrus/PersonalPackAnimals/PPAPackAnimalSpawnerScript.psc @@ -44,8 +44,6 @@ Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldCo endIf i += 1 endWhile - else - debug.notification("no workshop resource objects") endIf if !bFound @@ -67,8 +65,6 @@ Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldCo endIf i += 1 endWhile - else - debug.notification("no workshop actors") endIf endIf @@ -88,11 +84,7 @@ Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldCo endIf endIf endIf - else - debug.notification("No workshop animal") endIf - else - debug.notification("no workshop") endIf else PersonalPackAnimals:PPAPackAnimalManagerQuestScript tempScript = PersonalPackAnimals:PPAPackAnimalManagerQuestScript.GetScript() diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalTranqScript.psc b/Papyrus/PersonalPackAnimals/PPAPackAnimalTranqScript.psc similarity index 86% rename from Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalTranqScript.psc rename to Papyrus/PersonalPackAnimals/PPAPackAnimalTranqScript.psc index 6bfd6d8..44cab5f 100644 --- a/Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalTranqScript.psc +++ b/Papyrus/PersonalPackAnimals/PPAPackAnimalTranqScript.psc @@ -6,6 +6,7 @@ float Property nCaptureChanceMod = 1.0 auto const {multiplier applied to base capture/tame chance} FormList Property pPackAnimalRaces auto Const mandatory {main animal factions supported for capturing} +Message Property pFailedMessage auto Const mandatory Event OnEffectStart(Actor akTarget, Actor akCaster) @@ -15,7 +16,6 @@ Event OnEffectStart(Actor akTarget, Actor akCaster) if bCapture if tempIndex > -1 - debug.notification("tranq effect fired") PersonalPackAnimals:PPAPackAnimalManagerQuestScript tempScript = PersonalPackAnimals:PPAPackAnimalManagerQuestScript.GetScript() if tempScript as bool if tempScript.TryToTameAnimal(aktarget, tempIndex, nCaptureChanceMod) @@ -27,9 +27,9 @@ Event OnEffectStart(Actor akTarget, Actor akCaster) endIf endIf else - debug.notification("not a compatible animal") + pFailedMessage.Show() endIf else - debug.notification("cannot capture workshop animals") + pFailedMessage.Show() endIf EndEvent diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalWSConvertScript.psc b/Papyrus/PersonalPackAnimals/PPAPackAnimalWSConvertScript.psc similarity index 83% rename from Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalWSConvertScript.psc rename to Papyrus/PersonalPackAnimals/PPAPackAnimalWSConvertScript.psc index 469ad40..cd72837 100644 --- a/Data/Scripts/Source/User/PersonalPackAnimals/PPAPackAnimalWSConvertScript.psc +++ b/Papyrus/PersonalPackAnimals/PPAPackAnimalWSConvertScript.psc @@ -12,6 +12,7 @@ Group SpawnedAnimalBase EndGroup Message Property pPickerMessage auto Const mandatory +Message Property pFailedMessage auto Const mandatory WorkshopParentScript Property WorkshopParent auto Const mandatory {workshop link} @@ -46,24 +47,10 @@ Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldCo i += 1 endIf endWhile - - if bShowDebug - string sTempIndices = "Count: " + iCount[0] + ", Index: " - i = 1 - while i <= iCount[0] - if i > 1 - sTempIndices = sTempIndices + ", " + iCount[i] - else - sTempIndices = sTempIndices + iCount[i] - endIf - i += 1 - endWhile - debug.notification(sTempIndices) - endIf endIf endIf else - debug.notification("missing " + sWSAnimalSource) + pFailedMessage.Show() endIf endIf akNewContainer.RemoveItem(self.GetBaseObject(), 1, true) diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/PPATamingPerkUpgradeScript.psc b/Papyrus/PersonalPackAnimals/PPATamingPerkUpgradeScript.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/PPATamingPerkUpgradeScript.psc rename to Papyrus/PersonalPackAnimals/PPATamingPerkUpgradeScript.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_CheatPackLimit.psc b/Papyrus/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_CheatPackLimit.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_CheatPackLimit.psc rename to Papyrus/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_CheatPackLimit.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_DeleteDead.psc b/Papyrus/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_DeleteDead.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_DeleteDead.psc rename to Papyrus/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_DeleteDead.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_PartyLimit.psc b/Papyrus/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_PartyLimit.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_PartyLimit.psc rename to Papyrus/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_PartyLimit.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_PerkReqs.psc b/Papyrus/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_PerkReqs.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_PerkReqs.psc rename to Papyrus/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_PerkReqs.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_ProtectedGuards.psc b/Papyrus/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_ProtectedGuards.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_ProtectedGuards.psc rename to Papyrus/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_ProtectedGuards.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_ToggleFreeCheat.psc b/Papyrus/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_ToggleFreeCheat.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_ToggleFreeCheat.psc rename to Papyrus/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_ToggleFreeCheat.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_ToggleSurvival.psc b/Papyrus/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_ToggleSurvival.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_ToggleSurvival.psc rename to Papyrus/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_ToggleSurvival.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_ToggleWaitInt.psc b/Papyrus/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_ToggleWaitInt.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_ToggleWaitInt.psc rename to Papyrus/PersonalPackAnimals/Terminal/TERM_PackAnimalConfig_ToggleWaitInt.psc diff --git a/Data/Scripts/Source/User/PersonalPackAnimals/Terminal/TERM_PackAnimalConfing_MaxWaitTime.psc b/Papyrus/PersonalPackAnimals/Terminal/TERM_PackAnimalConfing_MaxWaitTime.psc similarity index 100% rename from Data/Scripts/Source/User/PersonalPackAnimals/Terminal/TERM_PackAnimalConfing_MaxWaitTime.psc rename to Papyrus/PersonalPackAnimals/Terminal/TERM_PackAnimalConfing_MaxWaitTime.psc