Minor aesthetic modifications

red-star-squadron · Nov 10, 2023 · 56f065e · 56f065e
1 parent 397e6eb
commit 56f065e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/rs_Assets.py b/rs_Assets.py
@@ -156,7 +156,7 @@ def _process_roughmets_multi(self) -> List["LiveryAsset"]:
                 os_join(self._dl_dir, self.basename, roughmets_dir)
             )
             new_instance = LiveryAsset(
-                basename=f"Roughmet {roughmets_dir}",
+                basename=f"Roughmets {roughmets_dir}",
                 gdrive_id=self.gdrive_id,
                 asset_type="roughmets_single",
             )

diff --git a/templates/effective_user_choice.j2 b/templates/effective_user_choice.j2
@@ -16,16 +16,6 @@ Section "-Resolve checkboxes"
 {%- endfor %}
 SectionEnd
 
-Section "-Resolve pilot priorities"
-    ${If} ${SectionIsSelected}  ${PILOTPRIO}
-        DetailPrint "Modifying pilot priorities..."
-        ${PowerShellExecFileLog} '"$PLUGINSDIR\livery-priorities.ps1" -dcs_liveries_root_dir "$InstDir" -pilot "$PilotSelected"  '
-        IfErrors 0 +2
-            Abort "There was a problem with the pilot priorities script. Aborting. You can probably use the liveries as normal."
-        ; nsExec::ExecToStack 'powershell -inputformat none -ExecutionPolicy RemoteSigned -File "$PLUGINSDIR\livery-priorities.ps1" -dcs_liveries_root_dir "$InstDir" -pilot "$PilotSelected"  '
-        ; MessageBox MB_OK "$PilotSelected"
-    ${Endif}
-SectionEnd
 {%- endmacro %}
 
 

diff --git a/templates/onclick_handler.j2 b/templates/onclick_handler.j2
@@ -44,10 +44,8 @@ FunctionEnd
 {#- Selects a parent if any of the children are clicked #}
 {#- Applies to install items only #}
 {%- macro dependancy_install_select_parent(parent) %}
-    {#- ; PARENT: {{parent.basename}} // {{parent.category_name}} #}
     {%- for child in parent._children %}
-        {#- ; CHILD:  {{child.basename}} // {{child.category_name}} #}
-        {%- if child == parent._children[0] %} {# First element in the loop has 'IfNot', others have 'AndIfNot'#}
+        {%- if child == parent._children[0] %} {# First element in the loop has 'If', others have 'OrIf'#}
     ${If} ${SectionIsSelected}  {{ '${' }}{{child._uuid + "_install"}}{{ '}' }} ; child.basename: {{child.basename}} // child.category_name: {{child.category_name}}
     ${OrIf} ${SectionIsPartiallySelected}  {{ '${' }}{{child._uuid + "_install"}}{{ '}' }} ; child.basename: {{child.basename}} // child.category_name: {{child.category_name}}
         {%- else %}

diff --git a/templates/rs-liveries.nsi.j2 b/templates/rs-liveries.nsi.j2
@@ -244,3 +244,14 @@ FunctionEnd
 
 {%- import "effective_user_choice.j2" as effective_user_choice %}
 {{- effective_user_choice.render(all_assets, github_ref_name) }}
+
+Section "-Resolve pilot priorities"
+    ${If} ${SectionIsSelected}  ${PILOTPRIO}
+        DetailPrint "Modifying pilot priorities..."
+        ${PowerShellExecFileLog} '"$PLUGINSDIR\livery-priorities.ps1" -dcs_liveries_root_dir "$InstDir" -pilot "$PilotSelected"  '
+        IfErrors 0 +2
+            Abort "There was a problem with the pilot priorities script. Aborting. You can probably use the liveries as normal."
+        ; nsExec::ExecToStack 'powershell -inputformat none -ExecutionPolicy RemoteSigned -File "$PLUGINSDIR\livery-priorities.ps1" -dcs_liveries_root_dir "$InstDir" -pilot "$PilotSelected"  '
+        ; MessageBox MB_OK "$PilotSelected"
+    ${Endif}
+SectionEnd