silkedit 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96d557c703ed8b5c346a5b31d0aae3a0fda14ef55165034bbf61b8fb86c5d40a
-  data.tar.gz: ae4dc23dd1cbea00444eae0b26a67f6c2b4d0c09cc1979deb9c33fad1beddc8c
+  metadata.gz: a12669881e8a00f516320116750f2e45aa5e784e10b4cdb68ad7a2b1d5fb1f91
+  data.tar.gz: 23234270ca141a2f408b1a012d8effb9730e703e2e2444d4c43a2d5d5a77106d
 SHA512:
-  metadata.gz: eff47e982e705a81a4c1a3ac7cb45b601824df97e2ad772fdf53038c3647696379c7c5a9192b5608f2b47f116c88f52b2d3b39c96bdd0ff68c4f3593ebe73c1f
-  data.tar.gz: 9950c35a3b373478218d3ffcac7e9dbd1f8abf99cd1b63ce1f469ab1992641d9740cb89cda24e63666be2fe65448984e5097c13344e9ac7bfdd6f2dc86d95453
+  metadata.gz: f66c14e57b5fe04d97bec8bdc2d540e6a95fb29be890007e923cf50ec080118f3aa263e29bc476c8b6e1dcb66d862c2b4a0b642552de93ba80c1ceec63907724
+  data.tar.gz: a5c2d93939d57933ec9444516b21cf00c62b9f8df2426eb02af671860096bf87b4d2e05c5d0a7ebfd25c9af7b0c6b3aa3f89effdf5547f3326360c3a84d645ef

data/exe/silkedit

@@ -4,8 +4,7 @@
 ### Silkedit ###
 ################
 
-#require 'rbcli'
-require '/Users/andrew/Documents/code/rbcli/lib/rbcli.rb'
+require 'rbcli'
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'silkedit')
 Dir[File.join(File.dirname(__FILE__), '..', 'lib', 'config', '*.rb')].each { |file| require file }

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)

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

@@ -197,7 +197,7 @@ playerData:
         Kills: 2
         HasBeenSeen: true
       GameName: Lace
-      Position: 232
+      Position: 233
     - Name: Fields Flock Flyers
       Record:
         Kills: 15
@@ -437,7 +437,7 @@ playerData:
         Kills: 1
         HasBeenSeen: true
       GameName: Widow
-      Position: 229
+      Position: 230
     - Name: Coral Judge
       Record:
         Kills: 15
@@ -894,6 +894,12 @@ playerData:
         HasBeenSeen: true
       GameName: Disgraced Chef Lugoli
       Position: 86
+    - Name: Shakra
+      Record:
+        Kills: 1
+        HasBeenSeen: true
+      GameName: Shakra
+      Position: 227
     - Name: Coral Spike Goomba
       Record:
         Kills: 15
@@ -941,7 +947,7 @@ playerData:
         Kills: 1
         HasBeenSeen: true
       GameName: Phantom
-      Position: 231
+      Position: 232
     - Name: Swamp Muckman
       Record:
         Kills: 15
@@ -1001,13 +1007,13 @@ playerData:
         Kills: 1
         HasBeenSeen: true
       GameName: First Sinner
-      Position: 230
+      Position: 231
     - Name: Silk Boss
       Record:
         Kills: 1
         HasBeenSeen: true
       GameName: Grand Mother Silk
-      Position: 233
+      Position: 234
     - Name: Dock Guard Thrower
       Record:
         Kills: 1
@@ -1091,7 +1097,7 @@ playerData:
         Kills: 1
         HasBeenSeen: true
       GameName: Pinstress
-      Position: 228
+      Position: 229
     - Name: Bone Hopper Giant
       Record:
         Kills: 10
@@ -1157,7 +1163,7 @@ playerData:
         Kills: 1
         HasBeenSeen: true
       GameName: Lost Garmond
-      Position: 227
+      Position: 228
     - Name: Bone Hunter Trapper
       Record:
         Kills: 1
@@ -1415,4 +1421,4 @@ playerData:
         Kills: 1
         HasBeenSeen: true
       GameName: Lost Lace
-      Position: 234
+      Position: 235