[Commands] Cleanup #object Command #3722

Kinglykrab · 2023-11-27T02:42:34Z

Notes

Cleanup messages and logic.
Introduce enum for object types.
Implement object manipulation similar to door manipulation.

# Notes - Cleanup messages and logic. - Introduce enum for object types. - Set ground work for object manipulation similar to door manipulation.

joligario

Since we know that unknown20 is now incline, we should updated the database structure as well.

+------------------------+----------------------+------+-----+---------+----------------+
| Field                  | Type                 | Null | Key | Default | Extra          |
+------------------------+----------------------+------+-----+---------+----------------+
| id                     | int(11)              | NO   | PRI | NULL    | auto_increment |
| zoneid                 | int(11) unsigned     | NO   | MUL | 0       |                |
| version                | smallint(5)          | NO   |     | 0       |                |
| xpos                   | float                | NO   |     | 0       |                |
| ypos                   | float                | NO   |     | 0       |                |
| zpos                   | float                | NO   |     | 0       |                |
| heading                | float                | NO   |     | 0       |                |
| itemid                 | int(11)              | NO   |     | 0       |                |
| charges                | smallint(3) unsigned | NO   |     | 0       |                |
| objectname             | varchar(32)          | YES  |     | NULL    |                |
| type                   | int(11)              | NO   |     | 0       |                |
| icon                   | int(11)              | NO   |     | 0       |                |
| unknown08              | mediumint(5)         | NO   |     | 0       |                |
| unknown10              | mediumint(5)         | NO   |     | 0       |                |
| unknown20              | int(11)              | NO   |     | 0       |                |
| unknown24              | int(11)              | NO   |     | 0       |                |
| unknown60              | int(11)              | NO   |     | 0       |                |
| unknown64              | int(11)              | NO   |     | 0       |                |
| unknown68              | int(11)              | NO   |     | 0       |                |
| unknown72              | int(11)              | NO   |     | 0       |                |
| unknown76              | int(11)              | NO   |     | 0       |                |
| unknown84              | int(11)              | NO   |     | 0       |                |
| size                   | float                | NO   |     | 100     |                |
| tilt_x                 | float                | NO   |     | 0       |                |
| tilt_y                 | float                | NO   |     | 0       |                |
| display_name           | varchar(64)          | YES  |     | NULL    |                |
| min_expansion          | tinyint(4)           | NO   |     | -1      |                |
| max_expansion          | tinyint(4)           | NO   |     | -1      |                |
| content_flags          | varchar(100)         | YES  |     | NULL    |                |
| content_flags_disabled | varchar(100)         | YES  |     | NULL    |                |
+------------------------+----------------------+------+-----+---------+----------------+

…rver into commands/object_cleanup

Kinglykrab · 2023-12-03T19:18:16Z

Since we know that unknown20 is now incline, we should updated the database structure as well.

+------------------------+----------------------+------+-----+---------+----------------+
| Field                  | Type                 | Null | Key | Default | Extra          |
+------------------------+----------------------+------+-----+---------+----------------+
| id                     | int(11)              | NO   | PRI | NULL    | auto_increment |
| zoneid                 | int(11) unsigned     | NO   | MUL | 0       |                |
| version                | smallint(5)          | NO   |     | 0       |                |
| xpos                   | float                | NO   |     | 0       |                |
| ypos                   | float                | NO   |     | 0       |                |
| zpos                   | float                | NO   |     | 0       |                |
| heading                | float                | NO   |     | 0       |                |
| itemid                 | int(11)              | NO   |     | 0       |                |
| charges                | smallint(3) unsigned | NO   |     | 0       |                |
| objectname             | varchar(32)          | YES  |     | NULL    |                |
| type                   | int(11)              | NO   |     | 0       |                |
| icon                   | int(11)              | NO   |     | 0       |                |
| unknown08              | mediumint(5)         | NO   |     | 0       |                |
| unknown10              | mediumint(5)         | NO   |     | 0       |                |
| unknown20              | int(11)              | NO   |     | 0       |                |
| unknown24              | int(11)              | NO   |     | 0       |                |
| unknown60              | int(11)              | NO   |     | 0       |                |
| unknown64              | int(11)              | NO   |     | 0       |                |
| unknown68              | int(11)              | NO   |     | 0       |                |
| unknown72              | int(11)              | NO   |     | 0       |                |
| unknown76              | int(11)              | NO   |     | 0       |                |
| unknown84              | int(11)              | NO   |     | 0       |                |
| size                   | float                | NO   |     | 100     |                |
| tilt_x                 | float                | NO   |     | 0       |                |
| tilt_y                 | float                | NO   |     | 0       |                |
| display_name           | varchar(64)          | YES  |     | NULL    |                |
| min_expansion          | tinyint(4)           | NO   |     | -1      |                |
| max_expansion          | tinyint(4)           | NO   |     | -1      |                |
| content_flags          | varchar(100)         | YES  |     | NULL    |                |
| content_flags_disabled | varchar(100)         | YES  |     | NULL    |                |
+------------------------+----------------------+------+-----+---------+----------------+

Done, renamed the other identified ones as well.

@nytmyr

### Bots * Add BotHealOnLevel to fully heal/mana on level. ([#3745](#3745)) @nytmyr 2023-12-08 * Fix bots learning spells on level ([#3744](#3744)) @nytmyr 2023-12-08 ### Bug * Fix blocked spells regression from #3638 ([#3753](#3753)) @joligario 2023-12-11 * PR 3638 Missed the blocked spells repository updates ([#3748](#3748)) @fryguy503 2023-12-08 ### CMake * Update minimum version of CMake ([#3743](#3743)) @joligario 2023-12-08 ### Code * Remove hard-coded Status Checks ([#3727](#3727)) @Kinglykrab 2023-12-03 ### Commands * #guild set CharName 0 did not remove char from guild. ([#3717](#3717)) @noudess 2023-11-25 * #petname changes PC to Nobody if selected. ([#3720](#3720)) @noudess 2023-11-26 * Add #show aas Command ([#3710](#3710)) @Kinglykrab 2023-11-26 * Add #task complete Command ([#3711](#3711)) @Kinglykrab 2023-11-26 * Cleanup #acceptrules Command ([#3716](#3716)) @Kinglykrab 2023-11-26 * Cleanup #disarmtrap Command ([#3713](#3713)) @Kinglykrab 2023-11-26 * Cleanup #list Command ([#3714](#3714)) @Kinglykrab 2023-11-26 * Cleanup #movement Command ([#3715](#3715)) @Kinglykrab 2023-11-26 * Cleanup #object Command ([#3722](#3722)) @Kinglykrab 2023-12-03 * Cleanup #zonebootup and #zoneshutdown Commands ([#3729](#3729)) @Kinglykrab 2023-12-03 * Fix formatting of #wpinfo output. ([#3728](#3728)) @noudess 2023-12-01 ### Database * Add primary key to keyring table ([#3746](#3746)) @Kinglykrab 2023-12-08 * Consolidate Starting Items Table ([#3723](#3723)) @Kinglykrab 2023-11-30 * Extra whitespace in #3723 ([#3730](#3730)) @joligario 2023-12-02 * Minor adjustment to #3726 ([#3732](#3732)) @joligario 2023-12-03 * Modify `updated` column in `items` table with proper default. ([#3726](#3726)) @joligario 2023-12-02 * Pull Spell Group Cache from Content DB ([#3749](#3749)) @fryguy503 2023-12-08 ### Faction * Alliance line is only allowed 1 faction change at a time. ([#3718](#3718)) @noudess 2023-11-26 ### Fixes * Changing Group Leader Invalidated GetLeaderName() ([#3712](#3712)) @Kinglykrab 2023-11-26 * Fix 9245 SQL ([#3740](#3740)) @Kinglykrab 2023-12-05 * Fix Swarm Pets Requiring NPC Aggros Flag ([#3738](#3738)) @Kinglykrab 2023-12-05 * Guild Message Limits ([#3724](#3724)) @neckkola 2023-11-29 ### Quest API * Add EVENT_AA_GAIN to AddAAPoints() ([#3733](#3733)) @Kinglykrab 2023-12-03 * Add GMMove Overloads to Perl/Lua ([#3719](#3719)) @Kinglykrab 2023-11-25 ### Scripts * Import items into `items_new` table instead of writing directly to the existing `items` table. ([#3725](#3725)) @joligario 2023-11-30 * Revert database engine change from #3702. ([#3736](#3736)) @joligario 2023-12-03 * Update 13th Floor Import Tool ([#3702](#3702)) @joligario 2023-11-26

@nytmyr

### Bots * Add BotHealOnLevel to fully heal/mana on level. ([#3745](#3745)) @nytmyr 2023-12-08 * Fix bots learning spells on level ([#3744](#3744)) @nytmyr 2023-12-08 ### Bug * Fix blocked spells regression from #3638 ([#3753](#3753)) @joligario 2023-12-11 * PR 3638 Missed the blocked spells repository updates ([#3748](#3748)) @fryguy503 2023-12-08 ### CMake * Update minimum version of CMake ([#3743](#3743)) @joligario 2023-12-08 ### Code * Remove hard-coded Status Checks ([#3727](#3727)) @Kinglykrab 2023-12-03 ### Commands * #guild set CharName 0 did not remove char from guild. ([#3717](#3717)) @noudess 2023-11-25 * #petname changes PC to Nobody if selected. ([#3720](#3720)) @noudess 2023-11-26 * Add #show aas Command ([#3710](#3710)) @Kinglykrab 2023-11-26 * Add #task complete Command ([#3711](#3711)) @Kinglykrab 2023-11-26 * Cleanup #acceptrules Command ([#3716](#3716)) @Kinglykrab 2023-11-26 * Cleanup #disarmtrap Command ([#3713](#3713)) @Kinglykrab 2023-11-26 * Cleanup #list Command ([#3714](#3714)) @Kinglykrab 2023-11-26 * Cleanup #movement Command ([#3715](#3715)) @Kinglykrab 2023-11-26 * Cleanup #object Command ([#3722](#3722)) @Kinglykrab 2023-12-03 * Cleanup #zonebootup and #zoneshutdown Commands ([#3729](#3729)) @Kinglykrab 2023-12-03 * Fix formatting of #wpinfo output. ([#3728](#3728)) @noudess 2023-12-01 ### Database * Add primary key to keyring table ([#3746](#3746)) @Kinglykrab 2023-12-08 * Consolidate Starting Items Table ([#3723](#3723)) @Kinglykrab 2023-11-30 * Extra whitespace in #3723 ([#3730](#3730)) @joligario 2023-12-02 * Minor adjustment to #3726 ([#3732](#3732)) @joligario 2023-12-03 * Modify `updated` column in `items` table with proper default. ([#3726](#3726)) @joligario 2023-12-02 * Pull Spell Group Cache from Content DB ([#3749](#3749)) @fryguy503 2023-12-08 ### Faction * Alliance line is only allowed 1 faction change at a time. ([#3718](#3718)) @noudess 2023-11-26 ### Fixes * Changing Group Leader Invalidated GetLeaderName() ([#3712](#3712)) @Kinglykrab 2023-11-26 * Fix 9245 SQL ([#3740](#3740)) @Kinglykrab 2023-12-05 * Fix Swarm Pets Requiring NPC Aggros Flag ([#3738](#3738)) @Kinglykrab 2023-12-05 * Guild Message Limits ([#3724](#3724)) @neckkola 2023-11-29 ### Quest API * Add EVENT_AA_GAIN to AddAAPoints() ([#3733](#3733)) @Kinglykrab 2023-12-03 * Add GMMove Overloads to Perl/Lua ([#3719](#3719)) @Kinglykrab 2023-11-25 ### Scripts * Import items into `items_new` table instead of writing directly to the existing `items` table. ([#3725](#3725)) @joligario 2023-11-30 * Revert database engine change from #3702. ([#3736](#3736)) @joligario 2023-12-03 * Update 13th Floor Import Tool ([#3702](#3702)) @joligario 2023-11-26

Kinglykrab added 2 commits November 26, 2023 21:41

[Commands] Cleanup #object Command

09e505a

# Notes - Cleanup messages and logic. - Introduce enum for object types. - Set ground work for object manipulation similar to door manipulation.

Update object_manipulation.cpp

5ca711f

Kinglykrab marked this pull request as draft November 27, 2023 03:13

Kinglykrab added 4 commits November 26, 2023 23:50

Final push

9831f87

Update client_packet.cpp

336980e

Update object_manipulation.cpp

535c9a1

Update object_manipulation.cpp

0979515

Kinglykrab marked this pull request as ready for review November 27, 2023 04:55

Kinglykrab and others added 3 commits November 27, 2023 00:02

Update object.h

dbc3a89

Update client_packet.cpp

c95437c

Update client_packet.cpp

ef3208f

joligario reviewed Dec 3, 2023

View reviewed changes

Kinglykrab and others added 4 commits December 3, 2023 13:23

Push.

70d71e5

Merge branch 'master' into commands/object_cleanup

7960465

Update version.h

1d7f639

Merge branch 'commands/object_cleanup' of https://github.com/EQEmu/Se…

fc92917

…rver into commands/object_cleanup

joligario approved these changes Dec 3, 2023

View reviewed changes

Kinglykrab added 2 commits December 3, 2023 15:45

Update database_update_manifest.cpp

63c9631

Update zone.cpp

f788481

Kinglykrab merged commit b03f52d into master Dec 3, 2023
2 checks passed

Kinglykrab deleted the commands/object_cleanup branch December 3, 2023 22:42

joligario added a commit to ProjectEQ/peqphpeditor that referenced this pull request Dec 4, 2023

Object updates from EQEmu/Server#3722

c0938a4

joligario mentioned this pull request Dec 11, 2023

[Release] 22.35.0 #3754

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Commands] Cleanup #object Command #3722

[Commands] Cleanup #object Command #3722

Kinglykrab commented Nov 27, 2023 •

edited

Loading

joligario left a comment

Kinglykrab commented Dec 3, 2023

[Commands] Cleanup #object Command #3722

[Commands] Cleanup #object Command #3722

Conversation

Kinglykrab commented Nov 27, 2023 • edited Loading

Notes

joligario left a comment

Choose a reason for hiding this comment

Kinglykrab commented Dec 3, 2023

Kinglykrab commented Nov 27, 2023 •

edited

Loading