lotrd 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89298c292f789a0f1ba64cb8ffc633defea0eda7efcccd256125dccf745ca647
-  data.tar.gz: 071e12d7b774f52edd837a5276949fe639f3f2bfcf7127be502b61d4c4a93302
+  metadata.gz: 418b83413abbe69853f7578db5cb89c63c9c23f718a80426ac1108a3663826f3
+  data.tar.gz: 0e7854148471c3652d587e167f09d069b860d7c1055343e8cb0eef244a9c5626
 SHA512:
-  metadata.gz: c051d92ad8c8e40fc591714da0b9d6ccffd4a9f7ea7a3581e94f528c772e266fbff93c81ab6116fa9622f06682aec8a0bcba95dac7c6ba833026d31d066da2f1
-  data.tar.gz: 77a9e484053add4379292cabb9736f9393b8b5debeaaf54747cf54be0144a197eb13194f8d205b03717b92616fc7fdc7a223499dcd75b0c4fbdfe65122d8bda8
+  metadata.gz: 79ebb37c78ac1346bd735fa139945b77ac39cbdad7ee507c786de05f6cd040fa557b6360eb070152ffbe1b88e23ccf40f9ee42f4023abece30da0afb9fe31206
+  data.tar.gz: f2a04b6eefb12f5dd44bf9e114d716945f6d5f0c84d90bea6e54e3ceb9a5068f22a0b4157fba593970568989d7ec093cc2e0a7ab9e0e3c6cd86a9b36fb5b6ee8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lotrd (0.1.7)
+    lotrd (0.1.8)
       artii (~> 2.1)
       colorize (~> 0.8.1)
       terminal-table (~> 1.8)

data/lib/lotrd.rb

@@ -10,10 +10,10 @@ module Lotrd
   def self.start
     system 'clear'
     titleStyle = Artii::Base.new :font => 'slant'
-    puts titleStyle.asciify('              Legend')
-    puts titleStyle.asciify('              Of The')
+    puts titleStyle.asciify('              Legend').colorize(:white)
+    puts titleStyle.asciify('              Of The').colorize(:white)
     puts titleStyle.asciify('               Ruby').colorize(:red)                                                                                                                             
-    puts titleStyle.asciify('            Dragon')
+    puts titleStyle.asciify('            Dragon').colorize(:white)
     puts "\n"*2 + "A CLI remake of the text-based adventure game, #{"'Legend of the Green Dragon' (LotGD)".colorize(:green)}."
     sleep(5)
     ::Check.playerData

data/lib/lotrd/controller/bankController.rb

@@ -6,7 +6,7 @@ module BankController
 
 
     def withdraw(wdw)
-        player = YAML.load(File.read("lib/lotrd/model/playerdata.yml"))
+        player = YAML.load(File.read(ENV['HOME'] + "/." + "playerdata.yml"))
         gold = player.gold
         balance = player.balance
         if wdw > balance
@@ -19,12 +19,12 @@ module BankController
         end
         player.gold = gold
         player.balance = balance
-        File.open('lib/lotrd/model/playerdata.yml', 'w') {|file| File.write('lib/lotrd/model/playerdata.yml', player.to_yaml)}
+        File.open(ENV['HOME'] + "/." + "playerdata.yml", 'w') {|file| File.write(ENV['HOME'] + "/." + "playerdata.yml", player.to_yaml)}
         ::Bank.withdrawConfirm(wdw, player.gold, player.balance)
     end
 
     def deposit(dep)
-        player = YAML.load(File.read("lib/lotrd/model/playerdata.yml"))
+        player = YAML.load(File.read(ENV['HOME'] + "/." + "playerdata.yml"))
         gold = player.gold
         balance = player.balance
         if dep > gold
@@ -37,7 +37,7 @@ module BankController
         end
         player.gold = gold
         player.balance = balance
-        File.open('lib/lotrd/model/playerdata.yml', 'w') {|file| File.write('lib/lotrd/model/playerdata.yml', player.to_yaml)}
+        File.open(ENV['HOME'] + "/." + "playerdata.yml", 'w') {|file| File.write(ENV['HOME'] + "/." + "playerdata.yml", player.to_yaml)}
         ::Bank.depositConfirm(dep, player.gold, player.balance)
     end
     module_function :withdraw, 

data/lib/lotrd/controller/check.rb

@@ -2,7 +2,7 @@ require_relative '../view/datacheck.rb'
 
 module Check
     def playerData
-        if File.size?("lib/lotrd/model/playerdata.rb") == nil
+        if File.size?(ENV['HOME'] + "/." + "playerdata.yml") == nil
             ::DataCheck.absent
         else
             ::DataCheck.present

data/lib/lotrd/controller/combatController.rb

@@ -12,8 +12,10 @@ module CombatSim
         mob1.jobGen
         mob1.nameGen
         #Load player stats
-            player = YAML.load(File.read("lib/lotrd/model/playerdata.yml"))
+            player = YAML.load(File.read(ENV['HOME'] + "/." + "playerdata.yml"))
             @currentPlayerHP = player.hp
+            @currentPlayerDef = player.def
+            @currentPlayerRes = player.res
             @currentPlayerStr = player.str
             @currentPlayerAgi = player.agi
             @currentPlayerInt = player.int
@@ -22,6 +24,8 @@ module CombatSim
         #Load mob stats
             @mobName = mob1.name
             @currentMobHP = mob1.hp
+            @currentMobDef = mob1.def
+            @currentMobRes = mob1.res
             @currentMobStr = mob1.str
             @currentMobAgi = mob1.agi
             @currentMobInt = mob1.int
@@ -43,18 +47,18 @@ module CombatSim
 
     def mobHit
         @turn = 'mob'
-        @currentMobDex - @currentPlayerAgi + rand(1..5) > 0 ? ::CombatSim.mobDmg : ::CombatView.mobMiss
+        @currentMobDex - @currentPlayerAgi + rand(1..10) > 0 ? ::CombatSim.mobDmg : ::CombatView.mobMiss
     end
 
     def mobDmg
         @mobAction = rand(1..3)
         case @mobAction
         when 1
-            (@currentMobStr - @currentPlayerStr) > 0 ? dmg = (@currentMobStr - @currentPlayerStr) : dmg = 0
+            (@currentMobStr - @currentPlayerDef) > 0 ? dmg = (@currentMobStr - @currentPlayerDef) : dmg = 0
         when 2
-            (@currentMobInt - @currentPlayerInt) > 0 ? dmg = (@currentMobInt - @currentPlayerInt): dmg = 0
+            (@currentMobInt - @currentPlayerRes) > 0 ? dmg = (@currentMobInt - @currentPlayerRes): dmg = 0
         when 3
-            (@currentMobDex - @currentPlayerStr) > 0 ? dmg = (@currentMobDex - @currentPlayerStr) : dmg = 0
+            (@currentMobDex - @currentPlayerDef) > 0 ? dmg = (@currentMobDex - @currentPlayerDef) : dmg = 0
         end
         ::CombatSim.mobCrit(dmg)
     end
@@ -70,18 +74,18 @@ module CombatSim
 
     def playerHit(action)
         @turn = 'player'
-        @currentPlayerDex - @currentMobAgi + rand(1..5) > 0 ? ::CombatSim.playerDmg(action) : ::CombatView.playerMiss
+        @currentPlayerDex - @currentMobAgi + rand(1..10) > 0 ? ::CombatSim.playerDmg(action) : ::CombatView.playerMiss
     end
 
     def playerDmg(action)
         @playerAction = action
         case @playerAction
         when 1
-            (@currentPlayerStr - @currentMobStr) > 0 ? dmg = (@currentPlayerStr - @currentMobStr) : dmg = 0
+            (@currentPlayerStr - @currentMobDef) > 0 ? dmg = (@currentPlayerStr - @currentMobDef) : dmg = 0
         when 2
-            (@currentPlayerInt - @currentMobInt) > 0 ? dmg = (@currentPlayerInt - @currentMobInt): dmg = 0
+            (@currentPlayerInt - @currentMobRes) > 0 ? dmg = (@currentPlayerInt - @currentMobRes): dmg = 0
         when 3
-            (@currentPlayerDex - @currentMobStr) > 0 ? dmg = (@currentPlayerDex - @currentMobStr) : dmg = 0
+            (@currentPlayerDex - @currentMobDef) > 0 ? dmg = (@currentPlayerDex - @currentMobRes) : dmg = 0
         end
         ::CombatSim.playerCrit(dmg)
     end
@@ -119,19 +123,19 @@ module CombatSim
     end
 
     def reward
-        player = YAML.load(File.read("lib/lotrd/model/playerdata.yml"))
+        player = YAML.load(File.read(ENV['HOME'] + "/." + "playerdata.yml"))
         drop = rand(20..200)
         player.gold += drop
-        File.open('lib/lotrd/model/playerdata.yml', 'w') {|file| File.write('lib/lotrd/model/playerdata.yml', player.to_yaml)}
+        File.open(ENV['HOME'] + "/." + "playerdata.yml", 'w') {|file| File.write(ENV['HOME'] + "/." + "playerdata.yml", player.to_yaml)}
         ::CombatView.victory(drop)
     end
 
     def loss
-        player = YAML.load(File.read("lib/lotrd/model/playerdata.yml"))
+        player = YAML.load(File.read(ENV['HOME'] + "/." + "playerdata.yml"))
         player.gold = 0
         player.armour = nil
         player.weapon = nil
-        File.open('lib/lotrd/model/playerdata.yml', 'w') {|file| File.write('lib/lotrd/model/playerdata.yml', player.to_yaml)}
+        File.open(ENV['HOME'] + "/." + "playerdata.yml", 'w') {|file| File.write(ENV['HOME'] + "/." + "playerdata.yml", player.to_yaml)}
         ::CombatView.defeat
     end
 

data/lib/lotrd/controller/leaderboardController.rb

@@ -8,13 +8,13 @@ require_relative '../view/leaderboard.rb'
 module LeaderboardController
     def menu(input)
         narcissist = input
-        player = YAML.load(File.read("lib/lotrd/model/playerdata.yml"))
+        player = YAML.load(File.read(ENV['HOME'] + "/." + "playerdata.yml"))
         achievement = player.achievements
 
         if (narcissist > 3 && achievement.include?('Narcissist') == false)
             achievement << 'Narcissist'
             player.achievements = achievement
-            File.open('lib/lotrd/model/playerdata.yml', 'w') {|file| File.write('lib/lotrd/model/playerdata.yml', player.to_yaml)}
+            File.open(ENV['HOME'] + "/." + "playerdata.yml", 'w') {|file| File.write(ENV['HOME'] + "/." + "playerdata.yml", player.to_yaml)}
             Leaderboard::start
         else
             narcissist += 1

data/lib/lotrd/controller/playergen.rb

@@ -54,7 +54,7 @@ module PlayerGen
                     system 'clear'
                     ::NewPlayer.jobOptions
                 end
-                File.open('lib/lotrd/model/playerdata.yml', 'w') {|file| File.write('lib/lotrd/model/playerdata.yml', @player.to_yaml)}
+                File.open(ENV['HOME'] + "/." + "playerdata.yml", 'w') {|file| File.write(ENV['HOME'] + "/." + "playerdata.yml", @player.to_yaml)}
             end
     module_function :race, 
                     :job, 

data/lib/lotrd/controller/storeBuy.rb

@@ -6,7 +6,7 @@ module Buy
     def weapon(item)
         system 'clear'
         puts "Hephy's Forge -> Weapons Menu -> Weapon Purchase" + "\n" + "=" * 40 + "\n"*2
-        player = YAML.load(File.read("lib/lotrd/model/playerdata.yml"))
+        player = YAML.load(File.read(ENV['HOME'] + "/." + "playerdata.yml"))
         weap_stats = YAML.load(File.read("lib/lotrd/model/weap_stats.yml"))
         gold = player.gold
         weapon = player.weapon
@@ -45,7 +45,7 @@ module Buy
         player.dex = dex
         player.int = int
         player.lck = lck
-        File.open('lib/lotrd/model/playerdata.yml', 'w') {|file| File.write('lib/lotrd/model/playerdata.yml', player.to_yaml)}
+        File.open(ENV['HOME'] + "/." + "playerdata.yml", 'w') {|file| File.write(ENV['HOME'] + "/." + "playerdata.yml", player.to_yaml)}
         sleep(3)
         ::Store.menu
     end
@@ -53,7 +53,7 @@ module Buy
     def armour(item)
         system 'clear'
         puts "Hephy's Forge -> Armours Menu -> Armour Purchase" + "\n" + "=" * 40 + "\n"*2
-        player = YAML.load(File.read("lib/lotrd/model/playerdata.yml"))
+        player = YAML.load(File.read(ENV['HOME'] + "/." + "playerdata.yml"))
         arm_stats = YAML.load(File.read("lib/lotrd/model/arm_stats.yml"))
         gold = player.gold
         armour = player.armour
@@ -95,7 +95,7 @@ module Buy
         player.dex = dex
         player.int = int
         player.lck = lck
-        File.open('lib/lotrd/model/playerdata.yml', 'w') {|file| File.write('lib/lotrd/model/playerdata.yml', player.to_yaml)}
+        File.open(ENV['HOME'] + "/." + "playerdata.yml", 'w') {|file| File.write(ENV['HOME'] + "/." + "playerdata.yml", player.to_yaml)}
         sleep(3)
         ::Store.menu
     end

data/lib/lotrd/model/job.rb

@@ -1,7 +1,7 @@
 require_relative '../model/race'
 
 class Job < Race
-    attr_accessor :hp, :str, :agi, :dex, :int, :lck
+    attr_accessor :hp, :def, :res, :str, :agi, :dex, :int, :lck
     def initialize
     end
 
@@ -27,21 +27,27 @@ class Job < Race
     
     def mage
         @int += 15 
-        @dex += 15 
+        @agi += 15 
+        @res += 20
     end
 
     def knight
         @hp += 15
         @str += 15
+        @def += 20
     end
 
     def rogue
         @agi += 15
         @str += 15
+        @def += 10
+        @res += 10
     end
 
     def ranger
         @dex += 15
         @lck += 15
+        @def += 15
+        @res += 5
     end
 end

data/lib/lotrd/model/player.rb

@@ -2,7 +2,7 @@ require_relative '../model/job'
 
 class Player < Job
     attr_reader :name
-    attr_accessor :gold, :balance, :weapon, :armour, :achievements, :hp, :str, :dex, :int, :lck, :agi
+    attr_accessor :gold, :balance, :weapon, :armour, :achievements, :hp, :def, :res, :str, :dex, :int, :lck, :agi
     
     def initialize(name)
         @name = name
@@ -11,6 +11,7 @@ class Player < Job
         @weapon = nil
         @armour = nil
         @achievements = []
+        @status = []
     end
 
     def elf

data/lib/lotrd/model/race.rb

@@ -1,7 +1,9 @@
 class Race
-    attr_accessor :hp, :str, :agi, :int, :dex, :lck
+    attr_accessor :hp, :def, :res, :str, :agi, :int, :dex, :lck
     def initialize
         @hp = 0
+        @def = 0
+        @res = 0
         @str = 0 
         @agi = 0
         @int = 0
@@ -11,6 +13,8 @@ class Race
 
     def elf
         @hp = 20
+        @def = 10
+        @res = 20
         @str = 10 
         @agi = 30
         @int = 10
@@ -20,6 +24,8 @@ class Race
 
     def human
         @hp = 20
+        @def = 15
+        @res = 15
         @str = 20 
         @agi = 10 
         @int = 20
@@ -29,6 +35,8 @@ class Race
 
     def dwarf
         @hp = 30
+        @def = 20
+        @res = 10
         @str = 25 
         @agi = 15 
         @int = 10
@@ -38,6 +46,8 @@ class Race
 
     def god
         @hp = 99999
+        @def = 999
+        @res = 999
         @str = 999
         @agi = 999
         @int = 999
@@ -48,6 +58,8 @@ class Race
 
     def beast
         @hp = 66666
+        @def = 666
+        @res = 666
         @str = 666
         @agi = 666
         @int = 666

data/lib/lotrd/version.rb

@@ -1,3 +1,3 @@
 module Lotrd
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/lib/lotrd/view/bank.rb

@@ -8,7 +8,7 @@ module Bank
 	def start
 		system 'clear'
 		puts "Hazelwood Bank" + "\n" + "=" * 40 + "\n"*2
-        @player = YAML.load(File.read("lib/lotrd/model/playerdata.yml"))
+        @player = YAML.load(File.read(ENV['HOME'] + "/." + "playerdata.yml"))
 		puts "#{@player.name.colorize(:yellow)}, welcome to Hazelwood bank!"
 		sleep(3)
 		menu
@@ -28,7 +28,7 @@ module Bank
 
 	def balance
 		system 'clear'
-        player = YAML.load(File.read("lib/lotrd/model/playerdata.yml"))
+        player = YAML.load(File.read(ENV['HOME'] + "/." + "playerdata.yml"))
         gold = player.gold
 		balance = player.balance
 		puts "Hazelwood Bank => Balance" + "\n" + "=" * 40 + "\n"*2

data/lib/lotrd/view/datacheck.rb

@@ -21,7 +21,7 @@ module DataCheck
     end
 
     def present
-        player = YAML.load(File.read("lib/lotrd/model/playerdata.yml"))
+        player = YAML.load(File.read(ENV['HOME'] + "/." + "playerdata.yml"))
         titleStyle = Artii::Base.new :font => 'slant'
         system 'clear'
         puts "Player data located. Welcome back," +"\n"*4 + "#{(titleStyle.asciify(player.name)).colorize(:yellow)}"

data/lib/lotrd/view/leaderboard.rb

@@ -20,7 +20,7 @@ module Leaderboard
     end
 
     def loadIn
-        @player = YAML.load(File.read("lib/lotrd/model/playerdata.yml"))
+        @player = YAML.load(File.read(ENV['HOME'] + "/." + "playerdata.yml"))
         @name = @player.name
         @gold = @player.gold
         @balance = @player.balance

data/lib/lotrd/view/store.rb

@@ -57,7 +57,7 @@ module Store
 
     def leave
         system 'clear'
-        player = YAML.load(File.read("lib/lotrd/model/playerdata.yml"))
+        player = YAML.load(File.read(ENV['HOME'] + "/." + "playerdata.yml"))
         puts "Hephy's Forge" + "\n" + "=" * 40 + "\n"*2
         puts "Stay alive out there, #{player.name.colorize(:yellow)}!"
         sleep(3)

data/lib/lotrd/view/town.rb

@@ -12,7 +12,7 @@ require_relative '../model/events'
 module Town
     def menu
         system 'clear'
-        player = YAML.load(File.read("lib/lotrd/model/playerdata.yml"))
+        player = YAML.load(File.read(ENV['HOME'] + "/." + "playerdata.yml"))
         puts "Welcome to #{'Hazelwood'.colorize(:magenta)}, #{player.name.colorize(:yellow)}!" + "\n" + "=" * 40 + "\n"*2
         puts ::Events.town + "\n"*2
         prompt = TTY::Prompt.new
@@ -27,7 +27,7 @@ module Town
 
     def quit
         system 'clear'
-        player = YAML.load(File.read("lib/lotrd/model/playerdata.yml"))
+        player = YAML.load(File.read(ENV['HOME'] + "/." + "playerdata.yml"))
         system 'clear'
         titleStyle = Artii::Base.new :font => 'slant'
         puts "Thanks for playing! See you next time," +"\n"*4 + "#{(titleStyle.asciify(player.name)).colorize(:yellow)}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lotrd
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Jackson N
@@ -139,7 +139,6 @@ files:
 - lib/lotrd/model/job.rb
 - lib/lotrd/model/mob.rb
 - lib/lotrd/model/player.rb
-- lib/lotrd/model/playerdata.yml
 - lib/lotrd/model/race.rb
 - lib/lotrd/model/weap_stats.yml
 - lib/lotrd/version.rb
@@ -153,6 +152,7 @@ files:
 - lib/lotrd/view/town.rb
 - lotrd-0.1.6.gem
 - lotrd-0.1.7.gem
+- lotrd-0.1.8.gem
 - lotrd.gemspec
 - vendor/cache/artii-2.1.2.gem
 - vendor/cache/colorize-0.8.1.gem