escapists/EscapistsReintroduced
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Combine Workshop addon and fix prison startup

Browse Source 
Merge owned systems into one addon while preserving resource identities. Gate player admission on the replicated prison scene, restore the original framed door, and hold enemy AI until escape. Correct scenario branding and author metadata, include publishing assets, and retain regression and native verification evidence.
This commit is contained in:
jakub
2026-09-20 16:42:52 +02:00
parent 7d94953b53
commit cab998fb64
513 changed files with 18940 additions and 862 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_dedicated_native.py
+11 -17
View File
@@ -48,15 +48,15 @@ class DedicatedNativeTests(unittest.TestCase):
self.assertEqual(runner.engine_args('header'), runner.engine_args('header', 'core'))
expected = {
'core': ('2528466DE220D91C', '{AD62322D5213C440}Missions/ERR_Everon_Base.conf'),
'chat': ('FA804F411BDDF2C6', '{C1E20667DCE324ED}Missions/ERR_Everon.conf'),
'chat': ('2528466DE220D91C', '{C1E20667DCE324ED}Missions/ERR_Everon.conf'),
}
root = Path(__file__).parents[1]
for project, (guid, header) in expected.items():
# Keep the CLI identities tied to the actual authored resources.
gproj = (root/'addons'/project/'addon.gproj').read_text()
gproj = (root/'addons/core'/'addon.gproj').read_text()
self.assertIn('GUID "'+guid+'"', gproj)
resource = header.split('}', 1)[1]
self.assertIn('Name "'+header+'"', (root/'addons'/project/(resource+'.meta')).read_text())
self.assertIn('Name "'+header+'"', (root/'addons/core'/(resource+'.meta')).read_text())
for route in ('header', 'diag-world'):
args = runner.engine_args(route, project)
self.assertEqual(args[args.index('-addonsDir')+1], '/tmp/source/addons')
@@ -74,14 +74,9 @@ class DedicatedNativeTests(unittest.TestCase):
self.assertEqual(args[0], '/tmp/runtime/ArmaReforgerServerDiag')
self.assertEqual(args[args.index('-server')+1], '{B6C516F86302C679}Worlds/ERR_Everon.ent')
self.assertEqual(args[args.index('-worldSystemsConfig')+1], '{C50579A2EC48E8EF}Configs/Systems/MissionSystems.conf')
# Selecting Chat activates the existing declared closure, not invented
# runtime addons or an explicit list that could omit dependencies.
chat = (root/'addons/chat/addon.gproj').read_text().split('Dependencies', 1)[1]
dependencies = set(re.findall(r'"([A-F0-9]{16})"', chat))
expected_dependencies = {'58D0FB3206B6F859'}
for project in ('core', 'ai', 'intel', 'map'):
expected_dependencies.add(re.search(r'GUID "([A-F0-9]{16})"', (root/'addons'/project/'addon.gproj').read_text())[1])
self.assertEqual(dependencies, expected_dependencies)
definition = (root/'addons/core/addon.gproj').read_text()
dependencies = set(re.findall(r'"([A-F0-9]{16})"', re.search(r'Dependencies\s*\{([^}]+)', definition)[1]))
self.assertEqual(dependencies, {'58D0FB3206B6F859', '595F2BF2F44836FB', '629B2BA37EFFD577', '5E524E4FEECCA92B'})
def test_invalid_project_route_combinations_fail_before_files_or_processes(self):
for route, project in [('vanilla-everon', 'chat'), ('unknown', 'core'), ('header', 'unknown')]:
@@ -101,7 +96,7 @@ class DedicatedNativeTests(unittest.TestCase):
launch.assert_not_called()
self.assertIn('vanilla-everon cannot be combined with --project chat', stderr.getvalue())
def addon_input(self, root, names=('core', 'ai', 'intel', 'map', 'chat')):
def addon_input(self, root, names=('core',)):
repository = Path(__file__).parents[1]
for addon in names:
folder = root/'addons'/addon
@@ -124,16 +119,15 @@ class DedicatedNativeTests(unittest.TestCase):
source = Path(directory)
self.addon_input(source, ('core',))
runner.preflight_addons(source, 'header')
with self.assertRaisesRegex(ValueError, 'ai'):
runner.preflight_addons(source, 'header', 'chat')
runner.preflight_addons(source, 'header', 'chat')
runner.preflight_addons(Path('/not-a-real-addon-input'), 'vanilla-everon')
def test_missing_core_dependency_and_empty_database_refuse_before_archive_or_process(self):
for project, relative, empty in [
('core', 'core/resourceDatabase.rdb', False),
('chat', 'core/addon.gproj', False),
('chat', 'ai/resourceDatabase.rdb', False),
('chat', 'map/resourceDatabase.rdb', True),
('chat', 'core/resourceDatabase.rdb', False),
('chat', 'core/resourceDatabase.rdb', True),
]:
with self.subTest(project=project, relative=relative, empty=empty), tempfile.TemporaryDirectory() as directory:
root = Path(directory); source=root/'source'; archive=root/'archive'
@@ -163,7 +157,7 @@ class DedicatedNativeTests(unittest.TestCase):
runner.preflight_addons(source, 'header')
database.rmdir(); database.write_bytes(b'presence-only')
project = source/'addons/core/addon.gproj'
project.write_text(project.read_text().replace('2528466DE220D91C', 'FA804F411BDDF2C6'))
project.write_text(project.read_text().replace('2528466DE220D91C', '1111111111111111'))
with self.assertRaisesRegex(ValueError, 'identity mismatch'):
runner.preflight_addons(source, 'header')
with tempfile.TemporaryDirectory() as directory: