Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .hemtt/hooks/post_build/post_build.rhai

This file was deleted.

1 change: 0 additions & 1 deletion .hemtt/hooks/post_release/post_release.rhai

This file was deleted.

2 changes: 1 addition & 1 deletion .hemtt/hooks/pre_build/pre_build.rhai
Original file line number Diff line number Diff line change
@@ -1 +1 @@
// HEMTT.script("update_3_build");
HEMTT.script("bump_build");
16 changes: 16 additions & 0 deletions .hemtt/hooks/pre_build/set_version_modcpp.rhai
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Read the contents of mod.cpp
let modcpp = HEMTT_VFS.join("mod.cpp")
.open_file()
.read();
// Replace the placeholder version with the actual version
modcpp.replace("{version}",
HEMTT.project()
.version()
.to_string_short()
);
// Write the new contents over the old contents
HEMTT_VFS.join("mod.cpp")
.create_file()
.write(modcpp);
// Done
print("mod.cpp version set to " + HEMTT.project().version().to_string_short());
16 changes: 16 additions & 0 deletions .hemtt/hooks/pre_build/set_version_readme.rhai
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Read the contents of README.md
let readme = HEMTT_VFS.join("README.md")
.open_file()
.read();
// Replace the placeholder version with the actual version
readme.replace("{version}",
HEMTT.project()
.version()
.to_string_short()
);
// Write the new contents over the old contents
HEMTT_VFS.join("README.md")
.create_file()
.write(readme);
// Done
print("README.md version set to " + HEMTT.project().version().to_string_short());
1 change: 0 additions & 1 deletion .hemtt/hooks/pre_release/pre_release.rhai

This file was deleted.

4 changes: 2 additions & 2 deletions .hemtt/launch.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ workshop = [
"1779063631", # ZEN
]

[debugger]
extended = "default"
[debug]
extends = "default"
workshop = [
"450814997", # CBA_A3's Workshop ID
"1585582292", # Arma Debug Engine
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ HEMTT_RFS.join("addons")
.join("main")
.join("script_version.hpp")
.create_file()
.write(script_version);
.write(script_version);
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ let prefix = "#define MINOR ";
let current = HEMTT.project().version().minor();
let next = current + 1;

script_version.replace(prefix + current.to_string(), prefix + next.to_string());

// Updating minor version should reset patch number
script_version.replace(prefix + current.to_string(), prefix + next.to_string());
current = HEMTT.project().version().patch();
script_version.replace("#define PATCH " + current.to_string(), "#define PATCH 0");

Expand All @@ -21,4 +20,4 @@ HEMTT_RFS.join("addons")
.join("main")
.join("script_version.hpp")
.create_file()
.write(script_version);
.write(script_version);
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@ let next = current + 1;

script_version.replace(prefix + current.to_string(), prefix + next.to_string());


// Write the modified contents to script_version.hpp
HEMTT_RFS.join("addons")
.join("main")
.join("script_version.hpp")
.create_file()
.write(script_version);
.write(script_version);
29 changes: 0 additions & 29 deletions .hemtt/scripts/update_0_major.rhai

This file was deleted.

14 changes: 0 additions & 14 deletions .hemtt/scripts/update_modcpp_version.rhai

This file was deleted.

9 changes: 0 additions & 9 deletions FUNDING.yml

This file was deleted.

2 changes: 1 addition & 1 deletion addons/main/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class CfgPatches {

// Required addons, used for setting load order.
// When any of the addons is missing, pop-up warning will appear when launching the game.
requiredAddons[] = {};
requiredAddons[] = {"cba_main"};

// Optional. If this is 1, if any of requiredAddons[] entry is missing in your game the entire config will be ignored and return no error (but in rpt) so useful to make a compat Mod (Since Arma 3 2.14)
skipWhenMissingDependencies = 1;
Expand Down
60 changes: 2 additions & 58 deletions addons/main/script_macros.hpp
Original file line number Diff line number Diff line change
@@ -1,58 +1,2 @@
#ifndef DOUBLES
#define DOUBLES(var1,var2) var1##_##var2
#define TRIPLES(var1,var2,var3) var1##_##var2##_##var3
#define QUOTE(var1) #var1
#endif

#ifndef Q
#define Q(var1) #var1
#endif

#ifndef PVAR
#define PVAR(var1) DOUBLES(PREFIX,var1)
#define QPVAR(var1) QUOTE(PVAR(var1))
#endif

#ifndef PFUNC
#define PFUNC(var1) TRIPLES(PREFIX,fnc,var1)
#define QPFUNC(var1) QUOTE(PFUNC(var1))
#endif

#ifndef ADDON_NAME
#define ADDON_NAME Q(PREFIX_BEAUTIFIED - COMPONENT_BEAUTIFIED)
#endif

#ifndef PATH_TO_FUNC_SUB
#define PATH_TO_FUNC_SUB(var1) QUOTE(\MAINPREFIX\PREFIX\addons\COMPONENT\functions\var1)
#endif

#ifndef VERSION
#define VERSION 0
#endif

#ifndef VERSION_STR
#define VERSION_STR VERSION
#endif

#ifndef VERSION_AR
#define VERSION_AR VERSION
#endif

#ifndef VERSION_CONFIG
#define VERSION_CONFIG version = VERSION; versionStr = QUOTE(VERSION_STR); versionAr[] = {VERSION_AR}
#endif

#ifndef LSTRING
#define LSTRING(var1) QUOTE(TRIPLES(STR,ADDON,var1))
#define ELSTRING(var1,var2) QUOTE(TRIPLES(STR,DOUBLES(PREFIX,var1),var2))
#endif

#ifndef CSTRING
#define CSTRING(var1) QUOTE(TRIPLES($STR,ADDON,var1))
#define ECSTRING(var1,var2) QUOTE(TRIPLES($STR,DOUBLES(PREFIX,var1),var2))
#endif

#ifndef LLSTRING
#define LLSTRING(var1) localize QUOTE(TRIPLES(STR,ADDON,var1))
#define LELSTRING(var1,var2) localize QUOTE(TRIPLES(STR,DOUBLES(PREFIX,var1),var2))
#endif
#include "\x\cba\addons\main\script_macros.hpp"
#include "script_macros_zrn.hpp"
13 changes: 7 additions & 6 deletions addons/main/script_macros_zrn.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#ifdef __A3_DEBUG__
#define _ZRN_DEBUG_
#endif


// CBA Settings
#define SET(var1) TRIPLES(ADDON,set,var1)
Expand All @@ -23,7 +21,10 @@
#ifndef QUOTE
#define QUOTE(var1) #var1
#endif
#define QQUOTE(var1) QUOTE(QUOTE(var1))
#ifndef QQUOTE
#define QQUOTE(var1) QUOTE(QUOTE(var1))
#endif

#define Q(var1) QUOTE(var1)
#define QQ(var1) QQUOTE(var1)

Expand All @@ -47,8 +48,8 @@
#define QCVAR(var1) QUOTE(CVAR(var1))
#define QQCVAR(var1) QUOTE(QCVAR(var1))

// missionNamespace set/get Variables

// missionNamespace set/get Variables
#define SETMGVAR(name,value) (missionNamespace setVariable [QGVAR(name),value])
#define SETMGVAR_PUBLIC(name,value,public) (missionNamespace setVariable [QGVAR(name),value,public])

Expand All @@ -74,7 +75,6 @@
#define QPATH_TO_ADDON(var1) QUOTE(\MAINPREFIX\PREFIX\addons\COMPONENT\var1)
#define QQPATH_TO_ADDON(var1) Q(QUOTE(\MAINPREFIX\PREFIX\addons\COMPONENT\var1))

// Debug
// Doesnt seem to work currently
#ifdef _ZRN_DEBUG_
#define _DEBUG_POSTINIT_ postInit = 1;
Expand All @@ -85,6 +85,7 @@
#endif


// Debug
#define DEBUG_HEADER format [QUOTE([PREFIX][COMPONENT](%1)),_fnc_scriptName]

#define ZRN_LOG_MSG(MSG) diag_log (DEBUG_HEADER + " " + QUOTE(MSG))
Expand Down
4 changes: 2 additions & 2 deletions addons/main/script_version.hpp
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#define MAJOR 1
#define MINOR 0
#define PATCH 0
#define BUILD 22
#define BUILD 29


// #define VERSION MACROS
#define VERSION MAJOR.MINOR
#define VERSION_AR MAJOR,MINOR,PATCH,BUILD
#define VERSION_STR MAJOR##.##MINOR##.##PATCH##.##BUILD

#define REQUIRED_VERSION 2.02
#define REQUIRED_VERSION 2.20
82 changes: 0 additions & 82 deletions addons/zeic/CfgFunctions.hpp

This file was deleted.

Loading