pktool 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 089a7e263e1c981304b149fc8e411068521ffa36
-  data.tar.gz: c7e85e680df581d54d0f1b00ad568c68699f591b
+  metadata.gz: dcfda98a106cfc380a525ded26be5be7441177fb
+  data.tar.gz: 9dfd17382348141419dd7567ebe362b799c2d248
 SHA512:
-  metadata.gz: a6fc3901e7780a2061757a352885fc49325b0979a142aea23c5c7eb03494522f25c7c932e80b58ed23f0b14d0f79a85da056e55fe8cf309df1c90f04b61d4b2c
-  data.tar.gz: 41a4d2f9701e00b2e782913d7304f4419b99a212c77ed8ed16ef2536a177bb61d0a1ea58151c9a03df3540311c1c577dc0f35e901530670ea471c996e05f39d7
+  metadata.gz: 7229411c11e02d4e89c3d3e8bf000a37fe16bb433de62d6c8c88cfdb43077f16de1c7e565d2962b833810a63e4f0e9f51c51d29b07bbb5a51ac86701516a8d7b
+  data.tar.gz: 0624e5a6193b1a7b19a1b9375f9c1dff24ecc80a86cc2e1177aa221e9f304559b76d0471bbcb6e6f7962316ac2a4cdf229388472767e37d5fd23ff5f3f3ee1d2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pktool (0.2.0)
+    pktool (0.2.1)
       activerecord (~> 4.2.1)
       bundler (~> 1.3)
       rake (~> 10.4.1)

data/lib/attack.rb

@@ -0,0 +1,66 @@
+require_relative "models/move"
+
+module Pktool
+
+  class Attack
+    def initialize(move, attacker, defender)
+      move = Move.where(name: move).first
+      raise Error, "存在ない技です。" unless move
+      @move = move
+      @attacker = attacker
+      @defender = defender
+      @effects = []
+      @level  = 50.0
+      @effect_rate = 1.0
+      @type_match = [attacker.type1, attacker.type2].include?(move.attack_type)
+      @type_rate = 1.0
+      @vital_rate = 1.5
+    end
+
+    def add_effect(effect)
+    end
+
+    def type_effect
+      type_effect = open("data/type.json") do |io|
+        JSON.load(io)
+      end
+      @type_rate *= type_effect[@defender.type1][@move.attack_type]
+      @type_rate *= type_effect[@defender.type2][@move.attack_type] unless @defender.type2.empty?
+    end
+
+    def type_match
+       @type_match ? 1.5 : 1.0
+    end
+
+    def select_move_type
+      case @move.move_type
+      when "物理"
+        @attack_stat = :A
+        @defence_stat = :B
+      when "特殊"
+        @attack_stat = :C
+        @defence_stat = :D
+      end
+    end
+
+    def fetch_base_damage
+      ((@move.power * @attacker.effected_statistics(@attack_stat) * (@level * 2.0 / 5.0 + 2.0 )) / @defender.effected_statistics(@defence_stat) / 50.0 * @effect_rate * type_match + 2.0) * @type_rate
+    end
+
+    def damage
+      type_effect
+      select_move_type
+      base = fetch_base_damage
+      min = base * 0.85
+      max = base * 1.0
+      {min: min.floor, max: max.floor}
+    end
+
+    def defeat
+      hp = @defender.statistics(:H)
+      return {num: (hp.to_f / damage[:min]).ceil, rate: (damage[:min] / hp.to_f)}
+    end
+
+  end
+
+end

data/lib/{builder.rb → cli/builder.rb}

@@ -1,8 +1,9 @@
-require_relative 'pokemon'
-require_relative "nature"
-require_relative 'party'
-require_relative 'move'
-require_relative 'log'
+require_relative '../models/pokemon'
+require_relative "../models/nature"
+require_relative '../models/move'
+require_relative '../attack'
+require_relative '../party'
+require_relative '../log'
 
 module Pktool
 
@@ -49,10 +50,10 @@ module Pktool
         return Pokemon.fetch(name, feature)
       end
 
-      def self.move(attacker, defender)
+      def self.attack(attacker, defender)
         moves = Move.pluck(:name)
         move = fetch("わざ", moves)
-        move = Move.fetch(move, attacker, defender)
+        Attack.new(move, attacker, defender)
       end
 
       def self.fetch(name, completion = [])

data/lib/{cli.rb → cli/cli.rb}

@@ -2,12 +2,12 @@ require 'thor'
 require 'thor/group'
 require 'romaji'
 require 'romaji/core_ext/string'
-require_relative "log"
-require_relative "version"
-require_relative "pokemon"
-require_relative "move"
 require_relative "builder"
-require_relative "exceptions"
+require_relative "../log"
+require_relative "../version"
+require_relative "../exceptions"
+require_relative "../models/pokemon"
+require_relative "../models/move"
 
 Dir.glob(File.expand_path(File.join(File.dirname(__FILE__), "command", "*.rb"))) do |path|
   require path
@@ -26,8 +26,13 @@ module Pktool
       puts "<underline>種族値</underline>".termcolor
       puts pokemon.base_stat.map{|k,v| "<bold>#{k}</bold>:<red>#{v}</red> ".termcolor}.join
       puts "<underline>相性</underline>".termcolor
-      puts pokemon.types.select{|k,v| v > 1 }.map{|k,v| "<bold>#{k}</bold>:<red>#{v}</red> ".termcolor}.join
-      puts pokemon.types.select{|k,v| v < 1 }.map{|k,v| "<bold>#{k}</bold>:<blue>#{v}</blue> ".termcolor}.join
+      puts "4.0: " + pokemon.types.select{|k,v| v == 4.00 }.map{|k,v| "<red>#{k}</red>".termcolor}.join
+      puts "2.0: " + pokemon.types.select{|k,v| v == 2.00 }.map{|k,v| "<red>#{k}</red>".termcolor}.join
+      puts "1.0: " + pokemon.types.select{|k,v| v == 1.00 }.map{|k,v| "#{k}".termcolor}.join
+      puts "1/2: " + pokemon.types.select{|k,v| v == 0.50 }.map{|k,v| "<blue>#{k}</blue>".termcolor}.join
+      puts "1/4: " + pokemon.types.select{|k,v| v == 0.25 }.map{|k,v| "<blue>#{k}</blue>".termcolor}.join
+      puts ""
+      power(pokemon)
     end
 
     desc "status", "ポケモンのステータスを見る"
@@ -42,6 +47,16 @@ module Pktool
       puts pokemon.types.select{|k,v| v < 1 }.map{|k,v| "<bold>#{k}</bold>:<blue>#{v}</blue> ".termcolor}.join
     end
 
+    desc "power", "ポケモンのタイプ別の威力を見る"
+    def power(pokemon = Builder.default_pokemon)
+      pokemon.type_ranked_moves.each do |kind, moves|
+        puts "<underline>#{kind}</underline>".termcolor
+        moves.each do |move|
+          puts "<bold>#{move.attack_type}</bold> 威力:#{'%3d' % move.power} 命中:#{'%3d' % move.accuracy} #{move.name}".termcolor
+        end
+      end
+    end
+
     desc "damage", "ダメージ計算する"
     def damage
       puts "<underline>攻撃側の指定</underline>".termcolor
@@ -51,7 +66,7 @@ module Pktool
       defender = Builder.new_pokemon
 
       puts "<underline>技の指定</underline>".termcolor
-      move = Builder.move(attacker, defender)
+      attack = Builder.attack(attacker, defender)
 
       puts ""
       puts "<underline>攻撃側</underline>".termcolor
@@ -59,8 +74,8 @@ module Pktool
       puts "<underline>防御側</underline>".termcolor
       puts defender.name + " " + defender.stats.map{|k,v| "<bold>#{k}</bold>:<blue>#{v}</blue> ".termcolor}.join
       puts
-      puts move.damage.map{|k,v| "<bold>#{k}</bold>:<blue>#{v}</blue> ".termcolor}.join
-      defeat = move.defeat
+      puts attack.damage.map{|k,v| "<bold>#{k}</bold>:<blue>#{v}</blue> ".termcolor}.join
+      defeat = attack.defeat
       puts "<bold>確定数</bold>:<red>#{defeat[:num]}回</red> (#{'%.2f' % (defeat[:rate] * 100)}%) ".termcolor
 
     end

data/lib/{command → cli/command}/party.rb

@@ -1,5 +1,5 @@
-require_relative "../party"
-require_relative "../pokemon"
+require_relative "../../party"
+require_relative "../../models/pokemon"
 require 'termcolorlight'
 
 module Pktool

data/lib/models/acquisition.rb

@@ -0,0 +1,13 @@
+require_relative "database"
+require_relative "pokemon"
+require_relative "move"
+
+module Pktool
+
+  class Acquisition < ActiveRecord::Base
+    belongs_to :pokemon
+    belongs_to :move
+
+  end
+
+end

data/lib/models/move.rb

@@ -0,0 +1,13 @@
+require_relative "database"
+require_relative "move"
+require_relative "acquisition"
+
+module Pktool
+
+  class Move < ActiveRecord::Base
+    has_many :acquisitions
+    has_many :pokemons, through: :acquisitions
+
+  end
+
+end

data/lib/{nature.rb → models/nature.rb}

@@ -1,5 +1,4 @@
 require_relative "database"
-require_relative "exceptions"
 
 module Pktool
   class Nature < ActiveRecord::Base

data/lib/{pokemon.rb → models/pokemon.rb}

@@ -1,12 +1,15 @@
 require 'json'
 require_relative "database"
-require_relative "exceptions"
 require_relative "nature"
+require_relative "acquisition"
+require_relative "move"
 
 
 module Pktool
 
   class Pokemon < ActiveRecord::Base
+    has_many :acquisitions
+    has_many :moves, through: :acquisitions
 
     attr_accessor :nature, :effort_value, :individual_value, :ability, :item
     attr_accessor :description
@@ -38,6 +41,7 @@ module Pktool
       @ability = feature[:ability] ||  1
       @item = feature[:item] ||  ""
       @level = feature[:level] || 50
+      @rank = feature[:rank] || 1
 
       if effort_value.instance_of?(Symbol) && @@ways.include?(effort_value)
         case effort_value
@@ -77,13 +81,36 @@ module Pktool
       [:H, :A, :B, :C, :D, :S].map { |name| [name, statistics(name)]}.to_h
     end
 
+    def effected_statistics(name)
+      effected = statistics(name)
+      effected *= rank_effect
+      effected *= 1.5 if name == :A && @item == "こだわりハチマキ"
+      effected *= 1.5 if name == :C && @item == "こだわりメガネ"
+
+      effected
+    end
+
+    def rank_effect
+      if @rank == 1
+        1.0
+      else
+        @rank > 0 ? (@rank.abs + 2.0) / 2.0 : 2.0 / (@rank.abs + 2.0)
+      end
+    end
+
     def types
       type_effect = open("data/type.json") do |io|
         JSON.load(io)
       end
-      Hash[type_effect.keys.map do |t|
-        [t, type_effect[type1][t] * type_effect[type2][t]]
-      end]
+      Hash[type_effect.keys.map { |t| [t, type_effect[type1][t] * (type2.present? ? type_effect[type2][t]: 1.0)] }]
+    end
+
+    def type_ranked_moves
+      list = moves.group("move_type, attack_type").having("max(power)").order("power desc")
+      {
+        "物理": list.where(move_type: "物理"),
+        "特殊": list.where(move_type: "特殊"),
+      }
     end
 
     def to_h

data/lib/party.rb

@@ -1,23 +1,22 @@
 require 'json'
-require_relative "pokemon"
+require_relative "models/pokemon"
 
 module Pktool
 
   class Party
     attr_accessor :list
 
-    @@party_path = "data/user/"
+    @@json_path = "data/user/party.json"
 
-    def initialize(name = "party")
-      @file_path = @@party_path + "#{name}.json"
-      json = open(@file_path) do |io|
+    def initialize
+      json = open(@@json_path) do |io|
         JSON.load(io, nil, { symbolize_names: true})
       end
       @list = json.map {|j| Pokemon.fetch(j[:name], j)}
     end
 
     def save
-      open(@file_path, 'w') do |io|
+      open(@@json_path, 'w') do |io|
         JSON.dump(@list.map{|p| p.to_h}, io)
       end
     end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Pktool
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/pktool.rb

@@ -1,4 +1,4 @@
 require_relative 'lib/log'
-require_relative 'lib/cli'
+require_relative 'lib/cli/cli'
 
 Pktool::Cli.start(ARGV)

data/spec/attack_spec.rb

@@ -0,0 +1,75 @@
+require_relative '../lib/attack'
+require_relative '../lib/models/pokemon'
+
+include Pktool
+
+describe "Move" do
+
+  it "should calculate the damage without any aditional condition in case #1" do
+    attacker = Pokemon.fetch("ガブリアス", {nature: :いじっぱり, effort_value: :hAS})
+    defender = Pokemon.fetch("カビゴン", {nature: :ずぶとい, effort_value: :HB})
+    a = Attack.new("げきりん", attacker, defender)
+
+    expect(a.damage).to eq({min: 106, max: 125})
+  end
+
+  it "should calculate the damage without any aditional condition in case #2" do
+    attacker = Pokemon.fetch("ガブリアス", {nature: :いじっぱり, effort_value: :hAS})
+    defender = Pokemon.fetch("クレセリア", {nature: :ずぶとい, effort_value: :HB})
+    a = Attack.new("げきりん", attacker, defender)
+
+    expect(a.damage).to eq({min: 72, max: 85})
+  end
+
+  it "should calculate the damage with type effect" do
+    attacker = Pokemon.fetch("ボーマンダ", {nature: :いじっぱり, effort_value: :hAS})
+    defender = Pokemon.fetch("ナットレイ", {nature: :ずぶとい, effort_value: :HB})
+    a = Attack.new("だいもんじ", attacker, defender)
+
+    expect(a.damage).to eq({min: 148, max: 174})
+    # pokemon-trainer: expect(m.damage(attacker, defender)).to eq({min: 144, max: 172})
+  end
+
+  it "should calculate the damage without any aditional condition in case #1" do
+    attacker = Pokemon.fetch("ガブリアス", {nature: :いじっぱり, effort_value: :hAS})
+    defender = Pokemon.fetch("カビゴン", {nature: :ずぶとい, effort_value: :HB})
+    a = Attack.new("げきりん", attacker, defender)
+
+    expect(a.damage).to eq({min: 106, max: 125})
+  end
+
+  it "should calculate the damage with attack rank 2" do
+    attacker = Pokemon.fetch("ガブリアス", {nature: :いじっぱり, effort_value: :hAS, rank: 2})
+    defender = Pokemon.fetch("クレセリア", {nature: :ずぶとい, effort_value: :HB})
+    a = Attack.new("げきりん", attacker, defender)
+
+    expect(a.damage).to eq({min: 144, max: 169})
+  end
+
+  it "should calculate the damage with defence rank 2" do
+    attacker = Pokemon.fetch("ガブリアス", {nature: :いじっぱり, effort_value: :hAS})
+    defender = Pokemon.fetch("クレセリア", {nature: :ずぶとい, effort_value: :HB, rank: 2})
+    a = Attack.new("げきりん", attacker, defender)
+
+    expect(a.damage).to eq({min: 37, max: 43})
+    # pokemon-trainer: expect(a.damage).to eq({min: 36, max: 43})
+  end
+
+  it "should calculate the damage with こだわりハチマキ" do
+    attacker = Pokemon.fetch("ガブリアス", {nature: :いじっぱり, effort_value: :hAS, item: "こだわりハチマキ"})
+    defender = Pokemon.fetch("クレセリア", {nature: :ずぶとい, effort_value: :HB})
+    a = Attack.new("げきりん", attacker, defender)
+
+    expect(a.damage).to eq({min: 108, max: 127})
+    # pokemon-trainer: expect(a.damage).to eq({min: 36, max: 43})
+  end
+
+  it "should calculate the damage with こだわりハチマキ" do
+    attacker = Pokemon.fetch("ラティオス", {nature: :ひかえめ, effort_value: :hCS, item: "こだわりメガネ"})
+    defender = Pokemon.fetch("クレセリア", {nature: :ずぶとい, effort_value: :HB})
+    a = Attack.new("りゅうせいぐん", attacker, defender)
+
+    expect(a.damage).to eq({min: 147, max: 173})
+    # pokemon-trainer: expect(a.damage).to eq({min: 147, max: 174})
+  end
+end

data/spec/{pokemon_spec.rb → models/pokemon_spec.rb}

@@ -1,4 +1,4 @@
-require_relative '../lib/pokemon.rb'
+require_relative '../../lib/models/pokemon.rb'
 
 include Pktool
 
@@ -39,5 +39,15 @@ describe "Pokemon" do
     p = Pokemon.fetch("ガブリアス", {nature: :いじっぱり, effort_value: :hAS})
     expect(p.types["氷"]).to eq(4)
   end
+
+  it "should has moves list"  do
+    p = Pokemon.fetch("ガブリアス", {nature: :いじっぱり, effort_value: :hAS})
+    expect(p.moves.pluck(:name)).to include("げきりん")
+  end
+
+  it "should has moves list"  do
+    p = Pokemon.fetch("ガブリアス", {nature: :いじっぱり, effort_value: :hAS})
+    expect(p.type_ranked_moves[:物理].find_by_attack_type("地").name).to include("じしん")
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pktool
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - uzimith
@@ -129,22 +129,24 @@ files:
 - data/pokemonData.sqlite
 - data/type.json
 - data/user/party.json
-- lib/builder.rb
-- lib/cli.rb
-- lib/command/party.rb
-- lib/database.rb
+- lib/attack.rb
+- lib/cli/builder.rb
+- lib/cli/cli.rb
+- lib/cli/command/party.rb
 - lib/exceptions.rb
 - lib/log.rb
-- lib/move.rb
-- lib/nature.rb
+- lib/models/acquisition.rb
+- lib/models/database.rb
+- lib/models/move.rb
+- lib/models/nature.rb
+- lib/models/pokemon.rb
 - lib/party.rb
 - lib/pktool.rb
-- lib/pokemon.rb
 - lib/version.rb
 - pktool.gemspec
 - pktool.rb
-- spec/move_spec.rb
-- spec/pokemon_spec.rb
+- spec/attack_spec.rb
+- spec/models/pokemon_spec.rb
 - spec/spec_helper.rb
 - tool/create_pokemon_db/.gitignore
 - tool/create_pokemon_db/Gemfile
@@ -175,6 +177,6 @@ signing_key:
 specification_version: 4
 summary: ''
 test_files:
-- spec/move_spec.rb
-- spec/pokemon_spec.rb
+- spec/attack_spec.rb
+- spec/models/pokemon_spec.rb
 - spec/spec_helper.rb

data/lib/move.rb

@@ -1,52 +0,0 @@
-require_relative "database"
-
-module Pktool
-  class Move < ActiveRecord::Base
-    attr_accessor :attacker, :defender
-
-    def self.fetch(name, attacker, defender)
-      move = self.where(name: name).first
-      raise Error, "存在ない技です。" unless move
-      move.attacker = attacker
-      move.defender = defender
-      return move
-    end
-
-    def damage
-      level  = 50.0
-      effect = 1.0
-      effect *= 1.5 if [@attacker.type1, @attacker.type2].include?(self.attack_type)
-
-      # type effect
-      type_effect = open("data/type.json") do |io|
-        JSON.load(io)
-      end
-      type = 1.0
-      type *= type_effect[@defender.type1][self.attack_type]
-      type *= type_effect[@defender.type2][self.attack_type] unless @defender.type2.empty?
-
-      vital = 1.0
-      case move_type
-      when "物理"
-        attack_stat = :A
-        defence_stat = :B
-      when "特殊"
-        attack_stat = :C
-        defence_stat = :D
-      end
-      # todo: this equation may be mistake.
-      base   = ((power * @attacker.statistics(attack_stat) * (level * 2.0 / 5.0 + 2.0 )) / @defender.statistics(defence_stat) / 50.0 * effect + 2.0) * type
-      min    = base * vital * 0.85
-      max    = base * vital * 1.0
-      {min: min.floor, max: max.floor}
-    end
-
-    def defeat
-      hp = @defender.statistics(:H)
-      damage = self.damage
-      return {num: (hp.to_f / damage[:min]).ceil, rate: (damage[:min] / hp.to_f)}
-    end
-
-  end
-
-end

data/spec/move_spec.rb

@@ -1,29 +0,0 @@
-require_relative '../lib/move.rb'
-require_relative '../lib/pokemon.rb'
-
-include Pktool
-
-describe "Move" do
-
-  it "should calculate the damage without any aditional condition in case #1" do
-    attacker = Pokemon.fetch("ガブリアス", {nature: :いじっぱり, effort_value: :hAS})
-    defender = Pokemon.fetch("カビゴン", {nature: :ずぶとい, effort_value: :HB})
-    m = Move.fetch("げきりん", attacker, defender)
-    expect(m.damage).to eq({min: 106, max: 125})
-  end
-
-  it "should calculate the damage without any aditional condition in case #2" do
-    attacker = Pokemon.fetch("ガブリアス", {nature: :いじっぱり, effort_value: :hAS})
-    defender = Pokemon.fetch("クレセリア", {nature: :ずぶとい, effort_value: :HB})
-    m = Move.fetch("げきりん", attacker, defender)
-    expect(m.damage).to eq({min: 72, max: 85})
-  end
-
-  it "should calculate the damage with type effect" do
-    attacker = Pokemon.fetch("ボーマンダ", {nature: :いじっぱり, effort_value: :hAS})
-    defender = Pokemon.fetch("ナットレイ", {nature: :ずぶとい, effort_value: :HB})
-    m = Move.fetch("だいもんじ", attacker, defender)
-    # expect(m.damage(attacker, defender)).to eq({min: 144, max: 172})
-    expect(m.damage).to eq({min: 148, max: 174})
-  end
-end