oakdex-battle 0.0.2 → 0.1.0

data/lib/oakdex/battle/move_execution.rb

@@ -104,7 +104,7 @@ module Oakdex
       end
 
       def random_stat
-        (Pokemon::BATTLE_STATS + Pokemon::OTHER_STATS).sample
+        (Oakdex::Pokemon::BATTLE_STATS + InBattlePokemon::OTHER_STATS).sample
       end
 
       def add_log(*args)

data/lib/oakdex/battle/side.rb

@@ -37,17 +37,17 @@ module Oakdex
       end
 
       def pokemon_in_battle?(position)
-        in_battle_pokemon.any? do |ibp|
+        active_in_battle_pokemon.any? do |ibp|
           ibp.position == position
         end
       end
 
       def pokemon_left?
-        !in_battle_pokemon.empty?
+        !active_in_battle_pokemon.empty?
       end
 
-      def in_battle_pokemon
-        @trainers.map(&:in_battle_pokemon).flatten(1)
+      def active_in_battle_pokemon
+        @trainers.map(&:active_in_battle_pokemon).flatten(1)
       end
 
       def fainted?
@@ -65,7 +65,7 @@ module Oakdex
       end
 
       def taken_positions
-        in_battle_pokemon.map(&:position).sort
+        active_in_battle_pokemon.map(&:position).sort
       end
 
       def all_position

data/lib/oakdex/battle/status_conditions/badly_poisoned.rb

@@ -9,7 +9,7 @@ module Oakdex
         end
 
         def after_turn(turn)
-          return if pokemon.current_hp.zero?
+          return if pokemon.fainted?
           turn.battle.add_to_log('damage_by_badly_poisoned',
                                  pokemon.trainer.name,
                                  pokemon.name, hp_by_turn)

data/lib/oakdex/battle/status_conditions/burn.rb

@@ -4,7 +4,7 @@ module Oakdex
       # Represents Burn status condition
       class Burn < NonVolatile
         def after_turn(turn)
-          return if pokemon.current_hp.zero?
+          return if pokemon.fainted?
           turn.battle.add_to_log('damage_by_burn',
                                  pokemon.trainer.name,
                                  pokemon.name, hp_by_turn)

data/lib/oakdex/battle/status_conditions/freeze.rb

@@ -13,7 +13,7 @@ module Oakdex
         end
 
         def after_received_damage(move_execution)
-          return unless move_execution.move.type == 'fire'
+          return unless move_execution.move.type_id == 'fire'
           defrost(move_execution.battle)
         end
 

data/lib/oakdex/battle/status_conditions/poison.rb

@@ -4,7 +4,7 @@ module Oakdex
       # Represents Poison status condition
       class Poison < NonVolatile
         def after_turn(turn)
-          return if pokemon.current_hp.zero?
+          return if pokemon.fainted?
           turn.battle.add_to_log('damage_by_poison',
                                  pokemon.trainer.name,
                                  pokemon.name, hp_by_turn)

data/lib/oakdex/battle/trainer.rb

@@ -2,48 +2,50 @@ module Oakdex
   class Battle
     # Represents a Pokemon Trainer. Owns Pokemon and has a name
     class Trainer
-      attr_reader :name, :team, :in_battle_pokemon
+      attr_reader :name, :team, :active_in_battle_pokemon
 
-      def initialize(name, team)
+      def initialize(name, pokemon)
         @name = name
-        team.each { |p| p.trainer = self }
-        @team = team
-        @in_battle_pokemon = []
+        pokemon.each { |p| p.trainer = self }
+        @team = pokemon.map { |p| Oakdex::Battle::InBattlePokemon.new(p) }
+        @active_in_battle_pokemon = []
       end
 
       def fainted?
-        @team.all? { |p| p.current_hp.zero? }
+        @team.all?(&:fainted?)
       end
 
       def send_to_battle(pokemon, side)
-        @in_battle_pokemon << InBattlePokemon.new(pokemon,
-                                                  side, side.next_position)
+        @active_in_battle_pokemon << ActiveInBattlePokemon.new(
+          pokemon,
+          side, side.next_position)
         side.add_to_log 'sends_to_battle', name, pokemon.name
       end
 
       def remove_from_battle(pokemon, side)
-        ibp_to_remove = @in_battle_pokemon.find { |ibp| ibp.pokemon == pokemon }
+        ibp_to_remove = @active_in_battle_pokemon
+          .find { |ibp| ibp.pokemon == pokemon }
         pokemon.reset_stats
         pokemon.status_conditions.each do |s|
           s.after_switched_out(ibp_to_remove.battle)
         end
-        @in_battle_pokemon -= [ibp_to_remove]
+        @active_in_battle_pokemon -= [ibp_to_remove]
         side.add_to_log 'removes_from_battle', name, pokemon.name
       end
 
       def remove_fainted
-        @in_battle_pokemon.each do |ibp|
+        @active_in_battle_pokemon.each do |ibp|
           next unless ibp.fainted?
           ibp.battle.add_to_log('pokemon_fainted', name, ibp.pokemon.name)
           ibp.pokemon.status_conditions
             .each { |s| s.after_fainted(ibp.battle) }
         end
-        @in_battle_pokemon = @in_battle_pokemon.reject(&:fainted?)
+        @active_in_battle_pokemon = @active_in_battle_pokemon.reject(&:fainted?)
       end
 
       def left_pokemon_in_team
-        @team.select { |p| !p.current_hp.zero? } -
-          @in_battle_pokemon.map(&:pokemon)
+        @team.select { |p| !p.fainted? } -
+          @active_in_battle_pokemon.map(&:pokemon)
       end
     end
   end

data/lib/oakdex/battle/turn.rb

@@ -19,7 +19,7 @@ module Oakdex
 
         ordered_actions.each do |action|
           next unless valid_target?(action)
-          next if action.pokemon && action.pokemon.current_hp.zero?
+          next if action.pokemon && action.pokemon.fainted?
           action.execute(self)
         end
 
@@ -36,7 +36,7 @@ module Oakdex
       end
 
       def status_conditions
-        sides.flat_map(&:in_battle_pokemon)
+        sides.flat_map(&:active_in_battle_pokemon)
           .map(&:pokemon)
           .flat_map(&:status_conditions)
       end
@@ -44,7 +44,7 @@ module Oakdex
       def valid_target?(action)
         targets = action.target.is_a?(Array) ? action.target : [action.target]
         targets.all? do |target|
-          !target.nil? && !target.current_hp.zero?
+          !target.nil? && !target.fainted?
         end
       end
 

data/lib/oakdex/battle/valid_action_service.rb

@@ -21,32 +21,32 @@ module Oakdex
       private
 
       def valid_move_actions_for(trainer)
-        trainer.in_battle_pokemon.flat_map(&:valid_move_actions)
+        trainer.active_in_battle_pokemon.flat_map(&:valid_move_actions)
       end
 
       def valid_recall_actions_for(trainer)
         trainer.left_pokemon_in_team.flat_map do |pokemon|
           pokemon_per_trainer.times.map do |position|
             recall_action(trainer,
-                          trainer.in_battle_pokemon[position],
+                          trainer.active_in_battle_pokemon[position],
                           pokemon)
           end.compact
         end
       end
 
-      def recall_action(trainer, in_battle_pokemon, target)
-        return if !recall_action_valid?(trainer, in_battle_pokemon, target) ||
+      def recall_action(trainer, active_ibp, target)
+        return if !recall_action_valid?(trainer, active_ibp, target) ||
                   recall_action_for?(target)
         {
           action: 'recall',
-          pokemon: in_battle_pokemon&.position || side(trainer).next_position,
+          pokemon: active_ibp&.position || side(trainer).next_position,
           target: target
         }
       end
 
-      def recall_action_valid?(trainer, in_battle_pokemon, _target)
-        if in_battle_pokemon
-          !in_battle_pokemon.action_added?
+      def recall_action_valid?(trainer, active_in_battle_pokemon, _target)
+        if active_in_battle_pokemon
+          !active_in_battle_pokemon.action_added?
         else
           next_position = side(trainer).next_position
           next_position && !recall_action_for_position?(next_position)
@@ -70,11 +70,11 @@ module Oakdex
       end
 
       def no_battle_pokemon?(trainer)
-        other_sides(trainer).all? { |s| s.in_battle_pokemon.empty? }
+        other_sides(trainer).all? { |s| s.active_in_battle_pokemon.empty? }
       end
 
       def own_battle_pokemon?(trainer)
-        !side(trainer).in_battle_pokemon.empty?
+        !side(trainer).active_in_battle_pokemon.empty?
       end
 
       def other_sides(trainer)

data/lib/oakdex/battle/version.rb

@@ -1,5 +1,5 @@
 module Oakdex
   class Battle
-    VERSION = '0.0.2'
+    VERSION = '0.1.0'
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: oakdex-battle
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Jalyna Schroeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-13 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: oakdex-pokedex
+  name: oakdex-pokemon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.0.4
 description: Pokémon Battle Engine Gen 7 Gem, based on oakdex-pokedex
 email: jalyna.schroeder@gmail.com
 executables: []
@@ -34,14 +34,10 @@ files:
 - lib/oakdex.rb
 - lib/oakdex/battle.rb
 - lib/oakdex/battle/action.rb
-- lib/oakdex/battle/breeding.rb
+- lib/oakdex/battle/active_in_battle_pokemon.rb
 - lib/oakdex/battle/damage.rb
 - lib/oakdex/battle/in_battle_pokemon.rb
-- lib/oakdex/battle/move.rb
 - lib/oakdex/battle/move_execution.rb
-- lib/oakdex/battle/pokemon.rb
-- lib/oakdex/battle/pokemon_factory.rb
-- lib/oakdex/battle/pokemon_stat.rb
 - lib/oakdex/battle/side.rb
 - lib/oakdex/battle/status_conditions.rb
 - lib/oakdex/battle/status_conditions/badly_poisoned.rb

data/lib/oakdex/battle/breeding.rb

@@ -1,109 +0,0 @@
-module Oakdex
-  class Battle
-    # Pokemon Breeding
-    class Breeding
-      class << self
-        def compatible?(pokemon1, pokemon2)
-          new(pokemon1, pokemon2).compatible?
-        end
-
-        def chance_in_percentage(pokemon1, pokemon2)
-          new(pokemon1, pokemon2).chance_in_percentage
-        end
-
-        def breed(pokemon1, pokemon2)
-          new(pokemon1, pokemon2).child
-        end
-      end
-
-      def initialize(pokemon1, pokemon2)
-        @female = pokemon1.gender == 'female' ? pokemon1 : pokemon2
-        @male = ([pokemon1, pokemon2] - [@female]).first
-      end
-
-      def compatible?
-        (opposite_gender? && same_egg_group? && !any_undiscovered?) ||
-          (exactly_one_is_ditto? && non_ditto_is_discovered?)
-      end
-
-      def chance_in_percentage
-        return 0 unless compatible?
-        return 50 if same_species?
-        20
-      end
-
-      def child
-        return unless compatible?
-        Oakdex::Battle::Pokemon.create(child_species.name,
-                                       level: 1,
-                                       additional_moves: enabled_egg_moves
-                                      )
-      end
-
-      private
-
-      def child_species
-        @child_species ||=
-          lowest_in_evolutionary_chain(non_ditto_or_female.species)
-      end
-
-      def enabled_egg_moves
-        egg_moves & parent_moves
-      end
-
-      def parent_moves
-        @female.moves.map(&:name) + @male.moves.map(&:name)
-      end
-
-      def egg_moves
-        child_species.learnset
-          .map { |l| l['egg_move'] ? l['move'] : nil }
-          .compact
-      end
-
-      def lowest_in_evolutionary_chain(species)
-        # TODO: take incenses into account
-        lowest_species = species
-        while lowest_species.evolution_from
-          lowest_species = Oakdex::Pokedex::Pokemon
-            .find!(lowest_species.evolution_from)
-        end
-        lowest_species
-      end
-
-      def exactly_one_is_ditto?
-        (@female.name == 'Ditto') ^ (@male.name == 'Ditto')
-      end
-
-      def non_ditto_is_discovered?
-        !non_ditto.species.egg_groups.include?('Undiscovered')
-      end
-
-      def non_ditto
-        return unless exactly_one_is_ditto?
-        @female.name == 'Ditto' ? @male : @female
-      end
-
-      def non_ditto_or_female
-        non_ditto || @female
-      end
-
-      def opposite_gender?
-        @female.gender == 'female' && @male.gender == 'male'
-      end
-
-      def same_egg_group?
-        !(@female.species.egg_groups & @male.species.egg_groups).empty?
-      end
-
-      def any_undiscovered?
-        (@female.species.egg_groups + @male.species.egg_groups)
-          .include?('Undiscovered')
-      end
-
-      def same_species?
-        @female.name == @male.name
-      end
-    end
-  end
-end

data/lib/oakdex/battle/move.rb

@@ -1,27 +0,0 @@
-require 'forwardable'
-
-module Oakdex
-  class Battle
-    # Represents Pokemon Move with PP
-    class Move
-      extend Forwardable
-
-      attr_reader :max_pp
-      attr_accessor :pp
-
-      def_delegators :@move_type, :target, :priority, :accuracy,
-                     :category, :power, :type, :stat_modifiers,
-                     :in_battle_properties
-
-      def initialize(move_type, pp, max_pp)
-        @move_type  = move_type
-        @pp         = pp
-        @max_pp     = max_pp
-      end
-
-      def name
-        @move_type.names['en']
-      end
-    end
-  end
-end

data/lib/oakdex/battle/pokemon.rb

@@ -1,173 +0,0 @@
-require 'forwardable'
-require 'oakdex/battle/pokemon_stat'
-require 'oakdex/battle/move'
-require 'oakdex/battle/pokemon_factory'
-require 'oakdex/battle/status_conditions'
-
-module Oakdex
-  class Battle
-    # Represents detailed pokemon instance
-    class Pokemon
-      extend Forwardable
-
-      BATTLE_STATS = %i[hp atk def sp_atk sp_def speed]
-      OTHER_STATS = %i[accuracy evasion critical_hit]
-      STATUS_CONDITIONS = {
-        'poison' => StatusConditions::Poison,
-        'burn' => StatusConditions::Burn,
-        'freeze' => StatusConditions::Freeze,
-        'paralysis' => StatusConditions::Paralysis,
-        'badly_poisoned' => StatusConditions::BadlyPoisoned,
-        'sleep' => StatusConditions::Sleep
-      }
-
-      def_delegators :@species, :types
-
-      attr_accessor :trainer
-      attr_reader :species
-
-      def self.create(species_name, options = {})
-        species = Oakdex::Pokedex::Pokemon.find!(species_name)
-        Oakdex::Battle::PokemonFactory.create(species, options)
-      end
-
-      def initialize(species, attributes = {})
-        @species = species
-        @attributes = attributes
-        @attributes[:status_conditions] ||= []
-        reset_stats
-      end
-
-      def name
-        @species.names['en']
-      end
-
-      def gender
-        @attributes[:gender]
-      end
-
-      def moves
-        @attributes[:moves]
-      end
-
-      def current_hp
-        @attributes[:hp]
-      end
-
-      def status_conditions
-        @attributes[:status_conditions]
-      end
-
-      def moves_with_pp
-        moves.select { |m| m.pp > 0 }
-      end
-
-      def change_hp_by(hp_change)
-        @attributes[:hp] = if hp_change < 0
-                             [@attributes[:hp] + hp_change, 0].max
-                           else
-                             [@attributes[:hp] + hp_change, hp].min
-                           end
-      end
-
-      def change_pp_by(move_name, pp_change)
-        move = moves.find { |m| m.name == move_name }
-        return unless move
-        move.pp = if pp_change < 0
-                    [move.pp + pp_change, 0].max
-                  else
-                    [move.pp + pp_change, move.max_pp].min
-                  end
-      end
-
-      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 add_status_condition(condition_name)
-        @attributes[:status_conditions] << status_condition(condition_name)
-      end
-
-      def remove_status_condition(condition)
-        @attributes[:status_conditions] = @attributes[:status_conditions]
-          .reject { |s| s == condition }
-      end
-
-      def reset_stats
-        @stat_modifiers = (BATTLE_STATS + OTHER_STATS - %i[hp]).map do |stat|
-          [stat, 0]
-        end.to_h
-      end
-
-      def level
-        PokemonStat.level_by_exp(@species.leveling_rate, @attributes[:exp])
-      end
-
-      def accuracy
-        stage(:accuracy)
-      end
-
-      def evasion
-        stage(:evasion)
-      end
-
-      def critical_hit_prob
-        stage(:critical_hit)
-      end
-
-      BATTLE_STATS.each do |stat|
-        define_method stat do
-          (initial_stat(stat) * stage(stat) *
-            status_condition_modifier(stat)).to_i
-        end
-      end
-
-      private
-
-      def status_condition_modifier(stat)
-        status_conditions.reduce(1.0) do |modifier, condition|
-          condition.stat_modifier(stat) * modifier
-        end
-      end
-
-      def status_condition(condition_name)
-        STATUS_CONDITIONS[condition_name].new(self)
-      end
-
-      def stage(stat)
-        multipliers = stage_multipliers(stat)
-        multipliers[@stat_modifiers[stat] || 0]
-      end
-
-      def initial_stat(stat)
-        PokemonStat.initial_stat(stat,
-                                 level:      level,
-                                 nature:     @attributes[:nature],
-                                 iv:         @attributes[:iv],
-                                 ev:         @attributes[:ev],
-                                 base_stats: @species.base_stats
-                                )
-      end
-
-      def stage_multipliers(stat)
-        case stat
-        when :evasion, :accuracy
-          PokemonStat::STAGE_MULTIPLIERS_ACC_EVA
-        when :critical_hit
-          PokemonStat::STAGE_MULTIPLIERS_CRITICAL_HIT
-        else
-          PokemonStat::STAGE_MULTIPLIERS
-        end
-      end
-    end
-  end
-end