Skip to content

Commit

Permalink
Merge pull request #322 from y0014984/dev
Browse files Browse the repository at this point in the history
Advanced Equipment v0.5.2 RC1
  • Loading branch information
y0014984 authored Jan 28, 2023
2 parents 0bec49c + de91cf7 commit 71eb36d
Show file tree
Hide file tree
Showing 234 changed files with 8,323 additions and 1,501 deletions.
2 changes: 1 addition & 1 deletion AUTHORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# If you contributed, but are not listed here, contact me:
# y0014984@gmail.com
#
# Feel free to add yourself to this when creating a pull
# Feel free to add yourself to this list when creating a pull
# request, preferably including an email address.

# CORE TEAM
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<p align="center">
<a href="https://github.com/y0014984/Advanced-Equipment/releases/latest">
<img src="https://img.shields.io/badge/Version-0.5.1-blue.svg?style=flat-square" alt="Advanced Equipment Version">
<img src="https://img.shields.io/badge/Version-0.5.2-blue.svg?style=flat-square" alt="Advanced Equipment Version">
</a>
<a href="https://www.bistudio.com/community/licenses/arma-public-license-share-alike">
<img src="https://img.shields.io/badge/License-APL%20SA-red.svg?style=flat-square" alt="Advanced Equipment License">
Expand All @@ -22,8 +22,9 @@ This project is entirely **open-source** and all contributions are welcome. Feel
## Features

- Power Management (Power Consumption, Batteries, Sun Collectors, Generators)
- Interaction (Turn On/Off/Standby/Adjust/Use things like Laptops and Lamps)
- armaOS (Unique Terminal-like interface for computers)
- Interaction (Turn On/Off/Standby/Adjust/Use things like Laptops and Lamps, Put in Inventory)
- armaOS (Unique Terminal-like interface for computers; multiple designs)
- Filesystem Managment (Files, Folders and Programs on Computers and USB-Sticks)
- Network Management (only basics implemented yet)
- Logistics (Fold and unfold objects, move them around, put them into vehicles)
- 3DEN Modules (Easy Mission Making)
Expand Down
14 changes: 14 additions & 0 deletions addons/armaos/CfgGames.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
class OsFunction;

// DO NOT USE [] in Strings.

class CfgGames
{
class snake : OsFunction
{
path = "/games/snake";
description = "Retro Snake Game";
man = "Retro Snake Game - use option --big for doubled block size";
code = "_this call AE3_armaos_fnc_games_snake";
};
};
50 changes: 36 additions & 14 deletions addons/armaos/CfgOsFunctions.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,14 @@ class CfgOsFunctions
code = "_this call AE3_armaos_fnc_os_mv";
};

class cp : OsFunction
{
path = "/bin/cp";
description = "$STR_AE3_ArmaOS_Config_CommandCpDescr";
man = "$STR_AE3_ArmaOS_Config_CommandCpMan";
code = "_this call AE3_armaos_fnc_os_cp";
};

class whoami : OsFunction
{
path = "/bin/whoami";
Expand Down Expand Up @@ -154,25 +162,39 @@ class CfgOsFunctions
code = "_this call AE3_armaos_fnc_os_echo";
};

class crypto : OsFunction
{
path = "/bin/crypto";
description = "$STR_AE3_ArmaOS_Config_CommandCryptoDescr";
man = "$STR_AE3_ArmaOS_Config_CommandCryptoMan";
code = "_this call AE3_armaos_fnc_os_crypto";
};
class crack : OsFunction
{
path = "/bin/crack";
description = "$STR_AE3_ArmaOS_Config_CommandCrackDescr";
man = "$STR_AE3_ArmaOS_Config_CommandCrackMan";
code = "_this call AE3_armaos_fnc_os_crack";
};
class find : OsFunction
{
path = "/bin/find";
description = "$STR_AE3_ArmaOS_Config_CommandFindDescr";
man = "$STR_AE3_ArmaOS_Config_CommandFindMan";
code = "_this call AE3_armaos_fnc_os_find";
};
class mount : OsFunction
{
path = "/bin/mount";
description = "$STR_AE3_ArmaOS_Config_CommandMountDescr";
man = "$STR_AE3_ArmaOS_Config_CommandMountMan";
code = "_this call AE3_armaos_fnc_os_mount";
};
class umount : OsFunction
{
path = "/bin/umount";
description = "$STR_AE3_ArmaOS_Config_CommandUmountDescr";
man = "$STR_AE3_ArmaOS_Config_CommandUmountMan";
code = "_this call AE3_armaos_fnc_os_unmount";
};
class lsusb : OsFunction
{
path = "/bin/lsusb";
description = "$STR_AE3_ArmaOS_Config_CommandLsusbDescr";
man = "$STR_AE3_ArmaOS_Config_CommandLsusbMan";
code = "_this call AE3_armaos_fnc_os_lsusb";
};
class chown : OsFunction
{
path = "/bin/chown";
description = "$STR_AE3_ArmaOS_Config_CommandChownDescr";
man = "$STR_AE3_ArmaOS_Config_CommandChownMan";
code = "_this call AE3_armaos_fnc_os_chown";
};
};
22 changes: 22 additions & 0 deletions addons/armaos/CfgSecurityCommands.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
class OsFunction;

// DO NOT USE [] in Strings.

class CfgSecurityCommands
{
class crypto : OsFunction
{
path = "/bin/crypto";
description = "$STR_AE3_ArmaOS_Config_CommandCryptoDescr";
man = "$STR_AE3_ArmaOS_Config_CommandCryptoMan";
code = "_this call AE3_armaos_fnc_os_crypto";
};

class crack : OsFunction
{
path = "/bin/crack";
description = "$STR_AE3_ArmaOS_Config_CommandCrackDescr";
man = "$STR_AE3_ArmaOS_Config_CommandCrackMan";
code = "_this call AE3_armaos_fnc_os_crack";
};
};
37 changes: 37 additions & 0 deletions addons/armaos/CfgSounds.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
class CfgSounds
{
sounds[] = {};
class SplashScreen
{
// how the sound is referred to in the editor (e.g. trigger effects)
name = "SplashScreen";

// filename, volume, pitch, distance (optional)
sound[] = { "\z\ae3\addons\armaos\sounds\SplashScreen.ogg", 1, 1, 100 };

// subtitle delay in seconds, subtitle text
titles[] = {};
};
class Blip
{
// how the sound is referred to in the editor (e.g. trigger effects)
name = "Blip";

// filename, volume, pitch, distance (optional)
sound[] = { "\z\ae3\addons\armaos\sounds\Blip.ogg", 1, 1, 100 };

// subtitle delay in seconds, subtitle text
titles[] = {};
};
class GameOver
{
// how the sound is referred to in the editor (e.g. trigger effects)
name = "GameOver";

// filename, volume, pitch, distance (optional)
sound[] = { "\z\ae3\addons\armaos\sounds\GameOver.ogg", 1, 1, 100 };

// subtitle delay in seconds, subtitle text
titles[] = {};
};
};
Loading

0 comments on commit 71eb36d

Please sign in to comment.