demigod_game 1.0.0 → 1.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGY1ZWFlYWE0Mjk4MjU2MTg5OWYwYzMwZDY0YTM4ZjcyMWQwZDZhMA==
+    YTExYTI0MDdhNWMyMThlZDA3ZmJiN2IzY2M5ZDA2MTg5Yjc4NDVlZg==
   data.tar.gz: !binary |-
-    MDc5MGM0MjU3MzNhOGFjNDgyOWVlM2JlY2Q2YjY4MzlkNmU4MjcyZQ==
+    NmFjMDY3ZGY3NmE2YWMxODc4NGI1MmMzNTBhY2U2MmM0MTRiNTIxMA==
 SHA512:
   metadata.gz: !binary |-
-    ZmRjYmIzNWU1OTFlYzJlYzc2OWYwMDE4ZGVkMjdhMzU0YjI2OWIxZmY5MTNm
-    ZDdlY2NjOWVhMzZkYzFmOGQ4MDJlMGEwMGE4MWI4YzI5MTZiN2YxYmE1NTVj
-    NzEzOWVjNGFhZmYwOTYyZWRhYTBkNGQwMTYzNzA3NzYyZWM0YmU=
+    M2I0YmFjZTJjZDZlYWNlYjUyM2Y1MzgyMTJmYzFlZDQxZDkwMmNjY2YzM2Yy
+    YTQ5OWYxNWRhYjI2OGVkZWY3YTg1NTk4MmJiZmQxNmVhMzhkNjJjMjBkY2Vk
+    ZmU3ODJlY2U0NTMxOGViZDcxOGJkYzVlZGI5ZTQzZGNlZDUzYTk=
   data.tar.gz: !binary |-
-    ZmVmODM1NGFlNWNhNWFlZDUzOWUzYmNjZTBlNzQ2YWUwNDMyYWQ3OTNkNjhl
-    YTY0YzZhOGI0MmI1ODA0NjY2YmY2MzE3ZWY1MGNkYWIxODU3MDI1NTFhYWM5
-    OTQwZTNhN2ExODJkMzRhYTIwODhlYTdlNDgyZDI0NTM5MjBjOTI=
+    MTkyNWZiOGE5YjE2MDUxNGU1M2M1MmRmMTVlM2I3NDQ4NDJmNTRhOGFiYjNi
+    ZWNkYzI2ZTI3M2YyOGY2NDc0NTk1MWQ3MjVkMDQ5ZGVjNWNmZjQ4NDMwMDI5
+    YjYwNWQzOTExNTk0M2Y1Zjk1ZTQyMzk5NDFlMDQxMzg5M2VmYTc=

data/README.md

@@ -1,29 +1,37 @@
-# DemigodGame
-
-TODO: Write a gem description
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'demigodGame'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install demigodGame
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+NEW: You can now install the game with 'gem install demigod_game' and then run the game using 'demigod'!!
+
+Hello
+=======================================
+    This is just some self practice project where I try to create a bigger game using ruby
+
+The game
+--------
+    is an island building game, where you need to manage your resources in
+    order to unleash the dragon from a dragon shrine and get his
+    powers and immortality.. Yeah, very original..
+
+How to play
+----------
+    Each turn you can choose a tile and either raise it (using favor), or build on it (using other resources).
+    Sea (_) turns into Plains (P) which turns into either a forest (F) or a mountain ridge (R). Forests can still be converted to mountains.
+    The building are houses, sheeps, woodcutters, chapels, mines and dragon shrine, which give you population, food, wood, favor and iron respectivelt
+    Building the dragon shrine is winning the game (not yet implemened)
+
+Buildings
+---------
+    **houses:**
+        can be built on plains and in forests, provide 1 population per turn
+    **sheeps:**
+        can only be built on plains, provides 1 food per turn
+        note: you lose 1 food per population you have, and lost population if you lack food
+    **woodcutters:**
+        provide 1 wood per turn, which is your basic building resource
+    **chapels:**
+        provide 1 favor per 10 population you have (not yet implemented in that way)
+    **mines:**
+        provide 1 iron per turn
+    **dragon shrine:**
+        win condition, build this and you win!
+more info
+---------
+    most of the hard data will still probably change, so it will remain for you to find it out :P

data/lib/demigodGame/Demigod.rb

@@ -21,7 +21,6 @@ class Demigod
   def initialize (world, resources = GameData::STARTING_RESOURCES)
     @world = world
     @resources = resources
-    system "clear" or system "cls"
   end
 
   # Handles a turn, main function of the game
@@ -40,27 +39,28 @@ class Demigod
     UiHandler.print_turn_message
 
     # Asks the user for a tile to do his action on
-    decision = gets.chomp
+    decision = UiHandler.get_decision()
 
-    until (@world.exists?(decision) || decision == '')
+    until (@world.valid?(decision) || decision == '')
       UiHandler.print_error(UiHandler::NO_TILE)
       UiHandler.print_turn_message
-      decision = gets.chomp
+      decision = UiHandler.get_decision()
     end
 
     unless decision == ''
       tile = @world.get_tile decision # returns the tile at decision
-      tile.print_options
-
-      # asks for action on tile
-      decision = gets.chomp
 
-      # tile.accepts? uses number of resources to decide if a move is valid
-      until tile.accepts?(decision, @resources)
+      # checks for legality of move on tiles using tile.accepts? and tile.check_cost
+      until tile.accepts?(decision)
         break if decision == ''
-        UiHandler.print_error(UiHandler::INVALID)
-        tile.print_options
-        decision = gets.chomp
+        UiHandler.print_tile_options(tile)
+        decision = UiHandler.get_decision()
+        if (!tile.accepts?(decision))
+          UiHandler.print_error(UiHandler::INVALID)
+        elsif (!tile.check_cost(decision, @resources))
+          decision = nil
+          UiHandler.print_error(UiHandler::RESOURCES)
+        end
       end
 
       if decision != ''
@@ -71,7 +71,7 @@ class Demigod
     end
 
     # Clears the screen
-    system "clear" or system "cls"
+    UiHandler.clear_messages()
   end
 
 private

data/lib/demigodGame/GameData.rb

@@ -52,6 +52,17 @@ module GameData
             :r => RAISE_RIDGE_PRICE
           }
 
+  OPTIONS = {:w => "Woodcutter",
+             :s => "Sheep",
+             :d => "Dragon Shrine",
+             :m => "Mine",
+             :c => "Chapel",
+             :h => "House",
+             :p => "Plains",
+             :f => "Forest",
+             :r => "Ridge"
+            }
+
   def self.get_price(sym)
     return PRICES[sym.to_sym]
   end

data/lib/demigodGame/Tile.rb

@@ -6,46 +6,13 @@
 require_relative 'GameData'
 class Tile
 
-  attr_reader :raisable, :buildable, :built_on, :x, :y
+  attr_reader :options, :built_on, :x, :y
   def initialize(x, y)
     @x = x
     @y = y
-    @raisable = []
-    @buildable = []
     @type = '.'
   end
 
-  # The base tile class is abstract and therfore accepts no value
-  # Should probably be overriden in subclasses
-  def accepts?(order, resources)
-    false
-  end
-
-  def print_options
-
-    if @raisable != [] # raising options
-      print "You can raise with:"
-      @raisable.each do |name|
-        print " #{name.to_s} | "
-      end
-      puts
-    end
-
-    if @buildable != [] # building options
-      print "You can build with:"
-      @buildable.each do |name|
-        print " #{name.to_s} | "
-      end
-      puts
-    end
-
-    puts UiHandler::RAISE_WARNING if @built_on
-    puts UiHandler::BACK
-
-
-    print UiHandler::PROMPT
-  end
-
   def to_s
     "#{@type}#{@built_on}"
   end
@@ -57,27 +24,18 @@ class Tile
   end
 
   # Checks if an order is valid
-  def accepts?(order, resources)
-    return false if !order.match( /\A\w\Z/ ) # vaild command
+  def accepts?(order)
+    return false if !order || !order.match( /\A\w\Z/) # vaild command
 
-    (@raisable + @buildable).each do |check| # checks which order was given
-      if (check.to_s == order)
-        cost = GameData.get_price(check)
-        puts "This costs #{cost}"
-        if !check_cost(cost, resources)
-          puts "Not enough resources!"
-          return false
-        end
-        return true
-      end
+    @options.each do |check| # checks which order was given
+      return true if (check.to_s == order)
     end
     false
   end
 
-private
-
-  def check_cost(cost, resources)
-
+  def check_cost(order, resources)
+    cost = GameData.get_price(order)
+    puts cost
     # checks each resource for the correct amount
     cost.each do |resource, amount|
       return false if amount > resources[resource]
@@ -91,7 +49,7 @@ class Sea < Tile
 
   def initialize(x, y)
     super(x, y)
-    @raisable = [:p]
+    @options = [:p]
     @type = '-'
   end
 end
@@ -101,7 +59,7 @@ class Ridge < Tile
 
   def initialize(x, y)
     super(x, y)
-    @buildable = [:m, :c, :d]
+    @options = [:m, :c, :d]
     @type = 'R'
   end
 end
@@ -111,8 +69,7 @@ class Plains < Tile
 
   def initialize(x, y)
     super(x, y)
-    @raisable = [:r, :f]
-    @buildable = [:h, :c, :s]
+    @options = [:r, :f, :h, :c, :s]
     @type = 'P'
   end
 end
@@ -122,8 +79,7 @@ class Forest < Tile
 
   def initialize(x, y)
     super(x, y)
-    @buildable = [:w, :c, :h]
-    @raisable = [:r]
+    @options = [:w, :c, :h, :r]
     @type = 'F'
   end
 end

data/lib/demigodGame/UiHandler.rb

@@ -1,6 +1,8 @@
 # Module to handle most of the output to the screen
 # =================================================
 
+require_relative 'GameData'
+
 module UiHandler
 
   NEW_GAME = "Welcome to Demigod! What size would you want your world to be?"
@@ -11,7 +13,11 @@ module UiHandler
   BACK = "Press enter on an empty line to go back"
   INVALID = "That's an invalid move!"
   LOST = "You ran out of resources, I guess you lose..."
-  WIN = "The dragon shrine is built and so the dragons grant you all the powers of immortality" 
+  WIN = "The dragon shrine is built and so the dragons grant you all the powers of immortality"
+  AVAILABLE = "Available moves are: "
+  RESOURCES = "Not enough resources!"
+
+          # output #
 
   def self.print_world(world)
     puts
@@ -50,12 +56,41 @@ module UiHandler
   end
 
   def self.print_turn_message
-      puts "Choose a tile to work on. Enter 2 numbers with a space in between i.e. \"1 1\""
-      print PROMPT
+    puts "Choose a tile to work on. Enter 2 numbers with a space in between i.e. \"1 1\""
+    print PROMPT
   end
 
-  def self.print_error(error_str)
+  def self.print_error(error_str="An error has occured")
     puts "Oops! #{error_str}"
     puts
   end
+
+  def self.print_lost_message()
+    puts "You ran out of resources! you lost!"
+    puts "(one of youre resources turned negative)"
+    puts
+  end
+
+  def self.print_win_message
+    puts WIN
+  end
+
+  def self.print_tile_options(tile)
+    puts (AVAILABLE)
+    tile.options.each do |key|
+      print ("#{key} - #{GameData::OPTIONS[key]},  ")
+    end
+    puts BACK
+    print PROMPT
+  end
+
+  def self.clear_messages()
+    #system "clear" or system "cls"
+  end
+
+          # input #
+
+  def self.get_decision()
+    gets.chomp()
+  end
 end

data/lib/demigodGame/World.rb

@@ -37,7 +37,7 @@ class World
     elsif order.match(/\A[wsmchd]\Z/) # for build of any building
       build_on_tile(tile, DECISIONS[:build][order.to_sym])
     else
-      puts "Error occured, continuing but turn skipped."
+      UiHandler.print_error()
     end
   end
 
@@ -60,15 +60,14 @@ class World
     resources.each do |name, value| # lose condition
       if value < 0
         system "clear" or system "cls"
-        puts "#{name} is negative!"
-        puts UiHandler::LOST
+        UiHandler.print_lost_message
         exit
       end
     end
     resources
   end
 
-  def exists? (str)
+  def valid? (str)
     str.strip!
     return false if !str.match(/\A\d+\s\d+\Z/)
     true
@@ -131,11 +130,11 @@ private
       tile.build(BUILDABLE[building.to_sym])
       @buildings[building.to_sym] += 1
       if building.to_sym == :dragon
-        puts UiHandler::WIN
+        UiHandler.print_win_message
         exit
       end
     else # This shouldn't happen normally
-      puts "There's already a building here"
+      puts "This shouldn't have happened (Buidling already in square)"
     end
 
   end

data/lib/demigodGame/version.rb

@@ -1,3 +1,3 @@
 module DemigodGame
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/test/test_demigod.rb

@@ -0,0 +1,19 @@
+require 'test/unit'
+require_relative '../lib/demigodGame/demigod'
+require_relative '../lib/demigodGame/world'
+
+class MyUnitTests < Test::Unit::TestCase
+
+  def setup
+    puts "setup!"
+  end
+
+  def teardown
+    puts "teardown!"
+  end
+
+  def test_basic
+    dummygod = Demigod.new(World.new)
+  end
+
+end

data/test_demigod.rb

@@ -0,0 +1,18 @@
+require 'test/unit'
+require_relative '../lib/demigod_game/demigod'
+
+class MyUnitTests < Test::Unit::TestCase
+
+  def setup
+    puts "setup!"
+  end
+
+  def teardown
+    puts "teardown!"
+  end
+
+  def test_basic
+    puts "I RAN!"
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: demigod_game
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Yuval
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,6 +61,8 @@ files:
 - lib/demigodGame/UiHandler.rb
 - lib/demigodGame/World.rb
 - lib/demigodGame/version.rb
+- test/test_demigod.rb
+- test_demigod.rb
 homepage: ''
 licenses:
 - MIT
@@ -85,4 +87,5 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Build your own island and unleash the dragons!
-test_files: []
+test_files:
+- test/test_demigod.rb