OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-05 06:50:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
e9bc2fe561
OpenFusion/src/Player.hpp

94 lines
2.1 KiB
C++
Raw Normal View History

Fix github issue #38
2020-08-25 18:42:52 +00:00
#pragma once
inital commit
2020-08-18 20:42:30 +00:00
#include <string>
#include <cstring>
#include "CNProtocol.hpp"
#include "CNStructs.hpp"
[refactor] Remove the word 'Manager' from most source files/namespaces ChatManager -> Chat MissionManager -> Missions NanoManager -> Nanos TransportManager -> Transport ChunkManager -> Chunking BuddyManager -> Buddies GroupManager -> Groups RacingManager -> Racing ItemManager -> Items NPCManager and PlayerManager remain. Note: You can use git log --follow src/file.cpp to trace the history of a file from before it was renamed.
2021-03-16 22:29:13 +00:00
#include "Chunking.hpp"
inital commit
2020-08-18 20:42:30 +00:00
Refactored mission data and implemented quest item mob drops. Most future missions are now playable. Quest items aren't being properly cleaned up yet.
2020-09-10 16:40:38 +00:00
#define ACTIVE_MISSION_COUNT 6
Cleaned up implementation of active nano powers.
2020-09-15 14:46:52 +00:00
#define PC_MAXHEALTH(level) (925 + 75 * (level))
inital commit
2020-08-18 20:42:30 +00:00
struct Player {
Rewrote DB to use ORM, added all remaining features to LoginServer and refactored it
2020-09-01 22:37:09 +00:00
int accountId;
Move from isGM to Account Levels (#106) Co-authored-by: dongresource <dongresource@protonmail.com>
2020-09-22 02:26:12 +00:00
int accountLevel; // permission level (see CN_ACCOUNT_LEVEL enums)
inital commit
2020-08-18 20:42:30 +00:00
int64_t SerialKey;
int32_t iID;
uint64_t FEKey;
int level;
int HP;
Players can now see eachother's nanos. (#28)
2020-08-23 00:52:54 +00:00
int slot; // player slot, not nano slot
Database saving update (#104) * implemented saving BatteryN and BatteryW * implemented saving mentor * moved int64->blob parsing to a separate function * moved parsing blob->int64 to a separate function * added functions for parsing int32->blob and vice versa * added functions for parsing int16->blob and vice versa * WIP saving quest items and active tasks * Quest items are stored in inventory table instead of blob * added sanity check for missionId * saving active missions works * removed unneccesary include * implemented saving warplocationflag, skywaylocationflag and currentmissionid in database * INFO DB message now shows how many accounts and player characters are in the database * fixed dbsaveinterval being in [login] instead of [shard] * fixed mission quit: - fixed wrong json name, causing qitems not deleting properly - quitting mission now resets npc kill count * adjusted saving active missions * removed blob parsing functions that ended up being unused * removed accidentaly added include * removed sending PCStyle2 on Player Enter * added a sanity check in itemMoveHandler * removed MapNum from PCLoad, as client doesn't even read it * set BuddyWarpCooldown to 60s on PCLoad * fixed a bug causing EXIT DUPLICATE not working * added creation and last login timestamps to accounts and players * added a sanity check for P_CL2LS_REQ_PC_EXIT_DUPLICATE * implemented web api support, toggled by new setting (off by default) * add usewebapi to config Co-authored-by: Gent <gentsemaj@live.com>
2020-09-21 19:43:53 +00:00
int16_t mentor;
Trading System (#43) * Sanity checks + Starting level changes - Item movement handler checks to make sure items aren't moved from equipment slot to equipment slot. - Item give command checks to make sure an out of bounds item is not spawned (Below iType 0 or above iType 8) - Players now begin at level 36, consequently the item give command does not level you up now. * Initial Trade Implementation * Taros and Trading * working trading system * Trading system code pointerified - It works with the recent pointer changes needed.
2020-08-26 17:40:10 +00:00
int32_t money;
Initial implementation of CombatManager. Overflow detection must still be implemented.
2020-08-27 20:16:52 +00:00
int32_t fusionmatter;
"Boosts and potions!" Fixed crate opening such that the item has an iOpt of 1.
2020-09-14 14:27:52 +00:00
int32_t batteryW;
int32_t batteryN;
inital commit
2020-08-18 20:42:30 +00:00
sPCStyle PCStyle;
sPCStyle2 PCStyle2;
Initial Academy support Support for the Academy's Nano system is complete, but they're not being saved to the DB yet.
2020-11-25 22:36:30 +00:00
sNano Nanos[NANO_COUNT]; // acquired nanos
Players can now see eachother's nanos. (#28)
2020-08-23 00:52:54 +00:00
int equippedNanos[3];
Add player revive, vehicle mount/dismount and more (#33)
2020-08-24 21:04:56 +00:00
int activeNano; // active nano (index into Nanos)
int8_t iPCState;
Implement transportation framework + full S.C.A.M.P.E.R. functionality (#86) * Add transportation registration * Add S.C.A.M.P.E.R. functionality Co-authored-by: dongresource <dongresource@protonmail.com>
2020-09-13 20:26:16 +00:00
int32_t iWarpLocationFlag;
int64_t aSkywayLocationFlag[2];
Initial implementation of nano powers.
2020-09-18 07:10:30 +00:00
int32_t iConditionBitFlag;
Refactored Nano Powers * All nano power functions have been merged into one goliath of a function. * Nano powers consume the correct amount of stamina. * Bugfixed gumball issues, gumballed nanos now perform better. * Revive powers now work correctly. * Recall powers both self and group are functional. * Removed nanoBuff. * Added a new applyBuff function, this allows for quick and easy application of nano skills. * Numerous other bugfixes.
2020-11-08 00:26:44 +00:00
int32_t iSelfConditionBitFlag;
Implemented GM SpecialState Handling Co-authored-by: dongresource <dongresource@protonmail.com>
2020-09-22 15:30:49 +00:00
int8_t iSpecialState;
inital commit
2020-08-18 20:42:30 +00:00
Add support for unique instances
2020-10-12 16:55:41 +00:00
int x, y, z, angle;
Kick players out of instances when they leave
2020-10-14 04:26:30 +00:00
int lastX, lastY, lastZ, lastAngle;
In the absence of a Resurrect 'Em in a Lair, respawn at the entrance
2020-12-14 23:22:27 +00:00
int recallX, recallY, recallZ, recallInstance; // also Lair entrances
Add support for unique instances
2020-10-12 16:55:41 +00:00
uint64_t instanceID;
inital commit
2020-08-18 20:42:30 +00:00
sItemBase Equip[AEQUIP_COUNT];
Items Implementation (#11) * Item Manager (Initial Implementation) * Item Manager (Second Phase) * Item Manager (Phase Three) * Not Working Code * Inventory Implementation (Complete?) * Items Implementation -Fixed Indentations -Final touches to make it all work * Update Makefile * Added small comments -- needs to be fixed
2020-08-21 02:10:14 +00:00
sItemBase Inven[AINVEN_COUNT];
Reimplement the bank
2020-12-03 23:58:10 +00:00
sItemBase Bank[ABANK_COUNT];
Trading System (#43) * Sanity checks + Starting level changes - Item movement handler checks to make sure items aren't moved from equipment slot to equipment slot. - Item give command checks to make sure an out of bounds item is not spawned (Below iType 0 or above iType 8) - Players now begin at level 36, consequently the item give command does not level you up now. * Initial Trade Implementation * Taros and Trading * working trading system * Trading system code pointerified - It works with the recent pointer changes needed.
2020-08-26 17:40:10 +00:00
sItemTrade Trade[12];
int32_t moneyInTrade;
Vehicle and trading bugfixes (#51) * Sanity checks + Starting level changes - Item movement handler checks to make sure items aren't moved from equipment slot to equipment slot. - Item give command checks to make sure an out of bounds item is not spawned (Below iType 0 or above iType 8) - Players now begin at level 36, consequently the item give command does not level you up now. * Initial Trade Implementation * Sanity Check - Prevents out of bounds item movement by comparing it to AINVEN_COUNT. * Taros and Trading * Update ItemManager.cpp * Update ItemManager.cpp * working trading system * Trading system code pointerified - It works with the recent pointer changes needed. * Vehicles and Trading bugfixes
2020-08-27 02:35:13 +00:00
bool isTrading;
bool isTradeConfirm;
[WIP] Incremental mission save 2 This commit (and the previous one) exist to document the first approach I took to storing mission data. It's only here for posterity. This comment was added while rebasing.
2020-09-10 13:01:35 +00:00
Implemented player tick (health/nano stamina). * The player now heals while not in combat * Nanos lose stamina while active, regain it while resting * Using active nano powers drains stamina * Standing in FM patches/lakes now deals damage * Fixed a memory error in npcAttackPc() * Mobs now aggro when a player gets close * Mobs now give up the chase if the player gets out of the combat zone; they no longer try chasing until they themselves have left it * Added a few missing break statements in the loops in BuddyManager Other players are not yet instantly notified of health/stamina updates, as finding the correct way to do this has proven tricky. FM patch damage updates other player's views just fine, though.
2020-09-26 22:16:15 +00:00
bool inCombat;
Fix freefalling after MSS DC
2020-11-26 15:01:48 +00:00
bool onMonkey;
Refactored Nano Powers * All nano power functions have been merged into one goliath of a function. * Nano powers consume the correct amount of stamina. * Bugfixed gumball issues, gumballed nanos now perform better. * Revive powers now work correctly. * Recall powers both self and group are functional. * Removed nanoBuff. * Added a new applyBuff function, this allows for quick and easy application of nano skills. * Numerous other bugfixes.
2020-11-08 00:26:44 +00:00
int nanoDrainRate;
Implement two more mission types + tweaks & fixes * Weapons will consume your batteries fully. * Nerfed enemy damage at lower levels. * Further reworked drain, uses a static variable as a timer (lastDrainTime) * resendMobHP has been repurposed to drainMobHP. * Players heal faster after a sizable cooldown. * Nano type advantage is more noticeable during combat. Implemented two more mission types + Tweaks * Item delivery quests now work. * Timed missions now work. * All escort missions (type 6) are skipped. * /minfo now also prints the terminator npc. * Weapon battery consumption tweaked * Fixed indentations. * Heal nanos have better output (25% -> 35%) * Damage formula had a slight tweak. * Bugfixed weapon equipping. * Other tweaks
2020-10-21 05:24:51 +00:00
int healCooldown;
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
Variable damage to/from mobs * Player weapons and armor ratings are taken into account when damaging/getting damaged by mobs. * Players have a 5% chance to critical strike mobs, this doubles the player's weapon power. * Aside from player and mob stat based damage variance, there is also an inherent 20% variance to any damage.
2020-09-27 01:53:03 +00:00
int pointDamage;
int groupDamage;
Basic Anti rapidfire
2020-12-31 05:54:57 +00:00
int fireRate;
Variable damage to/from mobs * Player weapons and armor ratings are taken into account when damaging/getting damaged by mobs. * Players have a 5% chance to critical strike mobs, this doubles the player's weapon power. * Aside from player and mob stat based damage variance, there is also an inherent 20% variance to any damage.
2020-09-27 01:53:03 +00:00
int defense;
Implemented player tick (health/nano stamina). * The player now heals while not in combat * Nanos lose stamina while active, regain it while resting * Using active nano powers drains stamina * Standing in FM patches/lakes now deals damage * Fixed a memory error in npcAttackPc() * Mobs now aggro when a player gets close * Mobs now give up the chase if the player gets out of the combat zone; they no longer try chasing until they themselves have left it * Added a few missing break statements in the loops in BuddyManager Other players are not yet instantly notified of health/stamina updates, as finding the correct way to do this has proven tricky. FM patch damage updates other player's views just fine, though.
2020-09-26 22:16:15 +00:00
added saving missions
2020-09-13 18:45:51 +00:00
int64_t aQuestFlag[16];
Refactored mission data and implemented quest item mob drops. Most future missions are now playable. Quest items aren't being properly cleaned up yet.
2020-09-10 16:40:38 +00:00
int tasks[ACTIVE_MISSION_COUNT];
Database saving update (#104) * implemented saving BatteryN and BatteryW * implemented saving mentor * moved int64->blob parsing to a separate function * moved parsing blob->int64 to a separate function * added functions for parsing int32->blob and vice versa * added functions for parsing int16->blob and vice versa * WIP saving quest items and active tasks * Quest items are stored in inventory table instead of blob * added sanity check for missionId * saving active missions works * removed unneccesary include * implemented saving warplocationflag, skywaylocationflag and currentmissionid in database * INFO DB message now shows how many accounts and player characters are in the database * fixed dbsaveinterval being in [login] instead of [shard] * fixed mission quit: - fixed wrong json name, causing qitems not deleting properly - quitting mission now resets npc kill count * adjusted saving active missions * removed blob parsing functions that ended up being unused * removed accidentaly added include * removed sending PCStyle2 on Player Enter * added a sanity check in itemMoveHandler * removed MapNum from PCLoad, as client doesn't even read it * set BuddyWarpCooldown to 60s on PCLoad * fixed a bug causing EXIT DUPLICATE not working * added creation and last login timestamps to accounts and players * added a sanity check for P_CL2LS_REQ_PC_EXIT_DUPLICATE * implemented web api support, toggled by new setting (off by default) * add usewebapi to config Co-authored-by: Gent <gentsemaj@live.com>
2020-09-21 19:43:53 +00:00
int RemainingNPCCount[ACTIVE_MISSION_COUNT][3];
[WIP] Incremental mission save 2 This commit (and the previous one) exist to document the first approach I took to storing mission data. It's only here for posterity. This comment was added while rebasing.
2020-09-10 13:01:35 +00:00
sItemBase QInven[AQINVEN_COUNT];
Database saving update (#104) * implemented saving BatteryN and BatteryW * implemented saving mentor * moved int64->blob parsing to a separate function * moved parsing blob->int64 to a separate function * added functions for parsing int32->blob and vice versa * added functions for parsing int16->blob and vice versa * WIP saving quest items and active tasks * Quest items are stored in inventory table instead of blob * added sanity check for missionId * saving active missions works * removed unneccesary include * implemented saving warplocationflag, skywaylocationflag and currentmissionid in database * INFO DB message now shows how many accounts and player characters are in the database * fixed dbsaveinterval being in [login] instead of [shard] * fixed mission quit: - fixed wrong json name, causing qitems not deleting properly - quitting mission now resets npc kill count * adjusted saving active missions * removed blob parsing functions that ended up being unused * removed accidentaly added include * removed sending PCStyle2 on Player Enter * added a sanity check in itemMoveHandler * removed MapNum from PCLoad, as client doesn't even read it * set BuddyWarpCooldown to 60s on PCLoad * fixed a bug causing EXIT DUPLICATE not working * added creation and last login timestamps to accounts and players * added a sanity check for P_CL2LS_REQ_PC_EXIT_DUPLICATE * implemented web api support, toggled by new setting (off by default) * add usewebapi to config Co-authored-by: Gent <gentsemaj@live.com>
2020-09-21 19:43:53 +00:00
int32_t CurrentMissionID;
vehicle has a proper expiration day when bought, implemented checking expired vehicles while login
2020-09-22 11:16:09 +00:00
sTimeLimitItemDeleteInfo2CL toRemoveVehicle;
Cleaned up whitespace. Incantation: sed -i 's/[ \t]*$//g' src/*.[ch]pp Also switched BuddyManager from tabs to spaces using vim's :retab command.
2020-10-05 00:03:13 +00:00
Groups, Group Nano powers and Revive (#129) * Initial Group Implementation * Request/refuse/join and leave groups. * Chat into groups. * Get status updates on every group member each tick. * Owner leaving the group destroys the entire group. * Added more nano powers * Revive for both variants work. * Many nano powers now have a group variant working. * Enemy checks for aggro before retreating. * Enemies keep aggro on dead players with revive nanos out. * Further Nano powers + Bugfixes * Infection damage now relies on bitcondition flags. * Antidote power now works. * Improved how groups handle leaving players. * Fixed mob aggro range. * Group Healing is now functional. * Possibly fixed the player being unselectable bug. * Fixed indentations. * Dismiss nano when starting a MSS ride * Sneak, Invisibility and Bugfixes * Sneak and invisibility affect mob aggro. * Possibly bugfixed equips not showing to other players. * Aggro checking is less likely to cause nullptr related crashes. * Group PR cleanup. * Made sure to label all hacky workarounds * Implemented the Antidote nano power the right way * Cleaned up the way various little things are written Didn't have the opportunity to actually test groups. Co-authored-by: CakeLancelot <CakeLancelot@users.noreply.github.com> Co-authored-by: CPunch <sethtstubbs@gmail.com> Co-authored-by: dongresource <dongresource@protonmail.com>
2020-10-04 23:54:08 +00:00
int32_t iIDGroup;
int groupCnt;
int32_t groupIDs[4];
Bugfixes + Damage Formula Adjustment * Entering/exiting groups should apply/remove group buffs. * Fixed issues with nanos losing all stamina from various revives/warp away. * Heavily tweaked damage formula, nano types now boost/decrease damage. * Weapons can consume battery returning extra damage, battery consumed depends on enemy level.
2020-10-09 00:01:35 +00:00
int32_t iGroupConditionBitFlag;
Added /notify and /players admin commands Co-authored-by: dongresource <dongresource@protonmail.com>
2020-10-31 17:12:13 +00:00
bool notify;
Added /hide command to exclude players from monitor output
2020-12-04 12:04:59 +00:00
bool hidden;
Add /unwarpable command GMs should use this before going to weird places where their non-GM buddies might warp to them and get stuck.
2020-12-28 15:24:24 +00:00
bool unwarpable;
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
Fix buddy list not syncing properly I couldn't reproduce this on my public server, but the list would show up empty sometimes on initial login on my local server, so I threw it in for good measure.
2020-11-08 18:58:44 +00:00
bool buddiesSynced;
Buddy rework, adjustments, and fixes I cleaned up the code a bit (I'll clean it up more as I make more progress) and fixed a bug with buddy slots. Now buddies aren't overwritten! A few reworks and adjustments I reworked the buddyIDs array to store only player UIDs instead of IDs. I also reworked buddy deleting so that it deletes buddies from the array. Code cleanup Cleaned up some of the code. I mainly just removed useless helper methods.
2020-10-27 15:28:37 +00:00
int64_t buddyIDs[50];
Implement player blocking
2020-12-05 00:29:08 +00:00
bool isBuddyBlocked[50];
Get rid of PlayerView. For good.
2020-11-17 23:16:16 +00:00
Properly implement first use flags
2020-12-07 18:01:29 +00:00
uint64_t iFirstUseFlag[2];
Reimplement chunk position caching
2020-11-19 01:37:58 +00:00
ChunkPos chunkPos;
Keep track of sold items so we can validate buyback packets
2021-03-09 02:40:23 +00:00
std::set<Chunk*> *viewableChunks;
Get rid of PlayerView. For good.
2020-11-17 23:16:16 +00:00
time_t lastHeartbeat;
Basic Anti rapidfire
2020-12-31 05:54:57 +00:00
int suspicionRating;
time_t lastShot;
Keep track of sold items so we can validate buyback packets
2021-03-09 02:40:23 +00:00
std::vector<sItemBase> *buyback;
inital commit
2020-08-18 20:42:30 +00:00
};
Reference in New Issue Copy Permalink