Commit Graph

89 Commits

Author SHA1 Message Date
jadebenn
d88b982904 Merge remote-tracking branch 'upstream/main' into PetFixes 2024-04-19 18:30:43 -05:00
jadebenn
36e0dbdb5e load imagination costs for pet abilities from CDClient 2024-04-18 23:31:27 -05:00
David Markowitz
5049f215ba
chore: Use string to access SQLite columns (#1535)
* use string to access field name

* Update DEVGMCommands.cpp

* corrected column name

* constexpr array

include <array>

Revert "constexpr array"

This reverts commit 1492e8b1773ed5fbbe767c74466ca263178ecdd4.

Revert "include <array>"

This reverts commit 2b7a67e89ad673d420f496be97f9bc51fd2d5e59.

include <array>

constexpr array

---------

Co-authored-by: jadebenn <jonahbenn@yahoo.com>
2024-04-13 23:41:51 -05:00
jadebenn
657fb35560 semi update the unit tests 2024-03-31 21:49:59 -05:00
jadebenn
e832dfbf71 add most pet messages 2024-03-08 18:43:40 -06:00
jadebenn
9a9254b583 Merge remote-tracking branch 'upstream/main' into PetFixes 2024-03-08 15:49:16 -06:00
David Markowitz
fcb89b3c7a
Remove multiple Script syntax (#1496) 2024-03-06 19:49:29 -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
70e0cd6f93 more merge 2024-02-13 20:59:35 -06:00
jadebenn
d6321a63d9 Merge remote-tracking branch 'upstream/main' into PetFixes 2024-02-13 20:59:27 -06:00
David Markowitz
dc29f5962d
Move CDClientManager to be a namespace (#1431)
Tested that worlds still load data as expected.  Had no use being a singleton anyways.
2024-02-08 23:40:43 -06:00
jadebenn
a0d51e21ca
refactor: allow usage of NiPoint3 and NiQuaternion in constexpr context (#1414)
* allow usage of NiPoint3 and NiQuaternion in constexpr context

* removed .cpp files entirely

* moving circular dependency circumvention stuff to an .inl file

* real world usage!!!!!

* reverting weird branch cross-pollination

* removing more weird branch cross-pollination

* remove comment

* added inverse header guard to inl file

* Update NiPoint3.inl

* trying different constructor syntax

* reorganize into .inl files for readability

* uncomment include

* moved non-constexpr definitions to cpp file

* moved static definitions back to inl files

* testing fix

* moved constants into seperate namespace

* Undo change in build-and-test.yml

* nodiscard
2024-01-29 01:53:12 -06:00
David Markowitz
36f7b8a928
remove singleton for dpWorld (#1427)
Removes the singleton inheritance from dpWorld.
Tested that crux prime, nimbus station, avant gardens and nexus tower still use navmeshes and physics and that physics volumes are still collided with.
2024-01-19 15:12:05 -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
0f365e0ae4
Merge branch 'DarkflameUniverse:main' into PetFixes 2024-01-05 15:37:17 -06:00
jadebenn
384083ea18 use reference instead of pointer for cdclient data 2024-01-05 14:50:49 -06:00
David Markowitz
870b56fe02
chore: cleanup objectIdManager overloading and classes (#1391)
* objectIdManager fixes

* Remove debug log
2024-01-05 06:31:22 -06:00
jadebenn
d5a0b71b9e
Update PetComponent.cpp 2024-01-01 12:24:13 -06:00
jadebenn
b83e1bf20d some further bouncer refinements 2023-12-28 18:21:45 -06:00
jadebenn
5f8f200bfc pet bouncers now bounce player upon pressing shift 2023-12-28 17:49:37 -06:00
jadebenn
a4f0602218 Merge branch 'main' into PetFixes 2023-12-27 22:36:39 -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
c6df078411 comment cleanup 2023-12-16 21:25:35 -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
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
775e4fee9e change AND priority 2023-12-13 01:01:34 -06:00
jadebenn
291fc83dc8 added bone dragon treasure dig handling 2023-12-13 00:57:01 -06:00
jadebenn
fd5ea75ead added bone dragon treasure dig handling 2023-12-13 00:56:41 -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
3f1468ebdf mission fix redo 2023-11-24 23:56:33 -06:00
jadebenn
cb65de61ca updated pet command functionality 2023-11-24 23:56:33 -06:00
jadebenn
1a74ed676b Fixed pet emotes not playing 2023-11-24 23:56:33 -06:00