Dominik Heidler
7948b94b12
* lua_add_getCurrentWarpSpeed.patch * lua_fix_multivar.patch * lua_fix_commandCombatManeuver.patch OBS-URL: https://build.opensuse.org/package/show/games/emptyepsilon?expand=0&rev=29
67 lines
3.9 KiB
Diff
67 lines
3.9 KiB
Diff
From c401c4ab03359ba27e91f285da71b0c190eb03fe Mon Sep 17 00:00:00 2001
|
|
From: Pithlit <Pithlit@mail.de>
|
|
Date: Mon, 31 Mar 2025 21:04:11 +0200
|
|
Subject: [PATCH] Fix commandCombatManeuver API
|
|
|
|
* register commandCombatManeuverStrafe and getCombatManeuverCharge functions
|
|
* amount is no longer directly set for the client. This caused issues
|
|
skipping the validity check of the given values.
|
|
---
|
|
src/spaceObjects/playerSpaceship.cpp | 10 ++++++++--
|
|
src/spaceObjects/spaceship.h | 1 +
|
|
2 files changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/spaceObjects/playerSpaceship.cpp b/src/spaceObjects/playerSpaceship.cpp
|
|
index b86aaad60e..16653bc20f 100644
|
|
--- a/src/spaceObjects/playerSpaceship.cpp
|
|
+++ b/src/spaceObjects/playerSpaceship.cpp
|
|
@@ -318,12 +318,20 @@ REGISTER_SCRIPT_SUBCLASS(PlayerSpaceship, SpaceShip)
|
|
/// Codes are 0-indexed. Index 0 corresponds to code A, 1 to B, etc.
|
|
/// Example: player:commandConfirmDestructCode(0) -- commands bypassing self-destruct confirmation code A
|
|
REGISTER_SCRIPT_CLASS_FUNCTION(PlayerSpaceship, commandBypassSelfDestruct);
|
|
+ /// Returns how much charge there is in the combat maneuvering system (0.0-1.0)
|
|
+ REGISTER_SCRIPT_CLASS_FUNCTION(SpaceShip, getCombatManeuverCharge);
|
|
/// Commands this PlayerSpaceship to set its forward combat maneuver to the given value.
|
|
/// Valid values are any from -1.0 (full reverse) to 1.0 (full forward).
|
|
/// The maneuver continues until the ship's combat maneuver reserves are depleted.
|
|
/// Crew screens allow only forward combat maneuvers, and the combat maneuver controls do not reflect a boost set via this command.
|
|
/// Example: player:commandCombatManeuverBoost(0.5) -- commands boosting forward at half combat maneuver capacity
|
|
REGISTER_SCRIPT_CLASS_FUNCTION(PlayerSpaceship, commandCombatManeuverBoost);
|
|
+ /// Commands this PlayerSpaceship to set its sideways combat maneuver to the given value.
|
|
+ /// Valid values are any from -1.0 (full left) to 1.0 (full right).
|
|
+ /// The maneuver continues until the ship's combat maneuver reserves are depleted.
|
|
+ /// The combat maneuver controls on the crew screens do not reflect a boost set via this command.
|
|
+ /// Example: player:commandCombatManeuverStrafe(0.5) -- commands boosting right at half combat maneuver capacity
|
|
+ REGISTER_SCRIPT_CLASS_FUNCTION(PlayerSpaceship, commandCombatManeuverStrafe);
|
|
/// Commands this PlayerSpaceship to launch a ScanProbe to the given coordinates.
|
|
/// Example: player:commandLaunchProbe(1000,2000) -- commands launching a scan probe to 1000,2000
|
|
REGISTER_SCRIPT_CLASS_FUNCTION(PlayerSpaceship, commandLaunchProbe);
|
|
@@ -2155,7 +2163,6 @@ void PlayerSpaceship::commandBypassSelfDestruct()
|
|
|
|
void PlayerSpaceship::commandCombatManeuverBoost(float amount)
|
|
{
|
|
- combat_maneuver_boost_request = amount;
|
|
sp::io::DataBuffer packet;
|
|
packet << CMD_COMBAT_MANEUVER_BOOST << amount;
|
|
sendClientCommand(packet);
|
|
@@ -2163,7 +2170,6 @@ void PlayerSpaceship::commandCombatManeuverBoost(float amount)
|
|
|
|
void PlayerSpaceship::commandCombatManeuverStrafe(float amount)
|
|
{
|
|
- combat_maneuver_strafe_request = amount;
|
|
sp::io::DataBuffer packet;
|
|
packet << CMD_COMBAT_MANEUVER_STRAFE << amount;
|
|
sendClientCommand(packet);
|
|
diff --git a/src/spaceObjects/spaceship.h b/src/spaceObjects/spaceship.h
|
|
index 77993a741f..c2dfc538b9 100644
|
|
--- a/src/spaceObjects/spaceship.h
|
|
+++ b/src/spaceObjects/spaceship.h
|
|
@@ -392,6 +392,7 @@ class SpaceShip : public ShipTemplateBasedObject
|
|
impulse_acceleration = acceleration;
|
|
impulse_reverse_acceleration = reverse_acceleration.value_or(acceleration);
|
|
}
|
|
+ float getCombatManeuverCharge() { return combat_maneuver_charge; }
|
|
void setCombatManeuver(float boost, float strafe) { combat_maneuver_boost_speed = boost; combat_maneuver_strafe_speed = strafe; }
|
|
bool hasJumpDrive() { return has_jump_drive; }
|
|
void setJumpDrive(bool has_jump) { has_jump_drive = has_jump; }
|