Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Basic Zeus Support #350

Merged
merged 62 commits into from
Jul 11, 2023
Merged

Basic Zeus Support #350

merged 62 commits into from
Jul 11, 2023

Conversation

y0014984
Copy link
Owner

@y0014984 y0014984 commented Jun 6, 2023 •
edited
Loading

Introduction

Merging this pull request will add basic Zeus/Curator support to the Advanced Equipment for Arma 3 mod. Basic support means that you can add all assets via Zeus like you can do via Eden Editor. Also all parameters like battery level or power status should be available. Last but not least connections for power and network should be available. Also all modules should be usable for example to create files, folders, users and so on. In a later stage advanced Zeus support would allow additional manipulation like manipulating an existing filesystem and so on.

Todo's

  • add all assets to Zeus
  • add all Modules to Zeus
  • add Interface for battery based assets
  • add interface for fuel based assets
  • add interface for modules
  • add functions to turn on/off/standby assets
  • add functions to open/close assets
  • make available functions conditional to current asset type
  • beautify dialogs
  • make main asset dialogs useable for all asset types
  • add information about device status, like current power output to text field on top
  • Remove modules placed in eden editor after processing
  • add connections (via new module)
  • handle deletion of assets/modules
  • hint and systemChat with BIS_fnc_showCuratorFeedbackMessage or BIS_fnc_curatorHint
  • add function headers
  • add localisation (reuse Eden Editor translations)
  • update documentation (md-files and Wiki)
  • testing
    • flash-drive
    • singleplayer
    • hosted multiplayer
    • dedicated multiplayer

Known Bugs

  • Generators are spawned with AI; Generators are with AI under BLUFOR and without AI unter Assets (Yellow Category)

@y0014984 y0014984 self-assigned this Jun 6, 2023
@y0014984 y0014984 added enhancement New feature or request ui armaOS power issues related to power system asset network editor module zeus labels Jun 6, 2023
@y0014984 y0014984 linked an issue Jun 6, 2023 that may be closed by this pull request
Add Zeus Compatibility #57
Closed
@y0014984
Copy link
Owner Author

"Land_Portable_generator_F" --> "$STR_A3_cfgVehicles_Land_Portable_generator_F0"
"Land_PowerGenerator_F" --> "$STR_A3_CfgVehicles_Land_PowerGenerator_F0"
"Land_MobileRadar_01_generator_F" ---> "$STR_A3_C_CfgVehicles_Land_MobileRadar_01_generator_F0"
"Land_PortableGenerator_01_sand_F" --> "$STR_A3_C_CfgVehicles_Land_PortableGenerator_01_sand_F0"
"Land_PortableGenerator_01_black_F" --> "$STR_A3_C_CfgVehicles_Land_PortableGenerator_01_black_F0"
"Land_PortableGenerator_01_F" --> "$STR_A3_CfgVehicles_Land_PortableGenerator_01_F0"

y0014984 added 19 commits July 4, 2023 15:46
@y0014984
changed deletion of modules
24a4b32
@y0014984
fixed some module related bugs
5fb4111
@y0014984
added server check
339ff2a
@y0014984
changed zeus module functions to trigger server
811184a
@y0014984
added checks for spaces in paths and usernames
05d232b
@y0014984
removed unnecessary event handler calls
1eefe88
@y0014984
changed "Init" to "InitPost"
3e089a2
@y0014984
added new power var "initDone" for related checks
3d0015e
@y0014984
changed setBatteryLevel to serverside execution
aac89a3
@y0014984
added missing localization strings
c890e1b
@y0014984
changed eden attribute updates for zeus mode
cfbab4e
@y0014984
added power device check to terminateDevice func
fa78071
@y0014984
fixed eden editor module addGames
1aeba7c
@y0014984
added ACE3 cargo name to Zeus UI title bar
968416f
@y0014984
added back again workaround eh on rugged lamps
df6d915
@y0014984
fixed not working network disconnect condition
85b251f
@y0014984
changed getBatteryLevel function to allow suspend modes
1362bac
@y0014984
added new var isDevice to check if it's a power device
e8571d9
@y0014984
fixed some network related bugs and harmonized code
b537146
@y0014984 y0014984 requested a review from GermanHydrogen July 9, 2023 15:43
@y0014984
Copy link
Owner Author

y0014984 commented Jul 9, 2023

@GermanHydrogen could you please review my changes? I think I could address all issues and also fixed some findings from my tests in dedicated multiplayer.

GermanHydrogen
GermanHydrogen approved these changes Jul 11, 2023
View reviewed changes
Copy link
Collaborator

@GermanHydrogen GermanHydrogen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only two small pedantic comments.
Otherwise LGTM

addons/power/functions/fnc_initFuelLevelWithEdenAttribute.sqf Show resolved Hide resolved
addons/power/functions/fnc_getBatteryLevel.sqf Outdated Show resolved Hide resolved
@y0014984 y0014984 merged commit 403ac01 into dev Jul 11, 2023
This was referenced Jul 11, 2023
Closed
Closed
Merged
Closed
@y0014984 y0014984 mentioned this pull request Jul 26, 2023
Closed
18 tasks
@y0014984 y0014984 deleted the basic-zeus-support branch July 26, 2023 13:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GermanHydrogen GermanHydrogen GermanHydrogen approved these changes

Assignees

@y0014984 y0014984

Labels
armaOS asset editor enhancement New feature or request module network power issues related to power system ui zeus
Projects
AE3 Version 0.6.0
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

In singleplayer the turn off powerCapacity reset doesn't work Add Zeus Compatibility
2 participants
@y0014984 @GermanHydrogen