modsvaskr 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d247b6d5b73f10426d5769b031213c408bc6ac8c390baea5e9f6a1b0af7495d
-  data.tar.gz: 97d98a1e6d93088e7a63f9a07ac31b01c3ed8e0aba4e4159a842fff9af8efaae
+  metadata.gz: 49c9d23f41a3e7e6b7f60f4961e402e28e2136074f6e01e62da3d9a36ec41fce
+  data.tar.gz: 276d691af40d723b2412951654299e7a4d745ac83de2e4c76bd2df1baba4c3a6
 SHA512:
-  metadata.gz: d17a2422af5a5428266c5586887ab5210e0ad7026c8c07fced929b2731aafb07c97bad7c4c8be5886cac8d19ae7e51e1f3f386da6d00d64536e0032bde004e76
-  data.tar.gz: 775b864997420ad4e78af51e4511d0ad579a236781cbc30c1f1c577992ae3f486d3ab40f701acf4937d51b2bf4397d02fb54c409d37965a03596e0acc57ad799
+  metadata.gz: 15c41045b26d2c8d05ab3ec94aa06420745a121402f08a5a0fb3aec1d7ab0bab0a459cb69a9083d34cdcb5b06574ea45a7cedd982be8a9503c791cfe82bff9df
+  data.tar.gz: 9c6370ad8b2f54728beb175a10887227193ad27817237db090d9a99e5a8f1d5eb5c0adac790c5596bb5cfbbd566f6750be665a60ab5e1ef06396a5dec72e0cbf

data/lib/modsvaskr/tests_suites/npc.rb

@@ -24,19 +24,34 @@ module Modsvaskr
       def discover_tests
         tests = {}
         @game.xedit.run_script('DumpInfo', only_once: true)
+        # Keep track of masters, per plugin
+        # Hash<String, Array<String> >
+        masters = {}
+        # Keep track of NPCs
+        # Array< [String, Integer, String] >
+        # Array< [Plugin, FormID,  NPC   ] >
+        npcs = []
         @game.xedit.parse_csv('Modsvaskr_ExportedDumpInfo') do |row|
-          if row[1].downcase == 'npc_'
-            # Know from which mod this ID comes from
-            plugin, base_form_id = @game.decode_form_id(row[2])
-            test_name = "#{plugin}/#{base_form_id}"
-            if tests.key?(test_name)
-              # Add the name of the mod to the description, so that we know which mod modifies which NPC.
-              tests[test_name][:name] << "/#{row[0].downcase}"
-            else
-              tests[test_name] = {
-                name: "Take screenshot of #{row[3]} - #{row[0].downcase}"
-              }
-            end
+          case row[1].downcase
+          when 'npc_'
+            npcs << [row[0].downcase, row[2].to_i(16), row[3]]
+          when 'tes4'
+            masters[row[0].downcase] = row[3..-1].map(&:downcase)
+          end
+        end
+        npcs.each do |(esp, form_id, npc_name)|
+          raise "Esp #{esp} declares NPC FormID #{form_id} (#{npc_name}) but its masters could not be parsed" unless masters.key?(esp)
+          # Know from which mod this ID comes from
+          mod_idx = form_id / 16_777_216
+          raise "NPC FormID #{form_id} (#{npc_name}) from #{esp} references an unknown master (known masters: #{masters[esp].join(', ')})" if mod_idx > masters[esp].size
+          test_name = "#{mod_idx == masters[esp].size ? esp : masters[esp][mod_idx]}/#{form_id % 16_777_216}"
+          if tests.key?(test_name)
+            # Add the name of the mod to the description, so that we know which mod modifies which NPC.
+            tests[test_name][:name] << "/#{esp}"
+          else
+            tests[test_name] = {
+              name: "Take screenshot of #{npc_name} - #{esp}"
+            }
           end
         end
         tests

data/lib/modsvaskr/tests_suites/npc_head.rb

@@ -1,12 +1,10 @@
-require 'modsvaskr/in_game_tests_suite'
+require 'modsvaskr/tests_suites/npc'
 
 module Modsvaskr
 
   module TestsSuites
 
-    class NpcHead < TestsSuite
-
-      include InGameTestsSuite
+    class NpcHead < TestsSuites::Npc
 
       # Return the in-game tests suite to which we forward the tests to be run
       #
@@ -22,22 +20,9 @@ module Modsvaskr
       # Result::
       # * Hash< String, Hash<Symbol,Object> >: Ordered hash of test information, per test name
       def discover_tests
-        tests = {}
-        @game.xedit.run_script('DumpInfo', only_once: true)
-        @game.xedit.parse_csv('Modsvaskr_ExportedDumpInfo') do |row|
-          if row[1].downcase == 'npc_'
-            # Know from which mod this ID comes from
-            plugin, base_form_id = @game.decode_form_id(row[2])
-            test_name = "#{plugin}/#{base_form_id}"
-            if tests.key?(test_name)
-              # Add the name of the mod to the description, so that we know which mod modifies which NPC.
-              tests[test_name][:name] << "/#{row[0].downcase}"
-            else
-              tests[test_name] = {
-                name: "Take head screenshot of #{row[3]} - #{row[0].downcase}"
-              }
-            end
-          end
+        tests = super
+        tests.values.each do |test_info|
+          test_info[:name].gsub!('Take screenshot', 'Take head screenshot')
         end
         tests
       end

data/lib/modsvaskr/version.rb

@@ -1,5 +1,5 @@
 module Modsvaskr
 
-  VERSION = '0.1.10'
+  VERSION = '0.1.11'
 
 end

data/xedit_scripts/Modsvaskr_DumpInfo.pas

@@ -20,6 +20,9 @@ end;
 function Process(e: IInterface): integer;
 var
   worldElement : IwbContainer;
+  modFile : IwbFile;
+  idxMaster : integer;
+  masters : string;
 begin
   // AddMessage('Processing: ' + FullPath(e));
   if Signature(e) = 'CELL' then begin
@@ -55,6 +58,16 @@ begin
       IntToHex(FixedFormID(e), 8) + ',' +
       GetElementEditValues(e, 'FULL')
     );
+  end else if (Signature(e) = 'TES4') then begin
+    modFile := GetFile(e);
+    masters := '';
+    for idxMaster := 0 to MasterCount(modFile) - 1 do
+      masters := masters + ',' + GetFileName(MasterByIndex(modFile, idxMaster));
+    slCsv.Add(
+      '"' + GetFileName(GetFile(e)) + '",' +
+      Signature(e) + ',' +
+      masters
+    );
   end;
   Result := 0;
 end;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modsvaskr
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Muriel Salvan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses_menu