Battlefield 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa18572f350de68cb43a22f90c7eac533233b891
-  data.tar.gz: 0d04d567322d981119b98d3dafec7bf3aea9cd85
+  metadata.gz: 26151680d3e15a6e6e4d0c7dfab984c51e07be91
+  data.tar.gz: 5f8d4b54ade88fd7a1626bfa5ab40d41c75e86c9
 SHA512:
-  metadata.gz: a197d8ae9ad17ddd2dbceacd306d3eb588231e9fef78993a5a382ba8a2db6ded95276f6ef0625533e598120b5243390b71a96f3f5332b5337803568da96bc178
-  data.tar.gz: cd11f3803b989d22b40c50d42b349b9de626d2a935b576978bfd0372ab00b0fa1c9d0600cd8a77fd3991a247a9863466aba89a13a588d6c0b56045ef6c0021de
+  metadata.gz: ece9c8ee79f3d6c2c56d7c71d043295c04a696d8e8b12b9fb293fd0b5b57364e438d8c2c2023438bfbef732a32392cb0a23edfc12e51773e499d716eba3bdac7
+  data.tar.gz: 0400cf0e0c9384092dad1908739c21da8828c553606f2aab475328afec8f5d31451fd6001ad4916f02955e87b696ed9f56714c571ca57fc18c526d2fb6459c4e

data/bin/battle

@@ -0,0 +1,4 @@
+#!/usr/bin/env/ruby
+
+require 'Battlefield'
+battle Hero(), Creature(ARGV[0].to_i)

data/lib/battlefield.rb

@@ -33,16 +33,16 @@ This is a great superclass if you want damage reductions.
 class ArmouredCreature < Creature
 	attr_reader = :armour
 # Initializes an ArmoredCreature. Parameter armour sets the damage reduction rate. It should be a float.
-	def initialize(health, armour); @health, @armour = health, armor; end
+	def initialize(health, armour); @health, @armour = health, armour; end
 # Reduces damage by multiplying it by armour.
 	def damage(amt)
-		@health -= (amt*@armour)
+		@health -= (amt * @armour)
 	end
 end
 # The Hero is the main character in any story. Works great for the player's avatar and can have armour.
 class Hero < ArmouredCreature
 # Initializes a new Hero. Sets health to 100. If you want your hero to have armour, set it as a float.
-	def initialize(armour = 1); @health = 100; end
+	def initialize(armour); @health, @armour = 100, armour; end
 end
 =begin
 Specify your combatants in parameters hero and enemy
@@ -52,6 +52,7 @@ If you want your hero to heal, set parameter heal to 'hero'. If you want your en
 =end 
 def battle(hero, enemy, heal = false)
 	until hero.health <= 0 || enemy.health <= 0
+		roll1, roll2 = hero.droll, enemy.droll
 # You hit enemy and it takes your roll amount
 		if roll1 > roll2
 			if heal == "hero" or heal == "both"
@@ -73,6 +74,7 @@ def battle(hero, enemy, heal = false)
 			hero.damage roll2
 			sleep 1
 		end
+		puts "You: #{hero.health}  #{enemy}: #{enemy.health}"
 		sleep 2
 	end
 end

data/{lib → test}/battlefield_test.rb

@@ -1,5 +1,5 @@
 require 'test/unit'
-require_relative 'battlefield.rb'
+require 'Battlefield'
 class TestCreature < Test::Unit::TestCase
 	def test_inititialize
 		assert_raise {Creature.new}

metadata

@@ -1,24 +1,26 @@
 --- !ruby/object:Gem::Specification
 name: Battlefield
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Zachary Perlmutter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies: []
 description: |
-  Allows you to create combatants and let them battle. Useful for pick-your-path text games.
+  Allows you to create combatants and let them battle. Useful for pick-your-path text games. Comes with an executable for simulating battles.
 email: zrp200@gmail.com
-executables: []
+executables:
+- battle
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/battle
 - lib/battlefield.rb
-- lib/battlefield_test.rb
+- test/battlefield_test.rb
 homepage: https://rubygems.org/gems/Battlefield
 licenses:
 - MIT
@@ -44,4 +46,4 @@ signing_key:
 specification_version: 4
 summary: Allows your objects to battle
 test_files:
-- lib/battlefield_test.rb
+- test/battlefield_test.rb