silkedit 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7f3339a4438bd794c4ed860bba4216a0b4bb018fdaa570d72f66e69388e975a
-  data.tar.gz: d4a14494a7d827fd61c91e48f3b98500fc9c072f5718da7e504a14fc7f0ecb4c
+  metadata.gz: d05ae384c578d0145ea95589e40baaff71f938ecf9e9e3d1abf64b42d5a7d34a
+  data.tar.gz: 95bd985c710fd438824af21275b55f569ca7833bb16b0414e1e55873e9b2ea72
 SHA512:
-  metadata.gz: dc0d913626bbe4eb89b3b7d684642202ccbe02b73de78d5bfacf6cd11ed034a922e4c8011acb31a57b23c5f84b5d409babf7f91cb888462833783c47c3ac4134
-  data.tar.gz: 5b4ee244c35db3d4eec09e6202f450f9681edfbec1a2c25d81ae3f27a3e3b724c9924dfbe78c3296cdeb8173ace4c698346943af8305550e67dac7e308e77ce9
+  metadata.gz: '09a35377f50b2b0ca8dc74151e5badbb17dd939145670eb14087ccc9755455e3cc0f2c52d08b04ae06b31b131271327b0da65001b736008c6d3fdbc94179a8f2'
+  data.tar.gz: f7993d5aafd4ca024f1ed247104607d2595176cbb971e28587f595c065c17770968b3e5f970b5b5d10452062ef2fc8035cddca13287ef7993ab82cd2f5d7456d

data/lib/commands/cheat.rb

@@ -2,18 +2,73 @@ 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?(cht) }
+        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
+
+    if changes.empty?
+      Rbcli.log.info ''
+      Rbcli.log.info 'No cheats applied'
+      Rbcli.exit(0)
+    end
+
+    if changes.include?(nil)
+      Rbcli.log.info ''
+      Rbcli.log.info 'Some cheats failed to apply. Discarding changes.'
+      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/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,31 @@ 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_crests
+      cheatdata = Silkedit::Cheat::SilksongCheats.module_eval { @cheatdata }
+      Rbcli.log.info "Applying cheat all_crests", 'CHEATS'
+      Silkedit::Cheat.merge_cheat(@data, cheatdata['reference']['all_crests'], should_merge_arrays: true)
+      %w[CurrentCrestID PreviousCrestID].each do |equip|
+        %w[Hunter Hunter_v2].each do |hunter_crest_version|
+          @data['playerData'][equip] = 'Hunter_v3' if @data['playerData'][equip] == hunter_crest_version
+        end
+      end
+      :success
     end
 
     def all_crest_unlocks
@@ -68,11 +88,21 @@ module Silkedit::Cheat
         end
         crest['Data']['Slots'].each { |slot| slot['IsUnlocked'] = true }
       end
+      :success
+    end
+
+    def overcharge_tools
+      Rbcli.log.info "Applying cheat overcharge_tools", 'CHEATS'
+      @data['playerData']['Tools']['savedData'].each do |tool|
+        tool['Data']['AmountLeft'] = 1000
+      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 +110,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,18 +141,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(