diff --git a/Data/JsonBytes/Audio/AudioResourceData.json b/Data/JsonBytes/Audio/AudioResourceData.json index 0c515ee5..eb5577bc 100644 Binary files a/Data/JsonBytes/Audio/AudioResourceData.json and b/Data/JsonBytes/Audio/AudioResourceData.json differ diff --git a/Data/_unsorted/Activity_SmashBro_Common_Avatar.json b/Data/_unsorted/Activity_SmashBro_Common_Avatar.json index 9e27739e..e178f9b2 100644 --- a/Data/_unsorted/Activity_SmashBro_Common_Avatar.json +++ b/Data/_unsorted/Activity_SmashBro_Common_Avatar.json @@ -340,7 +340,7 @@ "AnimEventIDs": [ "Longinus_Attack_Normal_Enhance_04_AttackProperty_05_02", "Longinus_Attack_Normal_04_AttackProperty_05", - "Brujas_Attack_Special_02_AttackProperty_04_02" + "Brujas_Attack_Special_02_AttackProperty_03" ] } ], diff --git a/Data/_unsorted/Brujas_BlockManager.json b/Data/_unsorted/Brujas_BlockManager.json index 6d14e1e3..9eb6274a 100644 --- a/Data/_unsorted/Brujas_BlockManager.json +++ b/Data/_unsorted/Brujas_BlockManager.json @@ -218,6 +218,15 @@ "ParamName": "AS_LaserStartCount", "ParamType": "Float" } + ], + "OnRemoved": [ + { + "$type": "SetAnimCtrlerParamAction", + "BoolVal": false, + "ParamName": "Bool_CanExtend", + "ParamType": 2, + "Target": "Self" + } ] }, "NoDamageModifier_Branch_02": { diff --git a/Data/_unsorted/Brujas_Bullet_Launcher.json b/Data/_unsorted/Brujas_Bullet_Launcher.json index 901449b0..44a796d8 100644 --- a/Data/_unsorted/Brujas_Bullet_Launcher.json +++ b/Data/_unsorted/Brujas_Bullet_Launcher.json @@ -7,13 +7,13 @@ "ActionList": [ { "$type": "ApplyModifier", - "ModifierName": "QTEBulletLaunchModifier" + "ModifierName": "QTEExtraBulletLaunchModifier" } ], "AnimatorStateName": "SwitchIn_Attack_Extra", "ForceTriggerOnTransitionIn": false, "ForceTriggerOnTransitionOut": false, - "Frame": 115, + "Frame": 79, "IsLoop": false, "LayerIndex": 0 }, @@ -27,7 +27,7 @@ "AnimatorStateName": "SwitchIn_Attack", "ForceTriggerOnTransitionIn": false, "ForceTriggerOnTransitionOut": false, - "Frame": 115, + "Frame": 79, "IsLoop": false, "LayerIndex": 0 }, @@ -41,7 +41,7 @@ "AnimatorStateName": "Attack_Special_02", "ForceTriggerOnTransitionIn": false, "ForceTriggerOnTransitionOut": false, - "Frame": 44, + "Frame": 62, "IsLoop": false, "LayerIndex": 0 } @@ -70,10 +70,28 @@ { "$type": "TriggerAbilityAction", "AbilityName": "Brujas_QTE_Bullet_04" + } + ] + }, + "QTEExtraBulletLaunchModifier": { + "Duration": 2, + "ModifierStacking": "Replace", + "OnAdded": [ + { + "$type": "TriggerAbilityAction", + "AbilityName": "Brujas_QTEExtra_Bullet_01" }, { "$type": "TriggerAbilityAction", - "AbilityName": "Brujas_QTE_Bullet_05" + "AbilityName": "Brujas_QTEExtra_Bullet_02" + }, + { + "$type": "TriggerAbilityAction", + "AbilityName": "Brujas_QTEExtra_Bullet_03" + }, + { + "$type": "TriggerAbilityAction", + "AbilityName": "Brujas_QTEExtra_Bullet_04" } ] }, @@ -96,10 +114,6 @@ { "$type": "TriggerAbilityAction", "AbilityName": "Brujas_SP_Bullet_04" - }, - { - "$type": "TriggerAbilityAction", - "AbilityName": "Brujas_SP_Bullet_05" } ] } diff --git a/Data/_unsorted/Brujas_Effect.json b/Data/_unsorted/Brujas_Effect.json index f5ffabc0..244f03ea 100644 --- a/Data/_unsorted/Brujas_Effect.json +++ b/Data/_unsorted/Brujas_Effect.json @@ -166,6 +166,11 @@ "$type": "ByTransitionName", "Target": "Caster", "TransitionName": "RunEndToNormal" + }, + { + "$type": "ByTransitionName", + "Target": "Caster", + "TransitionName": "Run_Loop -> Evade_Front" } ], "Target": "Caster" diff --git a/Data/_unsorted/Brujas_EnergyRecover.json b/Data/_unsorted/Brujas_EnergyRecover.json index 20f0a24a..d3f67aef 100644 --- a/Data/_unsorted/Brujas_EnergyRecover.json +++ b/Data/_unsorted/Brujas_EnergyRecover.json @@ -192,7 +192,7 @@ { "AnimatorStateName": "Attack_ChainAttack_02", "FrameCountHigh": 130, - "FrameCountLow": 30, + "FrameCountLow": 39, "MaxFrameCountHigh": false, "ModifierNameList": [ "AidAttack_Common_Modifier" diff --git a/Data/_unsorted/Brujas_ExQTE_Bullet_01.json b/Data/_unsorted/Brujas_ExQTE_Bullet_01.json new file mode 100644 index 00000000..c44af381 --- /dev/null +++ b/Data/_unsorted/Brujas_ExQTE_Bullet_01.json @@ -0,0 +1,74 @@ +{ + "AbilityMixins": [ + { + "$type": "BulletMixin", + "AliveDuration": 1, + "BulletColliderConfig": { + "ColliderAngleOffset": { + "x": 0, + "y": 0, + "z": 0 + }, + "ColliderPosOffset": { + "x": 0, + "y": 0, + "z": 0 + }, + "ColliderType": "Sphere", + "SphereColliderRadius": 3 + }, + "BulletHitTypeName": "Normal", + "BulletInitPosRot": { + "CoordsOption": "Caster", + "NeedRaycastGround": true, + "Offset": { + "AngleOffset": { + "x": 0, + "y": 0, + "z": 0 + }, + "IsUseRotationXZ": false, + "IsUseRotationY": true, + "PositionOffset": { + "x": -0.04, + "y": 0, + "z": 3.44 + } + }, + "TargetOption": { + "$type": "ConfigPosRotReferTarget", + "OffsetReferTarget": "Caster" + }, + "Targetting": "Enemy" + }, + "BulletName": "Bullet_Empty_IgnoreWall", + "CanHitStage": false, + "DelayActionList": [ + { + "Actions": [ + { + "$type": "FireEffect", + "EffectPattern": "Eff_Brujas_Attack_ExQTE_23_ShockWave", + "Target": "Other" + } + ], + "DelayTime": 0 + }, + { + "DelayTime": 0.07, + "HitAnimEventID": "Brujas_Attack_SwitchIn_Attack_Ex_AttackProperty_01_02" + } + ], + "DestroyExplode": false, + "HitOtherExplode": false, + "HitStageExplode": false, + "MaxHitNum": -1, + "MaxHitStageNum": -1, + "MaxHitTargetNum": -1, + "MaxTouchStageNum": 0, + "Targetting": "Enemy" + } + ], + "AbilityName": "Brujas_ExQTE_Bullet_01", + "AbilityStacking": "Unique" +} \ No newline at end of file diff --git a/Data/_unsorted/Brujas_QTEExtra_Bullet_01.json b/Data/_unsorted/Brujas_QTEExtra_Bullet_01.json new file mode 100644 index 00000000..b31370ba --- /dev/null +++ b/Data/_unsorted/Brujas_QTEExtra_Bullet_01.json @@ -0,0 +1,74 @@ +{ + "AbilityMixins": [ + { + "$type": "BulletMixin", + "AliveDuration": 1, + "BulletColliderConfig": { + "ColliderAngleOffset": { + "x": 0, + "y": 0, + "z": 0 + }, + "ColliderPosOffset": { + "x": 0, + "y": 0, + "z": 0 + }, + "ColliderType": "Sphere", + "SphereColliderRadius": 3 + }, + "BulletEffect": { + "EffectPattern": "Eff_Brujas_Attack_QTE_01_Boom" + }, + "BulletHitTypeName": "Normal", + "BulletInitPosRot": { + "CoordsOption": "Caster", + "NeedRaycastGround": true, + "Offset": { + "AngleOffset": { + "x": 0, + "y": 0, + "z": 0 + }, + "IsUseRotationXZ": false, + "IsUseRotationY": true, + "PositionOffset": { + "x": -1.2, + "y": 0, + "z": 2 + } + }, + "TargetOption": { + "$type": "ConfigPosRotReferTarget", + "OffsetReferTarget": "Caster" + }, + "Targetting": "Enemy" + }, + "BulletName": "Bullet_Empty_IgnoreWall", + "CanHitStage": false, + "DelayActionList": [ + { + "Actions": [ + { + "$type": "FireAudio", + "AudioPattern": "Play_SFX_Char_Skill_Brujas_SwitchIn_Attack_4_Explo_1_Extra", + "Target": "Other" + } + ], + "DelayTime": 0.35, + "HitAnimEventID": "Brujas_Attack_SwitchIn_Extra_Attack_AttackProperty_04" + } + ], + "DestroyExplode": false, + "HitOtherExplode": false, + "HitStageExplode": false, + "MaxHitNum": -1, + "MaxHitStageNum": -1, + "MaxHitTargetNum": -1, + "MaxTouchStageNum": 0, + "Targetting": "Enemy" + } + ], + "AbilityName": "Brujas_QTEExtra_Bullet_01", + "AbilityStacking": "Unique" +} \ No newline at end of file diff --git a/Data/_unsorted/Brujas_QTEExtra_Bullet_02.json b/Data/_unsorted/Brujas_QTEExtra_Bullet_02.json new file mode 100644 index 00000000..69af703e --- /dev/null +++ b/Data/_unsorted/Brujas_QTEExtra_Bullet_02.json @@ -0,0 +1,81 @@ +{ + "AbilityMixins": [ + { + "$type": "BulletMixin", + "AliveDuration": 1, + "BulletColliderConfig": { + "ColliderAngleOffset": { + "x": 0, + "y": 0, + "z": 0 + }, + "ColliderPosOffset": { + "x": 0, + "y": 0, + "z": 0 + }, + "ColliderType": "Sphere", + "SphereColliderRadius": 3 + }, + "BulletHitTypeName": "Normal", + "BulletInitPosRot": { + "CoordsOption": "Caster", + "NeedRaycastGround": true, + "Offset": { + "AngleOffset": { + "x": 0, + "y": 0, + "z": 0 + }, + "IsUseRotationXZ": false, + "IsUseRotationY": true, + "PositionOffset": { + "x": 0.7, + "y": 0, + "z": 1.5 + } + }, + "TargetOption": { + "$type": "ConfigPosRotReferTarget", + "OffsetReferTarget": "Caster" + }, + "Targetting": "Enemy" + }, + "BulletName": "Bullet_Empty_IgnoreWall", + "CanHitStage": false, + "DelayActionList": [ + { + "Actions": [ + { + "$type": "FireEffect", + "EffectPattern": "Eff_Brujas_Attack_QTE_01_Boom", + "Target": "Other" + }, + { + "$type": "FireAudio", + "AudioPattern": "Play_SFX_Char_Skill_Brujas_SwitchIn_Attack_4_Explo_3_Extra", + "Target": "Other" + }, + { + "$type": "TriggerSoundAction", + "Target": "Other", + "soundActionKey": "Play_SFX_Char_Impact_Brujas_SwitchIn_Attack_4" + } + ], + "DelayTime": 0.433333, + "HitAnimEventID": "Brujas_Attack_SwitchIn_Extra_Attack_AttackProperty_04" + } + ], + "DestroyExplode": false, + "HitOtherExplode": false, + "HitStageExplode": false, + "MaxHitNum": -1, + "MaxHitStageNum": -1, + "MaxHitTargetNum": -1, + "MaxTouchStageNum": 0, + "Targetting": "Enemy" + } + ], + "AbilityName": "Brujas_QTEExtra_Bullet_02", + "AbilityStacking": "Unique" +} \ No newline at end of file diff --git a/Data/_unsorted/Brujas_QTEExtra_Bullet_03.json b/Data/_unsorted/Brujas_QTEExtra_Bullet_03.json new file mode 100644 index 00000000..e53df328 --- /dev/null +++ b/Data/_unsorted/Brujas_QTEExtra_Bullet_03.json @@ -0,0 +1,81 @@ +{ + "AbilityMixins": [ + { + "$type": "BulletMixin", + "AliveDuration": 1, + "BulletColliderConfig": { + "ColliderAngleOffset": { + "x": 0, + "y": 0, + "z": 0 + }, + "ColliderPosOffset": { + "x": 0, + "y": 0, + "z": 0 + }, + "ColliderType": "Sphere", + "SphereColliderRadius": 3 + }, + "BulletHitTypeName": "Normal", + "BulletInitPosRot": { + "CoordsOption": "Caster", + "NeedRaycastGround": true, + "Offset": { + "AngleOffset": { + "x": 0, + "y": 0, + "z": 0 + }, + "IsUseRotationXZ": false, + "IsUseRotationY": true, + "PositionOffset": { + "x": -2, + "y": 0, + "z": 4 + } + }, + "TargetOption": { + "$type": "ConfigPosRotReferTarget", + "OffsetReferTarget": "Caster" + }, + "Targetting": "Enemy" + }, + "BulletName": "Bullet_Empty_IgnoreWall", + "CanHitStage": false, + "DelayActionList": [ + { + "Actions": [ + { + "$type": "FireEffect", + "EffectPattern": "Eff_Brujas_Attack_QTE_01_Boom", + "Target": "Other" + }, + { + "$type": "FireAudio", + "AudioPattern": "Play_SFX_Char_Skill_Brujas_SwitchIn_Attack_4_Explo_4_Extra", + "Target": "Other" + }, + { + "$type": "TriggerSoundAction", + "Target": "Other", + "soundActionKey": "Play_SFX_Char_Impact_Brujas_SwitchIn_Attack_4" + } + ], + "DelayTime": 0.5166667, + "HitAnimEventID": "Brujas_Attack_SwitchIn_Extra_Attack_AttackProperty_04" + } + ], + "DestroyExplode": false, + "HitOtherExplode": false, + "HitStageExplode": false, + "MaxHitNum": -1, + "MaxHitStageNum": -1, + "MaxHitTargetNum": -1, + "MaxTouchStageNum": 0, + "Targetting": "Enemy" + } + ], + "AbilityName": "Brujas_QTEExtra_Bullet_03", + "AbilityStacking": "Unique" +} \ No newline at end of file diff --git a/Data/_unsorted/Brujas_QTEExtra_Bullet_04.json b/Data/_unsorted/Brujas_QTEExtra_Bullet_04.json new file mode 100644 index 00000000..42e0c4f9 --- /dev/null +++ b/Data/_unsorted/Brujas_QTEExtra_Bullet_04.json @@ -0,0 +1,81 @@ +{ + "AbilityMixins": [ + { + "$type": "BulletMixin", + "AliveDuration": 1, + "BulletColliderConfig": { + "ColliderAngleOffset": { + "x": 0, + "y": 0, + "z": 0 + }, + "ColliderPosOffset": { + "x": 0, + "y": 0, + "z": 0 + }, + "ColliderType": "Sphere", + "SphereColliderRadius": 3 + }, + "BulletHitTypeName": "Normal", + "BulletInitPosRot": { + "CoordsOption": "Caster", + "NeedRaycastGround": true, + "Offset": { + "AngleOffset": { + "x": 0, + "y": 0, + "z": 0 + }, + "IsUseRotationXZ": false, + "IsUseRotationY": true, + "PositionOffset": { + "x": 1, + "y": 0, + "z": 3.5 + } + }, + "TargetOption": { + "$type": "ConfigPosRotReferTarget", + "OffsetReferTarget": "Caster" + }, + "Targetting": "Enemy" + }, + "BulletName": "Bullet_Empty_IgnoreWall", + "CanHitStage": false, + "DelayActionList": [ + { + "Actions": [ + { + "$type": "FireEffect", + "EffectPattern": "Eff_Brujas_Attack_QTE_01_Boom", + "Target": "Other" + }, + { + "$type": "FireAudio", + "AudioPattern": "Play_SFX_Char_Skill_Brujas_SwitchIn_Attack_4_Explo_5_Extra", + "Target": "Other" + }, + { + "$type": "TriggerSoundAction", + "Target": "Other", + "soundActionKey": "Play_SFX_Char_Impact_Brujas_SwitchIn_Attack_4" + } + ], + "DelayTime": 0.6, + "HitAnimEventID": "Brujas_Attack_SwitchIn_Extra_Attack_AttackProperty_04" + } + ], + "DestroyExplode": false, + "HitOtherExplode": false, + "HitStageExplode": false, + "MaxHitNum": -1, + "MaxHitStageNum": -1, + "MaxHitTargetNum": -1, + "MaxTouchStageNum": 0, + "Targetting": "Enemy" + } + ], + "AbilityName": "Brujas_QTEExtra_Bullet_04", + "AbilityStacking": "Unique" +} \ No newline at end of file diff --git a/Data/_unsorted/Brujas_QTE_Bullet_01.json b/Data/_unsorted/Brujas_QTE_Bullet_01.json index de120fc0..e68a7715 100644 --- a/Data/_unsorted/Brujas_QTE_Bullet_01.json +++ b/Data/_unsorted/Brujas_QTE_Bullet_01.json @@ -33,7 +33,7 @@ "IsUseRotationXZ": false, "IsUseRotationY": true, "PositionOffset": { - "x": -0.7, + "x": -1.2, "y": 0, "z": 2 } @@ -55,7 +55,8 @@ "Target": "Other" } ], - "DelayTime": 0 + "DelayTime": 0.35, + "HitAnimEventID": "Brujas_Attack_SwitchIn_Attack_AttackProperty_04" } ], "DestroyExplode": false, diff --git a/Data/_unsorted/Brujas_QTE_Bullet_02.json b/Data/_unsorted/Brujas_QTE_Bullet_02.json index 62498c8f..cf2b3134 100644 --- a/Data/_unsorted/Brujas_QTE_Bullet_02.json +++ b/Data/_unsorted/Brujas_QTE_Bullet_02.json @@ -30,9 +30,9 @@ "IsUseRotationXZ": false, "IsUseRotationY": true, "PositionOffset": { - "x": 1, + "x": 0.7, "y": 0, - "z": 4.5 + "z": 1.5 } }, "TargetOption": { @@ -62,7 +62,8 @@ "soundActionKey": "Play_SFX_Char_Impact_Brujas_SwitchIn_Attack_4" } ], - "DelayTime": 0.083333 + "DelayTime": 0.433333, + "HitAnimEventID": "Brujas_Attack_SwitchIn_Attack_AttackProperty_04" } ], "DestroyExplode": false, diff --git a/Data/_unsorted/Brujas_QTE_Bullet_03.json b/Data/_unsorted/Brujas_QTE_Bullet_03.json index b2278389..c06b039c 100644 --- a/Data/_unsorted/Brujas_QTE_Bullet_03.json +++ b/Data/_unsorted/Brujas_QTE_Bullet_03.json @@ -32,7 +32,7 @@ "PositionOffset": { "x": -2, "y": 0, - "z": 7 + "z": 4 } }, "TargetOption": { @@ -62,7 +62,8 @@ "soundActionKey": "Play_SFX_Char_Impact_Brujas_SwitchIn_Attack_4" } ], - "DelayTime": 0.1666667 + "DelayTime": 0.5166667, + "HitAnimEventID": "Brujas_Attack_SwitchIn_Attack_AttackProperty_04" } ], "DestroyExplode": false, diff --git a/Data/_unsorted/Brujas_QTE_Bullet_04.json b/Data/_unsorted/Brujas_QTE_Bullet_04.json index 93c49014..5f9e3985 100644 --- a/Data/_unsorted/Brujas_QTE_Bullet_04.json +++ b/Data/_unsorted/Brujas_QTE_Bullet_04.json @@ -30,9 +30,9 @@ "IsUseRotationXZ": false, "IsUseRotationY": true, "PositionOffset": { - "x": 1.25, + "x": 1, "y": 0, - "z": 9.5 + "z": 3.5 } }, "TargetOption": { @@ -62,7 +62,8 @@ "soundActionKey": "Play_SFX_Char_Impact_Brujas_SwitchIn_Attack_4" } ], - "DelayTime": 0.25 + "DelayTime": 0.6, + "HitAnimEventID": "Brujas_Attack_SwitchIn_Attack_AttackProperty_04" } ], "DestroyExplode": false, diff --git a/Data/_unsorted/Brujas_SP_Bullet_01.json b/Data/_unsorted/Brujas_SP_Bullet_01.json index 3782ae40..be1a5e22 100644 --- a/Data/_unsorted/Brujas_SP_Bullet_01.json +++ b/Data/_unsorted/Brujas_SP_Bullet_01.json @@ -30,9 +30,9 @@ "IsUseRotationXZ": false, "IsUseRotationY": true, "PositionOffset": { - "x": 0, + "x": -0.27, "y": 0, - "z": 1 + "z": 4.841536 } }, "TargetOption": { @@ -57,7 +57,7 @@ "Target": "Other" } ], - "DelayTime": 0.1, + "DelayTime": 0, "HitAnimEventID": "Brujas_Attack_Special_02_AttackProperty_04_01" } ], diff --git a/Data/_unsorted/Brujas_SP_Bullet_02.json b/Data/_unsorted/Brujas_SP_Bullet_02.json index d595176f..44ef9d44 100644 --- a/Data/_unsorted/Brujas_SP_Bullet_02.json +++ b/Data/_unsorted/Brujas_SP_Bullet_02.json @@ -30,9 +30,9 @@ "IsUseRotationXZ": false, "IsUseRotationY": true, "PositionOffset": { - "x": 0.5, + "x": -0.1, "y": 0, - "z": 2 + "z": 10.55154 } }, "TargetOption": { @@ -53,11 +53,11 @@ }, { "$type": "FireAudio", - "AudioPattern": "Play_SFX_Char_Skill_Brujas_Attack_Special_02_4_Explo_2", + "AudioPattern": "Play_SFX_Char_Skill_Brujas_Attack_Special_02_4_Explo_3", "Target": "Other" } ], - "DelayTime": 0.23333, + "DelayTime": 0.13333, "HitAnimEventID": "Brujas_Attack_Special_02_AttackProperty_04_01" } ], diff --git a/Data/_unsorted/Brujas_SP_Bullet_03.json b/Data/_unsorted/Brujas_SP_Bullet_03.json index 5737a352..79b3798b 100644 --- a/Data/_unsorted/Brujas_SP_Bullet_03.json +++ b/Data/_unsorted/Brujas_SP_Bullet_03.json @@ -30,9 +30,9 @@ "IsUseRotationXZ": false, "IsUseRotationY": true, "PositionOffset": { - "x": -0.5, + "x": 0.05, "y": 0, - "z": 5 + "z": 17.50154 } }, "TargetOption": { @@ -53,11 +53,11 @@ }, { "$type": "FireAudio", - "AudioPattern": "Play_SFX_Char_Skill_Brujas_Attack_Special_02_4_Explo_3", + "AudioPattern": "Play_SFX_Char_Skill_Brujas_Attack_Special_02_4_Explo_4", "Target": "Other" } ], - "DelayTime": 0.3333333, + "DelayTime": 0.2333333, "HitAnimEventID": "Brujas_Attack_Special_02_AttackProperty_04_01" } ], diff --git a/Data/_unsorted/Brujas_SP_Bullet_04.json b/Data/_unsorted/Brujas_SP_Bullet_04.json index 1ac29b75..b1c40a44 100644 --- a/Data/_unsorted/Brujas_SP_Bullet_04.json +++ b/Data/_unsorted/Brujas_SP_Bullet_04.json @@ -30,9 +30,9 @@ "IsUseRotationXZ": false, "IsUseRotationY": true, "PositionOffset": { - "x": 0.5, + "x": 0.22, "y": 0, - "z": 8 + "z": 25 } }, "TargetOption": { @@ -53,11 +53,11 @@ }, { "$type": "FireAudio", - "AudioPattern": "Play_SFX_Char_Skill_Brujas_Attack_Special_02_4_Explo_4", + "AudioPattern": "Play_SFX_Char_Skill_Brujas_Attack_Special_02_4_Explo_5", "Target": "Other" } ], - "DelayTime": 0.466666666, + "DelayTime": 0.3, "HitAnimEventID": "Brujas_Attack_Special_02_AttackProperty_04_01" } ], diff --git a/Data/_unsorted/Brujas_Talent_03.json b/Data/_unsorted/Brujas_Talent_03.json index fa420339..e6af0454 100644 --- a/Data/_unsorted/Brujas_Talent_03.json +++ b/Data/_unsorted/Brujas_Talent_03.json @@ -56,6 +56,7 @@ "$type": "ByAnimEventIDs", "AnimEventIDs": [ "Brujas_Attack_SwitchIn_Attack_Ex_AttackProperty_01", + "Brujas_Attack_SwitchIn_Attack_Ex_AttackProperty_01_02", "Brujas_Attack_SwitchIn_Attack_Ex_AttackProperty_02", "Brujas_Attack_SwitchIn_Attack_Ex_AttackProperty_03", "Brujas_Attack_SwitchIn_Attack_Ex_AttackProperty_04_01", diff --git a/Data/_unsorted/Brujas_TutorialAbility.json b/Data/_unsorted/Brujas_TutorialAbility.json index 80d39332..7de4f333 100644 --- a/Data/_unsorted/Brujas_TutorialAbility.json +++ b/Data/_unsorted/Brujas_TutorialAbility.json @@ -42,7 +42,7 @@ } ], "AnimatorStateName": "Attack_ChainAttack_02", - "ForceTriggerOnTransitionIn": false, + "ForceTriggerOnTransitionIn": true, "ForceTriggerOnTransitionOut": false, "Frame": 0, "IsLoop": false, diff --git a/Data/_unsorted/UsmInfo.json b/Data/_unsorted/UsmInfo.json index 0b08ead3..4ed8a6d9 100644 Binary files a/Data/_unsorted/UsmInfo.json and b/Data/_unsorted/UsmInfo.json differ diff --git a/FileCfg/AvatarSkillTemplateTb.json b/FileCfg/AvatarSkillTemplateTb.json index f9a10771..75563dce 100644 --- a/FileCfg/AvatarSkillTemplateTb.json +++ b/FileCfg/AvatarSkillTemplateTb.json @@ -19650,10 +19650,10 @@ "DBEACLEEOGA": 1301, "KPFDAJBNLJN": 1, "AGBJDONHLPK": 0, - "HELBJAHCAAF": 22590, - "NFOPJKIGIFE": 2060, - "DKLDKOAAEGF": 22590, - "BBIBJLPFNJH": 1030, + "HELBJAHCAAF": 28090, + "NFOPJKIGIFE": 2560, + "DKLDKOAAEGF": 28090, + "BBIBJLPFNJH": 1280, "MPNBPLPLLDE": 0, "EANHDJMLGAE": 0, "BJPMAHPCENC": 0, @@ -19661,15 +19661,15 @@ "OBKDJNKIIOJ": "", "MIMIKEMBIMP": 0, "JCBFBLKEEMK": 0, - "NOLDAEJFMPK": 23125, + "NOLDAEJFMPK": 28333, "HJPPLIKLICL": 0, "DOJCDGBIAGK": 2, - "IGCOCLADDHJ": 496375, + "IGCOCLADDHJ": 582175, "IIDOBJPFBHG": 0, "BCDFBJKOAAC": 0, "KIJBBHBHCJG": [], "GGNGEAIEPAM": 0, - "OIECPHMHAMJ": 10167, + "OIECPHMHAMJ": 14334, "FDOGFCLNBCD": 0, "EBGPDHCCPMI": 0, "LMABJBOOELC": 0 diff --git a/TextMap/TextMap_JAOverwriteTemplateTb.json b/TextMap/TextMap_JAOverwriteTemplateTb.json index a3199113..4fdf9276 100644 Binary files a/TextMap/TextMap_JAOverwriteTemplateTb.json and b/TextMap/TextMap_JAOverwriteTemplateTb.json differ