Updated naming convention to use FORGE
All checks were successful
Build / Build (push) Successful in 54s

This commit is contained in:
Jacob Schmidt 2025-01-01 21:35:44 -06:00
parent 752ec7d2fd
commit c24b967e2a
30 changed files with 90 additions and 122 deletions

View File

@ -1,11 +1,11 @@
name = "PMC Simulator 3.0 Mod" name = "FORGE Mod"
author = "IDSolutions" author = "IDSolutions"
prefix = "pmcs" prefix = "forge"
mainprefix = "z" mainprefix = "z"
[files] [files]
include = [ include = [
"pmcs_mod_version.json", "forge_mod_version.json",
"*.paa", "*.paa",
"userconfig/**/*" "userconfig/**/*"
] ]

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -0,0 +1,22 @@
class FORGE_CfgPhones {
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

@ -1,22 +0,0 @@
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\pmcs\addons\tablet z\forge\addons\tablet

View File

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

View File

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

View File

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

Binary file not shown.

View File

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

Binary file not shown.

View File

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

View File

@ -38,7 +38,7 @@ func main() {
} }
// Construct the filename using the version // Construct the filename using the version
artifactFilename := fmt.Sprintf("pmcs-%s.zip", version) artifactFilename := fmt.Sprintf("forge-%s.zip", version)
artifactPath := filepath.Join("releases", artifactFilename) artifactPath := filepath.Join("releases", artifactFilename)
if err := uploadArtifact(client, repoOwner, repoName, release.ID, artifactPath); err != nil { if err := uploadArtifact(client, repoOwner, repoName, release.ID, artifactPath); err != nil {
@ -55,7 +55,7 @@ func updateVersionFile(version string) error {
return fmt.Errorf("error marshaling version info: %w", err) return fmt.Errorf("error marshaling version info: %w", err)
} }
err = os.WriteFile("pmcs_mod_version.json", jsonData, 0644) err = os.WriteFile("forge_mod_version.json", jsonData, 0644)
if err != nil { if err != nil {
return fmt.Errorf("error writing version file: %w", err) return fmt.Errorf("error writing version file: %w", err)
} }
@ -74,7 +74,7 @@ func createGiteaClient() (*gitea.Client, error) {
func createRelease(client *gitea.Client, owner, repo, version string) (*gitea.Release, error) { func createRelease(client *gitea.Client, owner, repo, version string) (*gitea.Release, error) {
release, _, err := client.CreateRelease(owner, repo, gitea.CreateReleaseOption{ release, _, err := client.CreateRelease(owner, repo, gitea.CreateReleaseOption{
TagName: version, TagName: version,
Title: fmt.Sprintf("PMC Simulator 3.0 Mod v%s", version), Title: fmt.Sprintf("FORGE Mod v%s", version),
Note: fmt.Sprintf("Release notes for version %s", version), Note: fmt.Sprintf("Release notes for version %s", version),
}) })
return release, err return release, err

10
mod.cpp
View File

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

View File

@ -1,34 +0,0 @@
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

@ -0,0 +1,22 @@
class FORGE_CfgPhones {
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

@ -1,22 +0,0 @@
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 {};
};