Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-14 20:28:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,084 Commits 146 Branches 5 Tags 384 MiB
ed2639ce4e
Commit Graph

465 Commits

Author SHA1 Message Date
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
EmosewaMC
24d443537a Addressed spacing 2022-02-20 20:01:55 -08:00
EmosewaMC
3d1283675f Updated comment 2022-02-20 20:00:56 -08:00
Jett
ad52facef7
Merge pull request #452 from EmosewaMC/GMRacingCarFix 
Addressed GM Operators not being able to spawn in cars in non-racing worlds
 2022-02-21 03:55:28 +00:00
EmosewaMC
5ffb57d92c Removed special case from GM 2022-02-20 19:51:21 -08:00
EmosewaMC
1c116fb0c4 Sending rewards works fully 2022-02-20 19:23:17 -08:00
EmosewaMC
1c43d7f38c GameMessage is correct 2022-02-20 19:23:03 -08:00
EmosewaMC
78fbe3c7fe Added support for Windows Native 2022-02-17 03:17:41 -08:00
EmosewaMC
afa38ae890 Added call to GM in CharacterComponent 2022-02-12 21:03:04 -08:00
EmosewaMC
352f654ede Added GM in GameMessages 2022-02-12 21:02:52 -08:00
EmosewaMC
2bc9f8f66d Correctly set task value for shooting gallery 2022-02-10 03:08:47 -08:00
EmosewaMC
5fbb1e9cc2 removed comments 2022-02-10 02:16:33 -08:00
EmosewaMC
7c80c12b90 Removed comments 2022-02-10 01:40:57 -08:00
EmosewaMC
9021c5209f backup commit with comments 2022-02-10 01:03:51 -08:00
EmosewaMC
6c5c6b7b8e commit when car work 2022-02-09 21:21:10 -08:00
EmosewaMC
b077bd937d Fixed bugs with minigame progression 2022-02-09 16:42:17 -08:00
EmosewaMC
1607b506c8 bodgy bodge to fix minigame missions 2022-02-09 16:42:03 -08:00
EmosewaMC
a6ed435038 Added bounds check for proxies 2022-02-06 20:54:04 -08:00
EmosewaMC
679f077772 updated comment 2022-02-06 20:54:03 -08:00
EmosewaMC
56521d35d0 Added associate for 17 2022-02-06 14:28:27 -08:00
EmosewaMC
72b3812716 fixed tab indent 2022-02-06 14:28:15 -08:00
cooltrain7
579cf590b4
Implement CDZoneTable PlayerLoseCoinsOnDeath (#251) 
* Implement ZoneTable PlayerLoseCoinsOnDeath

- Adds a check on death if the character should drop coins in the current zone

* Refactored PlayerLoseCoinOnDeath into dZoneManager

* Coin death drops use LootGenerator

* Refactored again with use of CDZoneTableTable

* Remove duplicate CDZone call during initialization
 2022-02-05 13:27:24 +01:00
David Markowitz
933cdee414
Implemented Model Pickup and Reputation achievements (#413) 
* Implemented Model Pickup and Reputation achievements

* Moved mission progression to placement

* Changed name to place
 2022-02-05 13:08:40 +01:00
David Markowitz
77459af1d3
Removed AI Stopping after they use a skill (#407) 
* Removed SkillTime from stopping AI

* Reverted Downtime removal
 2022-02-05 13:07:30 +01:00
David Markowitz
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
David Markowitz
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
David Markowitz
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
David Markowitz
f0a4324bd4
Fixed an issue where leave-zone was working outside of instanced zones (#431) 2022-02-04 07:32:45 +01:00
Marcono1234
0d0949f5f0 Adjust chosen character name logging 2022-02-03 23:43:47 +01:00
David Markowitz
13980c4133
Added logic to Convert UScore to Coins for Level 45 Characters (#348) 2022-02-03 07:50:02 +01:00
TheMatt2
59afc63a2f Merge DarkflameServer 2022-01-30 13:40:08 -05:00
Marcono1234
477b629faf Fix UserManager not logging chosen name properly 2022-01-25 00:14:21 +01:00
Avery
f6558aa31e
implement jetpack behavior and remove hardcoded jetpacks (#411) 2022-01-24 14:02:56 -08:00
David Markowitz
1e01423a93
Added support for flags in macros (#410) 2022-01-24 14:57:50 +01:00
Xiphoseer
20037d12f7
Merge pull request #339 from CodeAX2/fix-aoe-targets 
Fix Area of Effect Behavior Targets
 2022-01-23 14:12:59 +01:00
Gie "Max" Vanommeslaeghe
e248b74ee6
Merge pull request #386 from EmosewaMC/passportflagnotbeingset 
Added joined a faction flag
 2022-01-20 15:15:50 +01:00
EmosewaMC
850ae40f05 Moved retroactive flag check to Character.cpp 2022-01-19 17:34:53 -08:00
enteryournamehere
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
TheMatt2
9dfa401b27 Fix whitespace 
Convert to tabs and remove trailing whitespace
 2022-01-15 14:02:14 -05:00
TheMatt2
4ff84e0730 Fix whitespace 2022-01-15 13:37:43 -05:00
David Markowitz
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
David Markowitz
ae06188871
Added Bat Lord Full Set Bonus (#375) 
* Added Bat Lord Full Set Bonus
 2022-01-14 13:46:41 +01:00
TheMatt2
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
Gie "Max" Vanommeslaeghe
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
TheMatt2
e5f7d164cb Additional SQLite lookup sanitizing. 
Using CDClientDatabase::ExecuteQueryWithArgs() across all known lookups.
 2022-01-06 21:12:47 -05:00
Jett
c1903ca12d Remove IP Logging 2022-01-06 21:54:48 +00:00
TheMatt2
4796b551ad Additional SQLite lookup sanitizing with CDClientDatabase::ExecuteQueryWithArgs() 2022-01-06 16:05:03 -05:00
TheMatt2
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
TheMatt2
f7b3a1ef10
Merge branch 'DarkflameUniverse:main' into main 2022-01-04 12:53:41 -08:00
CodeAX2
a19454f7ae Change destroyable component validator to properly check friends 2022-01-04 11:11:23 -07:00
Xiphoseer
8ed7690b96
Merge pull request #203 from cooltrain7/Log-Line-Cleaning 
Added Log content additions
 2022-01-04 13:15:24 +01:00
Xiphoseer
4d19459015
Merge pull request #291 from EmosewaMC/EmosewaMC 
Implemented sourceType for SendSetCurrency
 2022-01-04 12:01:32 +01:00
EmosewaMC
cca5b79e91 Update Mission.cpp 2022-01-03 23:05:56 -08:00
David Markowitz
329d3d66b3
Update dGame/dGameMessages/GameMessages.h 
Co-authored-by: Xiphoseer <Xiphoseer@users.noreply.github.com>
 2022-01-03 22:37:58 -08:00
David Markowitz
cb9ce85bda
Update dGame/Character.cpp 
Co-authored-by: Xiphoseer <Xiphoseer@users.noreply.github.com>
 2022-01-03 22:37:53 -08:00
David Markowitz
7aed5f0500
Update dGame/Character.h 
Co-authored-by: Xiphoseer <Xiphoseer@users.noreply.github.com>
 2022-01-03 22:37:49 -08:00
David Markowitz
a92e05c640
Update dGame/dGameMessages/GameMessages.cpp 
Co-authored-by: Xiphoseer <Xiphoseer@users.noreply.github.com>
 2022-01-03 22:37:40 -08:00
TheMatt2
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
Xiphoseer
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
EmosewaMC
a9da275673 removed extra tab 
removed extra tab
 2022-01-03 16:01:54 -08:00
EmosewaMC
f74cc9cb10 Updated variable assignment 
Changed the variable assignment to be a ternary operator.
 2022-01-03 16:01:28 -08:00
cooltrain7
975654f8e2 Merge branch 'main' into Log-Line-Cleaning 2022-01-03 17:51:13 +00:00
EmosewaMC
74013e07a8 Encapsulated variable properly 
lootSource was not encapsulated properly so this is now fixed.
 2022-01-03 03:11:04 -08:00
CodeAX2
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
CodeAX2
9f895205d4 Fix formatting and add comments 2022-01-02 14:00:01 -07:00
Jacob Hofer
1ddf7d1f94 Fix for Area of Affect Behaviors targeting incorrect entities 2022-01-02 20:37:03 +00:00
Marcono1234
df369612be Add XML attribute spaces consistently 2022-01-01 18:23:14 +01:00
Raphaël Dunant
f02165b912
Update UserManager.cpp 
fix function call
 2022-01-01 14:31:13 +01:00
Jett
203e75ef3d
Fix resurrecting in BONS (#334) 2022-01-01 02:10:12 -08:00
m888r
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
Marcono1234
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
cooltrain7
6e6eee71b3 Added more missing newline characters 2021-12-28 19:27:46 +00:00
Raphaël Dunant
2ac2dbd650
Update UserManager.cpp 
Style fix (CamelCase and space)
 2021-12-28 19:56:49 +01:00
cooltrain7
ff8d68f45c Merge branch 'main' into Log-Line-Cleaning 2021-12-28 18:46:44 +00:00
Racater
b6fc49f057 simplify shirt code in character creation 2021-12-26 14:45:21 +01:00
Raphaël Dunant
57e28d4619
Merge branch 'DarkflameUniverse:main' into main 2021-12-26 14:42:16 +01:00
EmosewaMC
5e605b30de Grammatical change in a comment 
Small grammatical change in a comment
 2021-12-23 19:50:17 -08:00
EmosewaMC
e95af79c8a Consolidated if statement 
Changed default variable to achievement and removed the else.
 2021-12-23 19:43:19 -08:00
EmosewaMC
e84811bdce Refactored if statement for coins 
Refactored the if statement for coins so there is only one SetCoins call for the function.
 2021-12-23 18:49:01 -08:00
EmosewaMC
6aad799f95 Updated variable names 
Updated the variable names to match the enum name update.
 2021-12-23 18:48:08 -08:00
Jett
9440af0d67 Repaired some bugs 
- Fixed Team loot
- LMI dropping for team sizes
- No more > 4 player teams
 2021-12-24 00:25:52 +00:00
Wincent Holm
271e14e2f1
Fix loot crash 
When applied this commit fixes a crash with the loot system due to a missing nullptr check.
 2021-12-22 17:16:31 +01:00
Raphaël Dunant
ac01edd440
Fix wrong shirt colors in the character selection 2021-12-22 16:02:19 +01:00
EmosewaMC
f772fedf19 Updated description of SetCoins 
Updated the description of the Character::SetCoins function to more accurately describe how the function works.
 2021-12-22 00:43:42 -08:00
EmosewaMC
29cf7f8998 Changed ambiguous variables 
Changed ambiguous variables from int to int32_t to clarify what they are.
 2021-12-22 00:15:08 -08:00
EmosewaMC
97f8e9e9fc Added enum for coin sources 
Added an enum for coin sources as to avoid leaving a random number in the code.
 2021-12-22 00:01:55 -08:00
EmosewaMC
c575294587 Changed variable names 
Changed variable names to more accurately match what they are
 2021-12-21 23:32:39 -08:00
EmosewaMC
23e269940b Implemented sourceType for SendSetCurrency 
Implemented sourceType for the function SendSetCurrency.
 2021-12-21 23:26:54 -08:00
Verathian
3cb16ddb5f Leaderboard Scoring Updates 2021-12-21 22:30:37 -05:00
Verathian
dcbca46e75 Leaderboard Scoring Updates 2021-12-21 22:15:29 -05:00
saltshaker
aad4ed6a83 Added include <vector> to Loot.h to allow the server to build on GCP. Resolves #281. 2021-12-21 03:17:35 -07:00
Jett
0531365cb5
Make loot accurate to the loot drop rates during live. (#216) 
* loot fix (broken)

* Fixed loot

* Update SlashCommandHandler.cpp

* Remove debug command

* Roll loot command

* Remove debug log

* Added const references
When this commit is applied it adds const references to the loot system avoid some unnecessary copies.

Co-authored-by: wincent <wincent.holm@gmail.com>
Co-authored-by: Avery <averysumner@gmail.com>
 2021-12-20 02:25:45 -08:00
Niklas Conen
3793b1f00b fixed bug where smashedTimes counter cont incremented at the beginning of a race 2021-12-17 17:37:03 +01:00
Avery
58229a922e
setminifig shirt -> setminifig shirtcolor 2021-12-14 18:55:05 -08:00
Avery
a2ed772417
setMinifig -> setminifig 2021-12-14 18:51:41 -08:00
Unknown
c060b01037 fix undeleted dpEntity after enemy smashed 
could be the cause of long-soak (hours long) sessions having CPU issues
 2021-12-14 16:24:48 +01:00
cooltrain7
995042f130 Added missing log newline character 2021-12-13 19:45:08 +00:00
Mick
ff3e10d076
Merge pull request #177 from DarkflameUniverse/implement-buccanneer-valiant 
Fix #164: Implement Buccaneer Valiant special ability
 2021-12-13 14:31:36 +01:00
Gie "Max" Vanommeslaeghe
180db5dea5
Merge pull request #151 from OogwayUniverse/trigger_fixes 
Moonbase fix
 2021-12-11 19:39:24 +01:00
wincent
bb508e91c1 Update the code style 
When applied this commit updates the code style used when validating coin pickups.
 2021-12-11 17:33:54 +01:00
Jett
94e32a5773 replace the other double cast 2021-12-11 14:24:25 +00:00
Jett
6427b097ab Replace two casts with one 2021-12-11 14:22:39 +00:00
Jett
22de531ab3 Changes asked for by Wincent 2021-12-11 13:57:15 +00:00
Jett
b6453376e4 patched coin exploit 2021-12-11 13:21:00 +00:00
Mick Vermeulen
833ed8a40d Implement Buccaneer Valiant special ability 
Adds the ability for the buccaneer valiant to spawn a ship that rams
enemies and smashes them. Next to a script that triggers the ship skill
a few other changes had to be made:
- Force movement behavior server side calculation and sync
- The ship has no physics volume so the FindValidTargets for behaviors
had to be altered to allow ControllablePhysics entities to find entities
within their area. The "target_self" AOE flag has been used to replicate
the old behavior.
 2021-12-11 11:59:29 +01:00
Jett
c8991666d2 Potential solution 2021-12-11 10:46:45 +00:00
Jett
6500b62c52 Minifig editing 2021-12-11 02:02:02 +00:00
Jett
a9dc0e0dac to improve (broken) 2021-12-09 21:06:01 +00:00
Jett
e4de42659e Update Entity.cpp 2021-12-09 13:56:07 +00:00
Matthew Day
50512cdef8 Fix spelling 2021-12-09 03:17:08 -06:00
Avery
f68f683e22
Revert "separate AgSpaceStuff and AgShipShake" 2021-12-07 18:14:15 -08:00
red031000
7bead89e39
fix a bug with timer erasing 2021-12-07 20:50:09 +00:00
yuwui
3845dc77f9 strip carriage return from txt files 2021-12-06 07:07:17 +01:00
Unknown
0545adfac3 Public release of the DLU server code! 
Have fun!
 2021-12-05 18:54:36 +01:00