Skip to content

Commit 6323d01

Browse files
authored
General - Move to HEMTT v1.0 (#758)
1 parent b512cef commit 6323d01

File tree

79 files changed

+2886
-1067
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+2886
-1067
lines changed

.github/workflows/arma.yml

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: Arma
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
9+
jobs:
10+
validate:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout the source code
14+
uses: actions/checkout@v4
15+
- name: Validate SQF
16+
run: python3 tools/sqf_validator.py
17+
- name: Validate Config
18+
run: python3 tools/config_style_checker.py
19+
- name: Validate Stringtables
20+
run: python3 tools/stringtable_validator.py
21+
- name: Validate Return Types
22+
run: python3 tools/return_checker.py
23+
- name: Check for BOM
24+
uses: arma-actions/bom-check@master
25+
with:
26+
path: 'addons'
27+
28+
lint:
29+
runs-on: ubuntu-latest
30+
steps:
31+
- name: Checkout the source code
32+
uses: actions/checkout@v4
33+
- name: Lint (sqflint)
34+
uses: arma-actions/sqflint@master
35+
continue-on-error: true # No failure due to many false-positives
36+
37+
build:
38+
runs-on: ubuntu-latest
39+
steps:
40+
- name: Checkout the source code
41+
uses: actions/checkout@v4
42+
- name: Setup HEMTT
43+
uses: arma-actions/hemtt@v1
44+
- name: Run HEMTT build
45+
run: hemtt build
46+
- name: Rename build folder
47+
run: mv .hemttout/build .hemttout/@zen
48+
- name: Upload Artifact
49+
uses: actions/upload-artifact@v3
50+
with:
51+
name: zen-${{ github.sha }}-nobin
52+
path: .hemttout/@*

.github/workflows/build.yml

-40
This file was deleted.

.github/workflows/notify.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Notify
22

33
on:
44
workflow_run:
5-
workflows: ["Build"]
5+
workflows: ["Arma"]
66
types:
77
- completed
88

.github/workflows/translations.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Translations
33
on:
44
push:
55
branches:
6-
- master
6+
- master
77

88
jobs:
99
update:

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ CHANGELOG.md
1515
*.tar.gz
1616
*.zip
1717
hemtt*
18+
.hemttout
1819
!hemtt.toml
1920
@zen
2021
tools/armake.exe
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
let releases = HEMTT_RFS.join("releases");
2+
3+
let src = releases.join(HEMTT.project().prefix() + "-" + HEMTT.project().version().to_string() + ".zip");
4+
let dst = releases.join(HEMTT.project().name().to_lower() + "_" + HEMTT.project().version().to_string_short() + ".zip");
5+
6+
print("Moving zip to " + dst);
7+
if !src.move(dst) {
8+
fatal("Failed to move " + src + " to " + dst);
9+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
let modcpp = HEMTT_VFS.join("mod.cpp").open_file().read();
2+
modcpp.replace("0.0.0", HEMTT.project().version().to_string_short());
3+
HEMTT_VFS.join("mod.cpp").create_file().write(modcpp);
4+
print("mod.cpp version set");

.hemtt/missions/test.VR/mission.sqm

+199
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,199 @@
1+
version=54;
2+
class EditorData
3+
{
4+
moveGridStep=1;
5+
angleGridStep=0.2617994;
6+
scaleGridStep=1;
7+
autoGroupingDist=10;
8+
toggles=1;
9+
class ItemIDProvider
10+
{
11+
nextID=3;
12+
};
13+
class Camera
14+
{
15+
pos[]={0,15,-30};
16+
};
17+
};
18+
binarizationWanted=0;
19+
sourceName="new_test";
20+
addons[]=
21+
{
22+
"A3_Characters_F",
23+
"A3_Modules_F_Curator_Curator"
24+
};
25+
class AddonsMetaData
26+
{
27+
class List
28+
{
29+
items=2;
30+
class Item0
31+
{
32+
className="A3_Characters_F";
33+
name="Arma 3 Alpha - Characters and Clothing";
34+
author="Bohemia Interactive";
35+
url="https://www.arma3.com";
36+
};
37+
class Item1
38+
{
39+
className="A3_Modules_F_Curator";
40+
name="Arma 3 Zeus Update - Scripted Modules";
41+
author="Bohemia Interactive";
42+
url="https://www.arma3.com";
43+
};
44+
};
45+
};
46+
randomSeed=10288023;
47+
class ScenarioData
48+
{
49+
author="mharis001";
50+
};
51+
class Mission
52+
{
53+
class Intel
54+
{
55+
timeOfChanges=1800.0002;
56+
startWeather=0;
57+
startWind=0.1;
58+
startWaves=0.1;
59+
forecastWeather=0;
60+
forecastWind=0.1;
61+
forecastWaves=0.1;
62+
forecastLightnings=0.1;
63+
year=2035;
64+
day=28;
65+
hour=13;
66+
minute=37;
67+
startFogDecay=0.014;
68+
forecastFogDecay=0.014;
69+
};
70+
class Entities
71+
{
72+
items=2;
73+
class Item0
74+
{
75+
dataType="Group";
76+
side="West";
77+
class Entities
78+
{
79+
items=1;
80+
class Item0
81+
{
82+
dataType="Object";
83+
class PositionInfo
84+
{
85+
position[]={0,5.0014391,0.050003052};
86+
};
87+
side="West";
88+
flags=7;
89+
class Attributes
90+
{
91+
isPlayer=1;
92+
};
93+
id=1;
94+
type="B_Soldier_F";
95+
class CustomAttributes
96+
{
97+
class Attribute0
98+
{
99+
property="speaker";
100+
expression="_this setspeaker _value;";
101+
class Value
102+
{
103+
class data
104+
{
105+
singleType="STRING";
106+
value="Male09ENG";
107+
};
108+
};
109+
};
110+
class Attribute1
111+
{
112+
property="pitch";
113+
expression="_this setpitch _value;";
114+
class Value
115+
{
116+
class data
117+
{
118+
singleType="SCALAR";
119+
value=1.02;
120+
};
121+
};
122+
};
123+
nAttributes=2;
124+
};
125+
};
126+
};
127+
class Attributes
128+
{
129+
};
130+
id=0;
131+
};
132+
class Item1
133+
{
134+
dataType="Logic";
135+
class PositionInfo
136+
{
137+
position[]={0,5,0};
138+
};
139+
id=2;
140+
type="ModuleCurator_F";
141+
class CustomAttributes
142+
{
143+
class Attribute0
144+
{
145+
property="ModuleCurator_F_Owner";
146+
expression="_this setVariable ['Owner',_value,true];";
147+
class Value
148+
{
149+
class data
150+
{
151+
singleType="STRING";
152+
value="#adminLogged";
153+
};
154+
};
155+
};
156+
class Attribute1
157+
{
158+
property="ModuleCurator_F_Forced";
159+
expression="_this setVariable ['Forced',_value,true];";
160+
class Value
161+
{
162+
class data
163+
{
164+
singleType="SCALAR";
165+
value=0;
166+
};
167+
};
168+
};
169+
class Attribute2
170+
{
171+
property="ModuleCurator_F_Name";
172+
expression="_this setVariable ['Name',_value,true];";
173+
class Value
174+
{
175+
class data
176+
{
177+
singleType="STRING";
178+
value="";
179+
};
180+
};
181+
};
182+
class Attribute3
183+
{
184+
property="ModuleCurator_F_Addons";
185+
expression="_this setVariable ['Addons',_value,true];";
186+
class Value
187+
{
188+
class data
189+
{
190+
singleType="SCALAR";
191+
value=3;
192+
};
193+
};
194+
};
195+
nAttributes=4;
196+
};
197+
};
198+
};
199+
};

.hemtt/project.toml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name = "Zeus Enhanced"
2+
prefix = "zen"
3+
author = "ZEN Team"
4+
mainprefix = "x"
5+
6+
[files]
7+
include = [
8+
"AUTHORS.txt",
9+
"LICENSE",
10+
"logo_zen_ca.paa",
11+
"logo_zen_small_ca.paa",
12+
"meta.cpp",
13+
"mod.cpp",
14+
"README.md",
15+
]
16+
17+
[version]
18+
git_hash = 0
19+
20+
[hemtt.launch]
21+
workshop = [
22+
"450814997", # CBA_A3
23+
]
24+
mission = "test.VR"
25+
26+
[hemtt.launch.ace]
27+
workshop = [
28+
"450814997", # CBA_A3
29+
"463939057", # ACE3
30+
]
31+
mission = "test.VR"

VERSION

-1
This file was deleted.

addons/area_markers/XEH_preInit.sqf

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ PREP_RECOMPILE_START;
66
#include "XEH_PREP.hpp"
77
PREP_RECOMPILE_END;
88

9-
#include "initSettings.sqf"
9+
#include "initSettings.inc.sqf"
1010

1111
if (isServer) then {
1212
// Unique ID for creating markers

0 commit comments

Comments
 (0)