chore: sync upstream DarkflameServer main (#1997–#2015) - #2
Merged
Conversation
tested that the fire breath attack works now (hack fix)
DarkflameUniverse#1999) * feat: implement a bunch of basic scripts that don't really do anything None of these do anything noticeable or break anything * fixes
…erse#1998) tested that stromlings in AG now correctly interrupt quickbuilds if the player takes damage
* feat: enemy npc pathing they live 🎉 tested that enemies path all around the world should they have a path configured. tested that the admiral in gf (at the first camp) paths now. fixes DarkflameUniverse#1546 * feedback
* feat: enemies now use weights on their attacks tested that 8 times out of 10, in close range, spiders did a web attack instead of a melee attack, vs the prior behavior of always following a pattern fixes DarkflameUniverse#2002 * feedback
…#2003) * fix: add range checks to npc combat skill behavior tested that all enemies now cast skills smartly based on range to targets, and do not cast skills if they are out of range. fixes an issue where the spider queen could attack you outside the normal range fixes an issue where entering happy flower caused you to need to restart the client fixes DarkflameUniverse#965 * feedback
…d trying to use the path if they were aggro'd to an enemy (DarkflameUniverse#2005) * fix: enemies snapping to the incorrect position if they had a path tested that ags enemies no longer snap backwards a large amount * fix: move the home point so we can aggro correctly
* feat: spawner weights * remove ref * default weights to 1
* feat: spawner weights * remove ref * default weights to 1 * fix: remove team member if they've logged out tested that if i logout, after 20 seconds the team member is removed.
tested that hatchlings now function fixes DarkflameUniverse#759 Update MovementAIComponent.cpp Update MovementAIComponent.cpp Update HatchlingPets.cpp
* feat: testmap improvements fixes DarkflameUniverse#1191 removed the force flag because it would only work to let you softlock your character. tested that taking the lego club door now spawns you at the lego club/ns lego club doors always vs letting you spawn where ever. tested that a testmap no longer spawns you where you last were in a zone and instead spawns you at the spawn point inspect allows you to inspect zoneControl and localCharacter now updated docs with the new info * Update Entity.cpp
tested that it now spawns in the lower path point instead. fixes DarkflameUniverse#741
* feat: add the lightning orb script* Doesn't do anything because MPC don't work... * Update LightningOrbServer.cpp
* feat: enhance possession mechanics with skill set integration and improved message handling * fix: restore SetPossessor in Mount() and scope IsRacing to vehicles SetPossessor was missing from Mount(), breaking direct possessions via PossessableComponent::OnUse which bypasses HandlePossession. IsRacing now only set/cleared when the mount has HavokVehiclePhysicsComponent, preventing non-vehicle possessions from incorrectly affecting the distance-driven statistic. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
* feat: dragon instance script * Update FvDragonInstanceServer.h * feat: implement ronin script * Update CountdownDestroyAI.cpp * default initialize Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * remove unused handlers Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * use float Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * fixes * Update ScriptComponent.h --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
…1990) * refactor: update behavior slot determination to use equipLocation instead of itemType * fix: improve skill management in InventoryComponent to ensure correct client updates
* feat: debugger additions Add type field for links in flash Add warning level for dangerous buttons fix uninitialzied memory with jetpack variable remove a bunch of duplicated position push code tested that the ui is still functional and components with multiple physics components have all their details visible. tested that jetpack is initialized now * remove amf3 header Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * fixes --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
…niverse#2015) tested that aggro is reset correctly and enemies no longer infinitely path to players. Tether now properly calculates the time to tether instead of guessing
Merge 18 upstream commits (DarkflameUniverse#1997–DarkflameUniverse#2015) including enemy pathing, spawner weights, hatchlings, dragon instance scripts, possession cleanup, and debugger inspect improvements. Preserve fork-only spawn management, vendor buyback, and banana tree defence changes. Co-authored-by: zPoche <zPoche@users.noreply.github.com>
cursor
Bot
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Brings NeoServer up to date with upstream
DarkflameUniverse/DarkflameServermain(18 commits since the last sync).Upstream sync
localCharacter/zoneControlinspect)Preserved fork integrations
angry_apesclient_location, root.xml build fix, Docker docs, Copilot instructionsConflict resolution
docs/Commands.md: kept upstream inspect description and forkinspect-despawndocsTest plan
/inspect localCharacterand/inspect zoneControl/list-group,/despawn-group)