mirror of
https://github.com/EDCD/EDMarketConnector.git
synced 2026-10-22 17:22:09 +03:00
Revert "[#2532] Ignore Loadout If Embarked"
This reverts commit b85705c13a.
This commit is contained in:
1 parent
26e3407f53
commit
140f0fbc41
1 file changed
+1
-9
+1
-9
@@ -106,7 +106,6 @@ class This:
|
||||
self.materials: list[dict[str, Any]] | None = None
|
||||
self.last_credits: int = 0 # Send credit update soon after Startup / new game
|
||||
self.storedmodules: list[dict[str, Any]] | None = None
|
||||
self.embarked: bool = False # Boarded Someone Else's Ship? Should always start as False.
|
||||
self.loadout: dict[str, Any] | None = None
|
||||
self.fleet: list[dict[str, Any]] | None = None
|
||||
self.shipswap: bool = False # just swapped ship
|
||||
@@ -534,13 +533,6 @@ def journal_entry( # noqa: C901, CCR001
|
||||
power_data = {'powerName': entry["Power"], 'rankValue': entry["Rank"]}
|
||||
new_add_event('setCommanderRankPower', entry['timestamp'], power_data)
|
||||
|
||||
# Handle Embark/Disembark Events
|
||||
if event_name == 'Embark':
|
||||
this.embarked = True
|
||||
|
||||
if event_name == 'Disembark':
|
||||
this.embarked = False
|
||||
|
||||
# Ship change
|
||||
if event_name == 'Loadout' and this.shipswap:
|
||||
this.loadout = make_loadout(state)
|
||||
@@ -830,7 +822,7 @@ def journal_entry( # noqa: C901, CCR001
|
||||
for ship in this.fleet:
|
||||
new_add_event('setCommanderShip', entry['timestamp'], ship)
|
||||
# Loadout
|
||||
if event_name == 'Loadout' and not this.embarked: # Ignore Loadout Events if Embarked
|
||||
if event_name == 'Loadout':
|
||||
loadout = make_loadout(state)
|
||||
if this.loadout != loadout:
|
||||
this.loadout = loadout
|
||||
|
||||
Reference in new issue
Block a user