oakdex-battle 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1d0972ff95da713b2117cf6f642ac45edc48daa
-  data.tar.gz: 9d71621683079bebffd2703b7c448a3df79873ca
+  metadata.gz: 2066dbb4e78aff0e298029c4eb76f345326e172e
+  data.tar.gz: bf2201bd2ebfdb085b1fa2b766ec344e41c8a97c
 SHA512:
-  metadata.gz: '08b23d0d4936817b5a93f044fd69af58ee74b534e973e97d143555d9f0f6b2af9b23a95c910833aa689bd13e794dcf4a37d383f09173906c4d632ffcd2613acd'
-  data.tar.gz: 25f79543b12fde79d5777cc6857a65b08aaee38bca10a11fa9c32b2bb259b50634d2f01a6502221432d786c04edcc9bd86bfc673846b47921ffc5f3c39d07ee0
+  metadata.gz: 30127361db91d8748335a8a58609a045ddf3c7faceac02a034e8da966496c89271f9c4ebe2cd3e3af3e83b6e819b2904e6ae80b823d22501b28696cb3fb5e7d7
+  data.tar.gz: 61482125d2312a029a6de584efc8069be965e9c21b26cdf7163e3501e3273c7d519b8578b61284adb770a5d6570c7e4b320e94371d8126d769d1ba228ad2f4a0

data/README.md

@@ -1,6 +1,6 @@
 # <img src="https://v20.imgup.net/oakdex_logfbad.png" alt="fixer" width=282>
 
-[![Build Status](https://travis-ci.org/jalyna/oakdex-battle.svg?branch=master)](https://travis-ci.org/jalyna/oakdex-battle) [![Maintainability](https://api.codeclimate.com/v1/badges/ef91681257a6900f03ac/maintainability)](https://codeclimate.com/github/jalyna/oakdex-battle/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/ef91681257a6900f03ac/test_coverage)](https://codeclimate.com/github/jalyna/oakdex-battle/test_coverage)
+[![Gem Version](https://badge.fury.io/rb/oakdex-battle.svg)](https://badge.fury.io/rb/oakdex-battle) [![Build Status](https://travis-ci.org/jalyna/oakdex-battle.svg?branch=master)](https://travis-ci.org/jalyna/oakdex-battle) [![Maintainability](https://api.codeclimate.com/v1/badges/ef91681257a6900f03ac/maintainability)](https://codeclimate.com/github/jalyna/oakdex-battle/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/ef91681257a6900f03ac/test_coverage)](https://codeclimate.com/github/jalyna/oakdex-battle/test_coverage)
 
 Based on [oakdex-pokedex](https://github.com/jalyna/oakdex-pokedex).
 
@@ -11,8 +11,8 @@ Based on [oakdex-pokedex](https://github.com/jalyna/oakdex-pokedex).
 ```ruby
 require 'oakdex/battle'
 
-pok1 = Oakdex::Battle::Pokemon.create('Pikachu', level: 10)
-pok2 = Oakdex::Battle::Pokemon.create('Bulbasaur', {
+pok1 = Oakdex::Pokemon.create('Pikachu', level: 10)
+pok2 = Oakdex::Pokemon.create('Bulbasaur', {
   exp: 120,
   gender: 'female',
   ability: 'Soundproof',
@@ -75,8 +75,8 @@ battle.winner # => trainer1
 ### Other Battle types
 
 ```ruby
-pok3 = Oakdex::Battle::Pokemon.create('Altaria', level: 20)
-pok4 = Oakdex::Battle::Pokemon.create('Elekid', level: 14)
+pok3 = Oakdex::Pokemon.create('Altaria', level: 20)
+pok4 = Oakdex::Pokemon.create('Elekid', level: 14)
 trainer1 = Oakdex::Battle::Trainer.new('Ash', [pok1, pok3, pok9])
 trainer2 = Oakdex::Battle::Trainer.new('Misty', [pok2, pok4, pok10])
 trainer3 = Oakdex::Battle::Trainer.new('Brock', [pok5, pok6])
@@ -90,19 +90,6 @@ battle = Oakdex::Battle.new([trainer1], [trainer2], pokemon_per_side: 3)
 battle = Oakdex::Battle.new([trainer1, trainer3], [trainer2, trainer4])
 ```
 
-
-### Breeding
-
-```ruby
-pok1 = Oakdex::Battle::Pokemon.create('Ditto', level: 20)
-pok2 = Oakdex::Battle::Pokemon.create('Pikachu', level: 20, gender: 'female')
-
-Oakdex::Battle::Breeding.compatible?(pok1, pok2) # => true
-Oakdex::Battle::Breeding.chance_in_percentage(pok1, pok2) # => 20
-Oakdex::Battle::Breeding.breed(pok1, pok2) #=> Oakdex::Battle::Pokemon Pichu
-```
-
-
 ## Contributing
 
 I would be happy if you want to add your contribution to the project. In order to contribute, you just have to fork this repository.

data/lib/oakdex/battle.rb

@@ -1,6 +1,6 @@
-require 'oakdex/pokedex'
+require 'oakdex/pokemon'
 
-require 'oakdex/battle/pokemon'
+require 'oakdex/battle/in_battle_pokemon'
 require 'oakdex/battle/trainer'
 require 'oakdex/battle/move_execution'
 require 'oakdex/battle/action'
@@ -8,8 +8,7 @@ require 'oakdex/battle/damage'
 require 'oakdex/battle/turn'
 require 'oakdex/battle/valid_action_service'
 require 'oakdex/battle/side'
-require 'oakdex/battle/in_battle_pokemon'
-require 'oakdex/battle/breeding'
+require 'oakdex/battle/active_in_battle_pokemon'
 
 module Oakdex
   # Represents battle, with has n turns and m sides

data/lib/oakdex/battle/action.rb

@@ -76,12 +76,12 @@ module Oakdex
       end
 
       def pokemon_by_position
-        trainer.in_battle_pokemon
+        trainer.active_in_battle_pokemon
           .find { |ibp| ibp.position == @attributes[:pokemon] }&.pokemon
       end
 
       def target_by_position(side, position)
-        side.in_battle_pokemon
+        side.active_in_battle_pokemon
           .find { |ibp| ibp.position == position }&.pokemon
       end
 

data/lib/oakdex/battle/active_in_battle_pokemon.rb

@@ -0,0 +1,152 @@
+require 'forwardable'
+
+module Oakdex
+  class Battle
+    # Represents a pokemon that is actively fighting in battle
+    class ActiveInBattlePokemon
+      extend Forwardable
+
+      def_delegators :@pokemon, :moves_with_pp, :fainted?
+      def_delegators :@side, :battle
+
+      attr_reader :pokemon, :position, :side
+
+      def initialize(pokemon, side, position = 0)
+        @pokemon = pokemon
+        @side = side
+        @position = position
+      end
+
+      def action_added?
+        actions.any? { |a| a.pokemon == pokemon }
+      end
+
+      def valid_move_actions
+        return [] if action_added?
+        moves = moves_with_pp
+        moves = [struggle_move] if moves_with_pp.empty?
+        moves.flat_map do |move|
+          targets_in_battle(move).map do |target|
+            {
+              action: 'move',
+              pokemon: pokemon,
+              move: move,
+              target: target
+            }
+          end
+        end
+      end
+
+      private
+
+      def targets_in_battle(move)
+        available_targets(move).map do |targets|
+          if targets.last.is_a?(Array)
+            targets if targets_in_battle?(targets)
+          elsif target_in_battle?(targets)
+            targets
+          end
+        end.compact.reject(&:empty?)
+      end
+
+      def targets_in_battle?(targets)
+        targets.any? { |target| target[0].pokemon_in_battle?(target[1]) }
+      end
+
+      def target_in_battle?(target)
+        target[0].pokemon_in_battle?(target[1]) ||
+          (!target[0].pokemon_left? && target[1] == 0)
+      end
+
+      def struggle_move
+        @struggle_move ||= Oakdex::Pokemon::Move.create('Struggle')
+      end
+
+      def available_targets(move)
+        with_target(move) || multiple_targets_adjacent(move) ||
+          multiple_targets(move) || []
+      end
+
+      def multiple_targets(move)
+        case move.target
+        when 'all_users' then [all_users]
+        when 'all_except_user' then [all_targets - [self_target]]
+        when 'all' then [all_targets]
+        when 'all_foes' then [all_foes]
+        end
+      end
+
+      def multiple_targets_adjacent(move)
+        case move.target
+        when 'all_adjacent' then [adjacent]
+        when 'adjacent_foes_all' then [adjacent_foes]
+        end
+      end
+
+      def with_target(move)
+        case move.target
+        when 'user', 'user_and_random_adjacent_foe' then [self_target]
+        when 'target_adjacent_user_single' then adjacent_users
+        when 'target_adjacent_single' then adjacent
+        when 'target_user_or_adjacent_user'
+          [self_target] + adjacent_users
+        end
+      end
+
+      def all_targets
+        all_foes + all_users
+      end
+
+      def target_adjacent_single
+        adjacent_foes + adjacent_users
+      end
+
+      def adjacent
+        adjacent_foes + adjacent_users
+      end
+
+      def self_target
+        [@side, position]
+      end
+
+      def adjacent_foes
+        [
+          [other_side, position - 1],
+          [other_side, position],
+          [other_side, position + 1]
+        ].select { |t| t[1] >= 0 && t[1] < pokemon_per_side }
+      end
+
+      def adjacent_users
+        [
+          [@side, position - 1],
+          [@side, position + 1]
+        ].select { |t| t[1] >= 0 && t[1] < pokemon_per_side }
+      end
+
+      def all_users
+        pokemon_per_side.times.map { |i| [@side, i] }
+      end
+
+      def all_foes
+        pokemon_per_side.times.map { |i| [other_side, i] }
+      end
+
+      def pokemon_per_side
+        battle.pokemon_per_side
+      end
+
+      def other_side
+        other_sides.first
+      end
+
+      def other_sides
+        battle.sides - [@side]
+      end
+
+      def actions
+        battle.actions
+      end
+    end
+  end
+end

data/lib/oakdex/battle/damage.rb

@@ -65,13 +65,12 @@ module Oakdex
       end
 
       def stab_modifier
-        pokemon.types.include?(move.type) ? 1.5 : 1.0
+        pokemon.types.include?(move.type_id) ? 1.5 : 1.0
       end
 
       def type_modifier
-        type_data = Oakdex::Pokedex::Type.find!(move.type)
         target.types.reduce(1.0) do |factor, type|
-          factor * type_data.effectivness[type]
+          factor * move.type.effectivness[type]
         end
       end
 

data/lib/oakdex/battle/in_battle_pokemon.rb

@@ -1,158 +1,151 @@
 require 'forwardable'
+require 'oakdex/battle/status_conditions'
 
 module Oakdex
   class Battle
-    # Represents a pokemon that is in battle
+    # Represents detailed pokemon instance that is part of a Trainer's Team
     class InBattlePokemon
       extend Forwardable
 
-      def_delegators :@pokemon, :current_hp, :moves_with_pp
-      def_delegators :@side, :battle
-
-      attr_reader :pokemon, :position, :side
-
-      def initialize(pokemon, side, position = 0)
+      OTHER_STATS = %i[accuracy evasion critical_hit]
+      ALL_STATS = Oakdex::Pokemon::BATTLE_STATS + OTHER_STATS
+      STATUS_CONDITIONS = {
+        'poison' => StatusConditions::Poison,
+        'burn' => StatusConditions::Burn,
+        'freeze' => StatusConditions::Freeze,
+        'paralysis' => StatusConditions::Paralysis,
+        'badly_poisoned' => StatusConditions::BadlyPoisoned,
+        'sleep' => StatusConditions::Sleep
+      }
+
+      STAGE_MULTIPLIERS = {
+        -6 => Rational(2, 8),
+        -5 => Rational(2, 7),
+        -4 => Rational(2, 6),
+        -3 => Rational(2, 5),
+        -2 => Rational(2, 4),
+        -1 => Rational(2, 3),
+        0 => Rational(2, 2),
+        1 => Rational(3, 2),
+        2 => Rational(4, 2),
+        3 => Rational(5, 2),
+        4 => Rational(6, 2),
+        5 => Rational(7, 2),
+        6 => Rational(8, 2)
+      }
+
+      STAGE_MULTIPLIERS_CRITICAL_HIT = {
+        0 => Rational(1, 24),
+        1 => Rational(1, 8),
+        2 => Rational(1, 2),
+        3 => Rational(1, 1)
+      }
+
+      STAGE_MULTIPLIERS_ACC_EVA = {
+        -6 => Rational(3, 9),
+        -5 => Rational(3, 8),
+        -4 => Rational(3, 7),
+        -3 => Rational(3, 6),
+        -2 => Rational(3, 5),
+        -1 => Rational(3, 4),
+        0 => Rational(3, 3),
+        1 => Rational(4, 3),
+        2 => Rational(5, 3),
+        3 => Rational(6, 3),
+        4 => Rational(7, 3),
+        5 => Rational(8, 3),
+        6 => Rational(9, 3)
+      }
+
+      def_delegators :@pokemon, :types, :trainer, :trainer=,
+                     :name, :moves, :moves_with_pp, :change_hp_by,
+                     :change_pp_by, :level, :fainted?
+
+      attr_reader :status_conditions
+
+      def initialize(pokemon, options = {})
         @pokemon = pokemon
-        @side = side
-        @position = position
-      end
-
-      def fainted?
-        current_hp.zero?
-      end
-
-      def action_added?
-        actions.any? { |a| a.pokemon == pokemon }
-      end
-
-      def valid_move_actions
-        return [] if action_added?
-        moves = moves_with_pp
-        moves = [struggle_move] if moves_with_pp.empty?
-        moves.flat_map do |move|
-          targets_in_battle(move).map do |target|
-            {
-              action: 'move',
-              pokemon: pokemon,
-              move: move,
-              target: target
-            }
-          end
+        @status_conditions = options[:status_conditions] || []
+        if @pokemon.primary_status_condition
+          add_status_condition(@pokemon.primary_status_condition)
         end
+        reset_stats
       end
 
-      private
-
-      def targets_in_battle(move)
-        available_targets(move).map do |targets|
-          if targets.last.is_a?(Array)
-            targets if targets_in_battle?(targets)
-          elsif target_in_battle?(targets)
-            targets
-          end
-        end.compact.reject(&:empty?)
+      def change_stat_by(stat, change_by)
+        modifiers = stage_multipliers(stat)
+        stat_before = @stat_modifiers[stat]
+        min_value = modifiers.keys.first
+        max_value = modifiers.keys.last
+        @stat_modifiers[stat] = if change_by < 0
+                                  [stat_before + change_by, min_value].max
+                                else
+                                  [stat_before + change_by, max_value].min
+                                end
+        stat_before != @stat_modifiers[stat]
       end
 
-      def targets_in_battle?(targets)
-        targets.any? { |target| target[0].pokemon_in_battle?(target[1]) }
+      def add_status_condition(condition_name)
+        @status_conditions << status_condition(condition_name)
+        @pokemon.primary_status_condition = condition_name
       end
 
-      def target_in_battle?(target)
-        target[0].pokemon_in_battle?(target[1]) ||
-          (!target[0].pokemon_left? && target[1] == 0)
+      def remove_status_condition(condition)
+        @status_conditions = @status_conditions.reject { |s| s == condition }
+        @pokemon.primary_status_condition = nil if @status_conditions.empty?
       end
 
-      def struggle_move
-        @struggle_move ||= begin
-          move_type = Oakdex::Pokedex::Move.find('Struggle')
-          Oakdex::Battle::Move.new(move_type, move_type.pp, move_type.pp)
-        end
+      def reset_stats
+        @stat_modifiers = (ALL_STATS - %i[hp]).map do |stat|
+          [stat, 0]
+        end.to_h
       end
 
-      def available_targets(move)
-        with_target(move) || multiple_targets_adjacent(move) ||
-          multiple_targets(move) || []
+      def accuracy
+        stage(:accuracy)
       end
 
-      def multiple_targets(move)
-        case move.target
-        when 'all_users' then [all_users]
-        when 'all_except_user' then [all_targets - [self_target]]
-        when 'all' then [all_targets]
-        when 'all_foes' then [all_foes]
-        end
+      def evasion
+        stage(:evasion)
       end
 
-      def multiple_targets_adjacent(move)
-        case move.target
-        when 'all_adjacent' then [adjacent]
-        when 'adjacent_foes_all' then [adjacent_foes]
-        end
+      def critical_hit_prob
+        stage(:critical_hit)
       end
 
-      def with_target(move)
-        case move.target
-        when 'user', 'user_and_random_adjacent_foe' then [self_target]
-        when 'target_adjacent_user_single' then adjacent_users
-        when 'target_adjacent_single' then adjacent
-        when 'target_user_or_adjacent_user'
-          [self_target] + adjacent_users
+      Oakdex::Pokemon::BATTLE_STATS.each do |stat|
+        define_method stat do
+          (@pokemon.public_send(stat) * stage(stat) *
+            status_condition_modifier(stat)).to_i
         end
       end
 
-      def all_targets
-        all_foes + all_users
-      end
-
-      def target_adjacent_single
-        adjacent_foes + adjacent_users
-      end
-
-      def adjacent
-        adjacent_foes + adjacent_users
-      end
-
-      def self_target
-        [@side, position]
-      end
-
-      def adjacent_foes
-        [
-          [other_side, position - 1],
-          [other_side, position],
-          [other_side, position + 1]
-        ].select { |t| t[1] >= 0 && t[1] < pokemon_per_side }
-      end
-
-      def adjacent_users
-        [
-          [@side, position - 1],
-          [@side, position + 1]
-        ].select { |t| t[1] >= 0 && t[1] < pokemon_per_side }
-      end
-
-      def all_users
-        pokemon_per_side.times.map { |i| [@side, i] }
-      end
-
-      def all_foes
-        pokemon_per_side.times.map { |i| [other_side, i] }
-      end
+      private
 
-      def pokemon_per_side
-        battle.pokemon_per_side
+      def status_condition_modifier(stat)
+        status_conditions.reduce(1.0) do |modifier, condition|
+          condition.stat_modifier(stat) * modifier
+        end
       end
 
-      def other_side
-        other_sides.first
+      def status_condition(condition_name)
+        STATUS_CONDITIONS[condition_name].new(self)
       end
 
-      def other_sides
-        battle.sides - [@side]
+      def stage(stat)
+        multipliers = stage_multipliers(stat)
+        multipliers[@stat_modifiers[stat] || 0]
       end
 
-      def actions
-        battle.actions
+      def stage_multipliers(stat)
+        case stat
+        when :evasion, :accuracy
+          STAGE_MULTIPLIERS_ACC_EVA
+        when :critical_hit
+          STAGE_MULTIPLIERS_CRITICAL_HIT
+        else
+          STAGE_MULTIPLIERS
+        end
       end
     end
   end