Merge pull request #970 from hkAlice/bs-stuff

[3.x] fix ifrit nail kill not pushing ifrit hellfire;
SapphireServer · Jan 7, 2025 · 130c603 · 130c603
2 parents d951a19 + 33a8212
commit 130c603
Showing 1 changed file with 29 additions and 2 deletions.
diff --git a/data/EncounterTimelines/IfritNormal.json b/data/EncounterTimelines/IfritNormal.json
@@ -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",