Update Collision tab UI

include/config.h

@@ -56,6 +56,7 @@ public:
         this->mapSortOrder = MapSortOrder::Group;
         this->prettyCursors = true;
         this->collisionOpacity = 50;
+        this->collisionZoom = 30;
         this->metatilesZoom = 30;
         this->showPlayerView = false;
         this->showCursorTile = true;
@@ -78,6 +79,7 @@ public:
     void setProjectSettingsEditorGeometry(QByteArray, QByteArray);
     void setCustomScriptsEditorGeometry(QByteArray, QByteArray);
     void setCollisionOpacity(int opacity);
+    void setCollisionZoom(int zoom);
     void setMetatilesZoom(int zoom);
     void setShowPlayerView(bool enabled);
     void setShowCursorTile(bool enabled);
@@ -100,6 +102,7 @@ public:
     QMap<QString, QByteArray> getProjectSettingsEditorGeometry();
     QMap<QString, QByteArray> getCustomScriptsEditorGeometry();
     int getCollisionOpacity();
+    int getCollisionZoom();
     int getMetatilesZoom();
     bool getShowPlayerView();
     bool getShowCursorTile();
@@ -140,6 +143,7 @@ private:
     QByteArray customScriptsEditorGeometry;
     QByteArray customScriptsEditorState;
     int collisionOpacity;
+    int collisionZoom;
     int metatilesZoom;
     bool showPlayerView;
     bool showCursorTile;

include/editor.h

@@ -152,7 +152,7 @@ public:
     void scaleMapView(int);
     static void openInTextEditor(const QString &path, int lineNum = 0);
     bool eventLimitReached(Event::Type type);
-    static void setCollisionGraphics();
+    void setCollisionGraphics();
 
 public slots:
     void openMapScripts() const;
@@ -163,6 +163,10 @@ public slots:
     void selectedEventIndexChanged(int index, Event::Group eventGroup);
 
 private:
+    const QImage defaultCollisionImgSheet = QImage(":/images/collisions.png");
+    const QImage collisionPlaceholder = QImage(":/images/collisions_unknown.png");
+    QPixmap collisionSheetPixmap;
+
     void setConnectionItemsVisible(bool);
     void setBorderItemsVisible(bool, qreal = 1);
     void setConnectionEditControlValues(MapConnection*);
@@ -181,6 +185,7 @@ private:
     void updateEncounterFields(EncounterFields newFields);
     QString getMovementPermissionText(uint16_t collision, uint16_t elevation);
     QString getMetatileDisplayMessage(uint16_t metatileId);
+    void setCollisionTabSpinBoxes(uint16_t collision, uint16_t elevation);
     static bool startDetachedProcess(const QString &command,
                                     const QString &workingDirectory = QString(),
                                     qint64 *pid = nullptr);

include/mainwindow.h

@@ -276,11 +276,13 @@ private slots:
     void on_pushButton_DeleteCustomHeaderField_clicked();
     void on_tableWidget_CustomHeaderFields_cellChanged(int row, int column);
     void on_horizontalSlider_MetatileZoom_valueChanged(int value);
+    void on_horizontalSlider_CollisionZoom_valueChanged(int value);
     void on_pushButton_NewWildMonGroup_clicked();
     void on_pushButton_DeleteWildMonGroup_clicked();
     void on_pushButton_ConfigureEncountersJSON_clicked();
     void on_pushButton_CreatePrefab_clicked();
-
+    void on_spinBox_SelectedElevation_valueChanged(int elevation);
+    void on_spinBox_SelectedCollision_valueChanged(int collision);
     void on_actionRegion_Map_Editor_triggered();
     void on_actionPreferences_triggered();
     void togglePreferenceSpecificUi();
@@ -370,7 +372,7 @@ private:
     void initMapSortOrder();
     void initShortcuts();
     void initExtraShortcuts();
-    void setProjectSpecificUIVisibility();
+    void setProjectSpecificUI();
     void setWildEncountersUIEnabled(bool enabled);
     void loadUserSettings();
     void applyMapListFilter(QString filterText);

include/project.h

@@ -230,6 +230,8 @@ public:
     static bool mapDimensionsValid(int width, int height);
     bool calculateDefaultMapSize();
     static int getMaxObjectEvents();
+    static int getMaxCollision();
+    static int getMaxElevation();
 
 private:
     void updateMapLayout(Map*);
@@ -253,6 +255,8 @@ private:
     static int max_map_data_size;
     static int default_map_size;
     static int max_object_events;
+    static int max_collision;
+    static int max_elevation;
 
     QStringListModel eventScriptLabelModel;
     QCompleter eventScriptLabelCompleter;

include/ui/collisionpixmapitem.h

@@ -1,8 +1,9 @@
 #ifndef COLLISIONPIXMAPITEM_H
 #define COLLISIONPIXMAPITEM_H
 
+#include <QSpinBox>
+
 #include "metatileselector.h"
-#include "movementpermissionsselector.h"
 #include "mappixmapitem.h"
 #include "map.h"
 #include "settings.h"
@@ -10,13 +11,15 @@
 class CollisionPixmapItem : public MapPixmapItem {
     Q_OBJECT
 public:
-    CollisionPixmapItem(Map *map, MovementPermissionsSelector *movementPermissionsSelector, MetatileSelector *metatileSelector, Settings *settings, qreal *opacity)
+    CollisionPixmapItem(Map *map, QSpinBox * selectedCollision, QSpinBox * selectedElevation, MetatileSelector *metatileSelector, Settings *settings, qreal *opacity)
         : MapPixmapItem(map, metatileSelector, settings){
-        this->movementPermissionsSelector = movementPermissionsSelector;
+        this->selectedCollision = selectedCollision;
+        this->selectedElevation = selectedElevation;
         this->opacity = opacity;
         map->setCollisionItem(this);
     }
-    MovementPermissionsSelector *movementPermissionsSelector;
+    QSpinBox * selectedCollision;
+    QSpinBox * selectedElevation;
     qreal *opacity;
     void updateMovementPermissionSelection(QGraphicsSceneMouseEvent *event);
     virtual void paint(QGraphicsSceneMouseEvent*);
@@ -28,6 +31,7 @@ public:
 private:
     unsigned actionId_ = 0;
     QPoint previousPos;
+    void updateSelection(QPoint pos);
 
 signals:
     void mouseEvent(QGraphicsSceneMouseEvent *, CollisionPixmapItem *);

include/ui/movementpermissionsselector.h

@@ -6,15 +6,19 @@
 class MovementPermissionsSelector: public SelectablePixmapItem {
     Q_OBJECT
 public:
-    MovementPermissionsSelector(int cellWidth, int cellHeight, QPixmap basePixmap) :
-        SelectablePixmapItem(cellWidth, cellHeight, 1, 1),
-        basePixmap(basePixmap) {
+    MovementPermissionsSelector(QPixmap basePixmap)
+    : SelectablePixmapItem(MovementPermissionsSelector::CellWidth, MovementPermissionsSelector::CellHeight, 1, 1) {
+        this->basePixmap = basePixmap;
         setAcceptHoverEvents(true);
     }
     void draw();
     uint16_t getSelectedCollision();
     uint16_t getSelectedElevation();
     void select(uint16_t collision, uint16_t elevation);
+    void setBasePixmap(QPixmap pixmap);
+
+    static const int CellWidth;
+    static const int CellHeight;
 
 protected:
     void hoverMoveEvent(QGraphicsSceneHoverEvent*);
@@ -22,7 +26,7 @@ protected:
 
 private:
     void setSelectedMovementPermissions(QPointF);
-    const QPixmap basePixmap;
+    QPixmap basePixmap;
 
 signals:
     void hoveredMovementPermissionChanged(uint16_t, uint16_t);

include/ui/selectablepixmapitem.h

@@ -35,6 +35,9 @@ protected:
     void mouseMoveEvent(QGraphicsSceneMouseEvent*);
     void mouseReleaseEvent(QGraphicsSceneMouseEvent*);
     virtual void drawSelection();
+
+signals:
+    void selectionChanged(int, int, int, int);
 };
 
 #endif // SELECTABLEPIXMAPITEM_H