Skip to content

Commit

Permalink
misc fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@shad0wshayd3
shad0wshayd3 committed May 16, 2024
1 parent 018fefa commit 8ba471d
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "extern/CommonLibF4"]
path = extern/CommonLibF4
url = https://github.com/FalloutCascadia/CommonLibF4.git
url = https://github.com/shad0wshayd3-FO4/CommonLibF4.git
[submodule "extern/DKUtil"]
path = extern/DKUtil
url = https://github.com/shad0wshayd3/DKUtil.git
18 changes: 9 additions & 9 deletions Plugin/src/Menus/Scaleform.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,15 +285,15 @@ namespace RE

bool RegisterScaleform(Scaleform::GFx::Movie* a_view, Scaleform::GFx::Value* a_value)
{
Scaleform::GFx::Value currentSWFPath;
if (a_view->asMovieRoot->GetVariable(&currentSWFPath, "root.loaderInfo.url"))
{
if (_stricmp(currentSWFPath.GetString(), "Interface/DialogueMenu.swf") == 0)
{
a_view->asMovieRoot->Invoke("root.XDI_Init", nullptr, nullptr, 0);
INFO("root.XDI_Init");
}
}
// Scaleform::GFx::Value currentSWFPath;
// if (a_view->asMovieRoot->GetVariable(&currentSWFPath, "root.loaderInfo.url"))
// {
// if (_stricmp(currentSWFPath.GetString(), "Interface/DialogueMenu.swf") == 0)
// {
// a_view->asMovieRoot->Invoke("root.XDI_Init", nullptr, nullptr, 0);
// INFO("root.XDI_Init");
// }
// }
return true;
}
}
Expand Down
38 changes: 19 additions & 19 deletions Plugin/src/Systems/Skills.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,27 +228,27 @@ namespace RE
bool DefineSkillsFormsFromGame()
{
// Cascadia Actor Values
CascadiaActorValues.Barter = TESDataHandler::GetSingleton()->LookupForm<ActorValueInfo>(996845, "FalloutCascadia.esm"); //HEX: F35ED
CascadiaActorValues.EnergyWeapons = TESDataHandler::GetSingleton()->LookupForm<ActorValueInfo>(996846, "FalloutCascadia.esm"); //HEX: F35EE
CascadiaActorValues.Explosives = TESDataHandler::GetSingleton()->LookupForm<ActorValueInfo>(996847, "FalloutCascadia.esm"); //HEX: F35EF
CascadiaActorValues.Guns = TESDataHandler::GetSingleton()->LookupForm<ActorValueInfo>(996848, "FalloutCascadia.esm"); //HEX: F35F0
CascadiaActorValues.Lockpick = TESDataHandler::GetSingleton()->LookupForm<ActorValueInfo>(996849, "FalloutCascadia.esm"); //HEX: F35F1
CascadiaActorValues.Medicine = TESDataHandler::GetSingleton()->LookupForm<ActorValueInfo>(996850, "FalloutCascadia.esm"); //HEX: F35F2
CascadiaActorValues.MeleeWeapons = TESDataHandler::GetSingleton()->LookupForm<ActorValueInfo>(996851, "FalloutCascadia.esm"); //HEX: F35F3
CascadiaActorValues.Repair = TESDataHandler::GetSingleton()->LookupForm<ActorValueInfo>(996852, "FalloutCascadia.esm"); //HEX: F35F4
CascadiaActorValues.Science = TESDataHandler::GetSingleton()->LookupForm<ActorValueInfo>(996853, "FalloutCascadia.esm"); //HEX: F35F5
CascadiaActorValues.Sneak = TESDataHandler::GetSingleton()->LookupForm<ActorValueInfo>(996854, "FalloutCascadia.esm"); //HEX: F35F6
CascadiaActorValues.Speech = TESDataHandler::GetSingleton()->LookupForm<ActorValueInfo>(996855, "FalloutCascadia.esm"); //HEX: F35F7
CascadiaActorValues.Survival = TESDataHandler::GetSingleton()->LookupForm<ActorValueInfo>(996856, "FalloutCascadia.esm"); //HEX: F35F8
CascadiaActorValues.Unarmed = TESDataHandler::GetSingleton()->LookupForm<ActorValueInfo>(996857, "FalloutCascadia.esm"); //HEX: F35F9
CascadiaActorValues.Barter = TESDataHandler::GetSingleton()->LookupForm<ActorValueInfo>(0x0F35ED, "FalloutCascadia.esm");
CascadiaActorValues.EnergyWeapons = TESDataHandler::GetSingleton()->LookupForm<ActorValueInfo>(0x0F35EE, "FalloutCascadia.esm");
CascadiaActorValues.Explosives = TESDataHandler::GetSingleton()->LookupForm<ActorValueInfo>(0x0F35EF, "FalloutCascadia.esm");
CascadiaActorValues.Guns = TESDataHandler::GetSingleton()->LookupForm<ActorValueInfo>(0x0F35F0, "FalloutCascadia.esm");
CascadiaActorValues.Lockpick = TESDataHandler::GetSingleton()->LookupForm<ActorValueInfo>(0x0F35F1, "FalloutCascadia.esm");
CascadiaActorValues.Medicine = TESDataHandler::GetSingleton()->LookupForm<ActorValueInfo>(0x0F35F2, "FalloutCascadia.esm");
CascadiaActorValues.MeleeWeapons = TESDataHandler::GetSingleton()->LookupForm<ActorValueInfo>(0x0F35F3, "FalloutCascadia.esm");
CascadiaActorValues.Repair = TESDataHandler::GetSingleton()->LookupForm<ActorValueInfo>(0x0F35F4, "FalloutCascadia.esm");
CascadiaActorValues.Science = TESDataHandler::GetSingleton()->LookupForm<ActorValueInfo>(0x0F35F5, "FalloutCascadia.esm");
CascadiaActorValues.Sneak = TESDataHandler::GetSingleton()->LookupForm<ActorValueInfo>(0x0F35F6, "FalloutCascadia.esm");
CascadiaActorValues.Speech = TESDataHandler::GetSingleton()->LookupForm<ActorValueInfo>(0x0F35F7, "FalloutCascadia.esm");
CascadiaActorValues.Survival = TESDataHandler::GetSingleton()->LookupForm<ActorValueInfo>(0x0F35F8, "FalloutCascadia.esm");
CascadiaActorValues.Unarmed = TESDataHandler::GetSingleton()->LookupForm<ActorValueInfo>(0x0F35F9, "FalloutCascadia.esm");

// Cascadia Perks
CascadiaPerks.WeaponTypeEnergyWeaponsPerk = TESDataHandler::GetSingleton()->LookupForm<BGSPerk>(35626494, "FalloutCascadia.esm"); //HEX: 21F9DFE
CascadiaPerks.WeaponTypeExplosivesPerk = TESDataHandler::GetSingleton()->LookupForm<BGSPerk>(35626495, "FalloutCascadia.esm"); //HEX: 21F9DFF
CascadiaPerks.WeaponTypeMeleeWeaponsPerk = TESDataHandler::GetSingleton()->LookupForm<BGSPerk>(35626496, "FalloutCascadia.esm"); //HEX: 21F9E00
CascadiaPerks.WeaponTypeGunsPerk = TESDataHandler::GetSingleton()->LookupForm<BGSPerk>(35626497, "FalloutCascadia.esm"); //HEX: 21F9E01
CascadiaPerks.WeaponTypeUnarmedPerk = TESDataHandler::GetSingleton()->LookupForm<BGSPerk>(35626498, "FalloutCascadia.esm"); //HEX: 21F9E02
CascadiaPerks.WeaponConditionHandlerPerk = TESDataHandler::GetSingleton()->LookupForm<BGSPerk>(35626499, "FalloutCascadia.esm"); //HEX: 21F9E04
CascadiaPerks.WeaponTypeEnergyWeaponsPerk = TESDataHandler::GetSingleton()->LookupForm<BGSPerk>(0x1F9DFE, "FalloutCascadia.esm");
CascadiaPerks.WeaponTypeExplosivesPerk = TESDataHandler::GetSingleton()->LookupForm<BGSPerk>(0x1F9DFF, "FalloutCascadia.esm");
CascadiaPerks.WeaponTypeMeleeWeaponsPerk = TESDataHandler::GetSingleton()->LookupForm<BGSPerk>(0x1F9E00, "FalloutCascadia.esm");
CascadiaPerks.WeaponTypeGunsPerk = TESDataHandler::GetSingleton()->LookupForm<BGSPerk>(0x1F9E01, "FalloutCascadia.esm");
CascadiaPerks.WeaponTypeUnarmedPerk = TESDataHandler::GetSingleton()->LookupForm<BGSPerk>(0x1F9E02, "FalloutCascadia.esm");
CascadiaPerks.WeaponConditionHandlerPerk = TESDataHandler::GetSingleton()->LookupForm<BGSPerk>(0x1F9E04, "FalloutCascadia.esm");

// Cascadia Skills List
CascadiaSkillsList.emplace_back(CascadiaActorValues.Barter);
Expand Down
5 changes: 2 additions & 3 deletions Plugin/src/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,13 @@ DLLEXPORT bool F4SEAPI F4SEPlugin_Load(const F4SE::LoadInterface* a_F4SE)
return false;
}

const F4SE::ScaleformInterface* scaleform = F4SE::GetScaleformInterface();

/*if (!RE::Cascadia::CAS_DialogueMenu::Install())
{
WARN("DialogueMenu - failed to install hooks.");
}*/

if (!scaleform->Register("Cascadia", RE::Cascadia::RegisterScaleform))
const auto scaleform = F4SE::GetScaleformInterface();
if (!scaleform || !scaleform->Register("Cascadia", RE::Cascadia::RegisterScaleform))
{
FATAL("Failed to register scaleform callback, marking as incompatible."sv);
return false;
Expand Down
2 changes: 1 addition & 1 deletion extern/CommonLibF4
Submodule CommonLibF4 updated 6 files
+1 −1 CommonLibF4/include/RE/Bethesda/ActorValueInfo.h
+24 −20 CommonLibF4/include/RE/Bethesda/BGSStoryManagerTreeForm.h
+2 −2 CommonLibF4/include/RE/Bethesda/BSExtraData.h
+1 −1 CommonLibF4/include/RE/Bethesda/Events.h
+16 −9 CommonLibF4/include/RE/Bethesda/PipboyDataGroup.h
+38 −25 CommonLibF4/include/RE/Bethesda/PipboyValue.h

0 comments on commit 8ba471d

Please sign in to comment.