Skip to content

Commit be58c03

Browse files
michaelchadwickmichaelchadwick
committed
rubocop improvements
1 parent 6ec092c commit be58c03

File tree

8 files changed

+157
-158
lines changed

8 files changed

+157
-158
lines changed

‎gemwarrior.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ Gem::Specification.new do |spec|
2828
spec.add_runtime_dependency 'win32-sound', '~> 0.6.0'
2929
spec.add_runtime_dependency 'feep', '~> 0.1.3'
3030
spec.add_runtime_dependency 'github_api', '~> 0.12.4'
31-
31+
3232
# gems for future features
33-
#spec.add_runtime_dependency 'hr', '~> 0.0.2'
33+
# spec.add_runtime_dependency 'hr', '~> 0.0.2'
3434

3535
spec.add_development_dependency 'pry-byebug', '~> 3.0'
3636
spec.add_development_dependency 'bundler', '~> 1.8'

‎lib/gemwarrior/arena.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ def start
2020

2121
loop do
2222
monster = generate_monster
23-
battle = Battle.new({:world => self.world, :player => self.player, :monster => monster})
23+
battle = Battle.new(world: world, player: player, monster: monster)
2424
result = battle.start(is_arena = true)
25-
25+
2626
if result.eql?('death')
2727
return 'death'
2828
end
@@ -56,7 +56,7 @@ def generate_monster
5656
random_monster = nil
5757

5858
loop do
59-
random_monster = world.monsters[rand(0..world.monsters.length-1)].clone
59+
random_monster = world.monsters[rand(0..world.monsters.length - 1)].clone
6060

6161
unless random_monster.is_boss
6262
break

‎lib/gemwarrior/battle.rb

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@ def initialize(options)
2525
def start(is_arena = nil, is_event = nil)
2626
if world.sound
2727
Music::cue([
28-
{:frequencies => 'G4', :duration => 50},
29-
{:frequencies => 'G#4', :duration => 50},
30-
{:frequencies => 'G4', :duration => 50},
31-
{:frequencies => 'G#4', :duration => 50},
32-
{:frequencies => 'G4', :duration => 50},
33-
{:frequencies => 'G#4', :duration => 50}
28+
{ frequencies: 'G4', duration: 50 },
29+
{ frequencies: 'G#4', duration: 50 },
30+
{ frequencies: 'G4', duration: 50 },
31+
{ frequencies: 'G#4', duration: 50 },
32+
{ frequencies: 'G4', duration: 50 },
33+
{ frequencies: 'G#4', duration: 50 }
3434
])
3535
end
36-
36+
3737
print_battle_line
3838

3939
if is_arena
4040
print 'Your opponent is now...'
41-
Animation::run({:phrase => "#{monster.name.upcase}!", :speed => :slow})
41+
Animation::run(phrase: "#{monster.name.upcase}!", speed: slow)
4242
elsif is_event
4343
puts "You are attacked by #{monster.name}!"
4444
else
@@ -74,7 +74,7 @@ def start(is_arena = nil, is_event = nil)
7474
end
7575

7676
puts
77-
77+
7878
# print health info
7979
print "#{player.name.upcase.ljust(12)} :: #{player.hp_cur.to_s.rjust(3)} HP"
8080
if world.debug_mode
@@ -123,7 +123,7 @@ def start(is_arena = nil, is_event = nil)
123123
dmg = calculate_damage_to(monster)
124124
if dmg > 0
125125
if world.sound
126-
Music::cue([{:frequencies => 'A4,E4,B5', :duration => 75}])
126+
Music::cue([{ frequencies: 'A4,E4,B5', duration: 75 }])
127127
end
128128
take_damage(monster, dmg)
129129
if monster_dead?
@@ -132,7 +132,7 @@ def start(is_arena = nil, is_event = nil)
132132
end
133133
else
134134
if world.sound
135-
Music::cue([{:frequencies => 'A4', :duration => 75}])
135+
Music::cue([{ frequencies: 'A4', duration: 75 }])
136136
end
137137
puts 'You miss entirely!'.colorize(:yellow)
138138
end
@@ -173,16 +173,16 @@ def start(is_arena = nil, is_event = nil)
173173

174174
private
175175

176-
# NEUTRAL
176+
# NEUTRAL
177177
def calculate_damage_to(entity)
178178
miss = rand(0..(100 + entity.defense))
179-
if (miss < 15)
179+
if miss < 15
180180
0
181181
else
182182
if entity.eql?(monster)
183183
# base attack range
184184
atk_range = player.atk_lo..player.atk_hi
185-
185+
186186
# beast mode modifier
187187
if player.beast_mode
188188
atk_range = BEAST_MODE_ATTACK..BEAST_MODE_ATTACK
@@ -201,7 +201,7 @@ def calculate_damage_to(entity)
201201
return rand(atk_range)
202202
else
203203
dmg = rand(monster.atk_lo..monster.atk_hi)
204-
dmg = dmg - (entity.defense / 2) if player_is_defending
204+
dmg -= (entity.defense / 2) if player_is_defending
205205
return dmg
206206
end
207207
end
@@ -218,7 +218,7 @@ def take_damage(entity, dmg)
218218
end
219219

220220
print who_gets_wounded
221-
Animation::run({ :phrase => dmg.to_s, :speed => :slow, :oneline => true, :alpha => false, :random => false })
221+
Animation::run({ phrase: dmg.to_s, speed: slow, oneline: true, alpha: false, random: false })
222222
print " point(s)!\n"
223223
end
224224

@@ -239,16 +239,16 @@ def monster_strikes_first?(is_event = nil)
239239

240240
def monster_attacks_player
241241
puts "#{monster.name} attacks you!"
242-
242+
243243
dmg = calculate_damage_to(player)
244244
if dmg > 0
245245
if world.sound
246-
Music::cue([{:frequencies => 'B4,E#5,A5', :duration => 75}])
246+
Music::cue([{ frequencies: 'B4,E#5,A5', duration: 75 }])
247247
end
248248
take_damage(player, dmg)
249249
else
250250
if world.sound
251-
Music::cue([{:frequencies => 'B4', :duration => 75}])
251+
Music::cue([{ frequencies: 'B4', duration: 75 }])
252252
end
253253
puts "#{monster.name} misses entirely!".colorize(:yellow)
254254
end
@@ -272,21 +272,21 @@ def monster_death
272272
# end game boss!
273273
if monster.name.eql?('Emerald')
274274
Music::cue([
275-
{:frequencies => 'G3', :duration => 250},
276-
{:frequencies => 'A3', :duration => 50},
277-
{:frequencies => 'B3', :duration => 50},
278-
{:frequencies => 'C4', :duration => 50},
279-
{:frequencies => 'D4', :duration => 250},
280-
{:frequencies => 'E4', :duration => 50},
281-
{:frequencies => 'F#4', :duration => 50},
282-
{:frequencies => 'G4', :duration => 50},
283-
{:frequencies => 'A4', :duration => 250},
284-
{:frequencies => 'B4', :duration => 50},
285-
{:frequencies => 'C5', :duration => 50},
286-
{:frequencies => 'D5', :duration => 50},
287-
{:frequencies => 'E5', :duration => 50},
288-
{:frequencies => 'F#5', :duration => 50},
289-
{:frequencies => 'G5', :duration => 1000}
275+
{ frequencies: 'G3', duration: 250 },
276+
{ frequencies: 'A3', duration: 50 },
277+
{ frequencies: 'B3', duration: 50 },
278+
{ frequencies: 'C4', duration: 50 },
279+
{ frequencies: 'D4', duration: 250 },
280+
{ frequencies: 'E4', duration: 50 },
281+
{ frequencies: 'F#4', duration: 50 },
282+
{ frequencies: 'G4', duration: 50 },
283+
{ frequencies: 'A4', duration: 250 },
284+
{ frequencies: 'B4', duration: 50 },
285+
{ frequencies: 'C5', duration: 50 },
286+
{ frequencies: 'D5', duration: 50 },
287+
{ frequencies: 'E5', duration: 50 },
288+
{ frequencies: 'F#5', duration: 50 },
289+
{ frequencies: 'G5', duration: 1000 }
290290
])
291291
puts monster.defeated_text
292292
gets
@@ -296,7 +296,7 @@ def monster_death
296296
puts " XP : #{monster.xp}".colorize(:green)
297297
puts " ROX: #{monster.rox}".colorize(:green)
298298
print_battle_line
299-
player.update_stats({:reason => :monster, :value => monster})
299+
player.update_stats(reason: monster, value: monster)
300300
world.location_by_coords(player.cur_coords).remove_monster(monster.name)
301301
end
302302
else
@@ -307,7 +307,7 @@ def monster_death
307307
puts " ITEMS: #{monster.inventory.list_contents}".colorize(:green) unless monster.inventory.items.empty?
308308
end
309309
print_battle_line
310-
player.update_stats({:reason => :monster, :value => monster})
310+
player.update_stats(reason: monster, value: monster)
311311
world.location_by_coords(player.cur_coords).remove_monster(monster.name)
312312
end
313313
end
@@ -324,20 +324,20 @@ def player_dead?
324324
def player_death
325325
if world.sound
326326
Music::cue([
327-
{:frequencies => 'D#5', :duration => 100},
328-
{:frequencies => 'A4', :duration => 150},
329-
{:frequencies => 'F#4', :duration => 200},
330-
{:frequencies => 'F4', :duration => 1000}
327+
{ frequencies: 'D#5', duration: 100 },
328+
{ frequencies: 'A4', duration: 150 },
329+
{ frequencies: 'F#4', duration: 200 },
330+
{ frequencies: 'F4', duration: 1000 }
331331
])
332332
end
333-
333+
334334
puts "You are dead, slain by the #{monster.name}!".colorize(:red)
335335
print_battle_line
336336
end
337337

338338
def player_escape?(is_arena)
339339
unless is_arena
340-
if (player.dexterity > monster.dexterity)
340+
if player.dexterity > monster.dexterity
341341
return true
342342
else
343343
dex_diff = monster.dexterity - player.dexterity
@@ -355,7 +355,7 @@ def player_escape?(is_arena)
355355
# STATUS TEXT
356356

357357
def print_escape_text
358-
Animation::run({ :phrase => '** POOF **', :oneline => true })
358+
Animation::run(phrase: '** POOF **', oneline: true)
359359
end
360360

361361
def print_battle_line

0 commit comments

Comments
 (0)