From 1c11b0b889aad89a19e211891680de54fffab70b Mon Sep 17 00:00:00 2001 From: Geeves Date: Sat, 7 Sep 2024 18:00:32 +0200 Subject: [PATCH] skin.dmf DME Check (#19865) skin dmf is in the wrong order in the .dme and keeps trying to reorder itself, opening this PR to see why it fails --- aurorastation.dme | 2 +- tools/validate_dme.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/aurorastation.dme b/aurorastation.dme index 5c863f7a43a..76924a35f12 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -3774,12 +3774,12 @@ #include "code\ZAS\Zone.dm" #include "code\ze_genesis_call\genesis_call.dm" #include "interface\interface.dm" +#include "interface\skin.dmf" #include "interface\fonts\fonts_datum.dm" #include "interface\fonts\grand_9k.dm" #include "interface\fonts\pixellari.dm" #include "interface\fonts\spess_font.dm" #include "interface\fonts\tiny_unicode.dm" -#include "interface\skin.dmf" #include "maps\_common\areas\ai.dm" #include "maps\_common\areas\areas.dm" #include "maps\_common\areas\asteroid_areas.dm" diff --git a/tools/validate_dme.py b/tools/validate_dme.py index 1d852f21e31..13c5d3ce163 100644 --- a/tools/validate_dme.py +++ b/tools/validate_dme.py @@ -74,9 +74,11 @@ def compare_lines(a, b): a_segments = a.split('\\') b_segments = b.split('\\') + file_end_types = (".dm", ".dmf") + for (a_segment, b_segment) in zip(a_segments, b_segments): - a_is_file = a_segment.endswith(".dm") - b_is_file = b_segment.endswith(".dm") + a_is_file = a_segment.endswith(file_end_types) + b_is_file = b_segment.endswith(file_end_types) # code\something.dm will ALWAYS come before code\directory\something.dm if a_is_file and not b_is_file: