modsvaskr 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec8a78a2351a1b75ce524ec43bc394f32af0ca8f9f8bdcb503227ef61c67a835
-  data.tar.gz: 1368b7d37845214a577ce3c90a74d771921c82dd9b6e2b29ea7290c7087c503a
+  metadata.gz: 8d247b6d5b73f10426d5769b031213c408bc6ac8c390baea5e9f6a1b0af7495d
+  data.tar.gz: 97d98a1e6d93088e7a63f9a07ac31b01c3ed8e0aba4e4159a842fff9af8efaae
 SHA512:
-  metadata.gz: 7fcdfcb6474e23a2194c368c8eb77af05b83d8c3ded3f34d9a11ecd7e8decf0bfd33d4d2c07edd2ac0f2ce865004ce8a7b5c0fe4a205a5efb82745d2d8a38d25
-  data.tar.gz: cf8b50f20f69992e5830472809bdb356293f3b5d5e5c3410b4a3b996bab5234932162836f5fecf0d563af24ad9fad8cc92cc9dbb186a1458642053c662e82201
+  metadata.gz: d17a2422af5a5428266c5586887ab5210e0ad7026c8c07fced929b2731aafb07c97bad7c4c8be5886cac8d19ae7e51e1f3f386da6d00d64536e0032bde004e76
+  data.tar.gz: 775b864997420ad4e78af51e4511d0ad579a236781cbc30c1f1c577992ae3f486d3ab40f701acf4937d51b2bf4397d02fb54c409d37965a03596e0acc57ad799

data/lib/modsvaskr/game.rb

@@ -174,6 +174,30 @@ module Modsvaskr
       end
     end
 
+    # Get the load order.
+    # Keep a cache of it.
+    #
+    # Result::
+    # * Array<String>: List of all active plugins, including masters
+    def get_load_order
+      @cache_load_order = load_order unless defined?(@cache_load_order)
+      @cache_load_order
+    end
+
+    # Get the mod and base id corresponding to a given form id.
+    # Uses load order to determine it.
+    #
+    # Parameters::
+    # * *form_id* (String or Integer): Form ID, either as hexadecimal string, or numercial value
+    # Result::
+    # * String: Plugin name
+    # * Integer: Base form id, independent from the load order
+    def decode_form_id(form_id)
+      form_id = form_id.to_i(16) if form_id.is_a?(String)
+      [get_load_order[form_id / 16_777_216], form_id % 16_777_216]
+    end
+
+
   end
 
 end

data/lib/modsvaskr/games/skyrim_se.rb

@@ -37,7 +37,9 @@ module Modsvaskr
         'SkyrimSE.exe'
       end
 
-      # List of default esps present in the game (the ones in the Data folder when 0 mod is being used)
+      # Ordered list of default esps present in the game (the ones in the Data folder when 0 mod is being used).
+      # The list is ordered according to the game's load order.
+      # [API] - This method is mandatory
       #
       # Result::
       # * Array<String>: List of esp/esm/esl base file names.
@@ -51,6 +53,18 @@ module Modsvaskr
         ]
       end
 
+      # Get the load order.
+      # [API] - This method is mandatory
+      #
+      # Result::
+      # * Array<String>: List of all active plugins, including masters
+      def load_order
+        game_esps +
+          File.read("#{ENV['USERPROFILE']}/AppData/Local/Skyrim Special Edition/plugins.txt").split("\n").map do |line|
+            line =~ /^\*(.+)$/ ? $1.downcase : nil
+          end.compact
+      end
+
       private
 
       # Install SKSE64 corresponding to our game

data/lib/modsvaskr/tests_suites/npc.rb

@@ -25,9 +25,19 @@ module Modsvaskr
         tests = {}
         @game.xedit.run_script('DumpInfo', only_once: true)
         @game.xedit.parse_csv('Modsvaskr_ExportedDumpInfo') do |row|
-          tests["#{row[0].downcase}/#{row[2].to_i(16)}"] = {
-            name: "Take screenshot of #{row[0]} - #{row[3]}"
-          } if row[1].downcase == 'npc_'
+          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
+          end
         end
         tests
       end

data/lib/modsvaskr/tests_suites/npc_head.rb

@@ -25,9 +25,19 @@ module Modsvaskr
         tests = {}
         @game.xedit.run_script('DumpInfo', only_once: true)
         @game.xedit.parse_csv('Modsvaskr_ExportedDumpInfo') do |row|
-          tests["#{row[0].downcase}/#{row[2].to_i(16)}"] = {
-            name: "Take head screenshot of #{row[0]} - #{row[3]}"
-          } if row[1].downcase == 'npc_'
+          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
         end
         tests
       end

data/lib/modsvaskr/ui.rb

@@ -1,4 +1,3 @@
-require 'csv'
 require 'curses_menu'
 require 'modsvaskr/logger'
 require 'modsvaskr/tests_runner'

data/lib/modsvaskr/version.rb

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

data/lib/modsvaskr/xedit.rb

@@ -1,3 +1,4 @@
+require 'csv'
 require 'modsvaskr/encoding'
 require 'modsvaskr/run_cmd'
 

metadata

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