Commit Graph

1014 Commits

Author SHA1 Message Date
de47210f15 Move to new branch
Added comments

Added some comments and changed a variable name to be less ambiguous.
2022-06-19 00:12:02 -07:00
ba5037300f Merge pull request #587 Address pets not consuming imagination on summon or while being active
Address pets not consuming imagination on summon or while being active
2022-06-18 20:26:55 -07:00
2e224cb151 update name
Pets will take imagination by default now
2022-06-18 13:25:34 -07:00
2a0616d0e9 Dont take imagination on initial tame 2022-06-18 00:16:00 -07:00
0774ab930d inverted config check
Since most people are not regularly updating their config files, this needs to assume the value is disabled rather than enabled.
2022-06-18 00:09:05 -07:00
e415d96a9d Added config setting
Added a config setting to allow players to disable pets consuming imagination.  This value defaults to zero as a feature of DLU.
2022-06-18 00:03:27 -07:00
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
e28b084395 Add GM
Added GM for UseItemRequirementsResponse that was missing in current implementation
2022-06-17 22:19:28 -07:00
136937184e Add to common vars and dnet
Added values to enums on dnet and common vars that were missing
2022-06-17 22:18:46 -07:00
2403a7fe45 Merge pull request #585 Fix child entities not being removed from their parents correctly on deletion
Fix child entities not being removed from their parents correctly on deletion
2022-06-16 19:34:03 -07:00
531c4a594c remove children
We need to make sure we are actually deleting children from the vector of children when they are deleted as entities.
2022-06-16 17:50:33 -07:00
1fe6c32933 Merge pull request #584 Fix an issue where quickbuilds were sometimes unbuildable
Fix an issue where quickbuilds were sometimes unbuildable
2022-06-16 09:06:45 -07:00
4a39221dd0 Address reviews
Changed the activator position parsing to have TryParse so that we dont throw an exception trying to load the position.  Should the loading of the activator position fail the game will default to the position of the entity.

change delimiter value to hex

Updated the character delimiter used for rebuild_activator settings to use hex

Remove extra parsing of activator position

in Entity.cpp we were parsing the activator position but when doing so where we were, this was after we had ended up spawning the activator since that is now in the constructor of the rebuild component.  The extra parsing has been removed.

Simplify dirty parent/child info

Simplify the if condition for parent child info.  This info only needs to be written should it be changed (dirty) or if the packet being sent is a construction, meaning that a requesting player needs all base data and needs to know what parents/children an entity has at that time.

get rid of extra parenthesis

Left over extra parenthesis were around these conditions on accident
2022-06-16 08:50:01 -07:00
09c459a083 Added comment 2022-06-15 23:17:44 -07:00
7dfcd22a2e Properly place build activator
The build activator as a result of the previous changes was spawning at the wrong position.  This commit pulls the activators position from the settings (should they exist) and sets them accordingly.
2022-06-15 22:59:30 -07:00
8bdd5b6e2c Address quickbuilds being unbuildable
Address an issue where quickbuilds would become unbuildable.  The main issue lied within serializing parent/child info too often for some reason / serializing it when the info wasnt dirty.  Only serializing this info when it is actually dirty and has changed has addressed the issue and allows quickbuilds to never break.
2022-06-15 22:58:38 -07:00
4556faf833 Merge pull request #583 from EmosewaMC/SetLevelCommand
Add setlevel command
2022-06-13 01:06:41 -07:00
1179f5a2fe Add setlevel to commands doc 2022-06-13 00:45:29 -07:00
a61c6e5e41 Add /setlevel slash command
Add the setlevel slash command.  Command accepts parameters of the requested level and a player to set the level of.  This also adjects the uscore of the player accordingly.  The player must re-log upon using the command to see any updates to themselves or others.
2022-06-13 00:45:17 -07:00
1f62f169c8 Merge pull request #582 from DarkflameUniverse/revert-581-bons-hotfix
Revert "Don't give activity loot for Battle of Nimbus Station"
2022-06-13 04:20:54 +01:00
842cb80137 Revert "Don't give activity loot for Battle of Nimbus Station" 2022-06-13 04:19:27 +01:00
2868465e89 Merge pull request #581 Don't give activity loot for Battle of Nimbus Station
Don't give activity loot for Battle of Nimbus Station
2022-06-12 19:25:56 -07:00
ef8ea13d99 Don't give activity loot for Battle of Nimbus Station
Address an issue on Brick Mesa where Battle of Nimbus Station was dropping activity loot.  Tested completing Battle of Nimbus Station and ending early and was not given loot as is expected.
2022-06-12 19:25:28 -07:00
df9f9f08b6 Merge pull request #580 Address issue with bricks selling 1 at a time
Address issue with bricks selling 1 at a time
2022-06-12 14:15:42 -07:00
50fd27b973 Merge branch 'DarkflameUniverse:main' into selling-fix-bricks 2022-06-12 11:49:17 -07:00
81431cfcbd Address bricks selling 1 at a time
Bricks have a stack size of zero in the cdclient so we need to make sure to give them a full stack size of 999 as we do for the bricks inventory with the selling inventory.
2022-06-12 11:48:52 -07:00
7af248feeb Merge pull request #578 Fix Selling "random" item
Address issue with selling/moving items grabbing a "random" item
2022-06-12 11:43:36 -07:00
fbf0b59ff1 Fix item getter for moving items
This fixes an issue where the item would get overwritten and would effectively fetch a "random" item in the inventory to move instead of the requested one.
2022-06-12 10:56:01 -07:00
c5dff54e01 Merge pull request #577 Address issue with some kills not contributing towards progress
Address issue with player spawned abilities not getting team
2022-06-11 22:01:41 -07:00
30c8326c3e Move owner override
Mover owner override to be earlier so that we dont try to get the team of an entity that doesnt have a team and may be a child entity of a player.  Tested changes with a team of two players and players were correctly given credit for kills
2022-06-11 20:50:01 -07:00
d8cde40b49 Fix unhealthy docker containers (#574)
* Add curl to brickfix dockerfile.

* Add curl to AccountManager docker.

* Fix issue preventing container from building.
2022-06-11 19:31:58 -05:00
db773e9778 Merge pull request #573 Fix crash for Footraces on Windows
Corrected ambiguous string to number conversion  which would cause a crash on operating systems where a long is 32 bits and not 64 bits.
2022-06-06 23:09:10 -07:00
33cc3a3dd9 Corrected string to long conversion
For Windows, the definition for a long is 32 bits, not 64 bits like on other operating systems.  This caused an issue on Windows only where a number larger than 32 bits was attempted to be converted to a long, the WorldServer would crash.  This commit replaces all instances of `stol` with `stoull` to further define a long and reduce ambiguity of number length.
2022-06-05 21:02:41 -07:00
66215da37a Fix overrides in ActMine (#568) 2022-05-31 00:24:55 -05:00
73bbe641c6 Merge pull request #567 Address solo activity team sizes
Activities that would now force players into teams no longer make teams of size 1.
2022-05-27 19:04:46 -07:00
c6f871d42b only make teams for minigames
if we have more than one participant
2022-05-27 15:25:57 -05:00
445c01d485 Add instructions on solving missing DLL issue (#379)
* Add instructions on solving missing DLL issue

* Repair formatting to be consistent
2022-05-25 18:41:42 -05:00
915b779f03 Update Docker.md with buildkit and submodule notes. (#458)
* Update Docker.md

Add link to enabling docker buildkit. Add note to remember to clone submodules.

* Remove unpacked client option

Unpacked client does not have required directories/files (e.g. /versions/trunk.txt) and thus the packed client is required.

* Add note about renaming CDClient.fdb

DarkflameSetup will fail because it cannot find cdclient.fdb. However, CDClient.fdb exists. Renaming it fixes the issue.

* Remove extra "client"
2022-05-25 12:32:18 -05:00
731c25741c Merge pull request #563 Fix leaderboard not updating when it is supposed to
Fixed leaderboards not updating when they are supposed to.
2022-05-24 20:36:35 -07:00
f8d73ccbc5 Fixed display logic for NS Survival leaderboard 2022-05-25 02:03:40 +00:00
f5caa1f00d Merge branch 'leaderboard-updates' of https://github.com/Verathian/DarkflameServer into leaderboard-fix-resubmit 2022-05-25 02:00:10 +00:00
769f789a43 Merge pull request #354 Sanitize SQLite Queries
adds support to prevent sql injection via using prepared statements and also fixes an issue with the runmacro command.
2022-05-24 17:31:58 -07:00
e3422ac0c5 Merge branch 'main' into main 2022-05-24 19:00:52 -05:00
cdb2cf0344 Added Comprehensive Slash Command Documentation (#402)
* Added documentation for all available commands

* Adjust formatting, removing backtick characters

* Replace HTML tables with Markdown tables

* Formatting changes

* Suggestions from @sersorrel in #402 and other minor edits

* Add detailed usage for /inspect

(thanks to @sersorrel for this information, in discussion of #402)
2022-05-23 21:59:31 -05:00
44e17eabca Merge pull request #559 Properly implement climbable setting for climbables
This shouldn't change anything that was available in live but anything that can be spawned in as climbable is able to be done so now.
2022-05-19 12:38:40 -07:00
06df15717c maybe fix it 2022-05-19 08:40:50 -05:00
813aca9d20 resolve comments 2022-05-18 06:36:21 -05:00
a363d0734c Merge pull request #557 optimized LUP Component
Optimized LUP Component to not use a query to build its list of worlds
2022-05-17 21:30:12 -07:00
667677dcdd Merge pull request #558 Implement boom trap
Implement Mine Script for boom trap
2022-05-17 21:29:33 -07:00
9169d844e2 explicit set to 0 2022-05-17 21:38:36 -05:00