New version 3.0.4.0

ENHANCEMENTS:
- Squadron credits added
- /squadron credits added
- Lua: dcsbot.addSquadronPoints() / dcsbot.getSquadronPoints() / dcsbot.listSquadrons() added
- Lua: dcsbot.getUserRoles() added to retrieve the roles of the user in mission.
- Competitive: auto-join to matches added, win-types added.

CHANGES:
- MissionStats: changed to dynamic event names
- MizEdit: can work better with variables now, performance improved syntax support for lists/searches
- People can only be a member of ONE squadron at a time now!
- CreditSystem: Squadrons will receive points on kills now for each squadron member.
- Competitive: new event onMatchFinished to be used in other plugins

BUGFIXES:
- Competitive: match finish check was not activated

Author: karel26

core/data/impl/serverimpl.py

@@ -732,6 +732,8 @@ async def apply_mission_changes(self, filename: Optional[str] = None, *, use_ori
                 orig_filename = utils.get_orig_file(new_filename)
                 # and copy the orig file over
                 shutil.copy2(orig_filename, new_filename)
+            elif new_filename != filename:
+                shutil.copy2(filename, new_filename)
             try:
                 # process all mission modifications
                 dirty = False
@@ -807,9 +809,17 @@ async def uploadMission(self, filename: str, url: str, *, missions_dir: str = No
     async def modifyMission(self, filename: str, preset: Union[list, dict], use_orig: bool = True) -> str:
         from extensions.mizedit import MizEdit
 
+        # create a writable mission
+        new_filename = utils.create_writable_mission(filename)
         if use_orig:
-            filename = utils.get_orig_file(filename)
-        return await MizEdit.apply_presets(self, filename, preset)
+            # get the orig file
+            orig_filename = utils.get_orig_file(new_filename)
+            # and copy the orig file over
+            shutil.copy2(orig_filename, new_filename)
+        elif new_filename != filename:
+            shutil.copy2(filename, new_filename)
+        await MizEdit.apply_presets(self, new_filename, preset)
+        return new_filename
 
     async def persist_settings(self):
         config_file = os.path.join(self.node.config_dir, 'servers.yaml')
@@ -937,22 +947,17 @@ async def loadMission(self, mission: Union[int, str], modify_mission: Optional[b
             if not mission:
                 return False
             if use_orig:
-                # now determine the original mission name
+                new_filename = utils.create_writable_mission(mission)
                 orig_mission = utils.get_orig_file(mission)
-                # check if the orig file has been replaced
-                if os.path.exists(orig_mission) and os.path.getmtime(orig_mission) > os.path.getmtime(mission):
-                    new_filename = utils.create_writable_mission(mission)
-                    # we can't write the original one, so use the copy
-                    if new_filename != mission:
-                        shutil.copy2(orig_mission, new_filename)
-                        await self.replaceMission(start_index, new_filename)
-                    else:
-                        shutil.copy2(orig_mission, mission)
-                    return await self.loadMission(start_index, modify_mission=modify_mission)
-            else:
+                shutil.copy2(orig_mission, new_filename)
+                if new_filename != mission:
+                    await self.replaceMission(start_index, new_filename)
+                return await self.loadMission(start_index, modify_mission=modify_mission)
+            elif modify_mission:
                 # don't use the orig file, still make sure we have a writable mission
                 new_filename = utils.create_writable_mission(mission)
                 if new_filename != mission:
+                    shutil.copy2(mission, new_filename)
                     await self.replaceMission(start_index, new_filename)
                     return await self.loadMission(start_index, modify_mission=modify_mission)
 

core/mizfile.py

@@ -149,10 +149,10 @@ def get_dir_path(name):
         finally:
             os.remove(tmpname)
 
-    def apply_preset(self, preset: Union[dict, list]):
+    def apply_preset(self, preset: Union[dict, list], **kwargs):
         if isinstance(preset, list):
             for _preset in preset:
-                self.apply_preset(_preset)
+                self.apply_preset(_preset, **kwargs)
             return
 
         for key, value in preset.items():
@@ -189,7 +189,7 @@ def apply_preset(self, preset: Union[dict, list]):
                 else:
                     self.log.warning("Value 'clouds', str or dict required.")
             elif key == 'modify':
-                self.modify(value)
+                self.modify(value, **kwargs)
             else:
                 converted_value = int(value) if isinstance(value, str) and value.isdigit() else value
                 try:
@@ -512,7 +512,7 @@ def parse_moment(self, value: str = "morning") -> int:
 
         return (base_time.hour * 3600) + (base_time.minute * 60)
 
-    def modify(self, config: Union[list, dict]) -> None:
+    def modify(self, config: Union[list, dict], **kwargs) -> None:
 
         def sort_dict(d):
             sorted_items = sorted(d.items())
@@ -545,10 +545,18 @@ def process_elements(reference: dict, **kwargs):
                 elif 'replace' in config:
                     sort = False
                     for _what, _with in config['replace'].items():
-                        if isinstance(_with, str):
-                            _with = utils.evaluate(_with, reference=reference, **kkwargs, **kwargs)
                         if debug:
-                            self.log.debug(f"Replacing {_what} with {_with}")
+                            if isinstance(_with, str):
+                                _w = utils.evaluate(_with, reference=reference, **kkwargs, **kwargs)
+                            elif isinstance(_with, list):
+                                _w = [utils.evaluate(x, reference=reference, **kkwargs, **kwargs) for x in _with]
+                            elif isinstance(_with, dict):
+                                _w = {}
+                                for k, v in _with.items():
+                                    _w[k] = utils.evaluate(v, reference=reference, **kkwargs, **kwargs)
+                            else:
+                                _w = _with
+                            self.log.debug(f"Replacing {_what} with {_w}")
                         if isinstance(_what, int) and isinstance(element, (list, dict)):
                             if isinstance(element, list):
                                 try:
@@ -560,17 +568,29 @@ def process_elements(reference: dict, **kwargs):
                                 element[_what] = utils.evaluate(_with, reference=reference, **kkwargs, **kwargs)
                                 sort = True
                         elif isinstance(_with, dict) and isinstance(element[_what], (int, str, float, bool)):
-                            for key, value in _with.items():
-                                if utils.evaluate(key, reference=reference):
-                                    element[_what] = utils.evaluate(value, reference=reference, **kkwargs, **kwargs)
+                            for k, v in _with.items():
+                                if utils.evaluate(k, reference=reference):
+                                    element[_what] = utils.evaluate(v, reference=reference, **kkwargs, **kwargs)
                                     break
+                        elif isinstance(_with, list):
+                            element[_what] = [utils.evaluate(x, reference=reference, **kkwargs, **kwargs) for x in _with]
                         else:
                             element[_what] = utils.evaluate(_with, reference=reference, **kkwargs, **kwargs)
                     if sort:
                         sort_dict(element)
                 elif 'merge' in config:
                     for _what, _with in config['merge'].items():
                         if debug:
+                            if isinstance(_with, str):
+                                _w = utils.evaluate(_with, reference=reference, **kkwargs, **kwargs)
+                            elif isinstance(_with, list):
+                                _w = [utils.evaluate(x, reference=reference, **kkwargs, **kwargs) for x in _with]
+                            elif isinstance(_with, dict):
+                                _w = {}
+                                for k, v in _with.items():
+                                    _w[k] = utils.evaluate(v, reference=reference, **kkwargs, **kwargs)
+                            else:
+                                _w = _with
                             self.log.debug(f"Merging {_what} with {_with}")
                         if isinstance(_with, dict):
                             if not element[_what]:
@@ -581,6 +601,9 @@ def process_elements(reference: dict, **kwargs):
                             for value in utils.for_each(source, _with[1:].split('/'), debug=debug, **kwargs):
                                 if isinstance(element[_what], dict):
                                     element[_what] |= value
+                                elif isinstance(element[_what], list):
+                                    # attention: merge of lists is not supported, as they need to keep the order
+                                    element[_what] = value
                                 else:
                                     element[_what] += value
                             if _with.startswith('/'):
@@ -642,7 +665,6 @@ def check_where(reference: dict, config: Union[list, str], debug: bool, **kwargs
             self.log.error(f"File {file} can not be changed.")
             return
 
-        kwargs = {}
         # check if we need to import stuff
         for imp in config.get('imports', []):
             try:

core/utils/__init__.py

@@ -7,4 +7,5 @@
 from core.utils.mizedit import *
 from core.utils.os import *
 from core.utils.performance import *
+from core.utils.squadrons import *
 from core.utils.validators import *