silkedit 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c84c630a7a0da05c4ac2f304f461cbafb290a66ff589bced25ec0ad894fb8eaa
-  data.tar.gz: 5243af655c84d359830f15beb18627c4530a82aed983b7484b6df249ce2fa579
+  metadata.gz: a12669881e8a00f516320116750f2e45aa5e784e10b4cdb68ad7a2b1d5fb1f91
+  data.tar.gz: 23234270ca141a2f408b1a012d8effb9730e703e2e2444d4c43a2d5d5a77106d
 SHA512:
-  metadata.gz: 1fbc1f2f828e0be815316b3e2bb0430f603e67eb2e6c64c8ac6cc4bfff3785ee430f83531d8c8ad673717e2444f42a2015a2046f37372afb6e625810d186404c
-  data.tar.gz: 98f0b8ac23d6e6f153dc17f719c9994f3a04c2f7358569a20428687485598e15da4c8e7d0ec4b0ce54d8f8f059d51506599327203eebf0e2b2ea64584fe751a1
+  metadata.gz: f66c14e57b5fe04d97bec8bdc2d540e6a95fb29be890007e923cf50ec080118f3aa263e29bc476c8b6e1dcb66d862c2b4a0b642552de93ba80c1ceec63907724
+  data.tar.gz: a5c2d93939d57933ec9444516b21cf00c62b9f8df2426eb02af671860096bf87b4d2e05c5d0a7ebfd25c9af7b0c6b3aa3f89effdf5547f3326360c3a84d645ef

data/lib/commands/journal.rb

@@ -1,10 +1,10 @@
 Rbcli.command 'journal' do
   description 'Manages the journal of enemy kills'
-  usage '[list|listmissing|complete|killsonly]'
+  usage '[listall|listmissing|complete|killsonly]'
   parameter :showimages, 'Show images of the enemies', short: 'i', type: :bool, default: false
   action do |opts, params, args, config, env|
     command = args.first
-    if command.nil? || command.empty? || !%w[list listmissing complete killsonly].include?(command)
+    if command.nil? || command.empty? || !%w[listall listmissing complete killsonly].include?(command)
       Rbcli.log.error "Must specify an action as one of: listall, listmissing, complete, killsonly"
       next
     end
@@ -27,7 +27,7 @@ Rbcli.command 'journal' do
       s.direct_backup
       s.save_to_dat
     else
-      raise "Unknown command: #{command}"
+      Rbcli.fatal "Unknown command: #{command}", exit_status: 1
     end
 
   end

data/lib/config/parser.rb

@@ -29,6 +29,6 @@ Rbcli::Configurate.cli do
   #   multi: If set to true, allows the option to be provided multiple times (--param --param, or in short form, -pp). (Default: false)
   #     When using this with a :boolean type, rather than returning `true` or `false`, it will return a count of the number of times the parameter was passed.
   #   permitted: If set to an array, restricts input to the values within that array. (Default: nil (no restrictions))
-  opt :verbose, "Twice or more enables very-verbose output", multi: true
+  # opt :verbose, "Twice or more enables very-verbose output", multi: true
   opt :savenum, "A number from 1-4, indicating which game save you'd like to address", short: 's', type: :integer
 end

data/lib/silkedit/cheats/silksong_enemyjournal.rb

@@ -8,8 +8,8 @@ module Silkedit::Cheat
     def update_journal(should_update_kills_only: true)
       enemylist = Silkedit::Cheat::SilksongJournaler.module_eval { @enemylist }
       Rbcli.log.info 'Applying ', 'JOURNAL'
-      enemylist['playerData']['EnemyJournalKillData']['list'].each do |known_enemy|
-        sleep 0.05
+      enemylist['playerData']['EnemyJournalKillData']['list'].sort_by { |known_enemy| known_enemy['Position']}.each do |known_enemy|
+        sleep 0.01
         player_enemy = @data['playerData']['EnemyJournalKillData']['list'].find { |i| i['Name'] == known_enemy['Name'] }
         self.display_enemy(known_enemy, player_enemy, show_images: false)
         if player_enemy.nil?
@@ -38,7 +38,7 @@ module Silkedit::Cheat
 
     def enemy_list(only_missing: false, show_images: false)
       enemylist = Silkedit::Cheat::SilksongJournaler.module_eval { @enemylist }
-      enemylist['playerData']['EnemyJournalKillData']['list'].each do |known_enemy|
+      enemylist['playerData']['EnemyJournalKillData']['list'].sort_by { |known_enemy| known_enemy['Position']}.each do |known_enemy|
         player_enemy = @data['playerData']['EnemyJournalKillData']['list'].find { |i| i['Name'] == known_enemy['Name'] }
         left = player_enemy.nil? ? known_enemy['Record']['Kills'] : known_enemy['Record']['Kills'] - player_enemy['Record']['Kills']
         left = 0 if left < 0
@@ -54,12 +54,13 @@ module Silkedit::Cheat
       left = player_enemy.nil? ? known_enemy['Record']['Kills'] : known_enemy['Record']['Kills'] - player_enemy['Record']['Kills']
       left = 0 if left < 0
       e_complete = left <= 0 ? '*'.colorize(:cyan) : ' '
+      e_number = known_enemy['Position'].to_s.rjust(3)
       e_name = known_enemy['GameName'].ljust(27).colorize(:blue).bold
       e_seen = player_enemy.nil? ? 'N'.colorize(:red) : 'Y'.colorize(:green)
       e_kills = (player_enemy.nil? ? 0 : player_enemy['Record']['Kills']).to_s.rjust(4).colorize(:green)
       e_req = known_enemy['Record']['Kills'].to_s.rjust(4).colorize(:blue)
       e_need = left.to_s.rjust(4).colorize(left <= 0 ? :cyan : :red)
-      Rbcli.log.info "#{e_complete} #{e_name} Seen? #{e_seen} Kills: #{e_kills} Needed: #{e_req} Left: #{e_need}"
+      Rbcli.log.info "#{e_number}. #{e_complete} #{e_name} Seen? #{e_seen} Kills: #{e_kills} Needed: #{e_req} Left: #{e_need}"
     end
 
     def show_enemy_image(name)