Update condition functons for FO3 and FNV

Also update corresponding xSE plugins
pcbeard · Jun 28, 2018 · 47fd369 · 47fd369
1 parent 2774379
commit 47fd369
Show file tree

Hide file tree

Showing 11 changed files with 926 additions and 2 deletions.
diff --git a/wbDefinitionsFNV.pas b/wbDefinitionsFNV.pas
@@ -2229,7 +2229,7 @@   TCTDAFunction = record
   end;
 
 const
-  wbCTDAFunctions : array[0..316] of TCTDAFunction = (
+  wbCTDAFunctions : array[0..320] of TCTDAFunction = (
     (Index:   1; Name: 'GetDistance'; ParamType1: ptObjectReference),
     (Index:   5; Name: 'GetLocked'),
     (Index:   6; Name: 'GetPos'; ParamType1: ptAxis),
@@ -2509,7 +2509,7 @@   TCTDAFunction = record
     (Index: 1476; Name: 'GetAltPerkRank'; ParamType1: ptPerk; ParamType2: ptActor;),
     (Index: 1541; Name: 'GetActorFIKstatus'; ),
 
-    // Added by nvse_plugin_ExtendedActorVariable
+    // Added by nvse_plugin_ExtendedActorVariables
     (Index: 4352; Name: 'GetExtendedActorVariable'; ParamType1: ptInventoryObject; ),
     (Index: 4353; Name: 'GetBaseExtendedActorVariable'; ParamType1: ptInventoryObject; ),
     (Index: 4355; Name: 'GetModExtendedActorVariable'; ParamType1: ptInventoryObject; ),
@@ -2528,6 +2528,10 @@   TCTDAFunction = record
     (Index: 4618; Name: 'GetRightTrigger'; ),
     (Index: 4708; Name: 'GetArmorClass'; ParamType1: ptAnyForm; ),
     (Index: 4709; Name: 'IsRaceInList'; ParamType1: ptFormList; ),
+    (Index: 4758; Name: 'IsButtonDisabled'; ParamType1: ptInteger; ),
+    (Index: 4761; Name: 'IsButtonHeld'; ParamType1: ptInteger; ),
+    (Index: 4774; Name: 'IsTriggerDisabled'; ParamType1: ptInteger; ),
+    (Index: 4777; Name: 'IsTriggerHeld'; ParamType1: ptInteger; ),
     (Index: 4822; Name: 'GetReferenceFlag'; ParamType1: ptInteger; ),
     (Index: 4832; Name: 'GetDistance2D'; ParamType1: ptObjectReference; ),
     (Index: 4833; Name: 'GetDistance3D'; ParamType1: ptObjectReference; ),

diff --git a/wbDefinitionsFO3.pas b/wbDefinitionsFO3.pas
@@ -2138,6 +2138,7 @@   TCTDAFunction = record
 
 const
   wbCTDAFunctions : array[0..243] of TCTDAFunction = (
+    // Added by Fallout 3
     (Index:   1; Name: 'GetDistance'; ParamType1: ptObjectReference),
     (Index:   5; Name: 'GetLocked'),
     (Index:   6; Name: 'GetPos'; ParamType1: ptAxis),

diff --git a/xSE/fose_plugin_xEdit/dllmain.c b/xSE/fose_plugin_xEdit/dllmain.c
@@ -0,0 +1,10 @@
+#include <Windows.h>
+
+BOOL WINAPI DllMain(
+        HANDLE  hDllHandle,
+        DWORD   dwReason,
+        LPVOID  lpreserved
+        )
+{
+	return TRUE;
+}
diff --git a/xSE/fose_plugin_xEdit/exports.def b/xSE/fose_plugin_xEdit/exports.def
@@ -0,0 +1,4 @@
+LIBRARY	"fose_plugin_xEdit"
+EXPORTS
+FOSEPlugin_Query
+FOSEPlugin_Load
diff --git a/xSE/fose_plugin_xEdit/fose_plugin_xEdit.dll b/xSE/fose_plugin_xEdit/fose_plugin_xEdit.dll
diff --git a/xSE/fose_plugin_xEdit/fose_plugin_xEdit.sln b/xSE/fose_plugin_xEdit/fose_plugin_xEdit.sln
@@ -0,0 +1,37 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fose_plugin_xEdit", "fose_plugin_xEdit.vcproj", "{AE7CFEE7-4058-4E3C-ADC2-AE7480EE2028}"
+	ProjectSection(ProjectDependencies) = postProject
+		{20C6411C-596F-4B85-BE4E-8BC91F59D8A6} = {20C6411C-596F-4B85-BE4E-8BC91F59D8A6}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\common\common.vcproj", "{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug ng|Win32 = Debug ng|Win32
+		Debug|Win32 = Debug|Win32
+		Release ng|Win32 = Release ng|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{AE7CFEE7-4058-4E3C-ADC2-AE7480EE2028}.Debug ng|Win32.ActiveCfg = Debug ng|Win32
+		{AE7CFEE7-4058-4E3C-ADC2-AE7480EE2028}.Debug ng|Win32.Build.0 = Debug ng|Win32
+		{AE7CFEE7-4058-4E3C-ADC2-AE7480EE2028}.Debug|Win32.ActiveCfg = Debug|Win32
+		{AE7CFEE7-4058-4E3C-ADC2-AE7480EE2028}.Debug|Win32.Build.0 = Debug|Win32
+		{AE7CFEE7-4058-4E3C-ADC2-AE7480EE2028}.Release ng|Win32.ActiveCfg = Release ng|Win32
+		{AE7CFEE7-4058-4E3C-ADC2-AE7480EE2028}.Release ng|Win32.Build.0 = Release ng|Win32
+		{AE7CFEE7-4058-4E3C-ADC2-AE7480EE2028}.Release|Win32.ActiveCfg = Release|Win32
+		{AE7CFEE7-4058-4E3C-ADC2-AE7480EE2028}.Release|Win32.Build.0 = Release|Win32
+		{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Debug ng|Win32.ActiveCfg = Debug|Win32
+		{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Debug|Win32.Build.0 = Debug|Win32
+		{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Release ng|Win32.ActiveCfg = Release|Win32
+		{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Release|Win32.ActiveCfg = Release|Win32
+		{20C6411C-596F-4B85-BE4E-8BC91F59D8A6}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal