Compare commits

..

No commits in common. "master" and "1.0.0.1" have entirely different histories.

51 changed files with 137 additions and 280 deletions

View File

@ -10,13 +10,12 @@ on:
- "tools/**"
- "LICENSE"
- "README.md"
- "*.json"
workflow_dispatch:
jobs:
build:
name: Build
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout Source Code
uses: actions/checkout@v4

View File

@ -1,20 +1,13 @@
name = "FORGE Mod"
name = "PMC Simulator 3.0 Mod"
author = "IDSolutions"
prefix = "forge"
prefix = "pmcs"
mainprefix = "z"
[files]
include = [
"pmcs_mod_version.json",
"*.paa",
"*.json",
"userconfig/**/*",
"mod.cpp",
"README.md",
"LICENSE",
"icon_64_ca.paa",
"icon_128_ca.paa",
"icon_128_highlight_ca.paa",
"title_co.paa"
"userconfig/**/*"
]
[version]

View File

@ -7,52 +7,18 @@
<img src="https://gitea.innovativedevsolutions.org/IDSolutions/mod/actions/workflows/build.yml/badge.svg?branch=master" alt="build-status" /></a>
</p>
Arma 3 FORGE Mod: Modern Combat Interface\
Version: Alpha 0.1.0
Welcome to **SOF Mod**.
[Development Status: Active]
This addon was designed for PMC Simulator 3.0.
---
If something is broken, contact **jschmidt92** or open a new issue on **[Gitea](https://gitea.innovativedevsolutions.org/IDSolutions/mod/issues)**.
Transform your battlefield communications with Arma 3 FORGE Mod, introducing next-generation mobile interfaces for modern warfare. Starting with an innovative phone and tablet system, this framework sets the foundation for future combat technology integration.
</br>
Key Features:
---
* Mobile Command: Access mission-critical information through sleek phone and tablet interfaces
* Tactical Communications: Coordinate with your team using modern mobile devices
* Modular Framework: Built for expansion with new devices and capabilities
* Clean Interface: Intuitive UI design focused on combat effectiveness
* Real-time Updates: Stay connected to your organization's operations
* Future-ready: Structured for continuous feature expansion
**For more information, [visit the Wiki.](https://innovativedevsolutions.org/knowledgebase)**
Perfect for:
* Modern combat scenarios
* Team communications
* Strategic coordination
* Tactical planning
**For additional tools, [visit the Website.](https://innovativedevsolutions.org)**
Coming Features:
* Advanced device capabilities
* Enhanced UI elements
* Expanded communication tools
* New technology integration
## Contributors
Technical Features:
---
* Modern UI Framework
* Event-Driven Systems
* Expandable Device Architecture
* Developer-friendly Structure
Support & Development
---
* Regular Updates
* Developer Documentation
* Community Input Welcome
* Technical Support
License:
---
This mod is licensed under the [Arma Public License (APL-SA)](https://www.bohemia.net/community/licenses/arma-public-license-share-alike).
Experience the future of battlefield communications with FORGE Mod.
- **_Creedcoder_** for his help and input

View File

@ -1 +0,0 @@
z\forge\addons\audio

View File

@ -1,19 +0,0 @@
class Extended_PreStart_EventHandlers {
class ADDON {
init = QUOTE(call COMPILE_FILE(XEH_preStart));
};
};
class Extended_PreInit_EventHandlers {
class ADDON {
init = QUOTE(call COMPILE_FILE(XEH_preInit));
serverInit = QUOTE(call COMPILE_FILE(XEH_preInit_server));
};
};
class Extended_PostInit_EventHandlers {
class ADDON {
init = QUOTE(call COMPILE_FILE(XEH_postInit));
clientInit = QUOTE(call COMPILE_FILE(XEH_postInit_client));
};
};

View File

@ -1 +0,0 @@
class CfgSentences {};

View File

@ -1,24 +0,0 @@
class CfgSounds {
sounds[] = {};
class FORGE_timerBeep {
name = "FORGE_timerBeep";
sound[] = {QUOTE(PATHTOF(sounds\timerClick.wav)), 1, 3};
titles[] = {};
};
class FORGE_timerBeepShort {
name = "FORGE_timerBeepShort";
sound[] = {QUOTE(PATHTOF(sounds\timerClickShort.wav)), 1, 3};
titles[] = {};
};
class FORGE_timerEnd {
name = "FORGE_timerEnd";
sound[] = {QUOTE(PATHTOF(sounds\timerEnd.wav)), 1, 3};
titles[] = {};
};
class FORGE_defused {
name = "FORGE_defused";
sound[] = {QUOTE(PATHTOF(sounds\defused.wav)), 1, 3};
titles[] = {};
};
};
class CfgSFX {};

View File

@ -1,16 +0,0 @@
class CfgVehicles {
class All;
class Sound: All {
author = "FORGE";
mapSize = 1;
_generalMacro = "Sound";
scope = 0;
side = -1;
animated = 0;
vehicleClass = "Sounds";
icon = "iconSound";
faction = "none";
editorCategory = "forge";
editorSubcategory = "forge_audio";
};
};

View File

@ -1 +0,0 @@
#include "script_component.hpp"

View File

@ -1 +0,0 @@
#include "script_component.hpp"

View File

@ -1,8 +0,0 @@
#include "script_component.hpp"
ADDON = false;
PREP_RECOMPILE_START;
#include "XEH_PREP.hpp"
PREP_RECOMPILE_END;
ADDON = true;

View File

@ -1 +0,0 @@
#include "script_component.hpp"

View File

@ -1,2 +0,0 @@
#include "script_component.hpp"
#include "XEH_PREP.hpp"

View File

@ -1,19 +0,0 @@
#include "script_component.hpp"
class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"forge_main"};
authors[] = {"J. Schmidt", "Creedcoder"};
author = "IDSolutions";
VERSION_CONFIG;
};
};
#include "CfgEventHandlers.hpp"
#include "CfgSounds.hpp"
#include "CfgSentences.hpp"
#include "CfgVehicles.hpp"

View File

@ -1,16 +0,0 @@
#define COMPONENT audio
#define COMPONENT_BEAUTIFIED Audio
#include "..\main\script_mod.hpp"
// #define DEBUG_MODE_FULL
// #define DISABLE_COMPILE_CACHE
#ifdef DEBUG_ENABLED_AUDIO
#define DEBUG_MODE_FULL
#endif
#ifdef DEBUG_SETTINGS_AUDIO
#define DEBUG_SETTINGS DEBUG_SETTINGS_AUDIO
#endif
#include "..\main\script_macros.hpp"

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1 +1 @@
z\forge\addons\main
z\pmcs\addons\main

View File

@ -1,7 +1,7 @@
class CfgMods {
class PREFIX {
dir = "@forge";
name = "FORGE Mod";
dir = "@pmcs";
name = "PMC Simulator 3.0 Mod";
author = "IDSolutions";
picture = "title_co.paa";
hideName = "false";

View File

@ -1,5 +1,5 @@
#define MAINPREFIX z
#define PREFIX forge
#define PREFIX sof
#include "script_version.hpp"
@ -9,7 +9,7 @@
#define REQUIRED_VERSION 2.12
#ifdef COMPONENT_BEAUTIFIED
#define COMPONENT_NAME QUOTE(FORGE Mod - COMPONENT_BEAUTIFIED)
#define COMPONENT_NAME QUOTE(SOF Mod - COMPONENT_BEAUTIFIED)
#else
#define COMPONENT_NAME QUOTE(FORGE Mod - COMPONENT)
#define COMPONENT_NAME QUOTE(SOF Mod - COMPONENT)
#endif

View File

@ -1,4 +1,4 @@
#define MAJOR 1
#define MINOR 0
#define PATCH 0
#define BUILD 2
#define BUILD 1

View File

@ -1 +1 @@
z\forge\addons\phone
z\pmcs\addons\phone

View File

@ -1,6 +1,6 @@
class CfgVehicles {
class Item_Base_F;
class FORGE_Item_Phone: Item_Base_F {
class PMCS_Item_Phone: Item_Base_F {
scope = 2;
scopeCurator = 2;
author = "IDSolutions";
@ -8,7 +8,7 @@ class CfgVehicles {
vehicleClass = "Items";
class TransportItems {
MACRO_ADDITEM(FORGE_Phone,1);
MACRO_ADDITEM(PMCS_Phone,1);
};
};
};

View File

@ -1,15 +1,15 @@
class CfgWeapons {
class ACE_ItemCore;
class CBA_MiscItem_ItemInfo;
class FORGE_Phone: ACE_ItemCore {
class PMCS_Phone: ACE_ItemCore {
scope = 2;
scopeArsenal = 2;
scopeCurator = 2;
author = "IDSolutions";
displayName = "Phone";
picture = QPATHTOF(images\mobile_frame.paa);
model = QPATHTOF(data\forge_mobile.p3d);
descriptionShort = "FORGE cell phone for text-messaging and more.";
model = QPATHTOF(data\pmcs_mobile.p3d);
descriptionShort = "PMC Simulator 3.0 cell phone for text-messaging and more.";
hiddenSelections[] = {};
hiddenSelectionsTextures[] = {};

View File

@ -3,10 +3,10 @@
class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
units[] = {"FORGE_Item_Phone"};
weapons[] = {"FORGE_Phone"};
units[] = {"PMCS_Item_Phone"};
weapons[] = {"PMCS_Phone"};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"forge_main"};
requiredAddons[] = {"pmcs_main"};
authors[] = {"J. Schmidt", "Creedcoder"};
author = "IDSolutions";
VERSION_CONFIG;

View File

@ -7,7 +7,7 @@ specularPower=0;
PixelShaderID = "NormalMapDetailSpecularDIMap";
VertexShaderID = "NormalMap";
class Stage1 {
texture = "z\forge\addons\phone\data\forge_mobile_nohq.paa";
texture = "z\pmcs\addons\phone\data\pmcs_mobile_nohq.paa";
uvSource = "tex";
class uvTransform {
aside[] = {1,0,0};
@ -17,7 +17,7 @@ class Stage1 {
};
};
class Stage2 {
texture = "z\forge\addons\phone\data\forge_mobile_dt.paa";
texture = "z\pmcs\addons\phone\data\pmcs_mobile_dt.paa";
uvSource = "tex";
class uvTransform {
aside[] = {1,0,0};
@ -27,7 +27,7 @@ class Stage2 {
};
};
class Stage3 {
texture = "z\forge\addons\phone\data\forge_mobile_smdi.paa";
texture = "z\pmcs\addons\phone\data\pmcs_mobile_smdi.paa";
uvSource = "tex";
class uvTransform {
aside[] = {1,0,0};

View File

@ -8,8 +8,7 @@
#ifdef DEBUG_ENABLED_PHONE
#define DEBUG_MODE_FULL
#endif
#ifdef DEBUG_SETTINGS_PHONE
#ifdef DEBUG_SETTINGS_PHONE
#define DEBUG_SETTINGS DEBUG_SETTINGS_PHONE
#endif

View File

@ -1,22 +0,0 @@
class CfgPhone {
class themes {
class bg_dark01 {
themeName = "Dark"; // Name of theme
themeBackground = "\@forge\userconfig\backgrounds\bgdark_01.paa"; // Must be file type: PAA and size: 512x1024
};
class bg_dark02 {
themeName = "Alt Dark";
themeBackground = "\@forge\userconfig\backgrounds\bgdark_02.paa";
};
class bg_light01 {
themeName = "Light";
themeBackground = "\@forge\userconfig\backgrounds\bglight_01.paa";
};
class bg_light02 {
themeName = "Alt Light";
themeBackground = "\@forge\userconfig\backgrounds\bglight_02.paa";
};
};
class notifications {};
class ringtones {};
};

View File

@ -0,0 +1,22 @@
class PMCS_CfgPhones {
class themes {
class bg_dark01 {
themeName = "Dark"; // Name of theme
themeBackground = "\@pmcs\userconfig\backgrounds\bgdark_01.paa"; // Must be file type: PAA and size: 512x1024
};
class bg_dark02 {
themeName = "Alt Dark";
themeBackground = "\@pmcs\userconfig\backgrounds\bgdark_02.paa";
};
class bg_light01 {
themeName = "Light";
themeBackground = "\@pmcs\userconfig\backgrounds\bglight_01.paa";
};
class bg_light02 {
themeName = "Alt Light";
themeBackground = "\@pmcs\userconfig\backgrounds\bglight_02.paa";
};
};
class notifications {};
class ringtones {};
};

View File

@ -1 +1 @@
z\forge\addons\tablet
z\pmcs\addons\tablet

View File

@ -1,6 +1,6 @@
class CfgVehicles {
class Item_Base_F;
class FORGE_Item_Tablet: Item_Base_F {
class PMCS_Item_Tablet: Item_Base_F {
scope = 2;
scopeCurator = 2;
author = "IDSolutions";
@ -8,7 +8,7 @@ class CfgVehicles {
vehicleClass = "Items";
class TransportItems {
MACRO_ADDITEM(FORGE_Tablet,1);
MACRO_ADDITEM(PMCS_Tablet,1);
};
};
};

View File

@ -1,15 +1,15 @@
class CfgWeapons {
class ACE_ItemCore;
class CBA_MiscItem_ItemInfo;
class FORGE_Tablet: ACE_ItemCore {
class PMCS_Tablet: ACE_ItemCore {
scope = 2;
scopeArsenal = 2;
scopeCurator = 2;
author = "IDSolutions";
displayName = "Tablet";
picture = QPATHTOF(images\getac_f110.paa);
model = QPATHTOF(data\forge_tablet.p3d);
descriptionShort = "FORGE tablet for navigation, communication, and more.";
model = QPATHTOF(data\pmcs_tablet.p3d);
descriptionShort = "PMC Simulator 3.0 tablet for navigation, communication, and more.";
hiddenSelections[] = {"camo1"};
hiddenSelectionsTextures[] = {QPATHTOF(data\getac_f110_co.paa)};

View File

@ -3,10 +3,10 @@
class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
units[] = {"FORGE_Item_Tablet"};
weapons[] = {"FORGE_Tablet"};
units[] = {"PMCS_Item_Tablet"};
weapons[] = {"PMCS_Tablet"};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"forge_main"};
requiredAddons[] = {"pmcs_main"};
authors[] = {"J. Schmidt", "Creedcoder"};
author = "IDSolutions";
VERSION_CONFIG;

Binary file not shown.

View File

@ -4,16 +4,16 @@ class CfgSkeletons {
skeletonInherit = "";
skeletonBones[] = {};
};
class forge_tablet_skeleton: Default {
class pmcs_tablet_skeleton: Default {
isDiscrete = 1;
skeletonInherit = "";
skeletonBones[] = {
"camo1",""
};
};
class land_forge_tablet_skeleton: forge_tablet_skeleton {
class land_pmcs_tablet_skeleton: pmcs_tablet_skeleton {
isDiscrete = 1;
skeletonInherit = "forge_tablet_skeleton";
skeletonInherit = "pmcs_tablet_skeleton";
skeletonBones[] = {
"camo1",""
};
@ -26,14 +26,14 @@ class CfgModels {
skeletonName = "";
class Animations {};
};
class forge_tablet: Default {
skeletonName = "forge_tablet_skeleton";
class pmcs_tablet: Default {
skeletonName = "pmcs_tablet_skeleton";
sections[] = {
"camo1"
};
};
class land_forge_tablet: forge_tablet {
skeletonName = "land_forge_tablet_skeleton";
class land_pmcs_tablet: pmcs_tablet {
skeletonName = "land_pmcs_tablet_skeleton";
sections[] = {
"camo1"
};

Binary file not shown.

View File

@ -8,8 +8,7 @@
#ifdef DEBUG_ENABLED_TABLET
#define DEBUG_MODE_FULL
#endif
#ifdef DEBUG_SETTINGS_TABLET
#ifdef DEBUG_SETTINGS_TABLET
#define DEBUG_SETTINGS DEBUG_SETTINGS_TABLET
#endif

30
main.go
View File

@ -1,7 +1,6 @@
package main
import (
"encoding/json"
"fmt"
"log"
"os"
@ -10,10 +9,6 @@ import (
"code.gitea.io/sdk/gitea"
)
type VersionInfo struct {
Version string `json:"version"`
}
func main() {
client, err := createGiteaClient()
if err != nil {
@ -25,10 +20,6 @@ func main() {
log.Fatalf("VERSION environment variable is not set")
}
if err := updateVersionFile(version); err != nil {
log.Fatalf("Error updating version file: %v", err)
}
repoOwner := "IDSolutions"
repoName := "mod"
@ -38,29 +29,14 @@ func main() {
}
// Construct the filename using the version
artifactFilename := fmt.Sprintf("forge-%s.zip", version)
artifactFilename := fmt.Sprintf("pmcs-%s.zip", version)
artifactPath := filepath.Join("releases", artifactFilename)
if err := uploadArtifact(client, repoOwner, repoName, release.ID, artifactPath); err != nil {
log.Fatalf("Error uploading release asset: %v", err)
}
fmt.Println("Release created, artifact uploaded, and version file updated successfully!")
}
func updateVersionFile(version string) error {
versionInfo := VersionInfo{Version: version}
jsonData, err := json.MarshalIndent(versionInfo, "", " ")
if err != nil {
return fmt.Errorf("error marshaling version info: %w", err)
}
err = os.WriteFile("forge_mod_version.json", jsonData, 0644)
if err != nil {
return fmt.Errorf("error writing version file: %w", err)
}
return nil
fmt.Println("Release created and artifact uploaded successfully!")
}
func createGiteaClient() (*gitea.Client, error) {
@ -74,7 +50,7 @@ func createGiteaClient() (*gitea.Client, error) {
func createRelease(client *gitea.Client, owner, repo, version string) (*gitea.Release, error) {
release, _, err := client.CreateRelease(owner, repo, gitea.CreateReleaseOption{
TagName: version,
Title: fmt.Sprintf("FORGE Mod v%s", version),
Title: fmt.Sprintf("PMC Simulator 3.0 Mod v%s", version),
Note: fmt.Sprintf("Release notes for version %s", version),
})
return release, err

10
mod.cpp
View File

@ -1,5 +1,5 @@
dir = "@forge";
name = "FORGE";
dir = "@pmcs";
name = "PMC Simulator 3.0";
author = "IDSolutions";
picture = "title_co.paa";
hideName = "false";
@ -8,9 +8,9 @@ logoSmall = "icon_64_ca.paa";
logo = "icon_128_ca.paa";
logoOver = "icon_128_highlight_ca.paa";
tooltip = "Tip of the morning";
tooltipOwned = "FORGE";
overview = "FORGE Official Modification";
description = "FORGE Mod - Version 1.0.0";
tooltipOwned = "PMC Simulator 3.0";
overview = "PMC Simulator 3.0 Official Modification";
description = "It's unclear where this will show";
action = "https://innovativedevsolutions.org/";
actionName = "Website";
dlcColor[] = {0.45, 0.47, 0.41, 1};

34
tools/zip_source.py Normal file
View File

@ -0,0 +1,34 @@
import os
from zipfile import ZipFile, ZIP_LZMA
def createReleasePath():
dirName = '../x/sof/release'
if not os.path.exists(dirName):
os.makedirs(dirName)
print('Directory ', dirName, ' created.')
else:
print('Directory ', dirName, ' already exists!')
def getAllFilePaths(dirName):
filePaths = []
for root, directories, files in os.walk(dirName):
for fileName in files:
filePath = os.path.join(root, fileName)
filePaths.append(filePath)
return filePaths
def main():
dirName = '../sof'
filePaths = getAllFilePaths(dirName)
print('The following files will be zipped:')
for fileName in filePaths:
print(fileName)
with ZipFile('../x/sof/release/sof.zip', 'w', compression=ZIP_LZMA) as zip:
for file in filePaths:
zip.write(file)
print('All files zipped successfully!')
if __name__ == "__main__":
createReleasePath()
main()

View File

@ -1,22 +0,0 @@
class CfgPhone {
class themes {
class bg_dark01 {
themeName = "Dark"; // Name of theme
themeBackground = "\@forge\userconfig\backgrounds\bgdark_01.paa"; // Must be file type: PAA and size: 512x1024
};
class bg_dark02 {
themeName = "Alt Dark";
themeBackground = "\@forge\userconfig\backgrounds\bgdark_02.paa";
};
class bg_light01 {
themeName = "Light";
themeBackground = "\@forge\userconfig\backgrounds\bglight_01.paa";
};
class bg_light02 {
themeName = "Alt Light";
themeBackground = "\@forge\userconfig\backgrounds\bglight_02.paa";
};
};
class notifications {};
class ringtones {};
};

22
userconfig/pmcs_phone.hpp Normal file
View File

@ -0,0 +1,22 @@
class PMCS_CfgPhones {
class themes {
class bg_dark01 {
themeName = "Dark"; // Name of theme
themeBackground = "\@pmcs\userconfig\backgrounds\bgdark_01.paa"; // Must be file type: PAA and size: 512x1024
};
class bg_dark02 {
themeName = "Alt Dark";
themeBackground = "\@pmcs\userconfig\backgrounds\bgdark_02.paa";
};
class bg_light01 {
themeName = "Light";
themeBackground = "\@pmcs\userconfig\backgrounds\bglight_01.paa";
};
class bg_light02 {
themeName = "Alt Light";
themeBackground = "\@pmcs\userconfig\backgrounds\bglight_02.paa";
};
};
class notifications {};
class ringtones {};
};