mythal 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 93df7b88edfe676136d9a561cb269b7022802dd8
-  data.tar.gz: 1a2c4e411edeb7bf665c70634c09d14e876f605f
+SHA256:
+  metadata.gz: '0755594699c3e8ada4db324d5b88d181c0c6d9b3f1c1d04c3bdd64e14cbeffdc'
+  data.tar.gz: '09d0440f87024bfe12a8dcda037296b2e74f7b23c863b85a35419537850dfca0'
 SHA512:
-  metadata.gz: 164157372e5163be879f270d064565fb7c5294ce03889e50dc49327cece0a5575651505cb338e31e855016a97c969eaf5f4c356390c7f6b17efa836f578b4957
-  data.tar.gz: 0be663be40c9c0cc936c2a4db483f00b49d4571f3fe30ae29dbdbd53eabd427783680078049cc3446815f6ebc944aeb4dc634c6c65d221a57219f7ee5fddb173
+  metadata.gz: 47ff05214de1e6a62e6720f14edea452d03c3d646b2031cd2201a19b7769b70223b06c3205b4c9332f69d686bb0c32db6c736eed56c27ce88578d868624f5ac3
+  data.tar.gz: b5857f68899ff251732dba197fc88b3d2e5e0e06ca8271aad6a51472d17ae4a1cfbe574084496a65e0a06ff660499e97309ef5f4cdb26600f5d5ed53a97748da

data/README.md

@@ -19,6 +19,31 @@ Or install it yourself as:
 
 ## Usage
 
+Roll dice on command line!
+
+```
+$ mythal roll 1d20
+rolling d20... 7
+
+$ mythal roll 5d8 + 4
+rolling d8... 7
+rolling d8... 3
+rolling d8... 3
+rolling d8... 5
+rolling d8... 3
+25
+```
+
+Generate quick NPC ideas!
+
+```
+$ mythal npc
+timid tiefling paladin
+
+$ mythal npc
+drunk elf wizard
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/config.yml

@@ -0,0 +1,49 @@
+traits:
+  - bombastic
+  - scrappy
+  - nimble
+  - argumentative
+  - grumpy
+  - drunk
+  - overly friendly
+  - touchy
+  - flirtatious
+  - ponderous
+  - inquisitive
+  - skeptical
+  - ruminating
+  - articulate
+  - ejaculatory (in terms of sound)
+  - timid
+  - bold
+  - dubious
+  - overly sympathetic
+  - boorish
+  - feckless
+  - nefarious
+  - honorable
+  - spasmodic
+
+races:
+  - orc
+  - half-orc
+  - human
+  - elf
+  - half-elf
+  - halfling
+  - dragonborn
+  - tiefling
+  - dwarf
+  - gnome
+
+dnd_classes:
+  - fighter
+  - rogue
+  - wizard
+  - sorceror
+  - druid
+  - cleric
+  - bard
+  - monk
+  - warlock
+  - paladin

data/lib/mythal.rb

@@ -2,6 +2,7 @@
 require "thor"
 require "procto"
 require "mythal/version"
+require "mythal/config"
 require "mythal/roll"
 require "mythal/npc"
 
@@ -11,13 +12,19 @@ module Mythal
     desc "roll", "roll some number of dice, plus modifiers e.g. 1d20, or 3d8 + 4"
 
     def roll(*args)
-      puts Mythal::Roll.call(*args)
+      puts Mythal::Roll.call(*args).message
     end
 
     desc "npc", "generate a random npc, e.g. 'a half-orc barbarian'"
 
     def npc
-      puts Mythal::Npc.call
+      puts Mythal::Npc.call(config: config)
+    end
+
+    private
+
+    def config
+      @config ||= Mythal::Config.new
     end
   end
 end

data/lib/mythal/config.rb

@@ -0,0 +1,34 @@
+require "yaml"
+require "pathname"
+
+module Mythal
+  class Config
+    def initialize(user_overrides: {})
+      @user_overrides = user_overrides
+    end
+
+    def traits
+      config["traits"]
+    end
+
+    def races
+      config["races"]
+    end
+
+    def dnd_classes
+      config["dnd_classes"]
+    end
+
+    def config
+      @config ||= user_overrides.empty? ? YAML.load(File.read(config_file)) : user_overrides
+    end
+
+    private
+
+    attr_reader :user_overrides
+
+    def config_file
+      Pathname.new(File.expand_path("../../../config.yml", __FILE__))
+    end
+  end
+end

data/lib/mythal/npc.rb

@@ -2,73 +2,32 @@ module Mythal
   class Npc
     include Procto.call
 
+    def initialize(config:)
+      @config = config
+    end
+
     def call
       character_description
     end
 
     private
 
+    attr_reader :config
+
     def character_description
       trait + " " + race + " " + dnd_class
     end
 
     def trait
-      [
-        "bombastic",
-        "scrappy",
-        "nimble",
-        "argumentative",
-        "grumpy",
-        "drunk",
-        "overly friendly",
-        "touchy",
-        "flirtatious",
-        "ponderous",
-        "inquisitive",
-        "skeptical",
-        "ruminating",
-        "articulate",
-        "ejaculatory (in terms of sound)",
-        "timid",
-        "bold",
-        "dubious",
-        "overly sympathetic",
-        "boorish",
-        "feckless",
-        "nefarious",
-        "honorable",
-        "spasmodic",
-      ].sample
+      config.traits.sample
     end
 
     def race
-      [
-        "orc",
-        "half-orc",
-        "human",
-        "elf",
-        "half-elf",
-        "halfling",
-        "dragonborn",
-        "tiefling",
-        "dwarf",
-        "gnome",
-      ].sample
+      config.races.sample
     end
 
     def dnd_class
-      [
-        "fighter",
-        "rogue",
-        "wizard",
-        "sorceror",
-        "druid",
-        "cleric",
-        "bard",
-        "monk",
-        "warlock",
-        "paladin",
-      ].sample
+      config.dnd_classes.sample
     end
   end
 end

data/lib/mythal/roll.rb

@@ -6,7 +6,7 @@ module Mythal
     NUMBER_OF_DICE = 1..100
 
     def initialize(*dice_string)
-      @dice_string = dice_string.join
+      @dice_string = dice_string.join.gsub(" ", '')
     end
 
     def call
@@ -15,35 +15,70 @@ module Mythal
 
     private
 
-    attr_reader :dice_string, :number_of_dice, :denomination, :bonus
+    attr_reader :dice_string, :number_of_dice, :denomination, :modifier
+
+    class DiceRollResult
+      attr_reader :rolls, :modifier, :message, :total, :success
+
+      def initialize(rolls: [], modifier: 0, message: "", total: 0, success: false)
+        @rolls = rolls
+        @modifier = modifier
+        @success = success
+        @message = message
+        @total = total
+      end
+
+      def success?
+        success
+      end
+    end
 
     def result
-      return "can't roll #{dice_string}" unless match_data
+      return DiceRollResult.new(message: "can't roll #{dice_string}") unless match_data
 
-      @number_of_dice = match_data[1].to_i
-      @denomination = match_data[2].to_i
-      @bonus = match_data[3] ? match_data[3].to_i : 0
+      parse_input_string
+
+      return DiceRollResult.new(message: "can't roll #{dice_string}") unless valid_denomination?
+      return DiceRollResult.new(message: "can only roll #{min_dice} - #{max_dice} dice") unless valid_number_of_dice?
 
-      return "can't roll #{dice_string}" unless valid_denomination?
-      return "can only roll #{min_dice} - #{max_dice} dice" unless valid_number_of_dice?
+      rolls = Array.new(number_of_dice) { random_dice_roll }
+      total = rolls.inject(:+) + modifier
+      message = format_output_message(rolls, total)
 
-      random_dice_roll + bonus
+      DiceRollResult.new(
+        rolls: rolls,
+        total: total,
+        message: message,
+        success: true,
+        modifier: modifier,
+      )
     end
 
-    def random_dice_roll
-      number_of_dice.times.inject(0) do |memo, _val|
-        current_roll = rand(1..denomination)
-        puts "rolling d#{denomination}... #{current_roll}"
-        memo += current_roll
-      end
+    def format_output_message(rolls, total)
+      subtotal = rolls.inject(:+)
+      sign = modifier > 0 ? "+" : "-"
+      messages = rolls.map { |roll| "rolling d#{denomination}... #{roll}" }
+      messages << "#{subtotal} #{sign} #{modifier.abs}" unless modifier.zero?
+      messages << total
+      messages.join("\n")
     end
 
     def match_data
-      @match_data ||= (pattern.match(dice_string))
+      @match_data ||= pattern.match(dice_string)
+    end
+
+    def parse_input_string
+      @number_of_dice = match_data[1].to_i
+      @denomination = match_data[2].to_i
+      @modifier = match_data[3] ? match_data[3].to_i : 0
+    end
+
+    def random_dice_roll
+      rand(1..denomination)
     end
 
     def pattern
-      @pattern ||= /^(-?\d+)d(\d+)\+?(\d+)?$/
+      @pattern ||= /^(-?\d+)d(\d+)?([+-]\d+)?$/
     end
 
     def valid_denomination?

data/lib/mythal/version.rb

@@ -1,3 +1,3 @@
 module Mythal
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mythal
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - George Groh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-25 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,8 +111,10 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- config.yml
 - exe/mythal
 - lib/mythal.rb
+- lib/mythal/config.rb
 - lib/mythal/npc.rb
 - lib/mythal/roll.rb
 - lib/mythal/version.rb
@@ -137,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Roll D&D dice from the command line.