liza/Questionable
liza/Questionable
2
1
Fork 18
Code Pull Requests 1 Releases 84 Activity

Fix item use in 'Strange Bedfellows' and 'Combat Evolved'

Browse Source
This commit is contained in:
Liza 2024-11-18 20:51:49 +01:00
parent f71ddeddfa
commit 3ab1069ab7
Signed by: liza
GPG Key ID: 7199F8D727D55F67
2 changed files with 63 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
QuestPaths/6.x - Endwalker/Side Quests/Labyrinthos/4326_Seeing Red.json Normal file
View File

@ -0,0 +1,62 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1037575,
"Position": {
"X": 6.454529,
"Y": -31.530432,
"Z": -78.14148
},
"TerritoryId": 956,
"InteractionType": "AcceptQuest"
}
]
},
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": 379.89767,
"Y": 68.15723,
"Z": -169.26231
},
"TerritoryId": 956,
"InteractionType": "Combat",
"EnemySpawnType": "OverworldEnemies",
"KillEnemyDataIds": [
13415
],
"CombatItemUse": {
"ItemId": 2003316,
"Condition": "Health%",
"Value": 50
},
"Fly": true
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1037575,
"Position": {
"X": 6.454529,
"Y": -31.530432,
"Z": -78.14148
},
"TerritoryId": 956,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Labyrinthos - Sharlayan Hamlet",
"Fly": true
}
]
}
]
}

3
Questionable/Controller/CombatModules/ItemUseModule.cs
View File

@ -142,8 +142,7 @@ internal sealed class ItemUseModule : ICombatModule
{ {
BattleChara* battleChara = (BattleChara*)gameObject.Address; BattleChara* battleChara = (BattleChara*)gameObject.Address;
if (_combatData.CombatItemUse.Condition == ECombatItemUseCondition.Incapacitated) if (_combatData.CombatItemUse.Condition == ECombatItemUseCondition.Incapacitated)
//return (byte)(((nint)battleChara + 0x1C68) & 0x40) != 0; // FIXME 7.1 return (*(byte*)((nint)battleChara + 0x1C68) & 0x40) != 0;
return false;
if (_combatData.CombatItemUse.Condition == ECombatItemUseCondition.HealthPercent) if (_combatData.CombatItemUse.Condition == ECombatItemUseCondition.HealthPercent)
return (100f * battleChara->Health / battleChara->MaxHealth) < _combatData.CombatItemUse.Value; return (100f * battleChara->Health / battleChara->MaxHealth) < _combatData.CombatItemUse.Value;