mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2026-11-18 09:45:28 +00:00
fix: a launch pad that does not use its table row is ruled by its level
LWORocketLaunchComponentCommon::LoadConfigData (0x00c55150) reads the
level's targetZone, targetScene, GMLevel, propertyDefaultTargetZone,
rocketLaunchPreCondition, rocketUseLaunchPrecondition and the alternative
landing keys, and the table row replaces them only while
rocketLaunchUseDBDefaults is true, its default (0x00c12ea0). The server
used the row for every pad.
31 pads in the 1.10.64 maps turn the key off. Their zones and scenes are
their rows'; what only the level has are the launch preconditions in use
on the Venture Explorer's four pads ("237;8;127|128;6|55;107;282") and
on Avant Gardens' pads to Nimbus Station, its two properties and the
Venture Explorer. Those are now checked before a launch, as the row's are.
Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
@@ -28,6 +28,9 @@ public:
|
||||
~RocketLaunchpadControlComponent() override;
|
||||
|
||||
void LoadDataFromTemplate() override;
|
||||
void LoadConfigData() override;
|
||||
|
||||
const std::string& GetTargetScene() const { return m_TargetScene; }
|
||||
|
||||
/**
|
||||
* Whether the player may launch from this pad: LWORocketLaunchComponentCommon refuses a player under the pad's GM
|
||||
@@ -146,12 +149,13 @@ private:
|
||||
PreconditionExpression* m_AltPrecondition{};
|
||||
|
||||
/**
|
||||
* The GM level a player needs to launch from this pad (the row's gmLevel)
|
||||
* The GM level a player needs to launch from this pad (the row's gmLevel, or the level's GMLevel)
|
||||
*/
|
||||
int32_t m_GMLevel{};
|
||||
|
||||
/**
|
||||
* The row's launchPrecondition, when its useLaunchPrecondition is set: what a player has to pass to launch
|
||||
* The row's launchPrecondition, when its useLaunchPrecondition is set: what a player has to pass to launch. For a pad
|
||||
* whose level turns rocketLaunchUseDBDefaults off, the level's rocketLaunchPreCondition and rocketUseLaunchPrecondition.
|
||||
*/
|
||||
std::string m_LaunchPrecondition;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user