Commit Graph

47 Commits

Author SHA1 Message Date
jadebenn
5ddf4ce28b
fix unused expression 2024-04-20 11:23:35 -05:00
jadebenn
6ddf5b3e92 remove unneeded tests 2024-04-20 00:07:08 -05:00
jadebenn
0b2453241b clean up PetComponent 2024-04-19 21:53:52 -05:00
jadebenn
e832dfbf71 add most pet messages 2024-03-08 18:43:40 -06:00
jadebenn
4791b31dc2 use class enums 2024-03-05 23:37:42 -06:00
jadebenn
c36bc8389a fix pet taming minigame countdown 2024-03-03 19:50:13 -06:00
jadebenn
1c1b7337b1 Merge remote-tracking branch 'upstream/main' into PetFixes 2024-03-03 19:10:33 -06:00
jadebenn
a449e5323b delete unused functions and update documentation 2024-03-03 19:02:11 -06:00
jadebenn
b261e63233
chore: Change entity and component logic to use bitstream references (#1468)
* chore: Change entity and component logic to use bitstream references

* merge
2024-02-27 01:25:44 -06:00
jadebenn
d6321a63d9 Merge remote-tracking branch 'upstream/main' into PetFixes 2024-02-13 20:59:27 -06:00
jadebenn
5225c86d65
chore: Misc. component cleanup (#1433)
* Misc component cleanup

* Update InventoryComponent.h

* Update MissionComponent.h

* Update PropertyManagementComponent.h

* Update PropertyVendorComponent.h

* Update SkillComponent.h

maximum pedantry B)

* SoundTriggerComponent.h braces gone

* Rename SoundTriggerComponent.h braces gone to SoundTriggerComponent.h

I was tired
2024-01-23 23:13:23 -06:00
jadebenn
4a50c60559
chore: Assorted pet improvements (#1402)
* Assorted pet improvements

* remove unecessary include

* updates to address some feedback

* fixed database code for testing

* Removed reference member (for now)

* Removed cmake flag
2024-01-08 15:32:09 -08:00
jadebenn
6c3c08cd2a Added fallback to default values if CDClient data cannot be loaded 2024-01-05 16:36:02 -06:00
jadebenn
384083ea18 use reference instead of pointer for cdclient data 2024-01-05 14:50:49 -06:00
jadebenn
17753c56e4
Update PetComponent.h 2024-01-01 12:21:49 -06:00
jadebenn
1ee5b64acc
Update PetComponent.h 2024-01-01 03:24:00 -06:00
jadebenn
5f8f200bfc pet bouncers now bounce player upon pressing shift 2023-12-28 17:49:37 -06:00
jadebenn
ef6f2f133e
chore: Eradicate C-style casts and further clean up some code (#1361)
* cast and code cleanup

* cast cleanup

* bug fixes and improvements

* no getBoolField method exists

* fixes

* unbroke sg cannon scoring

* removing comments

* Remove the c-style cast warning I added from CMakeLists now that they're gone (it triggers on 3rd party dependencies and slows down compilation)

* (Hopefully) fix MacOS compilation error

* partially-implemented feedback

* more updates to account for feedback

* change bool default

---------

Co-authored-by: jadebenn <jonahebenn@yahoo.com>
2023-12-27 22:18:20 -06:00
jadebenn
6edd42d37c pet bouncer minimum functionality 2023-12-27 19:39:07 -06:00
jadebenn
2d3e03a2a8 pet following and flag behavior improvements 2023-12-16 20:51:06 -06:00
jadebenn
8c97271108 Update treasure behavior 2023-12-16 19:55:43 -06:00
jadebenn
cecf0653c7 Changed how pet data is loaded 2023-12-15 21:47:16 -06:00
jadebenn
1c7ce6eac3 updated CDClient pet data handling 2023-12-15 18:38:52 -06:00
jadebenn
9add2c944e PetFlag system now functioning correctly 2023-12-15 14:36:27 -06:00
jadebenn
054371dd01 added new pet bitflag system 2023-12-15 05:34:38 -06:00
jadebenn
668bebf68c adding new pet flags 2023-12-14 23:43:08 -06:00
jadebenn
f5ca142eb9
Update PetStatus enum to prep for bitset use 2023-12-14 09:21:17 -06:00
jadebenn
1b8f10fcfb added treasure dig menu prompts and help messages 2023-12-14 01:33:49 -06:00
jadebenn
2a4cfe3447 function rename 2023-12-13 01:06:58 -06:00
jadebenn
68df8af784 capitalization 2023-12-13 00:17:53 -06:00
jadebenn
a99f7a7fc1 Re-implemented treasure dig handling 2023-12-13 00:14:53 -06:00
jadebenn
5b738dfc58 Further redid pet update loop 2023-12-11 21:10:29 -06:00
jadebenn
200d679dd8 redone pet update loop 2023-12-10 19:55:36 -06:00
jadebenn
1c01219ae9 added some pet debug commands 2023-12-09 22:24:35 -06:00
jadebenn
e4b3e22570 update loop cleanup 2023-11-24 23:56:33 -06:00
jadebenn
1a74ed676b Fixed pet emotes not playing 2023-11-24 23:56:33 -06:00
jadebenn
b3762dac05 added imagination cost to digs 2023-11-24 23:56:33 -06:00
jadebenn
119968a90c initial dig functionality; need to clean up kruft 2023-11-24 23:56:33 -06:00
David Markowitz
ae349d6b15
feat: Add isolated and simplified path to add components (#1204)
* Components: Make ComponentType inline

Prevents the next commits ODR violation

* Components: Add new components

* Entity: Add headers

inline script component ComponentType

* Components: Flip constructor argument order

Entity comes first always

* Entity: Add generic AddComponent

Allows for much easier adding of components and is error proof by not allowing the user to add more than 1 of a specific component type to an Entity.

* Entity: Migrate all component constructors

Move all to the new variadic templates AddComponent function to reduce clutter and ways the component map is modified.
The new function makes no assumptions.  Component is assumed to not exist and is checked for with operator[].  This will construct a null component which will then be newed if the component didnt exist, or it will just get the current component if it does already exist.  No new component will be allocated or constructed if the component already exists and the already existing pointer is returned instead.

* Entity: Add placement new

For the case where the component may already exist, use a placement new to construct the component again, it would be constructed again, but would not need to go through the allocator.

* Entity: Add comments on likely new code

* Tests: Fix tests

* Update Entity.cpp

* Update SGCannon.cpp

* Entity: call destructor when re-constructing

* Update Entity.cpp

Update Entity.cpp

---------

Co-authored-by: Aaron Kimbrell <aronwk.aaron@gmail.com>
2023-10-22 20:08:49 -05:00
David Markowitz
2cc13c6499
chore: Make serialize actually virtual (#1156)
* Make serialize actually virtual

* fix serialize and make update virutal

* Update VendorComponent.h

* Remove flag var

* Update SoundTriggerComponent.h

---------

Co-authored-by: Aaron Kimbrell <aronwk.aaron@gmail.com>
2023-08-10 14:33:15 -07:00
Aaron Kimbrell
6aa90ad5b2
Breakout rest of the enums from dCommonVars and clean it up (#1061)
* Breakout rest of the enums from dcommonvars
so we don't have to deal with merge conflicts
ePlayerFlags is not a scoped enum, yet, due to it's complexity

* address feedback

* make player flag types consistent

* fix typo
2023-05-02 17:39:21 -05:00
Aaron Kimbrell
e524b86e12
breakout the component types into a scoped enum (#1002)
* breakout the component types into a scoped enum

tested that things are the same as they were before

* fix missed rename

* fix brick-by-brick name to be crafting
because that's what it is
2023-03-04 01:16:37 -06:00
aronwk-aaron
19e77a38d8 format codebase 2022-07-28 08:39:57 -05:00
EmosewaMC
2a0616d0e9 Dont take imagination on initial tame 2022-06-18 00:16:00 -07:00
EmosewaMC
35ea3d35ae Add pet imagination draining
Address an issue where pets did not consume imagination when they were spawned.
2022-06-17 23:53:09 -07:00
EmosewaMC
5eb801eb12 uses number of bricks now 2022-04-06 22:21:29 -07:00
Unknown
0545adfac3 Public release of the DLU server code!
Have fun!
2021-12-05 18:54:36 +01:00