Skip to content

Commit

Permalink
v2.14.4.3
Browse files Browse the repository at this point in the history
  • Loading branch information
ividyon committed Oct 17, 2024
1 parent 0c1ad7b commit 13929d6
Show file tree
Hide file tree
Showing 10 changed files with 184 additions and 105 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<Authors>ividyon</Authors>
<Company>ividyon</Company>
<Version>2.14.4.2</Version>
<Version>2.14.4.3</Version>
<PathMap>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))=./</PathMap>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions NOTES.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
* Updated SoulsFormatsNEXT.
* Updated Paramdex.
* Hotfix for supporting 1.16 PARAMs.
* Updated SoulsFormatsNEXT to fix a MQB bug.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,11 @@ WitchyBND is built using the following licensed works:
# Changelog
## WitchyBND

### 2.14.4.3

* Hotfix for supporting 1.16 PARAMs.
* Updated SoulsFormatsNEXT to fix a MQB bug.

### 2.14.4.2

* Updated SoulsFormatsNEXT.
Expand Down
2 changes: 1 addition & 1 deletion SoulsFormats
16 changes: 15 additions & 1 deletion WitchyBND/Assets/Paramdex/DES/Enums.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
{
"List": [

{
"DisplayName": "ATKPARAM_DMGTYPE_NEW",
"Name": "ATKPARAM_DMGTYPE_NEW",
"Description": "These are categories used to determine the type of stagger the player or enemy takes. (AtkParam version)",
"Options": [
{ "ID": "0", "Name": "No Stagger [0: NONE]", "Description": "" },
{ "ID": "1", "Name": "Short Stagger [1: SMALL]", "Description": "" },
{ "ID": "2", "Name": "Medium Stagger [2: MIDDLE]", "Description": "" },
{ "ID": "3", "Name": "Long Stagger [3: LARGE]", "Description": "" },
{ "ID": "4", "Name": "Big Launch Back [4: EXLARGE]", "Description": "" },
{ "ID": "5", "Name": "Push [5: PUSH]", "Description": "" },
{ "ID": "6", "Name": "Pancake [6: FLING]", "Description": "" },
{ "ID": "7", "Name": "Launch Back [7: SMALL_BLOW]", "Description": "" }
]
}
]
}
174 changes: 102 additions & 72 deletions WitchyBND/Assets/Paramdex/DES/Meta/AtkParam.xml
Original file line number Diff line number Diff line change
@@ -1,78 +1,108 @@
<?xml version="1.0" encoding="utf-8"?>
<PARAMMETA XmlVersion="0">
<Enums>
<Enum Name="ATK_PARAM_HIT_TYPE" type="u8">
<Option Value="0" Name="Normal (tip)" />
<Option Value="1" Name="Middle" />
<Option Value="2" Name="Root" />
</Enum>
<Enum Name="ATK_PARAM_MAP_HIT" type="u8">
<Option Value="0" Name="Normal" />
<Option Value="1" Name="Precision" />
<Option Value="2" Name="Not on the map" />
</Enum>
<Enum Name="ATK_PARAM_HIT_SOURCE" type="u8">
<Option Value="0" Name="Weapon" />
<Option Value="1" Name="Body" />
</Enum>
</Enums>
<Field>
<pad12 AltName="pad12" />
<dmgLevel AltName="dmgLevel" />
<parryEnableFrame AltName="parryEnableFrame" />
<mapHitType AltName="mapHitType" />
<enableFlyingDamage AltName="enableFlyingDamage" />
<atkPhys AltName="atkPhys" />
<atkMag AltName="atkMag" />
<atkFire AltName="atkFire" />
<atkStam AltName="atkStam" />
<atkParry AltName="atkParry" />
<defParry AltName="defParry" />
<guardAtkRate AltName="guardAtkRate" />
<guardBreakRate AltName="guardBreakRate" />
<guardCutCancelRate AltName="guardCutCancelRate" />
<ignoreAtkType AltName="ignoreAtkType" />
<atkSuperArmor AltName="atkSuperArmor" />
<atkObj AltName="atkObj" />
<pad2 AltName="pad2" />
<atkPhysCorrection AltName="atkPhysCorrection" />
<atkMagCorrection AltName="atkMagCorrection" />
<atkFireCorrection AltName="atkFireCorrection" />
<atkStamCorrection AltName="atkStamCorrection" />
<atkParryCorrection AltName="atkParryCorrection" />
<defParryCorrection AltName="defParryCorrection" />
<guardAtkRateCorrection AltName="guardAtkRateCorrection" />
<guardBreakCorrection AltName="guardBreakCorrection" />
<pad10 AltName="pad10" />
<atkSuperArmorCorrection AltName="atkSuperArmorCorrection" />
<guardStaminaCutRate AltName="guardStaminaCutRate" />
<pad3 AltName="pad3" />
<disableGuard AltName="disableGuard" />
<disableStaminaAttack AltName="disableStaminaAttack" />
<pad4 AltName="pad4" />
<guardRate AltName="guardRate" />
<disableHitSpEffect AltName="disableHitSpEffect" />
<hitSourceType AltName="hitSourceType" />
<hit0_DmyPoly1 AltName="hit0_DmyPoly1" />
<hit0_DmyPoly2 AltName="hit0_DmyPoly2" />
<hit0_Radius AltName="hit0_Radius" />
<hit0_hitType AltName="hit0_hitType" />
<hti0_Priority AltName="hti0_Priority" />
<hit0_pad AltName="hit0_pad" />
<hit1_DmyPoly1 AltName="hit1_DmyPoly1" />
<hit1_DmyPoly2 AltName="hit1_DmyPoly2" />
<hit1_Radius AltName="hit1_Radius" />
<hit1_hitType AltName="hit1_hitType" />
<hti1_Priority AltName="hti1_Priority" />
<hit1_pad AltName="hit1_pad" />
<hit2_DmyPoly1 AltName="hit2_DmyPoly1" />
<hit2_DmyPoly2 AltName="hit2_DmyPoly2" />
<hit2_Radius AltName="hit2_Radius" />
<hit2_hitType AltName="hit2_hitType" />
<hti2_Priority AltName="hti2_Priority" />
<hit2_pad AltName="hit2_pad" />
<hit3_DmyPoly1 AltName="hit3_DmyPoly1" />
<hit3_DmyPoly2 AltName="hit3_DmyPoly2" />
<hit3_Radius AltName="hit3_Radius" />
<hit3_hitType AltName="hit3_hitType" />
<hti3_Priority AltName="hti3_Priority" />
<hit3_pad AltName="hit3_pad" />
<knockbackVellocity AltName="knockbackVellocity" />
<knocbackContTime AltName="knocbackContTime" />
<knockbackDecTime AltName="knockbackDecTime" />
<disableKnockbackCut AltName="disableKnockbackCut" />
<pad11 AltName="pad11" />
<IgnoreNotifyMissSwingForAI AltName="IgnoreNotifyMissSwingForAI" />
<spEffectId0 AltName="spEffectId0" />
<spEffectId1 AltName="spEffectId1" />
<spEffectId2 AltName="spEffectId2" />
<spEffectId3 AltName="spEffectId3" />
<spEffectId4 AltName="spEffectId4" />
<pad8 AltName="pad8" />
<pad12 AltName="pad12" IsHidden="" />

<dmgLevel AltName="Damage Level" Wiki="Impact level of attack, which determines how the target reacts to it (e.g. knocked backward, launched into the air, etc.)." ProjectEnum="ATKPARAM_DMGTYPE_NEW" />
<parryEnableFrame AltName="Enable Parry Frame" Wiki="" IsBool="" />
<mapHitType AltName="Map Hit Type" Wiki="Which map do you see around the attack? The set" Enum="ATK_PARAM_MAP_HIT" />
<enableFlyingDamage AltName="Enable Flying Damage" IsBool="" Wiki="" />
<atkPhys AltName="Attack Damage: Physical" Wiki="" />
<atkMag AltName="Attack Damage: Magic" Wiki="" />
<atkFire AltName="Attack Damage: Fire" Wiki="" />
<atkStam AltName="Attack Damage: Stamina" Wiki="" />
<atkParry AltName="Parry Damage" Wiki="" />
<defParry AltName="Parry Defence" Wiki="" />
<guardAtkRate AltName="Guard Attack Rate" Wiki="" />
<guardBreakRate AltName="Guard Break Rate" Wiki="" />
<guardCutCancelRate AltName="Guard Absorption Bypass Rate" Wiki="Guard cut rate invalidation ratio (-100 to 100) Normal at 0 / Completely invalidated at -100 / Doubles the defense effect of the opponent at 100 -50, 100% cut shield becomes 50% cut" />
<ignoreAtkType AltName="Ignore Attack Type" IsBool="" Wiki="" />
<atkSuperArmor AltName="Attack Damage: Poise" Wiki="" />
<atkObj AltName="Attack Damage: Object HP" Wiki="" />

<pad2 AltName="pad2" IsHidden="" />

<atkPhysCorrection AltName="Attack Correction: Physical" Wiki="" />
<atkMagCorrection AltName="Attack Correction: Magic" Wiki="" />
<atkFireCorrection AltName="Attack Correction: Fire" Wiki="" />
<atkStamCorrection AltName="Attack Correction: Stamina" Wiki="" />
<atkParryCorrection AltName="Parry Damage Correction" Wiki="" />
<defParryCorrection AltName="Parry Defence Correction" Wiki="" />
<guardAtkRateCorrection AltName="Guard Attack Rate Correction" Wiki="" />
<guardBreakCorrection AltName="Guard Break Rate Correction" Wiki="" />

<pad10 AltName="pad10" IsHidden="" />

<atkSuperArmorCorrection AltName="Attack Correction: Poise" Wiki="" />
<guardStaminaCutRate AltName="Guard Stamina Absorption Correction" Wiki="" />

<pad3 AltName="pad3" IsHidden="" />

<disableGuard AltName="Disable Guard" IsBool="" Wiki="" />
<disableStaminaAttack AltName="Disable Stamina Attack" IsBool="" Wiki="Destruction judgment is performed by stamina attack power, but stamina is not actually reduced." />
<pad4 AltName="pad4" IsHidden="" />
<guardRate AltName="Guard Rate" Wiki="NPC, the guard performance set in the weapon parameter is uniformly corrected. 0, 1x / 100, 2x / -100, guard multiplier = (guard multiplier / 100) to increase / decrease the parameter to 0. + 1)" />
<disableHitSpEffect AltName="Disable SpEffect on Hit" Wiki="Disables special effects when an attack hits." IsBool="" />
<hitSourceType AltName="Hit Source Type" Wiki="Where do you get the Damipoli ID per attack? To specify" Enum="ATK_PARAM_HIT_SOURCE" />

<hit0_DmyPoly1 AltName="Hit 0: Dummy Poly [1]" Wiki="Dummy polygon in sphere, capsule position" />
<hit0_DmyPoly2 AltName="Hit 0: Dummy Poly [2]" Wiki="Dummy polygon in sphere, capsule position" />
<hit0_Radius AltName="Hit 0: Radius" Wiki="Sphere, capsule radius" />
<hit0_hitType AltName="Hit 0: Hit Type" Wiki="Hit part" Enum="ATK_PARAM_HIT_TYPE" />
<hti0_Priority AltName="Hit 0: Priority" Wiki="priority. If there are two or more hits at the same time, the one with the higher priority will be adopted." />
<hit0_pad AltName="hit0_pad" IsHidden="" />

<hit1_DmyPoly1 AltName="Hit 1: Dummy Poly [1]" Wiki="Dummy polygon in sphere, capsule position" />
<hit1_DmyPoly2 AltName="Hit 1: Dummy Poly [2]" Wiki="Dummy polygon in sphere, capsule position" />
<hit1_Radius AltName="Hit 1: Radius" Wiki="Sphere, capsule radius" />
<hit1_hitType AltName="Hit 1: Hit Type" Wiki="Hit part" Enum="ATK_PARAM_HIT_TYPE" />
<hti1_Priority AltName="Hit 1: Priority" Wiki="priority. If there are two or more hits at the same time, the one with the higher priority will be adopted." />
<hit1_pad AltName="hit1_pad" IsHidden="" />

<hit2_DmyPoly1 AltName="Hit 2: Dummy Poly [1]" Wiki="Dummy polygon in sphere, capsule position" />
<hit2_DmyPoly2 AltName="Hit 2: Dummy Poly [2]" Wiki="Dummy polygon in sphere, capsule position" />
<hit2_Radius AltName="Hit 2: Radius" Wiki="Sphere, capsule radius" />
<hit2_hitType AltName="Hit 2: Hit Type" Wiki="Hit part" Enum="ATK_PARAM_HIT_TYPE" />
<hti2_Priority AltName="Hit 2: Priority" Wiki="priority. If there are two or more hits at the same time, the one with the higher priority will be adopted." />
<hit2_pad AltName="hit2_pad" IsHidden="" />

<hit3_DmyPoly1 AltName="Hit 3: Dummy Poly [1]" Wiki="Dummy polygon in sphere, capsule position" />
<hit3_DmyPoly2 AltName="Hit 3: Dummy Poly [2]" Wiki="Dummy polygon in sphere, capsule position" />
<hit3_Radius AltName="Hit 3: Radius" Wiki="Sphere, capsule radius" />
<hit3_hitType AltName="Hit 3: Hit Type" Wiki="Hit part" Enum="ATK_PARAM_HIT_TYPE" />
<hti3_Priority AltName="Hit 3: Priority" Wiki="priority. If there are two or more hits at the same time, the one with the higher priority will be adopted." />
<hit3_pad AltName="hit3_pad" IsHidden="" />

<knockbackVellocity AltName="Knockback Velocity" />
<knocbackContTime AltName="Knockback: Maintenance Time" />
<knockbackDecTime AltName="Knockback: Deceleration Time" />
<disableKnockbackCut AltName="Disable Knockback Absorption" IsBool="" />

<pad11 AltName="pad11" IsHidden="" />

<IgnoreNotifyMissSwingForAI AltName="Disable Missed Attack Notification For AI" Wiki="Do not notify AI of missed swing" IsBool="" />
<spEffectId0 AltName="Target SpEffect [0]" Wiki="Enter the ID created with the special effects parameter" Refs="SpEffectParam" />
<spEffectId1 AltName="Target SpEffect [1]" Wiki="Enter the ID created with the special effects parameter" Refs="SpEffectParam" />
<spEffectId2 AltName="Target SpEffect [2]" Wiki="Enter the ID created with the special effects parameter" Refs="SpEffectParam" />
<spEffectId3 AltName="Target SpEffect [3]" Wiki="Enter the ID created with the special effects parameter" Refs="SpEffectParam" />
<spEffectId4 AltName="Target SpEffect [4]" Wiki="Enter the ID created with the special effects parameter" Refs="SpEffectParam" />
<pad8 AltName="pad8" IsHidden="" />
</Field>
<Self Row0Dummy="" />
</PARAMMETA>
72 changes: 51 additions & 21 deletions WitchyBND/Assets/Paramdex/DES/Meta/BehaviorParam.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,59 @@
<Option Value="1" Name="Bullet" />
<Option Value="2" Name="SpEffect" />
</Enum>
<Enum Name="STATE_BEHAVIOR_TYPE" type="u8">
<Option Value="0" Name="None" />
<Option Value="1" Name="Player" />
<Option Value="2" Name="NPC" />
<Option Value="3" Name="NPC" />
</Enum>
<Enum Name="BEHAVIOR_CATEGORY" type="u8">
<Option Value="0" Name="None" />
<Option Value="1" Name="Normal Attack" />
<Option Value="2" Name="Left-hand Attack" />
<Option Value="3" Name="Magic" />
<Option Value="4" Name="Miracle" />
<Option Value="5" Name="Body" />
</Enum>
<Enum Name="BEHAVIOR_ATK_TYPE" type="u8">
<Option Value="0" Name="Slash" />
<Option Value="1" Name="Strike" />
<Option Value="2" Name="Thrust" />
<Option Value="3" Name="Push" />
</Enum>
<Enum Name="BEHAVIOR_ATK_SIZE" type="u8">
<Option Value="0" Name="Small" />
<Option Value="1" Name="Large" />
</Enum>
</Enums>
<Field>
<variationId AltName="variationId" VRef="BehaviorVariation" />
<behaviorJudgeId AltName="behaviorJudgeId" />
<ezStateBehaviorType_old AltName="ezStateBehaviorType_old" />
<refType AltName="refType" Enum="BEHAVIOR_REF_TYPE" />
<refType AltName="refType" />
<pad0 AltName="pad0" />
<atkParamId AltName="atkParamId" Refs="AtkParam_Npc(refType=0),AtkParam_Pc(refType=0)"/>
<bulletParamId AltName="bulletParamId" Refs="Bullet(refType=1)" />
<spEffectId AltName="spEffectId" Refs="SpEffectParam(refType=2)" />
<sfxVariationId AltName="sfxVariationId" />
<category AltName="category" />
<pad1 AltName="pad1" />
<stamina AltName="stamina" />
<mp AltName="mp" />
<pad3 AltName="pad3" />
<atkType AltName="atkType" />
<atkMaterial AltName="atkMaterial" />
<defMaterial AltName="defMaterial" />
<atkSize AltName="atkSize" />
<defSfxMaterial AltName="defSfxMaterial" />
<pad2 AltName="pad2" />
<variationId AltName="Behavior Variation ID" Wiki="Used when calculating the ID for attack parameters. It is not used directly on the actual machine." VRef="behaviorVariation" />
<behaviorJudgeId AltName="Behavior Judge ID" Wiki="Used when calculating the ID for attack parameters. This ID matches the action judgment ID entered in TimeActEditor. It is not used directly on the actual machine." />
<ezStateBehaviorType_old AltName="State Behavior Type" Wiki="For ID calculation rules" Enum="STATE_BEHAVIOR_TYPE" />
<refType AltName="Reference Type" Wiki="Specify the reference ID so that it is correct." Enum="BEHAVIOR_REF_TYPE" />

<pad0 AltName="pad0" IsHidden="" />

<atkParamId AltName="Attack Param ID" Refs="AtkParam_Npc(refType=0),AtkParam_Pc(refType=0)"/>
<bulletParamId AltName="Bullet Param ID" Refs="Bullet(refType=1)" />
<spEffectId AltName="SpEffect Param ID" Refs="SpEffectParam(refType=2)" />

<sfxVariationId AltName="SFX Variation ID" />
<category AltName="Category" Wiki="Since there are effects (enchantment weapons, etc.) whose parameters fluctuate depending on skills, magic, items, etc., set each action so that the determined effect can correspond to the effect such as power up only weapon attack. Set None for items that do not need to be set, such as varistor." Enum="BEHAVIOR_CATEGORY" />

<pad1 AltName="pad1" IsHidden="" />
<stamina AltName="Stamina" Wiki="Set the amount of stamina consumed during action." />
<mp AltName="MP" Wiki="Set the amount of MP consumed during action." />

<pad3 AltName="pad3" IsHidden="" />

<atkType AltName="Attack Type" Enum="BEHAVIOR_ATK_TYPE" />
<atkMaterial AltName="Attack Material" />
<defMaterial AltName="Defence Material" />
<atkSize AltName="Attack Size" Enum="BEHAVIOR_ATK_SIZE" />
<defSfxMaterial AltName="Defence SFX Material" />

<pad2 AltName="pad2" IsHidden="" />
</Field>
<Self Row0Dummy="" />
</PARAMMETA>
2 changes: 1 addition & 1 deletion WitchyBND/Assets/Paramdex/ER/Upgrader/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1_15_0_1000L
1_16_0_1000L
8 changes: 4 additions & 4 deletions WitchyBND/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@
"dependencies": {
"BouncyCastle.Cryptography": "[2.4.0, )",
"NativeFileDialogSharp": "[0.6.0-alpha, )",
"SoulsFormats": "[2.14.4.2, )"
"SoulsFormats": "[2.14.4.3, )"
}
},
"studioutils": {
Expand All @@ -320,8 +320,8 @@
"witchyformats": {
"type": "Project",
"dependencies": {
"SoulsFormats": "[2.14.4.2, )",
"StudioUtils": "[2.14.4.2, )"
"SoulsFormats": "[2.14.4.3, )",
"StudioUtils": "[2.14.4.3, )"
}
},
"witchylib": {
Expand All @@ -331,7 +331,7 @@
"Microsoft.Extensions.FileSystemGlobbing": "[8.0.0-preview.2.23128.3, )",
"Newtonsoft.Json": "[13.0.3, )",
"PromptPlus": "[4.2.0, )",
"WitchyFormats": "[2.14.4.2, )"
"WitchyFormats": "[2.14.4.3, )"
}
}
},
Expand Down
4 changes: 2 additions & 2 deletions WitchyLib/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@
"witchyformats": {
"type": "Project",
"dependencies": {
"SoulsFormats": "[2.14.4.2, )",
"StudioUtils": "[2.14.4.2, )"
"SoulsFormats": "[2.14.4.3, )",
"StudioUtils": "[2.14.4.3, )"
}
}
}
Expand Down

0 comments on commit 13929d6

Please sign in to comment.