Skip to content

Commit 39a69ad

Browse files
committed
Fixed #41, removed unecessary event/variable injection for now
1 parent f4202ae commit 39a69ad

File tree

22 files changed

+188
-4335
lines changed

22 files changed

+188
-4335
lines changed

PandoraPlus/Pandora_Engine/Skyrim/Template/actors/atronachflame/behaviors/atronachflamebehavior.hkx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3270,7 +3270,7 @@
32703270
<hkparam name="fromNestedStateId">0</hkparam>
32713271
<hkparam name="toNestedStateId">0</hkparam>
32723272
<hkparam name="priority">0</hkparam>
3273-
<hkparam name="flags">FLAG_IS_LOCAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
3273+
<hkparam name="flags">FLAG_IS_LOCAL_WILDCARD|FLAG_IS_GLOBAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
32743274
</hkobject>
32753275
</hkparam>
32763276
</hkobject>

PandoraPlus/Pandora_Engine/Skyrim/Template/actors/chaurus/behaviors/chaurusbehavior.hkx

+33-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<hkobject name="#0091" class="hkbBehaviorGraphStringData" signature="0xc713064e">
77

88

9-
<hkparam name="eventNames" numelements="137">
9+
<hkparam name="eventNames" numelements="138">
1010
<hkcstring>attackExit</hkcstring>
1111
<hkcstring>bashRelease</hkcstring>
1212
<hkcstring>attackRelease</hkcstring>
@@ -144,6 +144,7 @@
144144
<hkcstring>AttackStart_RightSide</hkcstring>
145145
<hkcstring>RagdollInstant</hkcstring>
146146
<hkcstring>StartAnimationDriven</hkcstring>
147+
<hkcstring>FNISDefault</hkcstring>
147148
</hkparam>
148149
<hkparam name="attributeNames" numelements="0"></hkparam>
149150
<hkparam name="variableNames" numelements="79">
@@ -1196,7 +1197,7 @@
11961197
</hkobject>
11971198
</hkparam>
11981199
<hkparam name="characterPropertyInfos" numelements="0"></hkparam>
1199-
<hkparam name="eventInfos" numelements="137">
1200+
<hkparam name="eventInfos" numelements="138">
12001201
<hkobject>
12011202
<hkparam name="flags">0</hkparam>
12021203
</hkobject>
@@ -1608,6 +1609,9 @@
16081609
<hkobject>
16091610
<hkparam name="flags">0</hkparam>
16101611
</hkobject>
1612+
<hkobject>
1613+
<hkparam name="flags">0</hkparam>
1614+
</hkobject>
16111615
</hkparam>
16121616
<hkparam name="wordMinVariableValues" numelements="0"></hkparam>
16131617
<hkparam name="wordMaxVariableValues" numelements="0"></hkparam>
@@ -3622,7 +3626,7 @@
36223626
<hkobject name="#0171" class="hkbStateMachineTransitionInfoArray" signature="0xe397b11e">
36233627

36243628

3625-
<hkparam name="transitions" numelements="9">
3629+
<hkparam name="transitions" numelements="10">
36263630
<hkobject>
36273631
<hkparam name="triggerInterval">
36283632
<hkobject>
@@ -3857,6 +3861,32 @@
38573861
<hkparam name="priority">0</hkparam>
38583862
<hkparam name="flags">FLAG_IS_LOCAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
38593863
</hkobject>
3864+
<hkobject>
3865+
<hkparam name="triggerInterval">
3866+
<hkobject>
3867+
<hkparam name="enterEventId">-1</hkparam>
3868+
<hkparam name="exitEventId">-1</hkparam>
3869+
<hkparam name="enterTime">0.000000</hkparam>
3870+
<hkparam name="exitTime">0.000000</hkparam>
3871+
</hkobject>
3872+
</hkparam>
3873+
<hkparam name="initiateInterval">
3874+
<hkobject>
3875+
<hkparam name="enterEventId">-1</hkparam>
3876+
<hkparam name="exitEventId">-1</hkparam>
3877+
<hkparam name="enterTime">0.000000</hkparam>
3878+
<hkparam name="exitTime">0.000000</hkparam>
3879+
</hkobject>
3880+
</hkparam>
3881+
<hkparam name="transition">#0174</hkparam>
3882+
<hkparam name="condition">null</hkparam>
3883+
<hkparam name="eventId">137</hkparam>
3884+
<hkparam name="toStateId">0</hkparam>
3885+
<hkparam name="fromNestedStateId">0</hkparam>
3886+
<hkparam name="toNestedStateId">0</hkparam>
3887+
<hkparam name="priority">0</hkparam>
3888+
<hkparam name="flags">FLAG_IS_GLOBAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
3889+
</hkobject>
38603890
</hkparam>
38613891
</hkobject>
38623892

PandoraPlus/Pandora_Engine/Skyrim/Template/actors/dlc01/vampirebrute/behaviors/vampirebrutebehavior.hkx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2775,7 +2775,7 @@
27752775
<hkparam name="fromNestedStateId">0</hkparam>
27762776
<hkparam name="toNestedStateId">0</hkparam>
27772777
<hkparam name="priority">0</hkparam>
2778-
<hkparam name="flags">FLAG_IS_LOCAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
2778+
<hkparam name="flags">FLAG_IS_LOCAL_WILDCARD|FLAG_IS_GLOBAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
27792779
</hkobject>
27802780
<hkobject>
27812781
<hkparam name="triggerInterval">

PandoraPlus/Pandora_Engine/Skyrim/Template/actors/dlc02/dwarvenballistacenturion/behaviors/bcbehavior.hkx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3503,7 +3503,7 @@
35033503
<hkparam name="fromNestedStateId">0</hkparam>
35043504
<hkparam name="toNestedStateId">0</hkparam>
35053505
<hkparam name="priority">0</hkparam>
3506-
<hkparam name="flags">FLAG_IS_LOCAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
3506+
<hkparam name="flags">FLAG_IS_LOCAL_WILDCARD|FLAG_IS_GLOBAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
35073507
</hkobject>
35083508
<hkobject>
35093509
<hkparam name="triggerInterval">

PandoraPlus/Pandora_Engine/Skyrim/Template/actors/dlc02/hmdaedra/behaviors/hmdaedra.hkx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3006,7 +3006,7 @@
30063006
<hkparam name="fromNestedStateId">0</hkparam>
30073007
<hkparam name="toNestedStateId">0</hkparam>
30083008
<hkparam name="priority">0</hkparam>
3009-
<hkparam name="flags">FLAG_IS_LOCAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
3009+
<hkparam name="flags">FLAG_IS_LOCAL_WILDCARD|FLAG_IS_GLOBAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
30103010
</hkobject>
30113011
<hkobject>
30123012
<hkparam name="triggerInterval">

PandoraPlus/Pandora_Engine/Skyrim/Template/actors/dlc02/netch/behaviors/netchbehavior.hkx

+1-1
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,7 @@
728728
<hkparam name="fromNestedStateId">0</hkparam>
729729
<hkparam name="toNestedStateId">0</hkparam>
730730
<hkparam name="priority">0</hkparam>
731-
<hkparam name="flags">FLAG_IS_LOCAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
731+
<hkparam name="flags">FLAG_IS_LOCAL_WILDCARD|FLAG_IS_GLOBAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
732732
</hkobject>
733733
</hkparam>
734734
</hkobject>

PandoraPlus/Pandora_Engine/Skyrim/Template/actors/dwarvenspherecenturion/behaviors/scbehavior.hkx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3260,7 +3260,7 @@
32603260
<hkparam name="fromNestedStateId">0</hkparam>
32613261
<hkparam name="toNestedStateId">0</hkparam>
32623262
<hkparam name="priority">0</hkparam>
3263-
<hkparam name="flags">FLAG_IS_LOCAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
3263+
<hkparam name="flags">FLAG_IS_LOCAL_WILDCARD|FLAG_IS_GLOBAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
32643264
</hkobject>
32653265
</hkparam>
32663266
</hkobject>

PandoraPlus/Pandora_Engine/Skyrim/Template/actors/dwarvenspider/behaviors/dwarvenspiderbehavior.hkx

+32-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<hkobject name="#0082" class="hkbBehaviorGraphStringData" signature="0xc713064e">
77

88

9-
<hkparam name="eventNames" numelements="119">
9+
<hkparam name="eventNames" numelements="120">
1010
<hkcstring>attackExit</hkcstring>
1111
<hkcstring>attackRelease</hkcstring>
1212
<hkcstring>bleedOutStart</hkcstring>
@@ -126,6 +126,7 @@
126126
<hkcstring>RemoveCharacterControllerFromWorld</hkcstring>
127127
<hkcstring>GetUpEnd</hkcstring>
128128
<hkcstring>GetUpBegin</hkcstring>
129+
<hkcstring>FNISDefault</hkcstring>
129130
</hkparam>
130131
<hkparam name="attributeNames" numelements="0"></hkparam>
131132
<hkparam name="variableNames" numelements="72">
@@ -1097,7 +1098,7 @@
10971098
<hkparam name="type">VARIABLE_TYPE_POINTER</hkparam>
10981099
</hkobject>
10991100
</hkparam>
1100-
<hkparam name="eventInfos" numelements="119">
1101+
<hkparam name="eventInfos" numelements="120">
11011102
<hkobject>
11021103
<hkparam name="flags">0</hkparam>
11031104
</hkobject>
@@ -1455,6 +1456,9 @@
14551456
<hkobject>
14561457
<hkparam name="flags">0</hkparam>
14571458
</hkobject>
1459+
<hkobject>
1460+
<hkparam name="flags">0</hkparam>
1461+
</hkobject>
14581462
</hkparam>
14591463
<hkparam name="wordMinVariableValues" numelements="0"></hkparam>
14601464
<hkparam name="wordMaxVariableValues" numelements="0"></hkparam>
@@ -3215,6 +3219,32 @@
32153219
<hkparam name="priority">0</hkparam>
32163220
<hkparam name="flags">FLAG_TO_NESTED_STATE_ID_IS_VALID|FLAG_IS_GLOBAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
32173221
</hkobject>
3222+
<hkobject>
3223+
<hkparam name="triggerInterval">
3224+
<hkobject>
3225+
<hkparam name="enterEventId">-1</hkparam>
3226+
<hkparam name="exitEventId">-1</hkparam>
3227+
<hkparam name="enterTime">0.000000</hkparam>
3228+
<hkparam name="exitTime">0.000000</hkparam>
3229+
</hkobject>
3230+
</hkparam>
3231+
<hkparam name="initiateInterval">
3232+
<hkobject>
3233+
<hkparam name="enterEventId">-1</hkparam>
3234+
<hkparam name="exitEventId">-1</hkparam>
3235+
<hkparam name="enterTime">0.000000</hkparam>
3236+
<hkparam name="exitTime">0.000000</hkparam>
3237+
</hkobject>
3238+
</hkparam>
3239+
<hkparam name="transition">#0148</hkparam>
3240+
<hkparam name="condition">null</hkparam>
3241+
<hkparam name="eventId">119</hkparam>
3242+
<hkparam name="toStateId">0</hkparam>
3243+
<hkparam name="fromNestedStateId">0</hkparam>
3244+
<hkparam name="toNestedStateId">0</hkparam>
3245+
<hkparam name="priority">0</hkparam>
3246+
<hkparam name="flags">FLAG_IS_GLOBAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
3247+
</hkobject>
32183248
</hkparam>
32193249
</hkobject>
32203250

PandoraPlus/Pandora_Engine/Skyrim/Template/actors/dwarvensteamcenturion/behaviors/steambehavior.hkx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3281,7 +3281,7 @@
32813281
<hkparam name="fromNestedStateId">0</hkparam>
32823282
<hkparam name="toNestedStateId">0</hkparam>
32833283
<hkparam name="priority">0</hkparam>
3284-
<hkparam name="flags">FLAG_IS_LOCAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
3284+
<hkparam name="flags">FLAG_IS_LOCAL_WILDCARD|FLAG_IS_GLOBAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
32853285
</hkobject>
32863286
<hkobject>
32873287
<hkparam name="triggerInterval">

PandoraPlus/Pandora_Engine/Skyrim/Template/actors/falmer/behaviors/falmerbehavior.hkx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3271,7 +3271,7 @@
32713271
<hkparam name="fromNestedStateId">0</hkparam>
32723272
<hkparam name="toNestedStateId">0</hkparam>
32733273
<hkparam name="priority">0</hkparam>
3274-
<hkparam name="flags">FLAG_IS_GLOBAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
3274+
<hkparam name="flags">FLAG_IS_GLOBAL_WILDCARD|FLAG_IS_GLOBAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
32753275
</hkobject>
32763276
<hkobject>
32773277
<hkparam name="triggerInterval">

PandoraPlus/Pandora_Engine/Skyrim/Template/actors/frostbitespider/behaviors/frostbitespiderbehavior.hkx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2968,7 +2968,7 @@
29682968
<hkparam name="fromNestedStateId">0</hkparam>
29692969
<hkparam name="toNestedStateId">1</hkparam>
29702970
<hkparam name="priority">0</hkparam>
2971-
<hkparam name="flags">FLAG_TO_NESTED_STATE_ID_IS_VALID|FLAG_IS_LOCAL_WILDCARD|FLAG_DISABLE_CONDITION|FLAG_DELAY_STATE_CHANGE</hkparam>
2971+
<hkparam name="flags">FLAG_TO_NESTED_STATE_ID_IS_VALID|FLAG_IS_LOCAL_WILDCARD|FLAG_IS_GLOBAL_WILDCARD|FLAG_DISABLE_CONDITION|FLAG_DELAY_STATE_CHANGE</hkparam>
29722972
</hkobject>
29732973
<hkobject>
29742974
<hkparam name="triggerInterval">

PandoraPlus/Pandora_Engine/Skyrim/Template/actors/horse/behaviors/horsebehavior.hkx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3921,7 +3921,7 @@
39213921
<hkparam name="fromNestedStateId">0</hkparam>
39223922
<hkparam name="toNestedStateId">0</hkparam>
39233923
<hkparam name="priority">0</hkparam>
3924-
<hkparam name="flags">FLAG_IS_LOCAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
3924+
<hkparam name="flags">FLAG_IS_LOCAL_WILDCARD|FLAG_IS_GLOBAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
39253925
</hkobject>
39263926
<hkobject>
39273927
<hkparam name="triggerInterval">

PandoraPlus/Pandora_Engine/Skyrim/Template/actors/slaughterfish/behaviors/slaughterfishbehavior.hkx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1886,7 +1886,7 @@
18861886
<hkparam name="fromNestedStateId">0</hkparam>
18871887
<hkparam name="toNestedStateId">0</hkparam>
18881888
<hkparam name="priority">0</hkparam>
1889-
<hkparam name="flags">FLAG_IS_LOCAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
1889+
<hkparam name="flags">FLAG_IS_LOCAL_WILDCARD|FLAG_IS_GLOBAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
18901890
</hkobject>
18911891
</hkparam>
18921892
</hkobject>

PandoraPlus/Pandora_Engine/Skyrim/Template/actors/spriggan/behaviors/sprigganbehavior.hkx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3590,7 +3590,7 @@
35903590
<hkparam name="fromNestedStateId">0</hkparam>
35913591
<hkparam name="toNestedStateId">0</hkparam>
35923592
<hkparam name="priority">0</hkparam>
3593-
<hkparam name="flags">FLAG_IS_LOCAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
3593+
<hkparam name="flags">FLAG_IS_LOCAL_WILDCARD|FLAG_IS_GLOBAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
35943594
</hkobject>
35953595
</hkparam>
35963596
</hkobject>

PandoraPlus/Pandora_Engine/Skyrim/Template/actors/troll/behaviors/trollbehavior.hkx

+1-1
Original file line numberDiff line numberDiff line change
@@ -6655,7 +6655,7 @@
66556655
<hkparam name="fromNestedStateId">0</hkparam>
66566656
<hkparam name="toNestedStateId">0</hkparam>
66576657
<hkparam name="priority">0</hkparam>
6658-
<hkparam name="flags">FLAG_IS_LOCAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
6658+
<hkparam name="flags">FLAG_IS_LOCAL_WILDCARD|FLAG_IS_GLOBAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
66596659
</hkobject>
66606660
<hkobject>
66616661
<hkparam name="triggerInterval">

PandoraPlus/Pandora_Engine/Skyrim/Template/actors/vampirelord/behaviors/vampirelord.hkx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3493,7 +3493,7 @@
34933493
<hkparam name="fromNestedStateId">0</hkparam>
34943494
<hkparam name="toNestedStateId">0</hkparam>
34953495
<hkparam name="priority">0</hkparam>
3496-
<hkparam name="flags">FLAG_IS_LOCAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
3496+
<hkparam name="flags">FLAG_IS_LOCAL_WILDCARD|FLAG_IS_GLOBAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
34973497
</hkobject>
34983498
<hkobject>
34993499
<hkparam name="triggerInterval">

PandoraPlus/Pandora_Engine/Skyrim/Template/actors/werewolfbeast/behaviors/werewolfbehavior.hkx

+1-1
Original file line numberDiff line numberDiff line change
@@ -4017,7 +4017,7 @@
40174017
<hkparam name="fromNestedStateId">0</hkparam>
40184018
<hkparam name="toNestedStateId">0</hkparam>
40194019
<hkparam name="priority">0</hkparam>
4020-
<hkparam name="flags">FLAG_IS_LOCAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
4020+
<hkparam name="flags">FLAG_IS_LOCAL_WILDCARD|FLAG_IS_GLOBAL_WILDCARD|FLAG_DISABLE_CONDITION</hkparam>
40214021
</hkobject>
40224022
<hkobject>
40234023
<hkparam name="triggerInterval">

0 commit comments

Comments
 (0)