Skip to content

Add slot functions for entity data #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Nekaida wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add slot functions for entity data #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
310dc51
Add slot functions for entity data
Nekaida May 12, 2017
6772415
Fix crash while loading FR/BG rom
Nekaida May 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/AME/Entities/Npc.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ namespace ame
UInt8 moveRadiusX; ///< Walking radius, vertical
UInt8 moveRadiusY; ///< Walking radius, horizontal
UInt8 filler_2; ///< Second filler byte
UInt8 property; ///< Npc property (trainer = 1)
UInt8 isTrainer; ///< If npc is trainer = 1
UInt8 filler_3; ///< Third filler byte
UInt16 viewRadius; ///< View radius for trainers
UInt32 ptrScript; ///< Offset of the script
Expand Down
64 changes: 46 additions & 18 deletions include/AME/Forms/MainWindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,6 @@ namespace ame
// Slots
//
///////////////////////////////////////////////////////////
void showCorrectSignType(Sign *sign);
bool loadROM(const QString &file);
bool loadMapChangeTreeView(Map *map);
bool loadMapChangeTreeView(int bank, int map);
Expand All @@ -192,34 +191,63 @@ namespace ame
void setScriptEditorButtonsEnabled(bool enabled);

void on_action_Open_ROM_triggered();
void on_sldWildGrassChance_valueChanged(int value);
void on_sldWildWaterChance_valueChanged(int value);
void on_sldWildFishingChance_valueChanged(int value);
void on_sldWildOtherChance_valueChanged(int value);
void on_cmbEntityTypeSelector_currentIndexChanged(int index);
void on_spnEntityScroller_valueChanged(int arg1);
void on_cmbSignType_currentIndexChanged(int index);
void on_warp_number_valueChanged(int value);
void on_warp_map_valueChanged(int value);
void on_warp_bank_valueChanged(int value);
void checkWarp();
void on_tabWidget_currentChanged(int index);
void on_actionClearRecentFiles_triggered();

void on_treeView_activated(const QModelIndex &index);
void on_lineEdit_textChanged(const QString &arg1);
void on_actionClearRecentFiles_triggered();
void on_tabWidget_currentChanged(int index);
void on_tabWidget_2_currentChanged(int index);

void on_action_Connection_Editor_triggered();
void on_action_Settings_triggered();
void on_action_Tileset_Editor_triggered();
void on_btnWarpToDest_clicked();
void on_btnShowSprites_toggled(bool checked);
void on_btnMapGrid_toggled(bool checked);
void on_btnEntitiesGrid_toggled(bool checked);

void on_cmbEntityTypeSelector_currentIndexChanged(int index);
void on_spnEntityScroller_valueChanged(int arg1);

void on_npc_sprite_valueChanged(int value);
void on_npc_pos_x_valueChanged(int value);
void on_npc_pos_y_valueChanged(int value);
void on_spnNPCHeight_valueChanged(int value);
void on_spnNPCIdleAnim_valueChanged(int value);
void on_npc_mov_x_valueChanged(int value);
void on_npc_mov_y_valueChanged(int value);
void on_npc_trainer_toggled(bool checked);
void on_npc_view_rad_valueChanged(int value);
void on_npc_script_valueChanged(int value);
void on_npc_flag_valueChanged(int value);
void on_btnNPCOpenScript_clicked();

void checkWarp();
void on_warp_pos_x_valueChanged(int value);
void on_warp_pos_y_valueChanged(int value);
void on_spnWarpHeight_valueChanged(int value);
void on_warp_number_valueChanged(int value);
void on_warp_map_valueChanged(int value);
void on_warp_bank_valueChanged(int value);
void on_btnWarpToDest_clicked();

void on_trigger_pos_x_valueChanged(int value);
void on_trigger_pos_y_valueChanged(int value);
void on_btnTriggerOpenScript_clicked();

void showCorrectSignType(Sign *sign);
void on_sign_pos_x_valueChanged(int value);
void on_sign_pos_y_valueChanged(int value);
void on_spnSignHeight_valueChanged(int value);
void on_cmbSignType_currentIndexChanged(int index);
void on_btnSignOpenScript_clicked();
void on_btnShowSprites_toggled(bool checked);

void on_btnMapGrid_toggled(bool checked);
void on_sldWildGrassChance_valueChanged(int value);
void on_sldWildWaterChance_valueChanged(int value);
void on_sldWildFishingChance_valueChanged(int value);
void on_sldWildOtherChance_valueChanged(int value);

void on_btnEntitiesGrid_toggled(bool checked);
void on_header_mapname_valueChanged(int value);
void on_cmbHeaderMapName_currentIndexChanged(int index);

private:

Expand Down
15 changes: 11 additions & 4 deletions include/AME/Widgets/Rendering/AMEEntityView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,9 @@ namespace ame
///////////////////////////////////////////////////////////
struct CurrentEntity
{
QPoint absPos;
QPoint position;
EntityType type = ET_Invalid;
void *entity = NULL;
int index = 0;
};


Expand Down Expand Up @@ -111,10 +110,18 @@ namespace ame
void setCurrentEntity(CurrentEntity entity);

///////////////////////////////////////////////////////////
/// \brief Retrieves the currently selected entity.
/// \brief Sets a new x position for the highlighting of the
/// currently selected entity.
///
///////////////////////////////////////////////////////////
const CurrentEntity &currentEntity() const;
void setCurrentEntityPosX(int x);

///////////////////////////////////////////////////////////
/// \brief Sets a new y position for the highlighting of the
/// currently selected entity.
///
///////////////////////////////////////////////////////////
void setCurrentEntityPosY(int y);

///////////////////////////////////////////////////////////
/// \brief Sets the visibility of the grid from the UI.
Expand Down
25 changes: 1 addition & 24 deletions resources/UI/MainWindow.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2433,36 +2433,13 @@
</spacer>
</item>
<item>
<widget class="QHexSpinBox" name="npc_trainer">
<widget class="QCheckBox" name="npc_trainer">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<family>Courier New</family>
</font>
</property>
<property name="buttonSymbols">
<enum>QAbstractSpinBox::NoButtons</enum>
</property>
<property name="prefix">
<string notr="true">0x</string>
</property>
<property name="maximum">
<number>255</number>
</property>
<property name="displayIntegerBase">
<number>16</number>
</property>
<property name="upperCase" stdset="0">
<bool>true</bool>
</property>
<property name="byteLength" stdset="0">
<number>1</number>
</property>
</widget>
</item>
</layout>
Expand Down
2 changes: 1 addition & 1 deletion src/Entities/EntityRawData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ namespace ame
ba.push_back((Int8) behaviour);
ba.push_back((Int8) ((moveRadiusY << 4) | moveRadiusX));
ba.push_back((Int8) filler_2);
ba.push_back((Int8) property);
ba.push_back((Int8) isTrainer);
ba.push_back((Int8) filler_3);
ba.append((Int8 *) &viewRadius, 2);
ptrScript += 0x08000000;
Expand Down
4 changes: 2 additions & 2 deletions src/Entities/EventTable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,8 @@ namespace ame
tempRadius = rom.readByte();
npc->moveRadiusX = tempRadius & 15;
npc->moveRadiusY = tempRadius >> 4;
npc->filler_2 = rom.readByte(); // either property is a hword or this isn't a filler
npc->property = rom.readByte();
npc->filler_2 = rom.readByte();
npc->isTrainer = rom.readByte();
npc->filler_3 = rom.readByte();
npc->viewRadius = rom.readHWord();
npc->ptrScript = rom.readPointer();
Expand Down
Loading