mission_game 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d57529ce9115a3acd92942159df8ccca05d7bd534d6054f28c35fb66f2df873f
-  data.tar.gz: a768a71daa75d1869d1a0d1f47c8dcc4c85e99cc6857a2a1c5b4b229451b3b54
+  metadata.gz: d4a63e6356c3aebf135e66163c4c73f53b776539a7e72023a3c6369bfab7bc99
+  data.tar.gz: ef1708f5f705150abbabfb40a57430036904f4afdbd5c8b6569639767944695e
 SHA512:
-  metadata.gz: 7097ef7f3fcba5a253e77d6a4e9f589b3422f570dced7f537c91f206df32278cc1120bc806094d9299a68bc227ccadf9990aaa8afb9913103bd879ed1d27ff31
-  data.tar.gz: 42cd40c3cae6b11292d368d8a13bea2d897d148dc0b65420783e69a547fc99f2cc3791bd4717841790060d713ad9f941b605bbd0de97d18ac671afc7988489d9
+  metadata.gz: 6afa74551ab65060d42055b034d6796fd4f8a1703e720010e07dfa7f09e6a3b48421865a0bb6408e4c03c31f93833770f572a650786527b9439b83ba5d0455c8
+  data.tar.gz: a53e29573583e890460fd6803001161c7ac589dfb570a70c80bd40fc85589eaa0201b48693a713f7d1f1df7a8309611b0751b5ade68c3367f4a3227f73286e5f

data/lib/enemy.rb

@@ -4,66 +4,62 @@
 #
 
 module MISSIONGAME
+  ENEMY_CATALOG = [
+    [name: 'Lucien Castle', lives: 3, bonus: 0, str: 3, points: 1],
+    [name: 'Klaus Mikaelson', lives: 8, bonus: 8, str: 4, points: 10],
+    [name: 'Damon Salvatore', lives: 5, bonus: 0, str: 4, points: 7],
+    [name: 'Mikael', lives: 3, bonus: 2, str: 4, points: 6],
+    [name: 'Taylor Lockwood', lives: 4, bonus: 0, str: 4, points: 2],
+    [name: 'Marcel Gerard', lives: 7, bonus: 3, str: 5, points: 5],
+    [name: 'Dahlia', lives: 2, bonus: 6, str: 1, points: 2],
+    [name: 'The Hollow', lives: 5, bonus: 0, str: 4, points: 3],
+    [name: 'Celeste Dubois', lives: 3, bonus: 10, str: 2, points: 5]
+  ]
 
-ENEMY_CATALOG = [
-  [:name => "Lucien Castle", :lives => 3, :bonus => 0, :str => 3, :points => 1], 
-  [:name => "Klaus Mikaelson", :lives => 8, :bonus => 8, :str => 4, :points => 10],
-  [:name => "Damon Salvatore", :lives => 5, :bonus => 0, :str => 4, :points => 7],
-  [:name => "Mikael", :lives => 3, :bonus => 2, :str => 4, :points => 6],
-  [:name => "Taylor Lockwood", :lives => 4, :bonus => 0, :str => 4, :points => 2],
-  [:name => "Marcel Gerard", :lives => 7, :bonus => 3, :str => 5, :points => 5],
-  [:name => "Dahlia", :lives => 2, :bonus => 6, :str => 1, :points => 2],
-  [:name => "The Hollow", :lives => 5, :bonus => 0, :str => 4, :points => 3],
-  [:name => "Celeste Dubois", :lives => 3, :bonus => 10, :str => 2, :points => 5]
-]
+  PLAYER_DEAD = 'PLAYER_DEAD'
 
-PLAYER_DEAD = "PLAYER_DEAD"
+  class Enemy
+    attr_accessor :name
+    attr_accessor :lives
+    attr_accessor :bonus
+    attr_accessor :str
+    attr_accessor :int
+    attr_accessor :points
 
-class Enemy
+    def initialize(args = nil)
+      # Pick a random enemy
+      selected_enemy = ENEMY_CATALOG.sample[0]
+      @name = selected_enemy[:name]
+      @lives = selected_enemy[:lives] + rand(0..3)
+      @bonus = selected_enemy[:bonus] + rand(0..3)
+      @str = selected_enemy[:str]
+      @points = selected_enemy[:points]
+      @int = rand(2..6)
+    end
 
-  attr_accessor :name
-  attr_accessor :lives
-  attr_accessor :bonus
-  attr_accessor :str
-  attr_accessor :int
-  attr_accessor :points
-  
-  def initialize(args = nil)
-    # Pick a random enemy
-    selected_enemy = ENEMY_CATALOG.sample[0]    
-    @name = selected_enemy[:name]
-    @lives = selected_enemy[:lives] + rand(0..3)
-    @bonus = selected_enemy[:bonus] + rand(0..3)
-    @str = selected_enemy[:str]
-    @points = selected_enemy[:points]
-    @int = rand(2..6)
-  end
- 
-  # Enemy attacks player
-  def attack(args)
-    enemy = self
-    player = args[:player]
-    
-    # Does the enemy even hit the player?
-    str_diff = (enemy.str - player.str) * 2
-    hit_chance = rand(1...100) + str_diff
+    # Enemy attacks player
+    def attack(args)
+      enemy = self
+      player = args[:player]
+
+      # Does the enemy even hit the player?
+      str_diff = (enemy.str - player.str) * 2
+      hit_chance = rand(1...100) + str_diff
 
-    if (hit_chance > 30)
-      # Determine value of the attack
-      attack_value = rand(1...player.str)
-      print enemy.name.light_red + " hits you for " + attack_value.to_s.light_yellow + " damage(s)!\n"
-      if attack_value > player.lives
-	return PLAYER_DEAD
+      if (hit_chance > 30)
+        # Determine value of the attack
+        attack_value = rand(1...player.str)
+        print enemy.name.light_red + ' hits you for ' +
+                attack_value.to_s.light_yellow + " damage(s)!\n"
+        if attack_value > player.lives
+          return PLAYER_DEAD
+        else
+          return attack_value
+        end
       else
-	return attack_value
+        print enemy.name.light_red + " sees you as an easy prey!\n"
       end
-    else
-      print enemy.name.light_red + " sees you as an easy prey!\n"
+      return true
     end
-    return true
   end
-	
-
-end
-
 end

data/lib/main.rb

@@ -1,142 +1,148 @@
-#!/usr/bin/env ruby
-#
-# Written by Webster AVosa
-
-MISSIONGAME_VERSION = "1.00"
-
-# Create a new UI and New Orleans
-ui = MISSIONGAME::UI.new
-neworleans = MISSIONGAME::NewOrleans.new
-
-# Clear the screen and print welcome message
-ui.clear
-ui.welcome
-
-# Ask name
-name = ui.ask("What is your name?", /\w/)
-
-# Create a new player
-player = MISSIONGAME::Player.new({:name => name, :neworleans => neworleans})
-
-# Show intro story
-ui.new_line
-story = MISSIONGAME::Story.new
-ui.draw_frame({:text => story.intro})
-
-
-# MAIN INPUT LOOP
-running = 1
-while running
-  ui.new_line
-  # Get command from user
-  cmd = ui.get_cmd
-  case cmd
-    when "~"
-      binding.pry
-    when "map", "m"
-      map = neworleans.get_map({:player => player})
-      ui.draw_frame({:text => map})
-    when "version", "ver"
-      ui.display_version
-    when "clear", "cls"
-      ui.clear
-    when "name", "whoami"
-      ui.display_name({:player => player})
-    when "location", "loc", "where", "whereami"
-      ui.show_location({:player => player})
-    when "look", "what", "around"
-      neworleans.check_area({:player => player, :ui => ui, :story => story})     
-    when "forward", "f"
-      unless player.in_combat
-        if !player.move({:direction => :up, :neworleans => neworleans, :ui => ui, :story => story})
-          player.in_combat = 1
-	      end
-      else
-        ui.cannot_travel_combat
-      end
-    when "backward", "b"
-      unless player.in_combat
-        if !player.move({:direction => :down, :neworleans => neworleans, :ui => ui, :story => story})
-          player.in_combat = 1
-	      end
-      else
-        ui.cannot_travel_combat
-      end
-    when "left", "l"
-      unless player.in_combat
-        if !player.move({:direction => :left, :neworleans => neworleans, :ui => ui, :story => story})
-          player.in_combat = 1
-	      end
-      else
-        ui.cannot_travel_combat
-      end
-    when "right", "r"
-      unless player.in_combat
-        if !player.move({:direction => :right, :neworleans => neworleans, :ui => ui, :story => story})
-          player.in_combat = 1
-	      end
-      else
-        ui.cannot_travel_combat
-      end
-    when "attack", "a"
-      if player.in_combat
-        retval = player.attack({:enemy => player.current_enemy, :ui => ui})
-	      if retval == MISSIONGAME::ENEMY_KILLED
-          player.points += player.current_enemy.points
-          # Remove enemy from map
-          neworleans.the_map[player.y-1][player.x-1] = MISSIONGAME::MAP_KEY_GRASS
-          # Take player out of combat
-          player.current_enemy = nil
-	        player.in_combat = false
-	      end
-	      if retval.is_a? Numeric
-          player.current_enemy.lives -= retval
-	        retval = player.current_enemy.attack({:player => player})
-	        if retval.is_a? Numeric
-            player.lives -= retval
-          end
-	      if retval == MISSIONGAME::PLAYER_DEAD
-          player.dead = 1
-	      end
-	    end
-    else
-      ui.not_in_combat
-    end
-    when "player", "me", "info", "status", "i"
-      ui.player_info({:player => player})
-    when "enemy"
-      if player.in_combat
-        ui.enemy_info({:player => player})
-      else
-        ui.not_in_combat
-      end
-    when "points", "score"
-      ui.points({:player => player})
-    when "suicide"
-      player.dead = 1
-    when "help", "h", "?"
-      ui.help
-    when "quit", "q", "exit"
-      ui.quit
-      running = nil
-    else
-      ui.not_found
-  end
-  # Is player in combat but has no enemy? Assign one.
-  if player.in_combat && !player.current_enemy
-    enemy = MISSIONGAME::Enemy.new
-    player.current_enemy = enemy
-    ui.enemy_greet({:enemy => enemy})
-  end
-  # Player is dead!
-  if player.dead == 1
-      ui.player_dead({:story => story})
-    exit
-  end
-  # If player has reached the Witch 
-  if player.x == MISSIONGAME::MAP_WIDTH && player.y == 1
-    ui.draw_frame({:text => story.ending})
-    ui.new_line
-    running = false
-  end
-end
+#!/usr/bin/env ruby
+#
+# Written by Webster AVosa
+
+MISSIONGAME_VERSION = '1.00'
+
+# Create a new UI and New Orleans
+ui = MISSIONGAME::UI.new
+neworleans = MISSIONGAME::NewOrleans.new
+
+# Clear the screen and print welcome message
+ui.clear
+ui.welcome
+
+# Ask name
+name = ui.ask('What is your name?', /\w/)
+
+# Create a new player
+player = MISSIONGAME::Player.new({ name: name, neworleans: neworleans })
+
+# Show intro story
+ui.new_line
+story = MISSIONGAME::Story.new
+ui.draw_frame({ text: story.intro })
+
+# MAIN INPUT LOOP
+running = 1
+while running
+  ui.new_line
+
+  # Get command from user
+  cmd = ui.get_cmd
+  case cmd
+  when '~'
+    binding.pry
+  when 'map', 'm'
+    map = neworleans.get_map({ player: player })
+    ui.draw_frame({ text: map })
+  when 'version', 'ver'
+    ui.display_version
+  when 'clear', 'cls'
+    ui.clear
+  when 'name', 'whoami'
+    ui.display_name({ player: player })
+  when 'location', 'loc', 'where', 'whereami'
+    ui.show_location({ player: player })
+  when 'look', 'what', 'around'
+    neworleans.check_area({ player: player, ui: ui, story: story })
+  when 'forward', 'f'
+    unless player.in_combat
+      if !player.move(
+           { direction: :up, neworleans: neworleans, ui: ui, story: story }
+         )
+        player.in_combat = 1
+      end
+    else
+      ui.cannot_travel_combat
+    end
+  when 'backward', 'b'
+    unless player.in_combat
+      if !player.move(
+           { direction: :down, neworleans: neworleans, ui: ui, story: story }
+         )
+        player.in_combat = 1
+      end
+    else
+      ui.cannot_travel_combat
+    end
+  when 'left', 'l'
+    unless player.in_combat
+      if !player.move(
+           { direction: :left, neworleans: neworleans, ui: ui, story: story }
+         )
+        player.in_combat = 1
+      end
+    else
+      ui.cannot_travel_combat
+    end
+  when 'right', 'r'
+    unless player.in_combat
+      if !player.move(
+           { direction: :right, neworleans: neworleans, ui: ui, story: story }
+         )
+        player.in_combat = 1
+      end
+    else
+      ui.cannot_travel_combat
+    end
+  when 'attack', 'a'
+    if player.in_combat
+      retval = player.attack({ enemy: player.current_enemy, ui: ui })
+      if retval == MISSIONGAME::ENEMY_KILLED
+        player.points += player.current_enemy.points
+
+        # Remove enemy from map
+        neworleans.the_map[player.y - 1][player.x - 1] =
+          MISSIONGAME::MAP_KEY_GRASS
+
+        # Take player out of combat
+        player.current_enemy = nil
+        player.in_combat = false
+      end
+      if retval.is_a? Numeric
+        player.current_enemy.lives -= retval
+        retval = player.current_enemy.attack({ player: player })
+        player.lives -= retval if retval.is_a? Numeric
+        player.dead = 1 if retval == MISSIONGAME::PLAYER_DEAD
+      end
+    else
+      ui.not_in_combat
+    end
+  when 'player', 'me', 'info', 'status', 'i'
+    ui.player_info({ player: player })
+  when 'enemy'
+    player.in_combat ? ui.enemy_info({ player: player }) : ui.not_in_combat
+  when 'points', 'score'
+    ui.points({ player: player })
+  when 'suicide'
+    player.dead = 1
+  when 'help', 'h', '?'
+    ui.help
+  when 'quit', 'q', 'exit'
+    ui.quit
+    running = nil
+  else
+    ui.not_found
+  end
+
+  # Is player in combat but has no enemy? Assign one.
+  if player.in_combat && !player.current_enemy
+    enemy = MISSIONGAME::Enemy.new
+    player.current_enemy = enemy
+    ui.enemy_greet({ enemy: enemy })
+  end
+
+  # Player is dead!
+  if player.dead == 1
+    ui.player_dead({ story: story })
+    exit
+  end
+
+  # If player has reached the Witch
+  if player.x == MISSIONGAME::MAP_WIDTH && player.y == 1
+    ui.draw_frame({ text: story.ending })
+    ui.new_line
+    running = false
+  end
+end