silkedit 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a12669881e8a00f516320116750f2e45aa5e784e10b4cdb68ad7a2b1d5fb1f91
-  data.tar.gz: 23234270ca141a2f408b1a012d8effb9730e703e2e2444d4c43a2d5d5a77106d
+  metadata.gz: a7f3339a4438bd794c4ed860bba4216a0b4bb018fdaa570d72f66e69388e975a
+  data.tar.gz: d4a14494a7d827fd61c91e48f3b98500fc9c072f5718da7e504a14fc7f0ecb4c
 SHA512:
-  metadata.gz: f66c14e57b5fe04d97bec8bdc2d540e6a95fb29be890007e923cf50ec080118f3aa263e29bc476c8b6e1dcb66d862c2b4a0b642552de93ba80c1ceec63907724
-  data.tar.gz: a5c2d93939d57933ec9444516b21cf00c62b9f8df2426eb02af671860096bf87b4d2e05c5d0a7ebfd25c9af7b0c6b3aa3f89effdf5547f3326360c3a84d645ef
+  metadata.gz: dc0d913626bbe4eb89b3b7d684642202ccbe02b73de78d5bfacf6cd11ed034a922e4c8011acb31a57b23c5f84b5d409babf7f91cb888462833783c47c3ac4134
+  data.tar.gz: 5b4ee244c35db3d4eec09e6202f450f9681edfbec1a2c25d81ae3f27a3e3b724c9924dfbe78c3296cdeb8173ace4c698346943af8305550e67dac7e308e77ce9

data/lib/silkedit/cheats/merger.rb

@@ -31,7 +31,7 @@ module Silkedit::Cheat
         merge_hash(data[k], cheat[k])
       elsif should_merge_arrays && cheat[k].is_a?(Array) && data[k].is_a?(Array)
         if cheat[k][0].is_a?(Hash)
-          merge_arrays_by_hash_keys(data[k], cheat[k])
+          data[k] = merge_arrays_by_hash_keys(data[k], cheat[k])
         else
           data[k].merge!(cheat[k])
           data[k].uniq!
@@ -44,7 +44,11 @@ module Silkedit::Cheat
   end
 
   def self.merge_arrays_by_hash_keys(data, cheat)
-    return nil unless data.is_a?(Array) && cheat.is_a?(Array) && data.first.is_a?(Hash)
+    return data unless data.is_a?(Array) && cheat.is_a?(Array) && cheat.first.is_a?(Hash)
+    if data.empty?
+      data = cheat
+      return data
+    end
     # First determine the primary key(s) for the object
     pkeys = []
     [%w[Name], %w[sceneData ID]].each do |pkey_arr|
@@ -58,7 +62,7 @@ module Silkedit::Cheat
         data << c
       end
     end
-    true
+    data
   end
 
   def self.verify_hash(data, reqs)

data/lib/silkedit/cheats/silksong_cheats.rb

@@ -117,5 +117,11 @@ module Silkedit::Cheat
       Rbcli.log.info "Toggling permadeath mode #{toggle ? 'ON' : 'OFF'}", 'CHEATS'
       @data['playerData']['permadeathMode'] = toggle ? 1 : 0
     end
+
+    def toggle_fly_mode
+      toggle = @data['playerData']['infiniteAirJump'] == false
+      Rbcli.log.info "Toggling fly mode #{toggle ? 'ON' : 'OFF'}", 'CHEATS'
+      @data['playerData']['infiniteAirJump'] = toggle ? true : false
+    end
   end
 end

data/lib/silkedit/config/silksong/cheatdata.yaml

@@ -770,6 +770,58 @@ cheats:
               Amount: 1
               IsSeenMask: 0
               AmountWhileHidden: 0
+  ability_dash:
+    data:
+      playerData:
+        hasDash: true
+        HasSeenDash: true
+  ability_doublejump:
+    data:
+      playerData:
+        hasDoubleJump: true
+  ability_drift:
+    data:
+      playerData:
+        hasBrolly: true
+  ability_walljump:
+    data:
+      playerData:
+        hasWalljump: true
+        HasSeenWalljump: true
+  ability_needolin:
+    data:
+      playerData:
+        hasNeedolin: true
+        HasSeenNeedolin: true
+  ability_needolin_up:
+    data:
+      playerData:
+        hasNeedolinMemoryPowerup: true
+        HasSeenNeedolinUp: true
+  ability_needolin_down:
+    data:
+      playerData:
+        UnlockedFastTravelTeleport: true
+        HasSeenNeedolinDown: true
+  ability_harpoon:
+    data:
+      playerData:
+        hasHarpoonDash: true
+        HasSeenHarpoon: true
+  ability_charge_weapon:
+    data:
+      playerData:
+        hasChargeSlash: true
+  ability_silkspecial:
+    data:
+      playerData:
+        hasSilkSpecial: true
+        HasSeenSilkSpecial: true
+  ability_superjump:
+    data:
+      playerData:
+        hasSuperJump: true
+        HasSeenSuperJump: true
   quill_none:
     data:
       playerData:

data/lib/silkedit/savegame/diff.rb

@@ -7,49 +7,50 @@ module Silkedit::Savegame
 
       diff = nil
 
-      if old.is_a?(Hash)
+      if old.is_a?(Hash) || new.is_a?(Hash)
         diff = {}
         (old.keys + new.keys).uniq.each do |k|
           itemdiff = mkdiff(old[k], new[k])
           diff[k] = itemdiff unless itemdiff.nil? || itemdiff.empty?
         end
-      elsif old.is_a?(Array)
+      elsif old.is_a?(Array) || new.is_a?(Array)
         diff = []
-        if old.first.is_a?(Hash)
-          if old.first.key?('Name')
-            keycomps = %w[Name]
-          elsif old.first.key?('SceneName') && old.first.key?('ID')
-            keycomps = %w[SceneName ID]
-          elsif old.first.key?('SceneName') && old.first.key?('EventType')
-            keycomps = %w[SceneName EventType]
-          else
-            keycomps = nil
-          end
-          if keycomps.nil?
-            diff = { old: old.reject { |e| new.include?(e) }, new: new.reject { |e| old.include?(e) } }
-          else
-            old.each do |o|
-              n = new.find { |e| keycomps.map { |k| e[k] == o[k] }.reduce { |a, b| a && b } }
-              itemdiff = mkdiff(
-                o.reject { |k, _v| keycomps.include?(k) },
-                n.nil? ? nil : n.reject { |k, _v| keycomps.include?(k) }
-              )
-              next if itemdiff.empty?
-              newobj = {}
-              keycomps.each { |k| newobj[k] = o[k] }
-              diff.append(newobj.merge(itemdiff))
-            end
-            new.each do |n|
-              o = old.find { |e| keycomps.map { |k| e[k] == n[k] }.reduce { |a, b| a && b } }
-              next unless o.nil?
-              itemdiff = mkdiff(
-                nil,
-                n.reject { |k, _v| keycomps.include?(k) }
-              )
-              newobj = {}
-              keycomps.each { |k| newobj[k] = n[k] }
-              diff.append(newobj.merge(itemdiff))
+        if (old.first.is_a?(Hash) && old.first.key?('Name')) ||
+           (new.first.is_a?(Hash) && new.first.key?('Name'))
+          keycomps = %w[Name]
+        elsif (old.first.is_a?(Hash) && old.first.key?('SceneName') && old.first.key?('ID')) ||
+              (new.first.is_a?(Hash) && new.first.key?('SceneName') && new.first.key?('ID'))
+          keycomps = %w[SceneName ID]
+        elsif (old.first.is_a?(Hash) && old.first.key?('SceneName') && old.first.key?('EventType')) ||
+              (new.first.is_a?(Hash) && new.first.key?('SceneName') && new.first.key?('EventType'))
+          keycomps = %w[SceneName EventType]
+        else
+          keycomps = nil
+        end
+        if keycomps.nil?
+          diff = { old: old.reject { |e| new.include?(e) }, new: new.reject { |e| old.include?(e) } }
+          diff = nil if diff[:old].empty? && diff[:new].empty?
+        else
+          old.each do |o|
+            n = new.find { |e| keycomps.map { |k| e[k] == o[k] }.reduce { |a, b| a && b } }
+            if n.nil?
+              diff.append({new: n, old: o})
+              next
             end
+            itemdiff = mkdiff(
+              o.reject { |k, _v| keycomps.include?(k) },
+              n.nil? ? nil : n.reject { |k, _v| keycomps.include?(k) }
+            )
+            next if itemdiff.empty?
+            newobj = {}
+            keycomps.each { |k| newobj[k] = o[k] }
+            diff.append(newobj.merge(itemdiff))
+          end
+          new.each do |n|
+            o = old.find { |e| keycomps.map { |k| e[k] == n[k] }.reduce { |a, b| a && b } }
+            next unless o.nil?
+            diff.append({new: n, old: o})
+            next
           end
         end
       elsif old != new
@@ -71,7 +72,7 @@ module Silkedit::Savegame
             if line[i] == '-' && blank_leadup
               colored_string += line[i].colorize(:yellow)
               i += 1
-            elsif line[i] == ':' && blank_leadup
+            elsif line[i] == ':' && (blank_leadup || line[0..i-1].sub('-', '').chars.map { |c| c == ' ' }.all?)
               j = i + line[i+1..-1].index(':')
               colored_string += line[i..j].colorize(:magenta)
               i += j - i + 1

data/lib/silkedit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Silkedit
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: silkedit
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Andrew Khoury