Commit Graph

363 Commits

Author SHA1 Message Date
HailStorm32
f8d73ccbc5 Fixed display logic for NS Survival leaderboard 2022-05-25 02:03:40 +00:00
HailStorm32
f5caa1f00d Merge branch 'leaderboard-updates' of https://github.com/Verathian/DarkflameServer into leaderboard-fix-resubmit 2022-05-25 02:00:10 +00:00
Aaron Kimbrell
e3422ac0c5
Merge branch 'main' into main 2022-05-24 19:00:52 -05:00
David Markowitz
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
Aaron Kimbre
06df15717c maybe fix it 2022-05-19 08:40:50 -05:00
Aaron Kimbre
813aca9d20 resolve comments 2022-05-18 06:36:21 -05:00
Aaron Kimbre
9169d844e2 explicit set to 0 2022-05-17 21:38:36 -05:00
Aaron Kimbre
03a5aa4da0 climbable server side settings 2022-05-17 21:27:08 -05:00
Aaron Kimbre
ca55fccb27 remove cdclient include 2022-05-17 10:20:36 -05:00
Aaron Kimbre
81af1f382e get zones from settings 2022-05-17 10:18:50 -05:00
Aaron Kimbrell
20b45bc27f
Merge branch 'main' into proper-rocket-holding 2022-05-12 08:21:17 -05:00
Aaron Kimbre
4c7034648b Exclude space blizzard from Zone ghosting 2022-05-08 22:07:07 -05:00
Aaron Kimbre
ec207838d4 Proper Rocket Holding
Sanity checks on Prop and LUP launchpads to not open if no valid rocket
Add serialization for sending item configs
so that rockets show for other players
2022-05-08 19:57:36 -05:00
David Markowitz
24745c2e7a
Merge pull request #541 Implement the LUP Rocket Launch Component
Implemented the LUP Rocket Launch Component and makes its UI live accurate
2022-05-06 11:54:32 -07:00
David Markowitz
8601976498
Merge pull request #544 address Elephant precondition
Pet Components now read in their preconditions from their settings (if they have any).  Mainly fixes just elephants not taking peanuts.
2022-05-06 04:15:13 -07:00
Aaron Kimbre
06a1949eaa remove sysaddr from call in Game Messages 2022-05-04 19:31:56 -05:00
Aaron Kimbre
b11b516641 fix Java doc comments
removed unused param
2022-05-04 19:26:56 -05:00
Aaron Kimbre
ad5c679d2d Styling edits 2022-05-04 18:24:28 -05:00
Aaron Kimbre
e81acb4c67 Client handles rocket being unequiped
when closing the dialog
and when launching
2022-05-04 07:50:05 -05:00
Aaron Kimbre
aa212ae6d8 Add precondition check 2022-05-03 22:38:49 -05:00
Aaron Kimbre
bd3e8aee51 Implement Rocket Launch Lup Component 2022-05-03 15:05:29 -05:00
EmosewaMC
6b409303af Update RebuildComponent.h
Quickbuilds jump fix

Corrected an error where the builder was erronously changed to an empty lwoobjid when a quickbuild was completed, causing the builds to no longer jump on completion (if configured to do so.)  Packet captures from live show that we do not want to get rid of the builder during resetting or during completion of the build so the file has been changed to not clear the builder in those cases.
2022-05-02 22:50:28 -07:00
EmosewaMC
59be7d8635 Added back brick inventory resizing 2022-04-28 14:36:55 -07:00
David Markowitz
16b108f69c
Merge pull request #522 from EmosewaMC/vendor-refresh
Added vendor refreshing
2022-04-27 13:21:59 -07:00
EmosewaMC
b713b94841 Added Loot Buff Behavior
Added functions and methods to support the pickup radius.  Functionality includes:
Corrected serialization for ControllablePhysicsComponent which correctly serializes the pickup radius to the client.
A method to add the pickup radius to the list of active pickup radii the component has.
A method to remove and re-calculate the largest active radii the component currently has.

Tested equipping all variations of the LootBuff behavior (passive skills, items, item skills) and all functioned as intended.  Tested equipping multiple items with a loot buff and then unequipping them in different orders.  Tested adding pickup radii of different values and the server correctly adjusted the pickup radius to the largest one currently equipped.
2022-04-27 12:40:43 -07:00
EmosewaMC
843a5b39c0 Vendor refresh change
Changed vendor refresh to happen as soon as it is able to.
2022-04-27 01:35:46 -07:00
EmosewaMC
fa7c4d9c27 added comments 2022-04-26 15:26:30 -07:00
EmosewaMC
cacf4fcd97 corrected serialization 2022-04-26 15:23:29 -07:00
EmosewaMC
5afeb265cd Updated vendor component
Fixed a few issues in VendorComponent.
- Corrected serialization to only happen on construction.
- Added functionality to refresh the vendor based on info from the vendor component table
- some whitespaceing inconsistencies.
- Sorted includes.
Tested the vendor in Nimbus Station and when the player re-enters the world, the vendor inventory refreshes, as opposed to previously where the world would need to reset in order to refresh the inventory.
2022-04-26 03:41:16 -07:00
EmosewaMC
7d233a04c0 Corrected action for OverTimeBehavior 2022-04-25 16:56:40 -07:00
EmosewaMC
4117ceb6c1 Skill Tasks changes
Addressed an issue where the Spinjitzu Initiate achievement would not progress.  This also allows mission tasks that specify that the player must get a kill on an enemy with a skill to progress.  Tested mission 1935 and 1139 and both missions progressed and completed as intended.
2022-04-25 03:25:07 -07:00
David Markowitz
58d2cee984
Merge pull request #516 from EmosewaMC/isPlayer-changes
Live accurate item loot sources
2022-04-24 18:56:49 -07:00
EmosewaMC
2e29dce77c removed logs 2022-04-24 17:27:25 -07:00
EmosewaMC
e56732184f commit 2022-04-24 17:26:05 -07:00
EmosewaMC
dc770299d1 removed debug logs 2022-04-23 22:22:21 -07:00
EmosewaMC
18fc01cd49 missed change for forge 2022-04-23 20:44:08 -07:00
EmosewaMC
c6480192f8 Revert "isPlayer changes"
This reverts commit 2e61839d93.
2022-04-23 20:35:39 -07:00
EmosewaMC
7a051afd97 loot source for item drops
Added support for Items to have a loot source attached to them when dropped or rolled.  This fixes the issue where achievements would give the item before it appeared in the achievement window.
2022-04-23 20:35:34 -07:00
EmosewaMC
ceab229a63 Specified enum
the LOOT_SOURCE enum is now attached to all loot sources.
2022-04-23 20:32:31 -07:00
EmosewaMC
8e10f090fd corrected number 2022-04-23 18:52:21 -07:00
EmosewaMC
a4d934913c added lootsource send in GM
WIP commit
2022-04-23 05:13:06 -07:00
EmosewaMC
0eece14b68 Vendor buyback inventory
Fixed vendor buyback inventory so it properly scrolls when the player adds enough items to it.
2022-04-23 04:16:10 -07:00
EmosewaMC
d0233a2cd0 Updated AddItemToInventorySync
AddItemToInventorySync now sends the correct loot source type
2022-04-23 04:14:55 -07:00
EmosewaMC
2e61839d93 isPlayer changes
Changed isPlayer to check for whether the entity has a character instead of checking system address of entity.
2022-04-22 00:10:15 -07:00
David Markowitz
6f9caaa8c1
Merge pull request #510 from IAmMajo/frostburgh-solo-racing
Fix solo_racing for Frostburgh's Space Blizzard Racetrack
2022-04-19 16:30:54 -07:00
David Markowitz
c489132f59
Merge pull request #504 from NinjaOfLU/fix-item-removal-underflow
Prevent integer underflow in item removal
2022-04-19 15:21:28 -07:00
Majo
a3331d009d
Fix solo_racing for Frostburgh's Space Blizzard Racetrack 2022-04-19 12:33:57 +02:00
Aaron Kimbrell
263b019262
Merge branch 'main' into Frostburgh 2022-04-18 23:35:40 -05:00
Aaron Kimbre
6933b2c301 case for putting you back into FB when leavign space blizzard 2022-04-18 23:33:09 -05:00
EmosewaMC
5691df9009 Fixed Racing Mission
* Try, Try Again achievement now progresses when the player gets last place in a race of 3 or more players, or when solo racing is enabled.
* Race Series 1 mission from Velocity Lane now progresses correctly.
2022-04-18 01:04:29 -07:00
David Markowitz
8f50e4ff56
Merge pull request #503 from aronwk-aaron/testmap-enhancements
Dynamically check if zone is viable from existence of file
2022-04-14 16:46:37 -07:00
NinjaOfLU
3d6d5e58a7
Update GameMessages.cpp
I promise I'm not farming changes. I woke up at like 4AM and realised that I'd screwed up in an obvious way. Note to self: You are ALLOWED to change variables.

Wasn't caught in testing because, well, it turns out it's actually impossible to test the edge case this covers, due to the script for the brick console.
2022-04-14 10:09:40 +01:00
NinjaOfLU
cdbb42badf
Added a bracket... -_-
Maybe I should write and test code on my computer rather than using Git as an IDE and commits as the save button...
2022-04-14 00:15:45 +01:00
NinjaOfLU
1d1f479387
Ensure items correctly removed from missions
Doubt it would have affected anyone, but technically if you had a mission to collect something interactable, and you deleted the items at the same time as interacting with something, this would have counted incorrectly. I'm being defensive because I was an idiot who couldn't read, but in my defence, it was late when I made the first edit, and I'm also a blundering idiot!
2022-04-14 00:11:35 +01:00
EmosewaMC
a32c5a2f3c Vault corrections 2022-04-13 01:50:06 -07:00
NinjaOfLU
59ec28a5a4
Prevent integer underflow in item removal
Previously, the only check that the user wasn't trashing more items than they had was clientsided, and this could be bypassed by contacting the server to remove items via a console or the like, and then trashing them before the server could respond, resulting in the count for the items being less than iStackCount. This check prevents that underflow.
2022-04-13 01:58:00 +01:00
Aaron Kimbre
959c90985c missed a semicolon 2022-04-12 18:32:52 -05:00
Aaron Kimbre
4a98c46fb9 fix tabs/spaces 2022-04-12 18:30:46 -05:00
Aaron Kimbre
40d396c7e2 simplify 2022-04-12 18:05:22 -05:00
Aaron Kimbre
6b44936c68 check if map exists for testmap 2022-04-12 14:06:03 -05:00
David Markowitz
e92cdc4f14
Merge pull request #493 from EmosewaMC/ugh
Pets no longer cause client hitches in Nimbus Station and Forbidden Valley
2022-04-11 14:35:57 -07:00
EmosewaMC
1e514a8b61 more specific logging 2022-04-09 18:48:13 -07:00
EmosewaMC
96f1c0a709 Fixed skills proxies 2022-04-08 20:20:42 -07:00
EmosewaMC
5a76cb3b44 fixed erronous log 2022-04-08 19:36:43 -07:00
David Markowitz
92d36496df
Merge pull request #490 from EmosewaMC/macos_compilation_warnings
Resolved MacOS (and possibly ARM?) compilation warnings
2022-04-07 12:09:37 -07:00
David Markowitz
9b6caef6b5
Merge pull request #487 from EmosewaMC/quickbuild-fixes
Added a GM send after QB complete
2022-04-07 09:48:40 -07:00
EmosewaMC
7030d937b1 dirty bit 2022-04-06 22:24:50 -07:00
EmosewaMC
e73793c1a3 removed unnccessary work 2022-04-06 22:21:54 -07:00
EmosewaMC
5eb801eb12 uses number of bricks now 2022-04-06 22:21:29 -07:00
EmosewaMC
4b0ab2380c Client does calcs 2022-04-06 22:21:17 -07:00
EmosewaMC
bd0926e0a5 special case for pets 2022-04-06 22:21:08 -07:00
EmosewaMC
9d79fc3d2e resolved MacOS compilation warnings 2022-04-05 05:11:06 -07:00
Gie "Max" Vanommeslaeghe
a0a9936e47
Merge pull request #415 from Marcono1234/UserManager-name-logging
Fix UserManager not logging chosen name properly
2022-04-03 11:33:59 +02:00
David Markowitz
395d607632
Merge pull request #484 from EmosewaMC/property-fixes
Reputation now saved in charxml.  This is not a retroactive fix for reputation earned before this merge.
2022-04-01 15:25:30 -07:00
David Markowitz
db0f363967
Merge pull request #476 from EmosewaMC/bugReportFixing
Added more specific bug reporting.  There is a new migration called migrations/dlu/2_reporter_id.sql to run on the database.
2022-04-01 15:12:58 -07:00
EmosewaMC
ec463dd4c8 Added a GM send after QB complete 2022-04-01 04:14:28 -07:00
David Markowitz
acbd46afcb
Removed debug log 2022-03-31 20:55:47 -07:00
EmosewaMC
8379fba079 added initializer 2022-03-31 18:46:56 -07:00
EmosewaMC
4bc5c8194f Added reputation tracker in charxml 2022-03-31 18:18:13 -07:00
EmosewaMC
ba33c15b2d reputation rewards are now applied to character and not properties 2022-03-31 18:17:58 -07:00
EmosewaMC
450bebc8a2 i am a big dum 2022-03-31 14:11:43 -07:00
EmosewaMC
cf70881370 simplified conversion 2022-03-31 03:20:13 -07:00
EmosewaMC
33b16a56e3 Added a save and fixed a crash
If am item were to be added to properties_contents and an item with that Primary Key already existed, the world would crash.  This addresses this.
2022-03-30 22:51:09 -07:00
EmosewaMC
cc9b6c05f6 removed include 2022-03-30 22:35:41 -07:00
EmosewaMC
9169acad47 changed to update 2022-03-30 22:14:51 -07:00
EmosewaMC
aed0ecc9fc removed newline 2022-03-30 22:05:09 -07:00
EmosewaMC
0561f60031 Added negative checks 2022-03-30 21:58:59 -07:00
EmosewaMC
e66421d34f clarified variable name 2022-03-30 21:58:43 -07:00
EmosewaMC
8462068a05 clarified variable names, used encapsulation 2022-03-30 21:33:25 -07:00
EmosewaMC
8a8b5b4f44 removed new line 2022-03-30 21:18:29 -07:00
EmosewaMC
bc7c543530 removed debug log 2022-03-30 21:15:50 -07:00
EmosewaMC
f22dab0f72 unapproved properties render correctly 2022-03-30 21:12:22 -07:00
EmosewaMC
002025231e Semantics 2022-03-30 20:33:50 -07:00
EmosewaMC
061d2b394c on the fly property moderating notifications 2022-03-30 20:33:37 -07:00
EmosewaMC
d3f954bdac changed serialized value to old
I am unsure if this is what gets serialized here so I am reverting this back to a zero.
2022-03-30 20:32:59 -07:00
EmosewaMC
c80a90e81e rejection statuses were backwards 2022-03-30 20:31:51 -07:00
EmosewaMC
b903c81a0a Shortened reputation update 2022-03-30 20:31:23 -07:00
EmosewaMC
f72c2dcaa5 Merge branch 'property-fixes' of https://github.com/EmosewaMC/DarkflameServer into property-fixes 2022-03-30 18:38:43 -07:00
David Markowitz
6b759ff54e
Merge branch 'DarkflameUniverse:main' into property-fixes 2022-03-30 18:38:07 -07:00
EmosewaMC
0bf2f0e92a Added enum for rejection statuses 2022-03-30 16:14:24 -07:00
EmosewaMC
04852ac1d9 Removed const 2022-03-30 16:13:21 -07:00
EmosewaMC
5fa0a16302 more options in BuildQuery method 2022-03-30 16:13:01 -07:00
EmosewaMC
4edb428954 next page query now works 2022-03-30 16:12:42 -07:00
Jett
0a6b8f139e
Merge pull request #437 from EmosewaMC/racingSpecificSmashFix
Addressed specific race smash missions not progressing
2022-03-30 22:20:38 +01:00
Jett
529b40b66c
Merge pull request #474 from EmosewaMC/char-create-fixes
Addressed hard coded character create values for shirts and pants
2022-03-30 22:19:55 +01:00
EmosewaMC
bd6bdddcde clone ID now based on character data 2022-03-30 00:33:31 -07:00
EmosewaMC
fe334d8739 clarified magic nums 2022-03-30 00:20:26 -07:00
EmosewaMC
69cc265fea added performance cost initializer 2022-03-30 00:20:15 -07:00
EmosewaMC
17e9fb0d3c Default time is now the current time rather than 0 2022-03-30 00:20:04 -07:00
EmosewaMC
b676343b02 removed print and rejection send 2022-03-30 00:02:18 -07:00
EmosewaMC
c838f4f422 Added query for friends list next page 2022-03-29 23:59:50 -07:00
EmosewaMC
e244fbccc2 General updates to the property manager
clone id is correctly assigned, reputation now shows up, rejection verdict is sent correctly (not sure about where the reason goes if  it even goes here).
2022-03-29 23:49:04 -07:00
EmosewaMC
36edbf393b Added support to update reputation 2022-03-29 23:46:56 -07:00
EmosewaMC
258174d4e1 Added GameMessage for UpdateReputation 2022-03-29 23:46:23 -07:00
EmosewaMC
fdd3e15b2f Added GM for reputation update 2022-03-29 19:52:07 -07:00
EmosewaMC
94e0ef77a9 performance cost is still a float 2022-03-29 19:49:54 -07:00
EmosewaMC
06671b8d66 performance cost is a float 2022-03-29 19:48:34 -07:00
EmosewaMC
9f16284595 tab spacing 2022-03-29 19:47:15 -07:00
EmosewaMC
82ebdccdb2 Reputation is sent as a float not an int 2022-03-29 14:54:31 -07:00
Avery
75fd425ef6
Remove ability for gmlevel 0 to use /playanim (#391) 2022-03-29 13:06:28 -07:00
EmosewaMC
ec9749ab85 flag for are more being worked on 2022-03-29 03:50:41 -07:00
EmosewaMC
9385c33729 grammar and new line 2022-03-29 02:33:15 -07:00
EmosewaMC
7b536ee079 Best friends is 2 not 1 2022-03-29 01:57:23 -07:00
EmosewaMC
0c41026df0 Fixed friendless crash 2022-03-29 01:00:30 -07:00
EmosewaMC
b0d4993344 owner name change 2022-03-28 21:02:46 -07:00
EmosewaMC
35e576a839 fixed moderator issue 2022-03-28 20:53:09 -07:00
EmosewaMC
69ec1216dc added comments 2022-03-28 20:51:19 -07:00
EmosewaMC
19e82a5150 more cleanup 2022-03-28 20:51:15 -07:00
EmosewaMC
965d4c7af0 cleaned up file and added helper functions 2022-03-28 19:58:50 -07:00
EmosewaMC
17b0de8062 clarified variable name 2022-03-28 19:58:23 -07:00
EmosewaMC
895bbec277 clarified variable name 2022-03-28 19:58:15 -07:00
EmosewaMC
17f773c6cb comment 2022-03-28 04:25:44 -07:00
EmosewaMC
dc74b46e11 off by one moment 2022-03-28 03:58:40 -07:00
EmosewaMC
148c177d27 shortened method 2022-03-28 03:37:12 -07:00
EmosewaMC
c94f0918c9 testing number reverted 2022-03-28 03:26:01 -07:00
EmosewaMC
54de6c6878 FINALLY WORKING JESUS 2022-03-28 03:24:49 -07:00
EmosewaMC
0a453e9dca working state 2022-03-27 23:46:43 -07:00
EmosewaMC
0a7fd6f79a updates 2022-03-27 20:05:00 -07:00
EmosewaMC
a7cd2f4d9b comments 2022-03-27 15:37:05 -07:00
EmosewaMC
e43517efe6 comments 2022-03-27 15:28:21 -07:00
EmosewaMC
b459790b2f Fixed mission progression 2022-03-27 15:24:24 -07:00
Daniel Seiler
66b7c6522e
Merge pull request #441 from EmosewaMC/ProxyItemFix
Addressed some proxy items granting duplicate skills
2022-03-26 08:17:04 +01:00
Jett
3a959778fe
Merge pull request #451 from EmosewaMC/ShootingGalleryScoreFix
Shooting Gallery daily mission fix
2022-03-25 15:59:39 +00:00
EmosewaMC
db3cd33bca fixed incorrect variable name 2022-03-24 17:51:21 -07:00
EmosewaMC
819c58df7c semantics 2022-03-24 00:33:05 -07:00
EmosewaMC
4e2c352ab9 Changed pants query and removed extra comments 2022-03-24 00:30:52 -07:00
EmosewaMC
b2c88bb6a7 working query 2022-03-24 00:09:18 -07:00
EmosewaMC
e2bfdcd174 moved char id storage 2022-03-20 20:46:34 -07:00
EmosewaMC
68c600facc Added better bug reports 2022-03-20 20:28:26 -07:00
Daniel Seiler
a49f9dc586
Merge pull request #461 from EmosewaMC/mailboxSpecialCase
Addressed special case in GameMessage for interacting with a mailbox
2022-02-24 16:10:10 +01:00