Add clone objects

darktyranitar · Feb 10, 2022 · b01581d · b01581d
1 parent 31f400e
commit b01581d
Show file tree

Hide file tree

Showing 11 changed files with 291 additions and 223 deletions.
diff --git a/include/config.h b/include/config.h
@@ -148,7 +148,7 @@ class ProjectConfig: public KeyValueConfigBase
  this->enableHiddenItemQuantity = false;
  this->enableHiddenItemRequiresItemfinder = false;
  this->enableHealLocationRespawnData = false;
- this->enableObjectEventInConnection = false;
+ this->enableEventCloneObject = false;
  this->enableFloorNumber = false;
  this->createMapTextFile = false;
  this->enableTripleLayerMetatiles = false;
@@ -178,8 +178,8 @@ class ProjectConfig: public KeyValueConfigBase
  bool getHiddenItemRequiresItemfinderEnabled();
  void setHealLocationRespawnDataEnabled(bool enable);
  bool getHealLocationRespawnDataEnabled();
- void setObjectEventInConnectionEnabled(bool enable);
- bool getObjectEventInConnectionEnabled();
+ void setEventCloneObjectEnabled(bool enable);
+ bool getEventCloneObjectEnabled();
  void setFloorNumberEnabled(bool enable);
  bool getFloorNumberEnabled();
  void setCreateMapTextFileEnabled(bool enable);
@@ -206,7 +206,7 @@ class ProjectConfig: public KeyValueConfigBase
  bool enableHiddenItemQuantity;
  bool enableHiddenItemRequiresItemfinder;
  bool enableHealLocationRespawnData;
- bool enableObjectEventInConnection;
+ bool enableEventCloneObject;
  bool enableFloorNumber;
  bool createMapTextFile;
  bool enableTripleLayerMetatiles;

diff --git a/include/core/event.h b/include/core/event.h
@@ -14,6 +14,7 @@ class EventType
 {
 public:
  static QString Object;
+ static QString CloneObject;
  static QString Warp;
  static QString Trigger;
  static QString WeatherTrigger;
@@ -23,6 +24,16 @@ class EventType
  static QString HealLocation;
 };
 
+class EventGroup
+{
+public:
+ static QString Object;
+ static QString Warp;
+ static QString Coord;
+ static QString Bg;
+ static QString Heal;
+};
+
 class DraggablePixmapItem;
 class Project;
 class Event
@@ -68,15 +79,19 @@ class Event
 
  static Event* createNewEvent(QString, QString, Project*);
  static Event* createNewObjectEvent(Project*);
+ static Event* createNewCloneObjectEvent(Project*, QString);
  static Event* createNewWarpEvent(QString);
  static Event* createNewHealLocationEvent(QString);
  static Event* createNewTriggerEvent(Project*);
  static Event* createNewWeatherTriggerEvent(Project*);
  static Event* createNewSignEvent(Project*);
  static Event* createNewHiddenItemEvent(Project*);
  static Event* createNewSecretBaseEvent(Project*);
+ static bool isValidType(QString event_type);
+ static QString typeToGroup(QString event_type);
 
  OrderedJson::object buildObjectEventJSON();
+ OrderedJson::object buildCloneObjectEventJSON(const QMap<QString, QString> &);
  OrderedJson::object buildWarpEventJSON(const QMap<QString, QString> &);
  OrderedJson::object buildTriggerEventJSON();
  OrderedJson::object buildWeatherTriggerEventJSON();
@@ -86,7 +101,7 @@ class Event
  void setPixmapFromSpritesheet(QImage, int, int, bool);
  int getPixelX();
  int getPixelY();
- QMap<QString, bool> getExpectedFields();
+ QStringList getExpectedFields();
  void readCustomValues(QJsonObject values);
  void addCustomValuesTo(OrderedJson::object *obj);
  void setFrameFromMovement(QString);

diff --git a/include/project.h b/include/project.h
@@ -60,7 +60,7 @@ class Project : public QObject
  QMap<QString, int> mapSectionNameToValue;
  QMap<int, QString> mapSectionValueToName;
  QMap<QString, EventGraphics*> eventGraphicsMap;
- QStringList gfxNames;
+ QMap<QString, int> gfxDefines;
  QStringList songNames;
  QStringList itemNames;
  QStringList flagNames;

diff --git a/include/ui/neweventtoolbutton.h b/include/ui/neweventtoolbutton.h
@@ -11,6 +11,7 @@ class NewEventToolButton : public QToolButton
  explicit NewEventToolButton(QWidget *parent = nullptr);
  QString getSelectedEventType();
  QAction *newObjectAction;
+ QAction *newCloneObjectAction;
  QAction *newWarpAction;
  QAction *newHealLocationAction;
  QAction *newTriggerAction;
@@ -20,6 +21,7 @@ class NewEventToolButton : public QToolButton
  QAction *newSecretBaseAction;
 public slots:
  void newObject();
+ void newCloneObject();
  void newWarp();
  void newHealLocation();
  void newTrigger();

diff --git a/src/config.cpp b/src/config.cpp
@@ -522,11 +522,11 @@ void ProjectConfig::parseConfigKeyValue(QString key, QString value) {
  if (!ok) {
  logWarn(QString("Invalid config value for enable_heal_location_respawn_data: '%1'. Must be 0 or 1.").arg(value));
  }
- } else if (key == "enable_object_event_in_connection") {
+ } else if (key == "enable_event_clone_object") {
  bool ok;
- this->enableObjectEventInConnection = value.toInt(&ok);
+ this->enableEventCloneObject = value.toInt(&ok);
  if (!ok) {
- logWarn(QString("Invalid config value for enable_object_event_in_connection: '%1'. Must be 0 or 1.").arg(value));
+ logWarn(QString("Invalid config value for enable_event_clone_object: '%1'. Must be 0 or 1.").arg(value));
  }
  } else if (key == "enable_floor_number") {
  bool ok;
@@ -570,7 +570,7 @@ void ProjectConfig::setUnreadKeys() {
  if (!readKeys.contains("enable_hidden_item_quantity")) this->enableHiddenItemQuantity = isPokefirered;
  if (!readKeys.contains("enable_hidden_item_requires_itemfinder")) this->enableHiddenItemRequiresItemfinder = isPokefirered;
  if (!readKeys.contains("enable_heal_location_respawn_data")) this->enableHealLocationRespawnData = isPokefirered;
- if (!readKeys.contains("enable_object_event_in_connection")) this->enableObjectEventInConnection = isPokefirered;
+ if (!readKeys.contains("enable_event_clone_object")) this->enableEventCloneObject = isPokefirered;
  if (!readKeys.contains("enable_floor_number")) this->enableFloorNumber = isPokefirered;
  if (!readKeys.contains("create_map_text_file")) this->createMapTextFile = (this->baseGameVersion != BaseGameVersion::pokeemerald);
 }
@@ -587,7 +587,7 @@ QMap<QString, QString> ProjectConfig::getKeyValueMap() {
  map.insert("enable_hidden_item_quantity", QString::number(this->enableHiddenItemQuantity));
  map.insert("enable_hidden_item_requires_itemfinder", QString::number(this->enableHiddenItemRequiresItemfinder));
  map.insert("enable_heal_location_respawn_data", QString::number(this->enableHealLocationRespawnData));
- map.insert("enable_object_event_in_connection", QString::number(this->enableObjectEventInConnection));
+ map.insert("enable_event_clone_object", QString::number(this->enableEventCloneObject));
  map.insert("enable_floor_number", QString::number(this->enableFloorNumber));
  map.insert("create_map_text_file", QString::number(this->createMapTextFile));
  map.insert("enable_triple_layer_metatiles", QString::number(this->enableTripleLayerMetatiles));
@@ -628,7 +628,7 @@ void ProjectConfig::onNewConfigFileCreated() {
  this->enableHiddenItemQuantity = isPokefirered;
  this->enableHiddenItemRequiresItemfinder = isPokefirered;
  this->enableHealLocationRespawnData = isPokefirered;
- this->enableObjectEventInConnection = isPokefirered;
+ this->enableEventCloneObject = isPokefirered;
  this->enableFloorNumber = isPokefirered;
  this->createMapTextFile = (this->baseGameVersion != BaseGameVersion::pokeemerald);
  this->useEncounterJson = true;
@@ -739,13 +739,13 @@ bool ProjectConfig::getHealLocationRespawnDataEnabled() {
  return this->enableHealLocationRespawnData;
 }
 
-void ProjectConfig::setObjectEventInConnectionEnabled(bool enable) {
- this->enableObjectEventInConnection = enable;
+void ProjectConfig::setEventCloneObjectEnabled(bool enable) {
+ this->enableEventCloneObject = enable;
  this->save();
 }
 
-bool ProjectConfig::getObjectEventInConnectionEnabled() {
- return this->enableObjectEventInConnection;
+bool ProjectConfig::getEventCloneObjectEnabled() {
+ return this->enableEventCloneObject;
 }
 
 void ProjectConfig::setFloorNumberEnabled(bool enable) {

diff --git a/src/core/editcommands.cpp b/src/core/editcommands.cpp
@@ -9,18 +9,16 @@
 int getEventTypeMask(QList<Event *> events) {
  int eventTypeMask = 0;
  for (auto event : events) {
- if (event->get("event_type") == EventType::Object) {
+ QString groupType = event->get("event_group_type");
+ if (groupType == EventGroup::Object) {
  eventTypeMask |= IDMask_EventType_Object;
- } else if (event->get("event_type") == EventType::Warp) {
+ } else if (groupType == EventGroup::Warp) {
  eventTypeMask |= IDMask_EventType_Warp;
- } else if (event->get("event_type") == EventType::Trigger ||
- event->get("event_type") == EventType::WeatherTrigger) {
+ } else if (groupType == EventGroup::Coord) {
  eventTypeMask |= IDMask_EventType_Trigger;
- } else if (event->get("event_type") == EventType::Sign ||
- event->get("event_type") == EventType::HiddenItem ||
- event->get("event_type") == EventType::SecretBase) {
+ } else if (groupType == EventGroup::Bg) {
  eventTypeMask |= IDMask_EventType_BG;
- } else if (event->get("event_type") == EventType::HealLocation) {
+ } else if (groupType == EventGroup::Heal) {
  eventTypeMask |= IDMask_EventType_Heal;
  }
  }