oakdex-battle 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2066dbb4e78aff0e298029c4eb76f345326e172e
-  data.tar.gz: bf2201bd2ebfdb085b1fa2b766ec344e41c8a97c
+SHA256:
+  metadata.gz: fb6705359f3c133ea6fe2ed3402b0afa848b008c3d546cc2f5ccb641c3967415
+  data.tar.gz: 94556920e80e6b1d273ded0be30fcc0058ebbf2ccd0d663049ba06b941e96c15
 SHA512:
-  metadata.gz: 30127361db91d8748335a8a58609a045ddf3c7faceac02a034e8da966496c89271f9c4ebe2cd3e3af3e83b6e819b2904e6ae80b823d22501b28696cb3fb5e7d7
-  data.tar.gz: 61482125d2312a029a6de584efc8069be965e9c21b26cdf7163e3501e3273c7d519b8578b61284adb770a5d6570c7e4b320e94371d8126d769d1ba228ad2f4a0
+  metadata.gz: c456d5bdccf1f8fca681f8438137c4814c1ee4aa0a023c80feab4178e458110a2df0a84895db08d5e44ed11177f4b65afb556776385f9b8c40ea114f6b628883
+  data.tar.gz: 6240ad289a2b5d6ac010d620bcf10535610118f94dbe7af8aed8d89134780043c7291f9dc976c31fd4d08fbb736cdfbc5479bc2b7917381c72b8dd47fecf4251

data/README.md

@@ -41,8 +41,8 @@ pok2 = Oakdex::Pokemon.create('Bulbasaur', {
   ]
 })
 
-trainer1 = Oakdex::Battle::Trainer.new('Ash', [pok1])
-trainer2 = Oakdex::Battle::Trainer.new('Misty', [pok2])
+trainer1 = Oakdex::Battle::Trainer.new('Ash', [pok1], ['Potion', 'Elixir', 'Ether'], enable_grow: true, using_exp_share: true) # trainer's pokemon receive exp and ev
+trainer2 = Oakdex::Battle::Trainer.new('Misty', [pok2], ['Potion', 'Potion', 'Revive', 'Soda Pop'])
 
 battle = Oakdex::Battle.new(trainer1, trainer2)
 battle.continue # => true
@@ -52,10 +52,10 @@ battle.arena # => Snapshot of current state as Hash
 battle.finished? # => false
 battle.valid_actions_for(trainer1) # => [{ action: 'move', pokemon: pok1, move: <Move>, target: pok2 }, ...]
 
-battle.add_action(trainer1, { action: 'move', pokemon: pok1, move: <Move>, target: pok2 }) # => false
-
 battle.add_action(trainer1, { action: 'move', pokemon: pok1, move: <Move>, target: pok2 }) # => true
 
+battle.add_action(trainer1, { action: 'move', pokemon: pok1, move: <Move>, target: pok2 }) # => false
+
 battle.valid_actions_for(trainer1) # => []
 battle.continue # => false
 battle.simulate_action(trainer2) # => true

data/lib/oakdex/battle/action.rb

@@ -4,7 +4,8 @@ module Oakdex
   class Battle
     # Represents one Action. One turn has many actions.
     class Action
-      RECALL_PRIORITY = 6
+      RECALL_PRIORITY = 7
+      ITEM_PRIORITY = 6
 
       extend Forwardable
 
@@ -18,10 +19,11 @@ module Oakdex
       end
 
       def priority
-        move&.priority || RECALL_PRIORITY
+        move&.priority || (recall? ? RECALL_PRIORITY : ITEM_PRIORITY)
       end
 
       def pokemon
+        return pokemon_by_team_position if item?
         recall? ? pokemon_by_position : @attributes[:pokemon]
       end
 
@@ -52,10 +54,16 @@ module Oakdex
 
       def execute(turn)
         @turn = turn
-        return execute_recall if type == 'recall'
+        return execute_growth if growth?
+        return execute_recall if recall?
+        return execute_use_item if item?
         targets.each { |t| MoveExecution.new(self, t).execute }
       end
 
+      def item_id
+        @attributes[:item_id]
+      end
+
       private
 
       def targets
@@ -66,7 +74,7 @@ module Oakdex
 
       def target_list
         list = @attributes[:target]
-        reutrn [] if list.empty?
+        return [] if (list || []).empty?
         list = [list] unless list[0].is_a?(Array)
         list
       end
@@ -75,11 +83,23 @@ module Oakdex
         type == 'recall'
       end
 
+      def item?
+        type == 'use_item_on_pokemon'
+      end
+
+      def growth?
+        type == 'growth_event'
+      end
+
       def pokemon_by_position
         trainer.active_in_battle_pokemon
           .find { |ibp| ibp.position == @attributes[:pokemon] }&.pokemon
       end
 
+      def pokemon_by_team_position
+        trainer.team[@attributes[:pokemon_team_pos]]
+      end
+
       def target_by_position(side, position)
         side.active_in_battle_pokemon
           .find { |ibp| ibp.position == position }&.pokemon
@@ -99,6 +119,37 @@ module Oakdex
         end
       end
 
+      def item_actions
+        @attributes[:item_actions]
+      end
+
+      def execute_growth
+        trainer.growth_event.execute(@attributes[:option])
+        while trainer.growth_event? && trainer.growth_event.read_only?
+          e = trainer.growth_event
+          add_log e.message
+          e.execute
+        end
+      end
+
+      def execute_use_item
+        add_log 'uses_item_on_pokemon', trainer.name, pokemon.name, item_id
+        consumed = pokemon.use_item(item_id, in_battle: true)
+        trainer.consume_item(item_id) if consumed
+        action_id = 0
+        while pokemon.growth_event? do
+          event = pokemon.growth_event
+          if event.read_only?
+            add_log trainer.name, pokemon.name, event.message
+            event.execute
+          else
+            raise 'Invalid Item Usage' unless item_actions[action_id]
+            event.execute(item_actions[action_id])
+            action_id += 1
+          end
+        end
+      end
+
       def add_log(*args)
         battle.add_to_log(*args)
       end

data/lib/oakdex/battle/in_battle_pokemon.rb

@@ -59,9 +59,10 @@ module Oakdex
 
       def_delegators :@pokemon, :types, :trainer, :trainer=,
                      :name, :moves, :moves_with_pp, :change_hp_by,
-                     :change_pp_by, :level, :fainted?
+                     :change_pp_by, :level, :fainted?, :usable_item?,
+                     :use_item, :growth_event?, :growth_event, :grow_from_battle
 
-      attr_reader :status_conditions
+      attr_reader :status_conditions, :pokemon
 
       def initialize(pokemon, options = {})
         @pokemon = pokemon
@@ -69,6 +70,7 @@ module Oakdex
         if @pokemon.primary_status_condition
           add_status_condition(@pokemon.primary_status_condition)
         end
+        @pokemon.enable_battle_mode
         reset_stats
       end
 

data/lib/oakdex/battle/side.rb

@@ -13,6 +13,7 @@ module Oakdex
       def initialize(battle, trainers)
         @battle = battle
         @trainers = trainers
+        @trainers.each { |t| t.side = self }
       end
 
       def next_position

data/lib/oakdex/battle/trainer.rb

@@ -2,19 +2,42 @@ module Oakdex
   class Battle
     # Represents a Pokemon Trainer. Owns Pokemon and has a name
     class Trainer
-      attr_reader :name, :team, :active_in_battle_pokemon
+      attr_reader :name, :team, :active_in_battle_pokemon, :items
+      attr_accessor :side
 
-      def initialize(name, pokemon)
+      def initialize(name, pokemon, items = [], options = {})
         @name = name
         pokemon.each { |p| p.trainer = self }
         @team = pokemon.map { |p| Oakdex::Battle::InBattlePokemon.new(p) }
         @active_in_battle_pokemon = []
+        @items = items
+        @options = options
       end
 
       def fainted?
         @team.all?(&:fainted?)
       end
 
+      def growth_event?
+        !growth_events.empty?
+      end
+
+      def growth_event
+        growth_events.first
+      end
+
+      def remove_growth_event
+        remove_growth_event = growth_event
+        return unless remove_growth_event
+        pokemon = team.find { |p| p.growth_event == remove_growth_event }
+        pokemon.remove_growth_event
+      end
+
+      def consume_item(item_id)
+        first_index = @items.index(item_id)
+        @items.delete_at(first_index)
+      end
+
       def send_to_battle(pokemon, side)
         @active_in_battle_pokemon << ActiveInBattlePokemon.new(
           pokemon,
@@ -39,6 +62,7 @@ module Oakdex
           ibp.battle.add_to_log('pokemon_fainted', name, ibp.pokemon.name)
           ibp.pokemon.status_conditions
             .each { |s| s.after_fainted(ibp.battle) }
+          other_side_gains(ibp)
         end
         @active_in_battle_pokemon = @active_in_battle_pokemon.reject(&:fainted?)
       end
@@ -47,6 +71,71 @@ module Oakdex
         @team.select { |p| !p.fainted? } -
           @active_in_battle_pokemon.map(&:pokemon)
       end
+
+      def grow(defeated_pokemon)
+        return unless @options[:enable_grow]
+        active_in_battle_pokemon.each do |ibp|
+          next if ibp.fainted?
+          execute_grow_for_pokemon(ibp.pokemon, defeated_pokemon)
+        end
+        grow_team_pokemon(defeated_pokemon)
+      end
+
+      private
+
+      def battle
+        side.battle
+      end
+
+      def grow_team_pokemon(defeated_pokemon)
+        return unless @options[:using_exp_share]
+        exclude_pokemon = active_in_battle_pokemon.map(&:pokemon)
+
+        (team - exclude_pokemon).each do |pok|
+          next if pok.fainted?
+          execute_grow_for_pokemon(pok, defeated_pokemon)
+        end
+      end
+
+      def execute_grow_for_pokemon(bp, defeated_pokemon)
+        bp.grow_from_battle(defeated_pokemon.pokemon.pokemon)
+        execute_read_only_events(bp)
+        return unless bp.growth_event?
+        add_choice_to_log(bp)
+      end
+
+      def execute_read_only_events(bp)
+        while bp.growth_event? && bp.growth_event.read_only?
+          battle.add_to_log(bp.growth_event.message)
+          bp.growth_event.execute
+        end
+      end
+
+      def add_choice_to_log(bp)
+        battle.add_to_log(
+          'choice_for',
+          name,
+          bp.growth_event.message,
+          bp.growth_event.possible_actions.join(',')
+        )
+      end
+
+      def other_side_gains(ibp)
+        winner_sides = ibp.battle.sides - side_of_trainer(ibp.battle.sides)
+        winner_sides.each do |side|
+          side.trainers.each do |trainer|
+            trainer.grow(ibp)
+          end
+        end
+      end
+
+      def side_of_trainer(sides)
+        sides.select { |s| s.trainer_on_side?(self) }
+      end
+
+      def growth_events
+        team.map(&:growth_event).compact
+      end
     end
   end
 end

data/lib/oakdex/battle/valid_action_service.rb

@@ -13,17 +13,97 @@ module Oakdex
       end
 
       def valid_actions_for(trainer)
-        return [] if sides.empty?
-        return [] if no_battle_pokemon?(trainer) && own_battle_pokemon?(trainer)
-        valid_move_actions_for(trainer) + valid_recall_actions_for(trainer)
+        return [] if no_actions_for?(trainer)
+        growth_events = growth_event_actions(trainer)
+        return growth_events unless growth_events.empty?
+        valid_move_actions_for(trainer) +
+          valid_recall_actions_for(trainer) +
+          valid_item_actions_for(trainer)
       end
 
       private
 
+      def actions_for_trainer(trainer)
+        actions.select { |a| a.trainer == trainer }
+      end
+
+      def no_actions_for?(trainer)
+        growth_events = growth_event_actions(trainer)
+        sides.empty? ||
+          (no_battle_pokemon?(trainer) && growth_events.empty?) ||
+          (other_is_growing?(trainer) && growth_events.empty?) ||
+          added_growth_action_already?(trainer)
+      end
+
+      def added_growth_action_already?(trainer)
+        growth_events = growth_event_actions(trainer)
+
+        !growth_events.empty? && !actions_for_trainer(trainer).empty?
+      end
+
+      def growth_event_actions(trainer)
+        while trainer.growth_event? && trainer.growth_event.read_only?
+          @battle.add_to_log(trainer.growth_event.message)
+          trainer.growth_event.execute
+        end
+
+        if trainer.growth_event?
+          trainer.growth_event.possible_actions.map do |option|
+            {
+              action: 'growth_event',
+              option: option
+            }
+          end
+        else
+          []
+        end
+      end
+
+      def other_is_growing?(trainer)
+        other_trainers = sides.flat_map(&:trainers) - [trainer]
+        other_trainers.any? do |t|
+          t.growth_event? && !t.growth_event.read_only?
+        end
+      end
+
       def valid_move_actions_for(trainer)
         trainer.active_in_battle_pokemon.flat_map(&:valid_move_actions)
       end
 
+      def valid_item_actions_for(trainer)
+        return [] if actions.select { |a| a.trainer == trainer }.size >= pokemon_per_trainer
+        trainer.items.flat_map do |item_id|
+          trainer.team.flat_map.with_index do |pokemon, i|
+            next if actions.any? { |a| a.item_id == item_id }
+            next unless pokemon.usable_item?(item_id, in_battle: true)
+            possible_item_actions(pokemon, item_id).map do |item_actions|
+              {
+                action: 'use_item_on_pokemon',
+                pokemon_team_pos: i,
+                item_id: item_id,
+                item_actions: item_actions
+              }
+            end
+          end.compact
+        end - actions
+      end
+
+      def possible_item_actions(battle_pokemon, item_id, prevActions = [])
+        dup_pokemon = battle_pokemon.pokemon.dup
+        dup_pokemon.use_item(item_id, in_battle: true)
+        e = dup_pokemon.growth_event
+        return [[]] if !e || e.read_only?
+        prevActions.each do |a|
+          e.execute(a)
+          e = dup_pokemon.growth_event
+        end
+        return [prevActions] if e.read_only?
+        e.possible_actions.flat_map do |a|
+          r = possible_item_actions(battle_pokemon, item_id, prevActions + [a])
+          r
+        end
+      end
+
       def valid_recall_actions_for(trainer)
         trainer.left_pokemon_in_team.flat_map do |pokemon|
           pokemon_per_trainer.times.map do |position|
@@ -70,7 +150,8 @@ module Oakdex
       end
 
       def no_battle_pokemon?(trainer)
-        other_sides(trainer).all? { |s| s.active_in_battle_pokemon.empty? }
+        other_sides(trainer).all? { |s| s.active_in_battle_pokemon.empty? } &&
+          own_battle_pokemon?(trainer)
       end
 
       def own_battle_pokemon?(trainer)

data/lib/oakdex/battle/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oakdex-battle
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jalyna Schroeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2019-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oakdex-pokemon
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.12
+- !ruby/object:Gem::Dependency
+  name: oakdex-pokedex
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.5
 description: Pokémon Battle Engine Gen 7 Gem, based on oakdex-pokedex
 email: jalyna.schroeder@gmail.com
 executables: []
@@ -71,8 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Pokémon Battle Engine in Ruby