Battlefield 0.0.2 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7473da22e3acc7b70e63ecede93c16ab0c91b2f8
-  data.tar.gz: 584a0b312f54ec4911352873107c927426941db3
+  metadata.gz: ea35d68f2814c70585aa9f1520c7eb501cf6365d
+  data.tar.gz: 7e1e69a87a0f70caaae3f96f68341d7d4d32044a
 SHA512:
-  metadata.gz: 64fbad08b08d1dec9ea4b86f3a6d1d77ab69f0aaaaae2c016a808e01c8a0954b43673f52de66672fb9524b6b1b93eb71a5e6d27bc1f4c9dea02fbddf47174f05
-  data.tar.gz: 8eed8418bb8d053606431351aab3b8aae0a08bb4904af6e0efe85fa5163db781aadd16597ab7a97c8f0a4e4c4da85084a1e961589216ffc534837618cfc80c2e
+  metadata.gz: d53ac2d164dc1bc2680f7a286c13e65f93d993c2fed8d708dc7d3e5e082ad0f45cc94ffc1fe62bf5eed8687adc7c685a070a1587baef37244e9a7513e6340b56
+  data.tar.gz: b938407b8c1622d7e47a28a961a7f57e33255418ffbeefe15e38e06836b8d99f19554fd8143407b1cb46dde17681df000819b6fea018f3a5ab94e3bc77a93f67

data/lib/battlefield.rb

@@ -1,6 +1,5 @@
 =begin
-If you want to make a new enemy, you have two ways to do it.
-
+If you want to make a new enemy, you have two ways to do it:
 1. Directly initialize it
 Creature.new (insert health here)
 
@@ -8,34 +7,56 @@ Creature.new (insert health here)
 class (Insert enemy name here) < Creature
 	def initialize; @health = _insert health here_; end
 end
+
+
+Common ancestor of any battle-able objects
 =end
-class Creature # Common ancestor of any battle-able objects
+class Creature 
 	attr_accessor :health
-	def initialize(health = 0) # Really should specify health and now you can battle
+# Really should specify health and now you can battle
+	def initialize(health = 0)
 		@health = health
 	end
-	def damage(amt) # Damage function
+# Damage function
+	def damage(amt)
 		@health -= amt
 	end
-	def roll # rolling function - higher # = more power
+# rolling function - higher # = more power
+	def roll
 		(1..6).to_a.sample; end 
-	def droll # roll twice
+# roll twice
+	def droll
 		self.roll + self.roll
 	end
-	def heal(c1, c2) # The 1st argument is your attack power. The other is the enemy's. You heal c1 - c2 health
+# The 1st argument is your attack power. The other is the enemy's. You heal c1 - c2 health
+	def heal(c1, c2) 
 		@health += c1 - c2
 	end
 end
-class Hero < Creature # hero object - to use, create an instance first
-	def initialize # The hero starts with 100 health
+# To use, create an instance first
+class Hero < Creature
+# The hero starts with 100 health
+	def initialize
 		@health = 100
 	end
 end
-def battle(hero, enemy, heal = false) # 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.
+# Initializes an ArmoredCreature. It takes a reduced amount of damage.
+class ArmoredCreature < Creature
+	attr_reader = :armour
+# specify damage reduction as a float in parameter armour
+	def initialize(health = 0, armour = 0.5); @health, @armour = health, armor; end
+# Reduces damage by multiplying it by armour
+	def damage(amt)
+		@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.
+def battle(hero, enemy, heal = false)
 	until hero.health <= 0 or enemy.health <= 0 
 		roll1 = hero.droll
 		roll2 = enemy.droll
-		if roll1 > roll2 # You hit enemy and it takes your roll amount
+# You hit enemy and it takes your roll amount
+		if roll1 > roll2
 			if heal == "hero" || "both"
 				hero.heal roll1, roll2
 				puts "You gained #{roll1 - roll2} health"
@@ -44,7 +65,8 @@ def battle(hero, enemy, heal = false) # specify your combatants. If you want you
 			puts "The enemy took #{roll1} damage"
 			enemy.damage roll1
 			sleep 1
-		elsif roll2 > roll1 # Enemy hits you and you take its roll amount
+# Enemy hits you and you take its roll amount
+		elsif roll2 > roll1
 			if heal == "enemy" || "both"
 				enemy.heal roll2, roll1
 				puts "The enemy gained #{roll2 - roll1} health"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Battlefield
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.9
 platform: ruby
 authors:
 - Zachary Perlmutter