Battlefield 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2f16160c4d075a4275b635bc87ec63ddd5a89d9
-  data.tar.gz: 59377d93132acda140b7823c7fdc6090cc25e500
+  metadata.gz: b5b802002ffaef02c5d8439cf65bb4623d36dc4c
+  data.tar.gz: acf7ee523ece0f4b6a0cecb2823e0942cff5bc35
 SHA512:
-  metadata.gz: cf34112cb186abacf6a35d4e7db09b714411c55074785e7bd899f91089973c40bf07d4f4f479fbbca56fcdd9ec87875b84f3ebb4cba1e4e7b0174473044674f0
-  data.tar.gz: 91ffe1e9a69f301980d5055583a8044ecfb69d35ad3d7f945001e0a71ba137132944adaeb9605ed4617d281fee42e8f05e0f76d8e1c3aca618118582354bd442
+  metadata.gz: ddcee7797f335bb2b80e81decd91dcfe5adaa278c284dc6806ef26803b94518bc64ef590768dc3c895131c548517e15d28838b2ac3cd846e6882e16cbec63bb1
+  data.tar.gz: f5ce7e75f38dc6720870be08e8d176fb58075ad30fa52a873f44dbeff233ff84b8c1f30e1225e0033159432bc70efa20b28a038bf7f3d31da1e4b6da12850d76

data/bin/battle

@@ -1,4 +1,10 @@
 #!/usr/bin/env/ruby
-
 require 'Battlefield'
-battle Hero(), Creature(ARGV[0].to_i), ARGV[1]
+for code in ARGV; code = instance_exec {code}; end
+
+case ARGV.length
+    when 0 then battle
+    when 1 then battle ARGV[0]
+    when 2 then battle ARGV[0], ARGV[1]
+else; battle ARGV[0], ARGV[1], ARGV[2]
+end

data/lib/battlefield.rb

@@ -1,89 +1,136 @@
+require_relative 'battlestruct.rb'
+=begin
+Used with Creature and its subclasses.
+Armour decreases damage taken in Creature#damage.
+There are two ways of initialization:
+	1. Direct
+		_armour_ = Armour
+		_armour_ = Armour _protection_
+	2. Create a subclass
+		class _Platemail_ < Armour
+			def initialize; @protection = _5_; end
+		end
+You can change @protection at any time.
+=end
+class Armour
+	attr_accessor :protection
+# Initializes a new Armour. Set original protection here. Alias: Armour()
+	def initialize(protection); @protection = protection; end
+end
+=begin
+Used w/ Creature and its subclasses.
+Weapons add to the attacking power of Creature#attack.
+There are two ways to create one:
+	1. Directly initialize it
+		_weapon_ = Weapon()
+		_weapon_ = Weapon _power_
+	2. Create a subclass
+		class _Dragonfire_ < Weapon
+			def initialize; @power = _1000_; end
+		end
+You can change your power after initialization:
+	(Lets say your weapon was damaged)
+	_weapon_.power -= _lostPower_
+	(Now you get it improved)
+	_weapon_.power += _gainedPower_
+=end
+class Weapon
+	attr_accessor :power
+# Creates a new Weapon. Set the original power of the Weapon here. Aliases: Weapon()
+	def initialize(power); @power = power; end
+end
 =begin
 If you want to make a new enemy, you have two ways to do it:
 1. Directly initialize it
-_enemy_ = Creature.new health
-
+	_enemy_ = Creature _health_
+	_enemy_ = Creature _health_, _armour_
+	_enemy_ = Creature _health_, _armour_, _weapon_
 2. Create a new class
-class Goblin
-	def initialize; @health = 5; end
-end
-
-
+	class Goblin
+		def initialize; @health, @armour, @weapon = _5_, _Armour()_, _Weapon()_; end
+	end
+You can change weapons and armour after initialization as well.
 Common ancestor of any battle-able objects
 =end
 class Creature 
 	attr_reader :health
-# Initializes a Creature. Parameter health sets the Creature's health.
-	def initialize(health); @health = health; end
-# Damage function
-	def damage(amt); @health -= amt; end
+	attr_accessor :armour, :weapon
+	protected :damage
+# Initializes a Creature. Parameter health sets the Creature's health. Parameter armour sets the Creature's armour, which reduces damage taken and should be a kind of Armour. Parameter weapon sets the Creature's weapon, which increases the damage taken on others and should be a kind of Weapon.
+	def initialize(health, armour, weapon); @health, @armour, @weapon = health, armour, weapon; end
+# Damage function. Takes into account armour.
+	def damage(amt); @health -= (amt - armour.protection); 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. self heals c1 - c2 health.
-	def heal(amt) 
+	def heal(c1, c2) 
 		@health += c1 - c2
 	end
+# Attacking function. Takes into account @weapon.
+	def attack(enemy, amt); enemy.damage amt + weapon.power; end
 end
+
 # Any error you get during a battle. If you get a different one, wait for the next update.
 class BattleError < Exception; end
-=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.
-	def initialize(health, armour); @health, @armour = health, armour; end
-# Reduces damage by multiplying it by armour.
-	def damage(amt)
-		@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); @health, @armour = 100, armour; end
+class Hero < Creature
+# Initializes a new Hero. Sets health to 100. See Creature#new for the parameters armour and weapon
+	def initialize(armour, weapon); @health, @armour, weapon = 100, armour, weapon; end
 end
 =begin
-Specify your combatants in parameters hero and enemy
+Strongly recommended keys -> :hero, :enemy
+Recommended keys -> :heal
+
+:hero should be a kind of Hero. This is your fighter.
 
-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.
+:enemy should be a kind of Creature. This is the enemy. If it is also a kind of Hero, use it in :hero instead.
 
+:heal can be set to:
+	1. false(default) - allows no one to heal during the battle
+	2. 'hero' - allows the hero to heal during the battle
+	3. 'enemy' - allows the enemy to heal during the battle
+	4.'both' - allows the hero and enemy to both heal during the battle
+This is also the name of the executable. To use the executable, treat it as the method battle. 
 =end 
-def battle(hero, enemy, heal = false)
-	raise(BattleError, "You must specify which party to heal.") unless heal == "both" || heal == "hero" || heal == "enemy" || heal == false
-	until hero.health <= 0 || enemy.health <= 0
-		roll1, roll2 = hero.droll, enemy.droll
+def battle(arg = Hash.new)
+	:hero = Hero() unless defined? :hero
+	:enemy = Creature() unless defined? :enemy
+	:heal = false unless defined? :enemy
+	raise(BattleError, "You must specify which party to heal.") unless :heal == "both" || :heal == "hero" || :heal == "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"
-				hero.heal roll1, roll2
+			if :heal == "hero" or :heal == "both"
+				:hero.heal roll1, roll2
 				puts "You gained #{roll1 - roll2} health"
 				sleep 1
 			end
 			puts "The enemy took #{roll1} damage"
-			enemy.damage roll1
+			:hero.attack :enemy, roll1
 			sleep 1
 # Enemy hits you and you take its roll amount
 		elsif roll2 > roll1
-			if heal == "enemy" or heal == "both"
-				enemy.heal roll2, roll1
+			if :heal == "enemy" or :heal == "both"
+				:enemy.heal roll2, roll1
 				puts "The enemy gained #{roll2 - roll1} health"
 				sleep(1)
 			end
 			puts "You took #{roll2} damage"
-			hero.damage roll2
+			:enemy.attack :hero, roll2
 			sleep 1
 		end
-		puts "You: #{hero.health}  #{enemy}: #{enemy.health}"
+		puts "\nYou: #{:hero.health}  #{:enemy}: #{:enemy.health}\n"
 		sleep 2
 	end
 end
-# Initializes a new Creature. If no arguments are given, health is set to 1.
-def Creature(health = 1); Creature.new health; end
-# Initializes a new ArmouredCreature. By default, health is set to 1 and armour is set to 0.5
-def ArmouredCreature(health = 1, armour = 0.5); ArmouredCreature.new health, armour; end
+# Initializes a new Weapon. If there are no arguments, power is set to 0.
+def Weapon(power = 0); Weapon.new power; end
+# Initializes a new Armour object. If there are no arguments, protection is set to 0.
+def Armour(protection = 0); Armour.new protection; end
+# Initializes a new Creature. If no arguments are given, health is set to 1, armour is set to Armour(0), and weapon is set to Weapon(0).
+def Creature(health = 1, armour = Armour(), weapon = Weapon()); Creature.new health, armour, weapon; 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
+def Hero(armour = Armour(), weapon = Weapon()); Hero.new(armour); end

data/lib/battlestruct.rb

@@ -0,0 +1,8 @@
+# Initializes a new Weapon. If there are no arguments, power is set to 0.
+def Weapon(power = 0); Weapon.new power; end
+# Initializes a new Armour object. If there are no arguments, protection is set to 0.
+def Armour(protection = 0); Armour.new protection; end
+# Initializes a new Creature. If no arguments are given, health is set to 1, armour is set to Armour(0), and weapon is set to Weapon(0).
+def Creature(health = 1, armour = Armour(), weapon = Weapon()); Creature.new health, armour, weapon; end
+# Alias for Hero.new. Remember to include the ()s if you give no arguments or you will get an error!
+def Hero(armour = Armour(), weapon = Weapon()); Hero.new(armour); end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Battlefield
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Zachary Perlmutter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies: []
 description: |
   Allows you to create combatants and let them battle. Useful for pick-your-path text games. Comes with an executable for simulating battles.
@@ -20,6 +20,7 @@ extra_rdoc_files: []
 files:
 - bin/battle
 - lib/battlefield.rb
+- lib/battlestruct.rb
 - test/battlefield_test.rb
 homepage: https://rubygems.org/gems/Battlefield
 licenses:
@@ -31,12 +32,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []