Add support for the new drop-in bnpc fields

Author: redstrate

parts/scene/objectpropertieswidget.cpp

@@ -342,6 +342,22 @@ void ObjectPropertiesWidget::refreshDropInData(DropInObject *object)
 
         const auto nonPopEdit = new BoolEdit(data->nonpop);
         layout->addRow(i18n("Nonpop"), nonPopEdit);
+
+        const auto aggressionModeEdit = new UIntEdit(data->aggressionMode);
+        layout->addRow(i18n("Aggression Mode"), aggressionModeEdit);
+
+        const auto gimmickId = new ObjectIdEdit(m_appState);
+        gimmickId->setObjectId(data->gimmickId);
+        layout->addRow(i18n("Gimmick Id"), gimmickId);
+
+        const auto maxLinksEdit = new UIntEdit(data->maxLinks);
+        layout->addRow(i18n("Max Links"), maxLinksEdit);
+
+        const auto linkFamilyEdit = new UIntEdit(data->linkFamily);
+        layout->addRow(i18n("Link Family"), linkFamilyEdit);
+
+        const auto linkRangeEdit = new UIntEdit(data->linkRange);
+        layout->addRow(i18n("Link Range"), linkRangeEdit);
     }
 }
 

parts/scene/scenelistmodel.cpp

@@ -484,7 +484,7 @@ void SceneListModel::processScene(SceneTreeInformation *parentNode, ObjectScene
                     if (std::holds_alternative<DropInGatheringPoint>(dropInObject.data)) {
                         dropinItem->name = i18n("Gathering Point");
                     } else if (auto data = std::get_if<DropInBattleNpc>(&dropInObject.data)) {
-                        dropinItem->name = m_appState->lookupBNpcName(data->nameId);
+                        dropinItem->name = m_appState->lookupBNpcName(data->nameId) + (data->nonpop ? i18n(" (Nonpop)") : QString());
                     }
                     dropinItem->row = j;
                     dropinItem->data = QVariant::fromValue(&dropInObject);

parts/scene/scenestate.cpp

@@ -203,6 +203,11 @@ void SceneState::loadDropIn(const QString &path)
                                 battleNpc.hp = jsonData["hp"_L1].toInteger();
                                 battleNpc.level = jsonData["level"_L1].toInt();
                                 battleNpc.nonpop = jsonData["nonpop"_L1].toBool();
+                                battleNpc.aggressionMode = jsonData["aggression_mode"_L1].toInteger();
+                                battleNpc.gimmickId = jsonData["gimmick_id"_L1].toInteger();
+                                battleNpc.maxLinks = jsonData["max_links"_L1].toInteger();
+                                battleNpc.linkFamily = jsonData["link_family"_L1].toInteger();
+                                battleNpc.linkRange = jsonData["link_range"_L1].toInteger();
 
                                 obj.data = battleNpc;
                             } else {
@@ -259,6 +264,11 @@ void SceneState::saveDropIns()
                         {"hp"_L1, (qint64)data->hp},
                         {"level"_L1, (qint64)data->level},
                         {"nonpop"_L1, data->nonpop},
+                        {"aggression_mode"_L1, (qint64)data->aggressionMode},
+                        {"gimmick_id"_L1, (qint64)data->gimmickId},
+                        {"max_links"_L1, (qint64)data->maxLinks},
+                        {"link_family"_L1, (qint64)data->linkFamily},
+                        {"link_range"_L1, (qint64)data->linkRange},
                     };
                 }
 

parts/scene/scenestate.h

@@ -21,6 +21,11 @@ struct DropInBattleNpc {
     uint32_t hp;
     uint32_t level;
     bool nonpop;
+    uint32_t aggressionMode;
+    uint32_t gimmickId;
+    uint32_t maxLinks;
+    uint32_t linkFamily;
+    uint32_t linkRange;
 };
 
 struct DropInObject {