eve_online 0.31.0 → 0.32.0

data/lib/eve_online/esi/models/killmail_short.rb

@@ -7,7 +7,7 @@ module EveOnline
         def as_json
           {
             killmail_hash: killmail_hash,
-            killmail_id: killmail_id,
+            killmail_id: killmail_id
           }
         end
 

data/lib/eve_online/esi/models/loyalty_point.rb

@@ -7,7 +7,7 @@ module EveOnline
         def as_json
           {
             corporation_id: corporation_id,
-            loyalty_points: loyalty_points,
+            loyalty_points: loyalty_points
           }
         end
 

data/lib/eve_online/esi/models/loyalty_store_offer.rb

@@ -11,7 +11,7 @@ module EveOnline
             lp_cost: lp_cost,
             offer_id: offer_id,
             quantity: quantity,
-            type_id: type_id,
+            type_id: type_id
           }
         end
 

data/lib/eve_online/esi/models/mail.rb

@@ -10,7 +10,7 @@ module EveOnline
             from_id: from_id,
             read: read,
             subject: subject,
-            timestamp: timestamp,
+            timestamp: timestamp
           }
         end
 

data/lib/eve_online/esi/models/mail_label.rb

@@ -9,7 +9,7 @@ module EveOnline
             color: color,
             label_id: label_id,
             name: name,
-            unread_count: unread_count,
+            unread_count: unread_count
           }
         end
 

data/lib/eve_online/esi/models/mail_recipient.rb

@@ -7,7 +7,7 @@ module EveOnline
         def as_json
           {
             recipient_id: recipient_id,
-            recipient_type: recipient_type,
+            recipient_type: recipient_type
           }
         end
 

data/lib/eve_online/esi/models/market_group.rb

@@ -9,7 +9,7 @@ module EveOnline
             description: description,
             market_group_id: market_group_id,
             name: name,
-            parent_group_id: parent_group_id,
+            parent_group_id: parent_group_id
           }
         end
 

data/lib/eve_online/esi/models/market_history.rb

@@ -11,7 +11,7 @@ module EveOnline
             highest: highest,
             lowest: lowest,
             order_count: order_count,
-            volume: volume,
+            volume: volume
           }
         end
 

data/lib/eve_online/esi/models/market_price.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    module Models
+      class MarketPrice < Base
+        def as_json
+          {
+            adjusted_price: adjusted_price,
+            average_price: average_price,
+            type_id: type_id
+          }
+        end
+
+        def adjusted_price
+          options["adjusted_price"]
+        end
+
+        def average_price
+          options["average_price"]
+        end
+
+        def type_id
+          options["type_id"]
+        end
+      end
+    end
+  end
+end

data/lib/eve_online/esi/models/moon.rb

@@ -8,7 +8,7 @@ module EveOnline
           {
             moon_id: moon_id,
             name: name,
-            system_id: system_id,
+            system_id: system_id
           }
         end
 

data/lib/eve_online/esi/models/notification.rb

@@ -12,7 +12,7 @@ module EveOnline
             sender_type: sender_type,
             text: text,
             timestamp: timestamp,
-            type: type,
+            type: type
           }
         end
 

data/lib/eve_online/esi/models/offer_required_item.rb

@@ -7,7 +7,7 @@ module EveOnline
         def as_json
           {
             quantity: quantity,
-            type_id: type_id,
+            type_id: type_id
           }
         end
 

data/lib/eve_online/esi/models/online.rb

@@ -9,7 +9,7 @@ module EveOnline
             last_login: last_login,
             last_logout: last_logout,
             logins: logins,
-            online: online,
+            online: online
           }
         end
 

data/lib/eve_online/esi/models/planet.rb

@@ -9,7 +9,7 @@ module EveOnline
             name: name,
             planet_id: planet_id,
             system_id: system_id,
-            type_id: type_id,
+            type_id: type_id
           }
         end
 

data/lib/eve_online/esi/models/planet_short.rb

@@ -6,7 +6,7 @@ module EveOnline
       class PlanetShort < Base
         def as_json
           {
-            planet_id: planet_id,
+            planet_id: planet_id
           }
         end
 

data/lib/eve_online/esi/models/position.rb

@@ -8,7 +8,7 @@ module EveOnline
           {
             x: x,
             y: y,
-            z: z,
+            z: z
           }
         end
 

data/lib/eve_online/esi/models/race.rb

@@ -9,7 +9,7 @@ module EveOnline
             alliance_id: alliance_id,
             description: description,
             name: name,
-            race_id: race_id,
+            race_id: race_id
           }
         end
 

data/lib/eve_online/esi/models/region.rb

@@ -8,7 +8,7 @@ module EveOnline
           {
             description: description,
             name: name,
-            region_id: region_id,
+            region_id: region_id
           }
         end
 

data/lib/eve_online/esi/models/server_status.rb

@@ -9,7 +9,7 @@ module EveOnline
             players: players,
             server_version: server_version,
             start_time: start_time,
-            vip: vip,
+            vip: vip
           }
         end
 

data/lib/eve_online/esi/models/skill.rb

@@ -9,7 +9,7 @@ module EveOnline
             active_skill_level: active_skill_level,
             skill_id: skill_id,
             skillpoints_in_skill: skillpoints_in_skill,
-            trained_skill_level: trained_skill_level,
+            trained_skill_level: trained_skill_level
           }
         end
 

data/lib/eve_online/esi/models/skill_queue_entry.rb

@@ -13,7 +13,7 @@ module EveOnline
             queue_position: queue_position,
             skill_id: skill_id,
             start_date: start_date,
-            training_start_sp: training_start_sp,
+            training_start_sp: training_start_sp
           }
         end
 

data/lib/eve_online/esi/models/standing.rb

@@ -8,7 +8,7 @@ module EveOnline
           {
             from_id: from_id,
             from_type: from_type,
-            standing: standing,
+            standing: standing
           }
         end
 

data/lib/eve_online/esi/models/star.rb

@@ -13,7 +13,7 @@ module EveOnline
             solar_system_id: solar_system_id,
             spectral_class: spectral_class,
             temperature: temperature,
-            type_id: type_id,
+            type_id: type_id
           }
         end
 

data/lib/eve_online/esi/models/stargate.rb

@@ -11,7 +11,7 @@ module EveOnline
             system_id: system_id,
             type_id: type_id,
             destination_stargate_id: destination_stargate_id,
-            destination_system_id: destination_system_id,
+            destination_system_id: destination_system_id
           }
         end
 

data/lib/eve_online/esi/models/station.rb

@@ -16,7 +16,7 @@ module EveOnline
             services: services,
             station_id: station_id,
             system_id: system_id,
-            type_id: type_id,
+            type_id: type_id
           }
         end
 

data/lib/eve_online/esi/models/system.rb

@@ -11,7 +11,7 @@ module EveOnline
             security_class: security_class,
             security_status: security_status,
             star_id: star_id,
-            system_id: system_id,
+            system_id: system_id
           }
         end
 

data/lib/eve_online/esi/models/system_jump.rb

@@ -7,7 +7,7 @@ module EveOnline
         def as_json
           {
             ship_jumps: ship_jumps,
-            system_id: system_id,
+            system_id: system_id
           }
         end
 

data/lib/eve_online/esi/models/system_kill.rb

@@ -9,7 +9,7 @@ module EveOnline
             npc_kills: npc_kills,
             pod_kills: pod_kills,
             ship_kills: ship_kills,
-            system_id: system_id,
+            system_id: system_id
           }
         end
 

data/lib/eve_online/esi/models/type.rb

@@ -19,7 +19,7 @@ module EveOnline
             published: published,
             radius: radius,
             type_id: type_id,
-            volume: volume,
+            volume: volume
           }
         end
 

data/lib/eve_online/esi/models/{wallet_journal_entry.rb → wallet_journal.rb}

@@ -3,7 +3,7 @@
 module EveOnline
   module ESI
     module Models
-      class WalletJournalEntry < Base
+      class WalletJournal < Base
         def as_json
           {
             amount: amount,
@@ -13,12 +13,12 @@ module EveOnline
             date: date,
             description: description,
             first_party_id: first_party_id,
-            id: id,
+            wallet_journal_id: wallet_journal_id,
             reason: reason,
             ref_type: ref_type,
             second_party_id: second_party_id,
             tax: tax,
-            tax_receiver_id: tax_receiver_id,
+            tax_receiver_id: tax_receiver_id
           }
         end
 
@@ -52,7 +52,7 @@ module EveOnline
           options["first_party_id"]
         end
 
-        def id
+        def wallet_journal_id
           options["id"]
         end
 

data/lib/eve_online/esi/models/wallet_transaction.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module ESI
+    module Models
+      class WalletTransaction < Base
+        def as_json
+          {
+            client_id: client_id,
+            date: date,
+            is_buy: is_buy,
+            is_personal: is_personal,
+            journal_ref_id: journal_ref_id,
+            location_id: location_id,
+            quantity: quantity,
+            transaction_id: transaction_id,
+            type_id: type_id,
+            unit_price: unit_price
+          }
+        end
+
+        def client_id
+          options["client_id"]
+        end
+
+        def date
+          date = options["date"]
+
+          parse_datetime_with_timezone(date) if date
+        end
+
+        def is_buy
+          options["is_buy"]
+        end
+
+        def is_personal
+          options["is_personal"]
+        end
+
+        def journal_ref_id
+          options["journal_ref_id"]
+        end
+
+        def location_id
+          options["location_id"]
+        end
+
+        def quantity
+          options["quantity"]
+        end
+
+        def transaction_id
+          options["transaction_id"]
+        end
+
+        def type_id
+          options["type_id"]
+        end
+
+        def unit_price
+          options["unit_price"]
+        end
+      end
+    end
+  end
+end

data/lib/eve_online/esi/models/war.rb

@@ -12,7 +12,7 @@ module EveOnline
             mutual: mutual,
             open_for_allies: open_for_allies,
             retracted: retracted,
-            started: started,
+            started: started
           }
         end
 

data/lib/eve_online/formulas/blueprint_copy_time.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module EveOnline
+  module Formulas
+    class BlueprintCopyTime
+      attr_reader :seconds, :science_level, :advanced_industry_level,
+        :science_copy_speed_bonus_per_level,
+        :advanced_industry_skill_industry_job_time_bonus_per_level, :runs
+
+      def initialize(seconds, science_level, advanced_industry_level,
+        science_copy_speed_bonus_per_level,
+        advanced_industry_skill_industry_job_time_bonus_per_level,
+        runs = 1)
+        @seconds = seconds
+        @science_level = science_level
+        @advanced_industry_level = advanced_industry_level
+        @science_copy_speed_bonus_per_level = science_copy_speed_bonus_per_level
+        @advanced_industry_skill_industry_job_time_bonus_per_level = advanced_industry_skill_industry_job_time_bonus_per_level
+        @runs = runs
+      end
+
+      def time
+        (BigDecimal(seconds.to_s) * BigDecimal(time_modifier.to_s) * BigDecimal(runs.to_s)).to_f
+      end
+
+      def time_modifier
+        science_copy_bonus_time_modifier * advanced_industry_job_time_bonus_time_modifier
+      end
+
+      def science_copy_bonus
+        science_level * science_copy_speed_bonus_per_level
+      end
+
+      def science_copy_bonus_time_modifier
+        (100.0 + science_copy_bonus) / 100.0
+      end
+
+      def advanced_industry_job_time_bonus
+        advanced_industry_level * advanced_industry_skill_industry_job_time_bonus_per_level
+      end
+
+      def advanced_industry_job_time_bonus_time_modifier
+        (100.0 + advanced_industry_job_time_bonus) / 100.0
+      end
+    end
+  end
+end