From 33a8212f0ca1b2305b0ae66174ad3e27424f44e6 Mon Sep 17 00:00:00 2001 From: Alice Ogeda Date: Tue, 7 Jan 2025 18:40:19 -0300 Subject: [PATCH] fix ifrit nail kill not pushing ifrit hellfire; --- data/EncounterTimelines/IfritNormal.json | 43 +++++++++++++++++++----- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/data/EncounterTimelines/IfritNormal.json b/data/EncounterTimelines/IfritNormal.json index f78401f86..ede462e02 100644 --- a/data/EncounterTimelines/IfritNormal.json +++ b/data/EncounterTimelines/IfritNormal.json @@ -105,10 +105,10 @@ }, { "data": { - "battleTalkId": 2939, + "battleTalkId": 2601, "handlerActorName": "Ifrit", - "kind": 1, - "nameId": 2961, + "kind": 2, + "nameId": 1185, "params": [ 0 ], @@ -219,10 +219,10 @@ "timepoints": [ { "data": { - "battleTalkId": 2939, + "battleTalkId": 2602, "handlerActorName": "Ifrit", - "kind": 1, - "nameId": 2961, + "kind": 2, + "nameId": 1185, "params": [ 0 ], @@ -458,6 +458,33 @@ "type": "idle" } ] + }, + { + "description": "", + "id": 9, + "name": "Nail death", + "timepoints": [ + { + "data": { + "conditionId": 5, + "conditionStr": "If Ifrit has 0% < HP < 50%, push Ifrit->Nail Spawn", + "enabled": false + }, + "description": "", + "duration": 0, + "type": "setCondition" + }, + { + "data": { + "conditionId": 8, + "conditionStr": "If Ifrit state is Combat, push Ifrit->Hellfire", + "enabled": true + }, + "description": "", + "duration": 0, + "type": "setCondition" + } + ] } ], "subactors": [], @@ -725,7 +752,7 @@ "rot": 0 }, "description": "", - "duration": 200, + "duration": 0, "type": "setPos" }, { @@ -992,7 +1019,7 @@ "sourceActor": "Ifrit Nail 1" }, "targetActor": "Ifrit", - "targetPhase": "Hellfire" + "targetPhase": "Nail death" }, { "condition": "combatState",