oakdex-battle 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb6705359f3c133ea6fe2ed3402b0afa848b008c3d546cc2f5ccb641c3967415
-  data.tar.gz: 94556920e80e6b1d273ded0be30fcc0058ebbf2ccd0d663049ba06b941e96c15
+  metadata.gz: 5dc5066190a2d5b69fbdd414ec99dbd63f6c9239153406d2ca4ab7ebcb055b22
+  data.tar.gz: 99b756dc78622714fbc2824e839a5f2ea68d8a51bd3e9b512b0c6f496787e8f6
 SHA512:
-  metadata.gz: c456d5bdccf1f8fca681f8438137c4814c1ee4aa0a023c80feab4178e458110a2df0a84895db08d5e44ed11177f4b65afb556776385f9b8c40ea114f6b628883
-  data.tar.gz: 6240ad289a2b5d6ac010d620bcf10535610118f94dbe7af8aed8d89134780043c7291f9dc976c31fd4d08fbb736cdfbc5479bc2b7917381c72b8dd47fecf4251
+  metadata.gz: 0abf78e77d33d9f64d8eb13e5ca06f4c3f17a21f70988db1c546a98a2777fcf66bd12e13391b830ce3a4aae4d35a377736efaabfcfd30a285f7337767550ac32
+  data.tar.gz: ce718361d1313ab36cf382d778d750f09bdc98604ffa4456445a27b35d7c1f7ee77b964b02cb17fd19f619a61a3604e260c8519aa408744db067943a101d9e51

data/README.md

@@ -50,11 +50,11 @@ battle.log.size # => 1
 battle.log.last # => [['sends_to_battle', 'Ash', 'Pikachu'], ['sends_to_battle', 'Misty', 'Bulbasaur']]
 battle.arena # => Snapshot of current state as Hash
 battle.finished? # => false
-battle.valid_actions_for(trainer1) # => [{ action: 'move', pokemon: pok1, move: <Move>, target: pok2 }, ...]
+valid_actions = battle.valid_actions_for(trainer1) # => [{"action"=>"move", "pokemon"=>"eb55b984-f0f0-48e5-9268-5bbf791a0793", "move"=>"Nuzzle", "target"=>["Misty", 0]}, {"action"=>"move", "pokemon"=>"eb55b984-f0f0-48e5-9268-5bbf791a0793", "move"=>"Hypnosis", "target"=>["Misty", 0]}, {"action"=>"recall", "pokemon"=>0, "target"=>"ceea31e4-adfc-4138-a148-424fa08c8f79"}, ...]
 
-battle.add_action(trainer1, { action: 'move', pokemon: pok1, move: <Move>, target: pok2 }) # => true
+battle.add_action(trainer1, valid_actions.first) # => true
 
-battle.add_action(trainer1, { action: 'move', pokemon: pok1, move: <Move>, target: pok2 }) # => false
+battle.add_action(trainer1, invalid_action) # => false
 
 battle.valid_actions_for(trainer1) # => []
 battle.continue # => false

data/lib/oakdex/battle.rb

@@ -25,16 +25,15 @@ module Oakdex
       @current_log = []
       @actions = []
       @turns = []
+      @sides = [@team1, @team2].map do |team|
+        Side.new(self, team)
+      end
     end
 
     def pokemon_per_side
       @options[:pokemon_per_side] || @team1.size
     end
 
-    def arena
-      { sides: sides }
-    end
-
     def valid_actions_for(trainer)
       valid_action_service.valid_actions_for(trainer)
     end
@@ -52,7 +51,7 @@ module Oakdex
     end
 
     def continue
-      return start if sides.empty?
+      return start if @log.empty?
       return false unless trainers.all? { |t| valid_actions_for(t).empty? }
       execute_actions
       true
@@ -75,6 +74,24 @@ module Oakdex
       sides.each(&:remove_fainted)
     end
 
+    def side_by_id(id)
+      sides.find { |s| s.id == id }
+    end
+
+    def trainers
+      sides.flat_map(&:trainers)
+    end
+
+    def pokemon_by_id(id)
+      trainers.each do |trainer|
+        trainer.team.each do |p|
+          return p if p.id == id
+        end
+      end
+
+      nil
+    end
+
     private
 
     def valid_action_service
@@ -86,9 +103,7 @@ module Oakdex
     end
 
     def start
-      @sides = [@team1, @team2].map do |team|
-        Side.new(self, team).tap(&:send_to_battle)
-      end
+      sides.each(&:send_to_battle)
       finish_turn
       true
     end
@@ -98,10 +113,6 @@ module Oakdex
       finish_turn
     end
 
-    def trainers
-      sides.flat_map(&:trainers)
-    end
-
     def finish_turn
       @log << @current_log
       @current_log = []

data/lib/oakdex/battle/action.rb

@@ -11,7 +11,8 @@ module Oakdex
 
       def_delegators :@turn, :battle
 
-      attr_reader :trainer, :damage, :turn
+      attr_reader :trainer, :damage
+      attr_accessor :turn
 
       def initialize(trainer, attributes)
         @trainer = trainer
@@ -24,23 +25,33 @@ module Oakdex
 
       def pokemon
         return pokemon_by_team_position if item?
-        recall? ? pokemon_by_position : @attributes[:pokemon]
+        recall? ? pokemon_by_position : battle.pokemon_by_id(pokemon_id)
+      end
+
+      def pokemon_id
+        move? ? @attributes['pokemon'] : nil
       end
 
       def pokemon_position
-        recall? ? @attributes[:pokemon] : nil
+        recall? ? @attributes['pokemon'] : nil
       end
 
       def target
-        recall? ? @attributes[:target] : targets
+        recall? ? battle.pokemon_by_id(@attributes['target']) : targets
+      end
+
+      def target_id
+        recall? ? @attributes['target'] : nil
       end
 
       def type
-        @attributes[:action]
+        @attributes['action']
       end
 
       def move
-        @attributes[:move]
+        return unless @attributes['move']
+        @move ||= pokemon.moves.find { |m| m.name == @attributes['move'] }
+        @move ||= Oakdex::Pokemon::Move.create(@attributes['move'])
       end
 
       def hitting_probability
@@ -52,8 +63,7 @@ module Oakdex
         @hitting == 1
       end
 
-      def execute(turn)
-        @turn = turn
+      def execute
         return execute_growth if growth?
         return execute_recall if recall?
         return execute_use_item if item?
@@ -61,19 +71,20 @@ module Oakdex
       end
 
       def item_id
-        @attributes[:item_id]
+        @attributes['item_id']
       end
 
       private
 
       def targets
         target_list.map do |target|
-          target_by_position(target[0], target[1])
+          side = battle.side_by_id(target[0])
+          target_by_position(side, target[1])
         end.compact
       end
 
       def target_list
-        list = @attributes[:target]
+        list = @attributes['target']
         return [] if (list || []).empty?
         list = [list] unless list[0].is_a?(Array)
         list
@@ -83,6 +94,10 @@ module Oakdex
         type == 'recall'
       end
 
+      def move?
+        type == 'move'
+      end
+
       def item?
         type == 'use_item_on_pokemon'
       end
@@ -93,11 +108,11 @@ module Oakdex
 
       def pokemon_by_position
         trainer.active_in_battle_pokemon
-          .find { |ibp| ibp.position == @attributes[:pokemon] }&.pokemon
+          .find { |ibp| ibp.position == @attributes['pokemon'] }&.pokemon
       end
 
       def pokemon_by_team_position
-        trainer.team[@attributes[:pokemon_team_pos]]
+        trainer.team[@attributes['pokemon_team_pos']]
       end
 
       def target_by_position(side, position)
@@ -120,11 +135,11 @@ module Oakdex
       end
 
       def item_actions
-        @attributes[:item_actions]
+        @attributes['item_actions']
       end
 
       def execute_growth
-        trainer.growth_event.execute(@attributes[:option])
+        trainer.growth_event.execute(@attributes['option'])
         while trainer.growth_event? && trainer.growth_event.read_only?
           e = trainer.growth_event
           add_log e.message

data/lib/oakdex/battle/active_in_battle_pokemon.rb

@@ -6,7 +6,7 @@ module Oakdex
     class ActiveInBattlePokemon
       extend Forwardable
 
-      def_delegators :@pokemon, :moves_with_pp, :fainted?
+      def_delegators :@pokemon, :moves_with_pp, :fainted?, :id
       def_delegators :@side, :battle
 
       attr_reader :pokemon, :position, :side
@@ -18,7 +18,7 @@ module Oakdex
       end
 
       def action_added?
-        actions.any? { |a| a.pokemon == pokemon }
+        actions.any? { |a| a.pokemon_id == id }
       end
 
       def valid_move_actions
@@ -28,10 +28,10 @@ module Oakdex
         moves.flat_map do |move|
           targets_in_battle(move).map do |target|
             {
-              action: 'move',
-              pokemon: pokemon,
-              move: move,
-              target: target
+              'action' => 'move',
+              'pokemon' => pokemon.id,
+              'move' => move.name,
+              'target' => target
             }
           end
         end
@@ -50,12 +50,16 @@ module Oakdex
       end
 
       def targets_in_battle?(targets)
-        targets.any? { |target| target[0].pokemon_in_battle?(target[1]) }
+        targets.any? do |target|
+          side = battle.side_by_id(target[0])
+          side.pokemon_in_battle?(target[1])
+        end
       end
 
       def target_in_battle?(target)
-        target[0].pokemon_in_battle?(target[1]) ||
-          (!target[0].pokemon_left? && target[1] == 0)
+        side = battle.side_by_id(target[0])
+        side.pokemon_in_battle?(target[1]) ||
+          (!side.pokemon_left? && target[1] == 0)
       end
 
       def struggle_move
@@ -106,30 +110,30 @@ module Oakdex
       end
 
       def self_target
-        [@side, position]
+        [@side.id, position]
       end
 
       def adjacent_foes
         [
-          [other_side, position - 1],
-          [other_side, position],
-          [other_side, position + 1]
+          [other_side.id, position - 1],
+          [other_side.id, position],
+          [other_side.id, position + 1]
         ].select { |t| t[1] >= 0 && t[1] < pokemon_per_side }
       end
 
       def adjacent_users
         [
-          [@side, position - 1],
-          [@side, position + 1]
+          [@side.id, position - 1],
+          [@side.id, position + 1]
         ].select { |t| t[1] >= 0 && t[1] < pokemon_per_side }
       end
 
       def all_users
-        pokemon_per_side.times.map { |i| [@side, i] }
+        pokemon_per_side.times.map { |i| [@side.id, i] }
       end
 
       def all_foes
-        pokemon_per_side.times.map { |i| [other_side, i] }
+        pokemon_per_side.times.map { |i| [other_side.id, i] }
       end
 
       def pokemon_per_side

data/lib/oakdex/battle/in_battle_pokemon.rb

@@ -1,5 +1,6 @@
 require 'forwardable'
 require 'oakdex/battle/status_conditions'
+require 'securerandom'
 
 module Oakdex
   class Battle
@@ -115,6 +116,10 @@ module Oakdex
         stage(:critical_hit)
       end
 
+      def id
+        @id ||= SecureRandom.uuid
+      end
+
       Oakdex::Pokemon::BATTLE_STATS.each do |stat|
         define_method stat do
           (@pokemon.public_send(stat) * stage(stat) *

data/lib/oakdex/battle/side.rb

@@ -55,6 +55,10 @@ module Oakdex
         @trainers.all?(&:fainted?)
       end
 
+      def id
+        @id ||= trainers.map(&:name).join(',')
+      end
+
       private
 
       def pokemon_per_trainer

data/lib/oakdex/battle/turn.rb

@@ -17,10 +17,11 @@ module Oakdex
       def execute
         execute_status_conditions(:before_turn)
 
+        @actions.each { |a| a.turn = self }
         ordered_actions.each do |action|
           next unless valid_target?(action)
           next if action.pokemon && action.pokemon.fainted?
-          action.execute(self)
+          action.execute
         end
 
         execute_status_conditions(:after_turn)

data/lib/oakdex/battle/valid_action_service.rb

@@ -50,8 +50,8 @@ module Oakdex
         if trainer.growth_event?
           trainer.growth_event.possible_actions.map do |option|
             {
-              action: 'growth_event',
-              option: option
+              'action' => 'growth_event',
+              'option' => option
             }
           end
         else
@@ -78,10 +78,10 @@ module Oakdex
             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
+                'action' => 'use_item_on_pokemon',
+                'pokemon_team_pos' => i,
+                'item_id' => item_id,
+                'item_actions' => item_actions
               }
             end
           end.compact
@@ -118,9 +118,9 @@ module Oakdex
         return if !recall_action_valid?(trainer, active_ibp, target) ||
                   recall_action_for?(target)
         {
-          action: 'recall',
-          pokemon: active_ibp&.position || side(trainer).next_position,
-          target: target
+          'action' => 'recall',
+          'pokemon' => active_ibp&.position || side(trainer).next_position,
+          'target' => target.id
         }
       end
 
@@ -139,7 +139,7 @@ module Oakdex
 
       def recall_action_for?(target)
         actions.any? do |action|
-          action.type == 'recall' && action.target == target
+          action.type == 'recall' && action.target_id == target.id
         end
       end
 

data/lib/oakdex/battle/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oakdex-battle
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Jalyna Schroeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-24 00:00:00.000000000 Z
+date: 2019-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oakdex-pokemon