Skip to content
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.

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

[Feature] Evolving Item Support for RoF2 #4496

Merged
merged 42 commits into from
Jan 20, 2025
Merged
Show file tree
Hide file tree
Changes from 41 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
bbe91dd
basic evolving items framework created
neckkola Aug 28, 2024
3d8d11b
Implement evolving tab in the inventory window
neckkola Aug 30, 2024
85776f0
Implement experience and number of kills
neckkola Sep 1, 2024
fe61553
Move zone evolving map to a evolvingitemsmanager class
neckkola Sep 2, 2024
f2e1a07
rework gm commands
neckkola Sep 2, 2024
9e8865b
rework GetInventory
neckkola Sep 2, 2024
00574ae
wip
neckkola Sep 4, 2024
7848a99
wip loot testing
neckkola Sep 6, 2024
6dfeb27
Fix Duplicate Message
neckkola Sep 7, 2024
79ac763
reworked evolving item looting, swapping, etc
neckkola Sep 8, 2024
414a8d1
reworked const functions for evolving methods
neckkola Sep 8, 2024
0ed4abe
Functioning Player Trade of evolving items test item_id is 89550
neckkola Sep 8, 2024
970d845
First pass of Final Result link working
neckkola Sep 9, 2024
917e57f
First pass of item upgrading when reaching 100%
neckkola Sep 10, 2024
b34d69f
Add strings and logic for displaying the evolving item xp transfer wi…
neckkola Sep 11, 2024
4ee15f2
Prototype of xp transfer window sending items
neckkola Sep 16, 2024
c0742e2
WIP for evolve xp transfer
neckkola Sep 22, 2024
6e8f359
WIP for evolve xp transfer. First tests passed
neckkola Sep 22, 2024
f4a3019
XP Transfer Cleanup
neckkola Sep 22, 2024
d422a77
XP Transfer Cleanup
neckkola Sep 22, 2024
9db9deb
Add Rule for evolving items equip timer/ default is 30 secs
neckkola Sep 22, 2024
53a7372
Add logging and player events
neckkola Oct 5, 2024
76ec59a
Formatting
neckkola Oct 5, 2024
4c43ded
Database updates
neckkola Oct 5, 2024
03e25b8
Updates for linux build
neckkola Oct 5, 2024
27afa21
Perl/Cleanup
Kinglykrab Oct 6, 2024
b436314
Command cleanup
Kinglykrab Oct 6, 2024
80c3a49
Lua
Kinglykrab Oct 6, 2024
70330bb
Added a crash condition check if final item id is blank or not found.
neckkola Oct 7, 2024
23b52f9
Review Changes
neckkola Oct 14, 2024
1fad9bd
migrate to content_db for items_evolving_details
neckkola Dec 14, 2024
16f4422
Simplify, don't hit database unless evolving
Akkadius Jan 19, 2025
f3b4e48
Update 2025_01_19_items_evolving_details.sql
Akkadius Jan 19, 2025
8c44c4e
Update client.cpp
Akkadius Jan 19, 2025
b8647be
Update manifest with items_evolving_details
Akkadius Jan 19, 2025
3a6d8b8
character_id vs char_id
Akkadius Jan 19, 2025
cf34983
Remove _Struct from structs
Akkadius Jan 19, 2025
b211921
Remove license header in evolving.cpp
Akkadius Jan 19, 2025
fb3b99c
Move evolving constants from eq_constants.h to evolving.h since it is…
Akkadius Jan 19, 2025
3425205
Update database_schema.h
Akkadius Jan 19, 2025
f191436
General cleanup
Akkadius Jan 19, 2025
8552fe7
Be more specific with `evolving_items` vs `evolving`
Akkadius Jan 20, 2025
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
14 changes: 8 additions & 6 deletions client_files/export/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,14 @@
#include "../../common/file.h"
#include "../../common/events/player_event_logs.h"
#include "../../common/skill_caps.h"

EQEmuLogSys LogSys;
WorldContentService content_service;
ZoneStore zone_store;
PathManager path;
PlayerEventLogs player_event_logs;
#include "../../common/evolving.h"

EQEmuLogSys LogSys;
WorldContentService content_service;
ZoneStore zone_store;
PathManager path;
PlayerEventLogs player_event_logs;
EvolvingItemsManager evolving_items_manager;

void ExportSpells(SharedDatabase *db);
void ExportSkillCaps(SharedDatabase *db);
Expand Down
14 changes: 8 additions & 6 deletions client_files/import/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,14 @@
#include "../../common/repositories/base_data_repository.h"
#include "../../common/file.h"
#include "../../common/events/player_event_logs.h"

EQEmuLogSys LogSys;
WorldContentService content_service;
ZoneStore zone_store;
PathManager path;
PlayerEventLogs player_event_logs;
#include "../../common/evolving.h"

EQEmuLogSys LogSys;
WorldContentService content_service;
ZoneStore zone_store;
PathManager path;
PlayerEventLogs player_event_logs;
EvolvingItemsManager evolving_items_manager;

void ImportSpells(SharedDatabase *db);
void ImportSkillCaps(SharedDatabase *db);
Expand Down
6 changes: 6 additions & 0 deletions common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ SET(common_sources
event_sub.cpp
events/player_event_logs.cpp
events/player_event_discord_formatter.cpp
evolving.cpp
expedition_lockout_timer.cpp
extprofile.cpp
discord/discord_manager.cpp
Expand Down Expand Up @@ -172,6 +173,7 @@ SET(repositories
repositories/base/base_character_currency_repository.h
repositories/base/base_character_data_repository.h
repositories/base/base_character_disciplines_repository.h
repositories/base/base_character_evolving_items_repository.h
repositories/base/base_character_expedition_lockouts_repository.h
repositories/base/base_character_exp_modifiers_repository.h
repositories/base/base_character_inspect_messages_repository.h
Expand Down Expand Up @@ -240,6 +242,7 @@ SET(repositories
repositories/base/base_inventory_snapshots_repository.h
repositories/base/base_ip_exemptions_repository.h
repositories/base/base_items_repository.h
repositories/base/base_items_evolving_details_repository.h
repositories/base/base_ldon_trap_entries_repository.h
repositories/base/base_ldon_trap_templates_repository.h
repositories/base/base_level_exp_mods_repository.h
Expand Down Expand Up @@ -355,6 +358,7 @@ SET(repositories
repositories/character_currency_repository.h
repositories/character_data_repository.h
repositories/character_disciplines_repository.h
repositories/character_evolving_items_repository.h
repositories/character_expedition_lockouts_repository.h
repositories/character_exp_modifiers_repository.h
repositories/character_inspect_messages_repository.h
Expand Down Expand Up @@ -423,6 +427,7 @@ SET(repositories
repositories/inventory_snapshots_repository.h
repositories/ip_exemptions_repository.h
repositories/items_repository.h
repositories/items_evolving_details_repository.h
repositories/ldon_trap_entries_repository.h
repositories/ldon_trap_templates_repository.h
repositories/level_exp_mods_repository.h
Expand Down Expand Up @@ -555,6 +560,7 @@ SET(common_headers
events/player_event_discord_formatter.h
events/player_events.h
event_sub.h
evolving.h
expedition_lockout_timer.h
extprofile.h
faction.h
Expand Down
Loading