Battlefield 0.1.0.pre → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7db41d3f12bc6be854fb8390b3cae6b7000acd8b
-  data.tar.gz: a7edebab8e1c6c34b4866d7c801338237cdc5169
+  metadata.gz: 3d616d3d718f8b33cd6dcb57eb05bb5046775003
+  data.tar.gz: a150bef37cd0386fdd50af971fff5b147e3805ab
 SHA512:
-  metadata.gz: 926c60085b735bf4bbd292525cd8dcb0482cb270556385e0630a499abe4ab397a2f5b3d6efd4191ab9a53aa0b7588a886f2b142e5197eae38c8ba22f86fd591c
-  data.tar.gz: 04f99b38c4ab5fd75b0ccef0bb243ae402f5a587821e2803bd709d7a2d71689f42c4eae7cc44e29ee5c83653ae56a0aecb0a5caaadd7b741abef0863b0820416
+  metadata.gz: b2d8343e16f36e62fd2215c6eba1284f3dfa1d6a8be3185e5832d1eb7f6a8991c37d1202b521174b7dd18a0ac81e79e4437f8a79b6777c1c6be9a763b9da41da
+  data.tar.gz: 075d5eabe39d8651ea9cdfa432d11f288168a044186854f01f5e926452f7bb0dcdde640d4d0912c666ba94996e25cfbf4d0c043c62274b34ef9137ecce5b9906

data/lib/battlefield.rb

@@ -1,45 +1,36 @@
 =begin
 If you want to make a new enemy, you have two ways to do it:
 1. Directly initialize it
-_enemy_ = Creature.new(rand(100))
+_enemy_ = Creature.new health
 
-2. Create  a new class
-class _Insert enemy name here_ < Creature
-	def initialize; @health = _insert health here_; end
+2. Create a new class
+class Goblin
+	def initialize; @health = 5; end
 end
 
 
 Common ancestor of any battle-able objects
 =end
 class Creature 
-	attr_accessor :health
+	attr_reader :health
 # Initializes a Creature. Parameter health sets the Creature's health.
-	def initialize(health)
-		@health = health
-	end
+	def initialize(health); @health = health; end
 # Damage function
-	def damage(amt)
-		@health -= amt
-	end
+	def damage(amt); @health -= amt; end
 # Rolling function - higher # = more power.
 	def roll
 		(1..6).to_a.sample; end 
-# roll twice
-	def droll
-		self.roll + self.roll
-	end
-# The 1st argument is your attack power. The other is the enemy's. You heal c1 - c2 health.
+# Roll twice
+	def droll; self.roll + self.roll; end
+# The 1st argument is your attack power. The other is the enemy's. self heals c1 - c2 health.
 	def heal(c1, c2) 
 		@health += c1 - c2
 	end
 end
-# The Hero is the main character in any story. Works great for the player's avatar.
-class Hero < Creature
-# Initializes a new Hero. Sets health to 100.
-	def initialize; @health = 100
-	end
-end
-# ArmouredCreatures take a reduced amount of damage.
+=begin
+ArmouredCreatures take a reduced amount of damage.
+This is a great superclass if you want damage reductions.
+=end
 class ArmouredCreature < Creature
 	attr_reader = :armour
 # Initializes an ArmoredCreature. Parameter armour sets the damage reduction rate. It should be a float.
@@ -49,14 +40,22 @@ class ArmouredCreature < Creature
 		@health -= (amt*@armour)
 	end
 end
-# specify your combatants. If you want your hero to heal, set heal to 'hero'. If you want your enemy to heal, set heal to 'enemy'. If you want them both to heal, set heal to 'both'. Otherwise leave it blank.
+# 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
+end
+=begin
+Specify your combatants in parameters hero and enemy
+
+If you want your hero to heal, set parameter heal to 'hero'. If you want your enemy to heal, set heal to 'enemy'. If you want them both to heal, set heal to 'both'. Otherwise leave the parameter blank.
+
+=end 
 def battle(hero, enemy, heal = false)
-	until hero.health <= 0 or enemy.health <= 0 
-		roll1 = hero.droll
-		roll2 = enemy.droll
+	until hero.health <= 0 || enemy.health <= 0
 # You hit enemy and it takes your roll amount
 		if roll1 > roll2
-			if heal == "hero" || "both"
+			if heal == "hero" or heal == "both"
 				hero.heal roll1, roll2
 				puts "You gained #{roll1 - roll2} health"
 				sleep 1
@@ -66,7 +65,7 @@ def battle(hero, enemy, heal = false)
 			sleep 1
 # Enemy hits you and you take its roll amount
 		elsif roll2 > roll1
-			if heal == "enemy" || "both"
+			if heal == "enemy" or heal == "both"
 				enemy.heal roll2, roll1
 				puts "The enemy gained #{roll2 - roll1} health"
 				sleep(1)
@@ -81,4 +80,6 @@ end
 # Initializes a new Creature. If no arguments are given, health is set to 0.
 def Creature(health = 0); Creature.new health; end
 # Initializes a new ArmouredCreature. By default, health is set to 0 and armour is set to 0.5
-def ArmouredCreature(health=0, armour=0.5); ArmouredCreature.new health, armour; end
+def ArmouredCreature(health = 0, armour = 0.5); ArmouredCreature.new health, armour; end
+# Alias for Hero.new. Remember to include the ()s if you give no arguments or you will get an error!
+def Hero(armour = 1); Hero.new(armour); end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Battlefield
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre
+  version: 0.1.0
 platform: ruby
 authors:
 - Zachary Perlmutter
@@ -30,12 +30,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.3.0