Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-09-08 17:05:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Properly create new emerald map headers. Use 'trigger' instead of coord script, trap, etc.

Browse Source
This commit is contained in:
Marcus Huderle
2018-12-26 14:15:35 -06:00
parent ebdab421cb
commit 08ff21e415
9 changed files with 73 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/core/event.h
View File

@@ -10,8 +10,8 @@ class EventType
public:
static QString Object;
static QString Warp;
static QString CoordScript;
static QString CoordWeather;
static QString Trigger;
static QString WeatherTrigger;
static QString Sign;
static QString HiddenItem;
static QString SecretBase;
@@ -58,16 +58,16 @@ public:
static Event* createNewObjectEvent();
static Event* createNewWarpEvent(QString);
static Event* createNewHealLocationEvent(QString);
static Event* createNewCoordScriptEvent();
static Event* createNewCoordWeatherEvent();
static Event* createNewTriggerEvent();
static Event* createNewWeatherTriggerEvent();
static Event* createNewSignEvent();
static Event* createNewHiddenItemEvent();
static Event* createNewSecretBaseEvent();
QString buildObjectEventMacro(int);
QString buildWarpEventMacro(QMap<QString, QString>*);
QString buildCoordScriptEventMacro();
QString buildCoordWeatherEventMacro();
QString buildTriggerEventMacro();
QString buildWeatherTriggerEventMacro();
QString buildSignEventMacro();
QString buildHiddenItemEventMacro();
QString buildSecretBaseEventMacro();

4
include/editor.h
View File

@@ -137,8 +137,8 @@ private:
Event* createNewObjectEvent();
Event* createNewWarpEvent();
Event* createNewHealLocationEvent();
Event* createNewCoordScriptEvent();
Event* createNewCoordWeatherEvent();
Event* createNewTriggerEvent();
Event* createNewWeatherTriggerEvent();
Event* createNewSignEvent();
Event* createNewHiddenItemEvent();
Event* createNewSecretBaseEvent();

8
include/ui/neweventtoolbutton.h
View File

@@ -14,8 +14,8 @@ public slots:
void newObject();
void newWarp();
void newHealLocation();
void newCoordScript();
void newCoordWeather();
void newTrigger();
void newWeatherTrigger();
void newSign();
void newHiddenItem();
void newSecretBase();
@@ -26,8 +26,8 @@ private:
QAction *newObjectAction;
QAction *newWarpAction;
QAction *newHealLocationAction;
QAction *newCoordScriptAction;
QAction *newCoordWeatherAction;
QAction *newTriggerAction;
QAction *newWeatherTriggerAction;
QAction *newSignAction;
QAction *newHiddenItemAction;
QAction *newSecretBaseAction;