Skip to content

Commit 4f4bc3d

Browse files
johnoclockdkjohnoclockdk
authored
Merge branch 'dev' into dev2
2 parents dec88a3 + 6017779 commit 4f4bc3d

168 files changed

Lines changed: 23100 additions & 5470 deletions

File tree

Some content is hidden

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

‎benchmarks/src/zoneStress/construction.json‎

Lines changed: 10592 additions & 0 deletions
Large diffs are not rendered by default.

‎benchmarks/src/zoneStress/zone-stress.ts‎

Lines changed: 454 additions & 0 deletions
Large diffs are not rendered by default.

‎bin/2016/zoneServer.js‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
1-
const { ZoneServer2016 } = require("../../h1z1-server");
1+
if (process.env.APM_ENABLED == "true") {
2+
require("elastic-apm-node").start({
3+
serviceName: process.env.ELASTIC_APM_SERVICE_NAME,
4+
secretToken: process.env.ELASTIC_APM_SECRET_TOKEN,
5+
serverUrl: process.env.ELASTIC_APM_SERVER_URL,
6+
environment: process.env.ELASTIC_APM_ENVIRONMENT,
7+
});
8+
}
29

10+
const { ZoneServer2016 } = require("../../h1z1-server");
311
const Zone = new ZoneServer2016(
412
1117,
513
Buffer.from("F70IaxuU8C/w7FPXY1ibXw==", "base64")

‎data/2016/dataSources/AllowedFileHashes.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,7 +1025,7 @@
10251025
},
10261026
{
10271027
"file_name": "Assets_256.pack",
1028-
"crc32_hash": "396f3599"
1028+
"crc32_hash": "5fd58d48"
10291029
},
10301030
{
10311031
"file_name": "Assets_257.pack",
@@ -1037,7 +1037,6 @@
10371037
},
10381038
{
10391039
"file_name": "Assets_259.pack",
1040-
"old_crc32_hash": "bfdc08a2",
1041-
"crc32_hash": "a20404c1"
1040+
"crc32_hash": "03c27f8e"
10421041
}
10431042
]

‎data/2016/dataSources/LoginData.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3268,7 +3268,7 @@
32683268
"unknownString6": "LVS",
32693269
"unknownString7": ""
32703270
},
3271-
"unknownArray2": [],
3271+
"errorDetails": [],
32723272
"unknownString2": "",
32733273
"unknownString3": "",
32743274
"unknownBoolean3": false,

‎data/2016/lootTables/containers/Armoire.json‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
{
2+
"type": "container",
3+
"pools": [
4+
{
5+
"conditions": [],
6+
"rolls": {
7+
"min": 0,
8+
"max": 3
9+
},
10+
"entries": [
11+
{
12+
"item": 2088,
13+
"weight": 50,
14+
"count": {
15+
"min": 1,
16+
"max": 1
17+
}
18+
},
19+
{
20+
"item": 2177,
21+
"weight": 50,
22+
"count": {
23+
"min": 1,
24+
"max": 1
25+
}
26+
},
27+
{
28+
"item": 23,
29+
"weight": 50,
30+
"count": {
31+
"min": 1,
32+
"max": 4
33+
}
34+
},
35+
{
36+
"item": 2102,
37+
"weight": 50,
38+
"count": {
39+
"min": 1,
40+
"max": 1
41+
}
42+
},
43+
{
44+
"item": 142,
45+
"weight": 50,
46+
"count": {
47+
"min": 1,
48+
"max": 1
49+
}
50+
},
51+
{
52+
"item": 1803,
53+
"weight": 60,
54+
"count": {
55+
"min": 1,
56+
"max": 1
57+
}
58+
},
59+
{
60+
"item": 2255,
61+
"weight": 60,
62+
"count": {
63+
"min": 1,
64+
"max": 1
65+
}
66+
}
67+
]
68+
}
69+
]
70+
}

‎data/2016/lootTables/containers/Builder.json‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
{
2+
"type": "container",
3+
"pools": [
4+
{
5+
"conditions": [],
6+
"rolls": {
7+
"min": 1,
8+
"max": 1
9+
},
10+
"entries": [
11+
{
12+
"item": 48,
13+
"weight": 1,
14+
"count": {
15+
"min": 50,
16+
"max": 50
17+
}
18+
},
19+
{
20+
"item": 16,
21+
"weight": 1,
22+
"count": {
23+
"min": 50,
24+
"max": 50
25+
}
26+
},
27+
{
28+
"item": 58,
29+
"weight": 1,
30+
"count": {
31+
"min": 1,
32+
"max": 1
33+
}
34+
},
35+
{
36+
"item": 82,
37+
"weight": 1,
38+
"count": {
39+
"min": 1,
40+
"max": 1
41+
}
42+
},
43+
{
44+
"item": 1536,
45+
"weight": 1,
46+
"count": {
47+
"min": 1,
48+
"max": 1
49+
}
50+
},
51+
{
52+
"item": 1433,
53+
"weight": 1,
54+
"count": {
55+
"min": 1,
56+
"max": 1
57+
}
58+
},
59+
{
60+
"item": 1891,
61+
"weight": 1,
62+
"count": {
63+
"min": 1,
64+
"max": 1
65+
}
66+
},
67+
{
68+
"item": 1441,
69+
"weight": 1,
70+
"count": {
71+
"min": 1,
72+
"max": 1
73+
}
74+
}
75+
]
76+
}
77+
]
78+
}

‎data/2016/lootTables/containers/Cabinets.json‎

Lines changed: 174 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,174 @@
1+
{
2+
"type": "container",
3+
"pools": [
4+
{
5+
"conditions": [],
6+
"rolls": {
7+
"min": 0,
8+
"max": 2
9+
},
10+
"entries": [
11+
{
12+
"item": 23,
13+
"weight": 15,
14+
"count": {
15+
"min": 1,
16+
"max": 2
17+
}
18+
},
19+
{
20+
"item": 1436,
21+
"weight": 10,
22+
"count": {
23+
"min": 1,
24+
"max": 1
25+
}
26+
},
27+
{
28+
"item": 1428,
29+
"weight": 15,
30+
"count": {
31+
"min": 1,
32+
"max": 2
33+
}
34+
},
35+
{
36+
"item": 22,
37+
"weight": 13,
38+
"count": {
39+
"min": 1,
40+
"max": 1
41+
}
42+
},
43+
{
44+
"item": 7,
45+
"weight": 30,
46+
"count": {
47+
"min": 1,
48+
"max": 1
49+
}
50+
},
51+
{
52+
"item": 1393,
53+
"weight": 30,
54+
"count": {
55+
"min": 1,
56+
"max": 1
57+
}
58+
},
59+
{
60+
"item": 1394,
61+
"weight": 30,
62+
"count": {
63+
"min": 1,
64+
"max": 1
65+
}
66+
},
67+
{
68+
"item": 1391,
69+
"weight": 30,
70+
"count": {
71+
"min": 1,
72+
"max": 1
73+
}
74+
},
75+
{
76+
"item": 1392,
77+
"weight": 30,
78+
"count": {
79+
"min": 1,
80+
"max": 1
81+
}
82+
},
83+
{
84+
"item": 1396,
85+
"weight": 30,
86+
"count": {
87+
"min": 1,
88+
"max": 1
89+
}
90+
},
91+
{
92+
"item": 1397,
93+
"weight": 30,
94+
"count": {
95+
"min": 1,
96+
"max": 1
97+
}
98+
},
99+
{
100+
"item": 1398,
101+
"weight": 30,
102+
"count": {
103+
"min": 1,
104+
"max": 1
105+
}
106+
},
107+
{
108+
"item": 1399,
109+
"weight": 30,
110+
"count": {
111+
"min": 1,
112+
"max": 1
113+
}
114+
},
115+
{
116+
"item": 1400,
117+
"weight": 30,
118+
"count": {
119+
"min": 1,
120+
"max": 1
121+
}
122+
},
123+
{
124+
"item": 1401,
125+
"weight": 30,
126+
"count": {
127+
"min": 1,
128+
"max": 1
129+
}
130+
},
131+
{
132+
"item": 1395,
133+
"weight": 30,
134+
"count": {
135+
"min": 1,
136+
"max": 1
137+
}
138+
},
139+
{
140+
"item": 1431,
141+
"weight": 30,
142+
"count": {
143+
"min": 1,
144+
"max": 1
145+
}
146+
},
147+
{
148+
"item": 2536,
149+
"weight": 30,
150+
"count": {
151+
"min": 1,
152+
"max": 1
153+
}
154+
},
155+
{
156+
"item": 3460,
157+
"weight": 5,
158+
"count": {
159+
"min": 1,
160+
"max": 1
161+
}
162+
}
163+
]
164+
},
165+
{
166+
"conditions": [{ "condition": "poi_names", "poi_names": ["Pleasant Valley"] }],
167+
"rolls": { "min": 0, "max": 1 },
168+
"entries": [
169+
{ "type": "loot_table", "table": "sub/Cabinets_pv", "weight": 70 },
170+
{ "type": "empty", "weight": 30 }
171+
]
172+
}
173+
]
174+
}

0 commit comments

Comments
 (0)