silkedit 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a12669881e8a00f516320116750f2e45aa5e784e10b4cdb68ad7a2b1d5fb1f91
-  data.tar.gz: 23234270ca141a2f408b1a012d8effb9730e703e2e2444d4c43a2d5d5a77106d
+  metadata.gz: 59acadecebfa7ff2b98fbccabf203cc9f03cf092f9358ee0366031aa6b0e0024
+  data.tar.gz: c8ecb69055f19e1f7be924dec8b5d51cc42b9c8d0e4edb0b82a8879cb1aa2dc5
 SHA512:
-  metadata.gz: f66c14e57b5fe04d97bec8bdc2d540e6a95fb29be890007e923cf50ec080118f3aa263e29bc476c8b6e1dcb66d862c2b4a0b642552de93ba80c1ceec63907724
-  data.tar.gz: a5c2d93939d57933ec9444516b21cf00c62b9f8df2426eb02af671860096bf87b4d2e05c5d0a7ebfd25c9af7b0c6b3aa3f89effdf5547f3326360c3a84d645ef
+  metadata.gz: 88a7be67351215bc3936d245a7b77a33b86f6f7bbaa119508b972b625a3133f1f81518eb811b7e54f0be873f6470e059c888835fbfa503e02432099741b47b41
+  data.tar.gz: 46b28d7d3f421f8068a0b7ab3bc92da0df83956824998d5b5150e1ddbf3d94d14f0ca270fd379a04ec45f60b90252d0945a481ffe6e65a0c93df76e7dbf123cf

data/lib/commands/cheat.rb

@@ -2,18 +2,67 @@ Rbcli.command 'cheat' do
   description 'Applies one or more cheats to the selected savefile'
   usage '<cheat1> <cheat2> <cheat3>...'
   parameter :list, 'List all cheats', type: :bool, default: false
+  # parameter :force, "Force application of a cheat even when requirements aren't met. Additional changes may be made to your savegave.", type: :bool, default: false
   action do |opts, params, args, config, env|
     s = Silkedit::Savegame::SaveFile.new(:silksong, opts[:savenum])
     s.load_from_dat
     c = Silkedit::Cheat::Engine.new(s.data)
-    selected_cheats = args.map { |arg| arg.downcase }.select { |cht| c.cheat_exists?(cht) }
-    if params[:list] || selected_cheats.empty?
-      Rbcli.log.info "Cheats: \n" + c.list_cheats.map(&:to_s).join("\n")
-    else
-      selected_cheats.each { |cht| c.apply_cheat(cht) }
-      s.direct_backup
-      s.save_to_dat
-      Rbcli.log.info "applied cheats: #{selected_cheats.join(', ')}"
+
+    display_simple_list = lambda do |list, cols|
+      max_length = list.map(&:length).max
+      display_set = []
+      rows = (list.length / cols.to_f).ceil
+      row_idx = 0
+      max_rows = rows - 1
+      list.length.times do |i|
+        display_set[row_idx] ||= []
+        display_set[row_idx] << list[i]
+        row_idx += 1
+        row_idx = 0 if row_idx > max_rows
+      end
+      display_set.map { |row| row.map { |z| z.ljust(max_length) }.join('   ') }.join("\n")
     end
+
+    if args.empty? || params[:list]
+      Rbcli.log.info 'Cheats:'
+      Rbcli.log.info display_simple_list.call(c.list_cheats, 5)
+      Rbcli.exit(0)
+    end
+
+    changes = args.map do |cht|
+      cht = cht.downcase
+      status = c.apply_cheat(cht)
+      case status
+      when :no_cheat
+        Rbcli.log.warn "Could not apply cheat #{cht}: Cheat does not exist"
+        Rbcli.log.info 'Did you mean one of these?'
+        possible_cheats = c.list_cheats.select { |cheat| cheat.include?(args.first) }
+        Rbcli.log.info display_simple_list.call(possible_cheats, 5)
+        nil
+      when :failed_act_check
+        Rbcli.log.warn "Could not apply cheat #{cht.colorize(:red)}: The player is in the wrong act. Use --(f)orce to override."
+        nil
+      when :failed_soft_reqs
+        Rbcli.log.warn "Could not apply cheat #{cht.colorize(:red)}: Soft requirements not met. Use --(f)orce to apply the required changes."
+        nil
+      when :failed_hard_reqs
+        Rbcli.log.error "Could not apply cheat #{cht.colorize(:red)}: Hard requirements not met. Applying the cheat would cause in-game errors."
+        nil
+      when :success
+        Rbcli.log.info "    Success!".colorize(:green)
+        cht
+      else
+        raise "Unknown status: #{status}"
+      end
+    end.reject(&:nil?)
+
+    if changes.empty?
+      Rbcli.log.info ''
+      Rbcli.log.info 'No cheats applied'
+      Rbcli.exit(0)
+    end
+
+    s.direct_backup
+    s.save_to_dat
   end
 end

data/lib/commands/zone_mkzone.rb

@@ -1,25 +1,26 @@
 Rbcli.command 'zone' do
   description 'Zones the character to a different respawn point'
   usage '<zone> (--(f)orce)'
-  parameter :force, 'Force select a spawn point even when requirements are not met. Changes may be made to your savegave.', type: :bool, default: false
   parameter :list, 'Display the full list of zones to select from', type: :bool, default: false
+  parameter :force, 'Force select a spawn point even when requirements are not met. Changes may be made to your savegave.', type: :bool, default: false
   action do |opts, params, args, config, env|
     s = Silkedit::Savegame::SaveFile.new(:silksong, opts[:savenum])
     s.load_from_dat
     c = Silkedit::Cheat::Engine.new(s.data)
 
-    display_simple_zone_list = lambda do |list, cols|
+    display_simple_list = lambda do |list, cols|
+      max_length = list.map(&:length).max
       display_set = []
-      rows = (c.list_shortcuts.length / cols.to_f).ceil
+      rows = (list.length / cols.to_f).ceil
       row_idx = 0
       max_rows = rows - 1
-      c.list_shortcuts.length.times do |i|
+      list.length.times do |i|
         display_set[row_idx] ||= []
-        display_set[row_idx] << c.list_shortcuts.keys[i]
+        display_set[row_idx] << list[i]
         row_idx += 1
         row_idx = 0 if row_idx > max_rows
       end
-      display_set.map { |row| row.map { |z| z.rjust(15) }.join(' ') }.join("\n")
+      display_set.map { |row| row.map { |z| z.ljust(max_length) }.join('   ') }.join("\n")
     end
 
     display_detailed_zone_list = lambda do |list|
@@ -33,7 +34,7 @@ Rbcli.command 'zone' do
 
     if args.empty? || params[:list]
       Rbcli.log.info 'Shortcuts:'
-      Rbcli.log.info display_simple_zone_list.call(c.list_shortcuts, 5)
+      Rbcli.log.info display_simple_list.call(c.list_shortcuts.keys, 5)
     end
 
     if params[:list]
@@ -47,20 +48,20 @@ Rbcli.command 'zone' do
     status = c.zone_to(args.first, force_soft_reqs: params[:force], enforce_min_act: !params[:force])
     case status
     when :no_zone
-      Rbcli.log.info "Could not zone to #{args.first}: Specified spawn point does not exist"
+      Rbcli.log.warn "Could not zone to #{args.first}: Specified spawn point does not exist"
       Rbcli.log.info 'Did you mean one of these?'
       possible_zones = c.list_zones.select { |zone| zone[:slug].include?(args.first) || !zone[:shortcut].nil? && zone[:shortcut].include?(args.first) }
-      Rbcli.log.info display_detailed_zone_list.call(possible_zones)
+      Rbcli.log.info display_detailed_zone_list.call(possible_zones, 5)
     when :failed_act_check
-      Rbcli.log.warn "Could not zone to #{args.first}: The player is in the wrong act. Use --(f)orce to override."
+      Rbcli.log.warn "Could not zone to #{args.first.colorize(:red)}: The player is in the wrong act. Use --(f)orce to override."
     when :failed_soft_reqs
-      Rbcli.log.warn "Could not zone to #{args.first}: Soft requirements not met. Use --(f)orce to apply the required changes."
+      Rbcli.log.warn "Could not zone to #{args.first.colorize(:red)}: Soft requirements not met. Use --(f)orce to apply the required changes."
     when :failed_hard_reqs
-      Rbcli.log.error "Could not zone to #{args.first}: Hard requirements not met. Zoning here would cause errors."
+      Rbcli.log.error "Could not zone to #{args.first.colorize(:red)}: Hard requirements not met. Zoning here would cause in-game errors."
     when :success
       s.direct_backup
       s.save_to_dat
-      Rbcli.log.info "Zoned to #{args.first}"
+      Rbcli.log.info "Zoned to #{args.first.colorize(:green)}"
     else
       raise "Unknown status: #{status}"
     end

data/lib/silkedit/cheats/cheatengine.rb

@@ -8,9 +8,8 @@ module Silkedit::Cheat
     end
 
     def apply_cheat(cheat, *args)
-      return false unless cheat_exists?(cheat.to_s)
+      return :no_cheat unless cheat_exists?(cheat.to_s)
       self.send(cheat.to_sym, *args)
-      true
     end
 
     def apply_cheats(cheats)

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

@@ -33,7 +33,8 @@ module Silkedit::Cheat
     end
 
     def max_everything
-      %w[
+      backup_data = @data.dup
+      result = %w[
         max_health
         max_silk
         max_weapon
@@ -48,12 +49,19 @@ module Silkedit::Cheat
         give_consumables
         max_rosaries
         max_shards
-      ].each { |cht| self.send(cht.to_sym) }
+      ].map { |cht| self.send(cht.to_sym) }
+      if result.all?(:success)
+        :success
+      else
+        @data = backup_data
+        result.reject { |r| r == :success }.first
+      end
     end
 
     def max_shards
       Rbcli.log.info 'Applying cheat max_shards', 'CHEATS'
       @data['playerData']['ShellShards'] = 400 + (@data['playerData']['ToolPouchUpgrades'] || 0) * 100
+      :success
     end
 
     def all_crest_unlocks
@@ -68,11 +76,13 @@ module Silkedit::Cheat
         end
         crest['Data']['Slots'].each { |slot| slot['IsUnlocked'] = true }
       end
+      :success
     end
 
     def toggle_map_reveal
       @data['playerData']['mapAllRooms'] = !@data['playerData']['mapAllRooms']
       Rbcli.log.info "Full map reveal is #{@data['playerData']['mapAllRooms'] ? 'enabled' : 'disabled'}", 'CHEATS'
+      :success
     end
 
     def toggle_flea_reveal
@@ -80,6 +90,7 @@ module Silkedit::Cheat
       is_enabled = flea_keys.all? { |k| @data['playerData'][k] }
       flea_keys.each { |k| @data[k] = !is_enabled }
       Rbcli.log.info "Flea locations are #{is_enabled ? 'hidden' : 'revealed'} on map", 'CHEATS'
+      :success
     end
 
     def toggle_cloakless
@@ -110,12 +121,21 @@ module Silkedit::Cheat
         # @data['playerData']['slab_cloak_battle_completed'] = true
         @data['playerData']['IsSilkSpoolBroken'] = false
       end
+      :success
     end
 
     def toggle_permadeath_mode
       toggle = @data['playerData']['permadeathMode'] == 0
       Rbcli.log.info "Toggling permadeath mode #{toggle ? 'ON' : 'OFF'}", 'CHEATS'
       @data['playerData']['permadeathMode'] = toggle ? 1 : 0
+      :success
+    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
+      :success
     end
   end
 end

data/lib/silkedit/cheats/silksong_zoner.rb

@@ -25,7 +25,7 @@ module Silkedit::Cheat
       zonelist = Silkedit::Cheat::SilksongZoner.module_eval { @zonelist }
       shortcuts = Silkedit::Cheat::SilksongZoner.module_eval { @shortcuts }
       Rbcli.log.info "Zoning to #{zone}", 'ZONER'
-      return self.zone_to(shortcuts[zone]) if shortcuts.key?(zone)
+      return self.zone_to(shortcuts[zone], force_soft_reqs: force_soft_reqs, enforce_min_act: enforce_min_act) if shortcuts.key?(zone)
       return :no_zone unless zonelist.find { |z| z['slug'] == zone }
       region, target = zone.split('.')
       Silkedit::Cheat.merge_cheat(

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

@@ -27,6 +27,13 @@ cheats:
       playerData:
         ToolPouchUpgrades: 4
         ToolKitUpgrades: 4
+        Collectables:
+          savedData:
+          - Name: Tool Pouch&Kit Inv
+            Data:
+              Amount: 0
+              IsSeenMask: 4
+              AmountWhileHidden: 0
   max_liquids:
     data:
       playerData:
@@ -63,6 +70,13 @@ cheats:
         HasSeenNeedolinDown: true
         HasSeenHarpoon: true
         UnlockedFastTravelTeleport: true
+        Collectables:
+          savedData:
+          - Name: Dresses
+            Data:
+              Amount: 0
+              IsSeenMask: 8
+              AmountWhileHidden: 0
   all_crests:
     data:
       playerData:
@@ -132,7 +146,6 @@ cheats:
       playerData:
         UnlockedFastTravel: true
         FastTravelNPCLocation: 1
-        UnlockedFastTravelTeleport: true
         UnlockedDocksStation: true
         UnlockedBoneforestEastStation: true
         UnlockedGreymoorStation: true
@@ -278,6 +291,13 @@ cheats:
         hasMarker_c: true
         hasMarker_d: true
         hasMarker_e: true
+        Collectables:
+          savedData:
+          - Name: Quill
+            Data:
+              Amount: 1
+              IsSeenMask: 255
+              AmountWhileHidden: 0
   all_spells:
     data:
       playerData:
@@ -768,85 +788,78 @@ cheats:
           - Name: Plasmium Gland
             Data:
               Amount: 1
-              IsSeenMask: 0
+              IsSeenMask: 1
               AmountWhileHidden: 0
-  quill_none:
+  ability_dash:
     data:
       playerData:
-        hasQuill: false
-        QuillState: 0
-      sceneData:
-        persistentBools:
-          serializedList:
-          - SceneName: Library_13b
-            ID: Collectable Item Pickup - Quill Red
-            Value: false
-            Mutator: 0
-          - SceneName: Library_13b
-            ID: Collectable Item Pickup - Quill Purple
-            Value: false
-            Mutator: 0
-  quill_white:
+        hasDash: true
+        HasSeenDash: true
+  ability_doublejump:
     data:
       playerData:
-        hasQuill: true
-        QuillState: 1
-      sceneData:
-        persistentBools:
-          serializedList:
-          - SceneName: Library_13b
-            ID: Collectable Item Pickup - Quill Red
-            Value: false
-            Mutator: 0
-          - SceneName: Library_13b
-            ID: Collectable Item Pickup - Quill Purple
-            Value: false
-            Mutator: 0
-  quill_red:
+        hasDoubleJump: true
+        Collectables:
+          savedData:
+          - Name: Dresses
+            Data:
+              Amount: 0
+              IsSeenMask: 8
+              AmountWhileHidden: 0
+  ability_drift:
     data:
       playerData:
-        hasQuill: true
-        QuillState: 2
-      sceneData:
-        persistentBools:
-          serializedList:
-          - SceneName: Library_13b
-            ID: Collectable Item Pickup - Quill Red
-            Value: true
-            Mutator: 0
-          - SceneName: Library_13b
-            ID: Collectable Item Pickup - Quill Purple
-            Value: false
-            Mutator: 0
-  quill_purple:
+        hasBrolly: true
+        Collectables:
+          savedData:
+          - Name: Dresses
+            Data:
+              Amount: 0
+              IsSeenMask: 8
+              AmountWhileHidden: 0
+  ability_walljump:
     data:
       playerData:
-        hasQuill: true
-        QuillState: 3
-      sceneData:
-        persistentBools:
-          serializedList:
-          - SceneName: Library_13b
-            ID: Collectable Item Pickup - Quill Red
-            Value: false
-            Mutator: 0
-          - SceneName: Library_13b
-            ID: Collectable Item Pickup - Quill Purple
-            Value: true
-            Mutator: 0
-  easy_dice_game_win:
+        hasWalljump: true
+        HasSeenWalljump: true
+  ability_needolin:
     data:
       playerData:
-        dicePilgrimBank: 0
-  easy_flea_games_win:
+        hasNeedolin: true
+        HasSeenNeedolin: true
+  ability_needolin_up:
     data:
       playerData:
-        fleaGames_juggling_played: true
-        fleaGames_juggling_highscore: 56
-        fleaGames_bouncing_played: true
-        fleaGames_bouncing_highscore: 69
-        fleaGames_dodging_played: true
-        fleaGames_dodging_highscore: 96
+        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
+  ability_teleport:
+    data:
+      playerData:
+        UnlockedFastTravelTeleport: true
   complete_mushroom_quest:
     data:
       playerData:
@@ -866,21 +879,19 @@ cheats:
               CompletedCount: 0
               IsCompleted: true
               WasEverCompleted: false
-  unlock_terminus_door:
+  easy_dice_game_win:
     data:
       playerData:
-        laceTowerDoorOpened: true
-      sceneData:
-        persistentBools:
-          serializedList:
-          - SceneName: Tube_Hub
-            ID: Understore Lever
-            Value: true
-            Mutator: 0
-          - SceneName: Tube_Hub
-            ID: cradle_pipe_trapdoor
-            Value: true
-            Mutator: 0
+        dicePilgrimBank: 0
+  easy_flea_games_win:
+    data:
+      playerData:
+        fleaGames_juggling_played: true
+        fleaGames_juggling_highscore: 56
+        fleaGames_bouncing_played: true
+        fleaGames_bouncing_highscore: 69
+        fleaGames_dodging_played: true
+        fleaGames_dodging_highscore: 96
   give_consumables:
     data:
       playerData:
@@ -947,6 +958,150 @@ cheats:
     data:
       playerData:
         ConstructedFarsight: true
+  quill_none:
+    data:
+      playerData:
+        hasQuill: false
+        QuillState: 0
+      sceneData:
+        persistentBools:
+          serializedList:
+          - SceneName: Library_13b
+            ID: Collectable Item Pickup - Quill Red
+            Value: false
+            Mutator: 0
+          - SceneName: Library_13b
+            ID: Collectable Item Pickup - Quill Purple
+            Value: false
+            Mutator: 0
+  quill_white:
+    data:
+      playerData:
+        hasQuill: true
+        QuillState: 1
+        Collectables:
+          savedData:
+          - Name: Quill
+            Data:
+              Amount: 1
+              IsSeenMask: 16
+              AmountWhileHidden: 0
+      sceneData:
+        persistentBools:
+          serializedList:
+          - SceneName: Library_13b
+            ID: Collectable Item Pickup - Quill Red
+            Value: false
+            Mutator: 0
+          - SceneName: Library_13b
+            ID: Collectable Item Pickup - Quill Purple
+            Value: false
+            Mutator: 0
+  quill_red:
+    data:
+      playerData:
+        hasQuill: true
+        QuillState: 2
+        Collectables:
+          savedData:
+          - Name: Quill
+            Data:
+              Amount: 1
+              IsSeenMask: 16
+              AmountWhileHidden: 0
+      sceneData:
+        persistentBools:
+          serializedList:
+          - SceneName: Library_13b
+            ID: Collectable Item Pickup - Quill Red
+            Value: true
+            Mutator: 0
+          - SceneName: Library_13b
+            ID: Collectable Item Pickup - Quill Purple
+            Value: false
+            Mutator: 0
+  quill_purple:
+    data:
+      playerData:
+        hasQuill: true
+        QuillState: 3
+        Collectables:
+          savedData:
+          - Name: Quill
+            Data:
+              Amount: 1
+              IsSeenMask: 72
+              AmountWhileHidden: 0
+      sceneData:
+        persistentBools:
+          serializedList:
+          - SceneName: Library_13b
+            ID: Collectable Item Pickup - Quill Red
+            Value: false
+            Mutator: 0
+          - SceneName: Library_13b
+            ID: Collectable Item Pickup - Quill Purple
+            Value: true
+            Mutator: 0
+  silk_overdrive:
+    data:
+      playerData:
+        silk: 27
+        silkMax: 27
+        silkRegenMax: 27
+        HasSeenSilkHearts: true
+        IsSilkSpoolBroken: false
+  unlock_terminus_door:
+    data:
+      playerData:
+        laceTowerDoorOpened: true
+      sceneData:
+        persistentBools:
+          serializedList:
+          - SceneName: Tube_Hub
+            ID: Understore Lever
+            Value: true
+            Mutator: 0
+          - SceneName: Tube_Hub
+            ID: cradle_pipe_trapdoor
+            Value: true
+            Mutator: 0
+  unlock_all_bellshrines:
+    data:
+      playerData:
+        bellShrineBoneForest: true
+        bellShrineGreymoor: true
+        bellShrineShellwood: true
+        bellShrineBellhart: true
+        bellShrineWilds: true
+        bellShrineEnclave: true
+      sceneData:
+        persistentInts:
+          serializedList:
+          - SceneName: Bellshrine
+            ID: Bellshrine Sequence
+            Value: 3
+            Mutator: 0
+          - SceneName: Bellshrine_02
+            ID: Bellshrine Sequence
+            Value: 3
+            Mutator: 0
+          - SceneName: Bellshrine_03
+            ID: Bellshrine Sequence
+            Value: 3
+            Mutator: 0
+          - SceneName: Belltown_Shrine
+            ID: Bellshrine Sequence Bellhart
+            Value: 3
+            Mutator: 0
+          - SceneName: Bellshrine_05
+            ID: Bellshrine Sequence
+            Value: 3
+            Mutator: 0
+          - SceneName: Bellshrine_Enclave
+            ID: Bellshrine Sequence
+            Value: 3
+            Mutator: 0
 reference:
   full_crests:
     playerData:

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

@@ -572,6 +572,19 @@ farfields:
     soft_reqs: {}
     hard_reqs: {}
     min_act: 1
+  soprano_spawn:
+    data:
+      playerData:
+        atBench: false
+        respawnScene: Ant_Queen
+        mapZone: 16
+        extraRestZone: 0
+        respawnMarkerName: Death Respawn Marker
+        respawnType: 0
+        hazardRespawnFacing: 0
+    soft_reqs: {}
+    hard_reqs: {}
+    min_act: 2
   sprintmaster:
     data:
       playerData:
@@ -890,8 +903,8 @@ marrow:
         respawnMarkerName: Silk Heart Memory Respawn Marker
         respawnType: 0
         hazardRespawnFacing: 0
-    soft_reqs: { }
-    hard_reqs: { }
+    soft_reqs: {}
+    hard_reqs: {}
     min_act: 1
   entrance:
     data:
@@ -1033,6 +1046,19 @@ mossgrove:
     soft_reqs: {}
     hard_reqs: {}
     min_act: 3
+  church_spawn:
+    data:
+      playerData:
+        atBench: false
+        respawnScene: Bonetown
+        mapZone: 18
+        extraRestZone: 0
+        respawnMarkerName: Death Respawn Marker Church
+        respawnType: 0
+        hazardRespawnFacing: 2
+    soft_reqs: {}
+    hard_reqs: {}
+    min_act: 1
   druid:
     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.5"
 end

metadata

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