Commit Graph

690 Commits

Author SHA1 Message Date
6ba9eea993 Added check to prevent accidental sentinel passive proc (#396)
* Added check to prevent accidental sentinel passive proc

Added a boolean to check if the player is at zero armor already and if so, do not trigger the passive ability.

* Renamed variable and condensed armor check
2022-02-05 12:59:07 +01:00
fe178bf745 Fully Implemented Shooting Gallery Mission and Achievement Fixes (#381)
* Fixed tab indent

* Fully implemented Achievement tracking for Shooting Gallery

- Removed logging in MissionTask.cpp and moved the checks for mission progression to after checking the instance.

- Implemented the achievement tracking in SGCannon as well as tracking of the maximum hit streak and progression of enemy smashes in the shooting gallery.
2022-02-05 12:54:12 +01:00
c6f220ee31 Implementing and Fixing All Racing Achievements (#366)
* Grammatical changes in comments

* Grammatical fixes in comments

Small grammatical fixes found in comments throughout the code.

* Added descriptions to functions

Added descriptions to functions that didn't have them to keep the code well documented

* Created RacingTaskParam.h

Created RacingTaskParam so eliminate magic numbers in the original implementation of completing racing missions.

* Updated magic numbers in Mission.cpp

Updated magic numbers in Mission.cpp to a meaningful name.

* Implemented racing smashable task progression

Previously, races did not progress tasks for smashing Entities.  Now all achievements tracking smashables track them correctly.  This has been implemented in the three Entities that can be smashed in a race (imagination boxes, track specific smashables, Forbidden Valley dragon eggs).

* Updated race imagination task progression

Race imagination now no longer uses a magic number when passed to missionComponent.  Instead we use a number defined in an enum located in RacingTaskParam.h

* Updated Race task checks

Racing tasks for completing races without smashing now no longer auto complete the whole chain of missions.  Tasks that track placing on tracks and races overall now properly complete.  Tasks that count how many missions in a zone are completed now function.  Tasks that track race completions in multiple areas now function.

* Updated RacingControlComponent.cpp

Fixed any tasks that required 3 players to now require 3 or more players in a race to progress.  This restriction is ignored if the world config opted in for solo racing to allow progression in solo worlds.  Updated magic numbers sent into missionComponent->Progress to an enum created in this PR.  Fixed some indentation.

* Fixed a grammatical error in variable name

Fixed a grammatical error in the enum for task params
2022-02-05 12:28:17 +01:00
f0a4324bd4 Fixed an issue where leave-zone was working outside of instanced zones (#431) 2022-02-04 07:32:45 +01:00
0d0949f5f0 Adjust chosen character name logging 2022-02-03 23:43:47 +01:00
13980c4133 Added logic to Convert UScore to Coins for Level 45 Characters (#348) 2022-02-03 07:50:02 +01:00
59afc63a2f Merge DarkflameServer 2022-01-30 13:40:08 -05:00
477b629faf Fix UserManager not logging chosen name properly 2022-01-25 00:14:21 +01:00
f6558aa31e implement jetpack behavior and remove hardcoded jetpacks (#411) 2022-01-24 14:02:56 -08:00
1e01423a93 Added support for flags in macros (#410) 2022-01-24 14:57:50 +01:00
20037d12f7 Merge pull request #339 from CodeAX2/fix-aoe-targets
Fix Area of Effect Behavior Targets
2022-01-23 14:12:59 +01:00
e248b74ee6 Merge pull request #386 from EmosewaMC/passportflagnotbeingset
Added joined a faction flag
2022-01-20 15:15:50 +01:00
850ae40f05 Moved retroactive flag check to Character.cpp 2022-01-19 17:34:53 -08:00
84a376b425 Add zone 1700 to list of accessible zones (#87)
* Add zone 1700 to list of accessible zones

also fix indentation

* Indent using tabs instead of spaces

* Add zone 1500

* Remove zone 1500

and add back 1700 which was accidentally deleted again
2022-01-18 11:48:56 -08:00
9dfa401b27 Fix whitespace
Convert to tabs and remove trailing whitespace
2022-01-15 14:02:14 -05:00
4ff84e0730 Fix whitespace 2022-01-15 13:37:43 -05:00
70af1f9314 Fixed an issue where repeatable missions were not rewarding the items they should be rewarding (#357)
When applied this fixes issues with repeatable mission were not rewarding the correct items.
2022-01-14 14:00:09 +01:00
ae06188871 Added Bat Lord Full Set Bonus (#375)
* Added Bat Lord Full Set Bonus
2022-01-14 13:46:41 +01:00
3de3932503 Comply with Xiphoseer required changes.
Remove the CDClientDatabase::ExecuteQueryWithArgs() function and replace 
it with CDClientDatabase::CreatePreppedStmt().

This prevents a developer from accidently using %s, or incorrectly 
passing std::string, and causing a silent error.
2022-01-12 22:48:27 -05:00
d9d27a88fc Merge pull request #293 from Racater/main
Fix issue #268 : wrong shirt colors in the character selection
2022-01-11 23:48:58 +01:00
e5f7d164cb Additional SQLite lookup sanitizing.
Using CDClientDatabase::ExecuteQueryWithArgs() across all known lookups.
2022-01-06 21:12:47 -05:00
c1903ca12d Remove IP Logging 2022-01-06 21:54:48 +00:00
4796b551ad Additional SQLite lookup sanitizing with CDClientDatabase::ExecuteQueryWithArgs() 2022-01-06 16:05:03 -05:00
590ccc78aa Add proper sanitizing for input to SQLite database.
Adds function `ExecuteQueryWithArgs(query, ...)` to allow for queries 
with user input.

There is a known issue, that the funciton does not work with 
std::string. All strings must be converted to c strings.
2022-01-05 21:52:33 -05:00
f7b3a1ef10 Merge branch 'DarkflameUniverse:main' into main 2022-01-04 12:53:41 -08:00
a19454f7ae Change destroyable component validator to properly check friends 2022-01-04 11:11:23 -07:00
8ed7690b96 Merge pull request #203 from cooltrain7/Log-Line-Cleaning
Added Log content additions
2022-01-04 13:15:24 +01:00
4d19459015 Merge pull request #291 from EmosewaMC/EmosewaMC
Implemented sourceType for SendSetCurrency
2022-01-04 12:01:32 +01:00
cca5b79e91 Update Mission.cpp 2022-01-03 23:05:56 -08:00
329d3d66b3 Update dGame/dGameMessages/GameMessages.h
Co-authored-by: Xiphoseer <Xiphoseer@users.noreply.github.com>
2022-01-03 22:37:58 -08:00
cb9ce85bda Update dGame/Character.cpp
Co-authored-by: Xiphoseer <Xiphoseer@users.noreply.github.com>
2022-01-03 22:37:53 -08:00
7aed5f0500 Update dGame/Character.h
Co-authored-by: Xiphoseer <Xiphoseer@users.noreply.github.com>
2022-01-03 22:37:49 -08:00
a92e05c640 Update dGame/dGameMessages/GameMessages.cpp
Co-authored-by: Xiphoseer <Xiphoseer@users.noreply.github.com>
2022-01-03 22:37:40 -08:00
f2b3b0bf66 Check user input for the "/runmacro" command
Presents users from specifying a file path, and looking up macros in the 
expected folder.
2022-01-03 21:40:07 -08:00
64a78532ed Merge pull request #325 from Marcono1234/marcono1234/malformed-character-xml
Fix initial character XML being malformed
2022-01-04 06:12:55 +01:00
a9da275673 removed extra tab
removed extra tab
2022-01-03 16:01:54 -08:00
f74cc9cb10 Updated variable assignment
Changed the variable assignment to be a ternary operator.
2022-01-03 16:01:28 -08:00
975654f8e2 Merge branch 'main' into Log-Line-Cleaning 2022-01-03 17:51:13 +00:00
74013e07a8 Encapsulated variable properly
lootSource was not encapsulated properly so this is now fixed.
2022-01-03 03:11:04 -08:00
d78b2404e2 Refactor CheckValidity
- Change variables names to make it clear they are referring to the target
- Change how the target is decided to be an enemy of friend to use the built-in method
2022-01-02 14:01:29 -07:00
9f895205d4 Fix formatting and add comments 2022-01-02 14:00:01 -07:00
1ddf7d1f94 Fix for Area of Affect Behaviors targeting incorrect entities 2022-01-02 20:37:03 +00:00
df369612be Add XML attribute spaces consistently 2022-01-01 18:23:14 +01:00
f02165b912 Update UserManager.cpp
fix function call
2022-01-01 14:31:13 +01:00
203e75ef3d Fix resurrecting in BONS (#334) 2022-01-01 02:10:12 -08:00
14fc049ea0 Damage Buff source fix - inventor beehive bug (#306)
* add HandleUnmanaged overload to account for skill source

* add source to buff damage skill call to credit players for kills

* use LWOOBJID_EMPTY default arg & behaviorcontext constructor
2022-01-01 01:46:05 -08:00
7c1f392fdf Fix initial character XML being malformed
XML was missing a space between attributes `lzrw` and `stt`.
2021-12-30 19:42:59 +01:00
6e6eee71b3 Added more missing newline characters 2021-12-28 19:27:46 +00:00
2ac2dbd650 Update UserManager.cpp
Style fix (CamelCase and space)
2021-12-28 19:56:49 +01:00
ff8d68f45c Merge branch 'main' into Log-Line-Cleaning 2021-12-28 18:46:44 +00:00