Skip to content

Commit

Permalink
Merge branch 'elanthia-online:main' into athletics_buffing
Browse files Browse the repository at this point in the history
  • Loading branch information
MahtraDR authored Dec 10, 2024
2 parents 7d9d07b + ee901e6 commit f684ebe
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 10 deletions.
31 changes: 22 additions & 9 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
AllCops:
TargetRubyVersion: 3.2
SuggestExtensions: false
TargetRubyVersion: 3.3
NewCops: disable
Include:
- '**/*.lic'
- '**/*.rb'

Naming/FileName:
Layout/ClosingHeredocIndentation:
Enabled: false

Naming/AccessorMethodName:
Enabled: false

Naming/PredicateName:
Layout/EmptyLineAfterGuardClause:
Enabled: false

Style:
Layout/EndOfLine:
Enabled: false

Layout/FirstHashElementIndentation:
EnforcedStyle: consistent

Layout/HashAlignment:
EnforcedHashRocketStyle: table

Layout/EndOfLine:
Layout/HeredocIndentation:
Enabled: false

Layout/LineLength:
Expand Down Expand Up @@ -49,6 +50,18 @@ Metrics/ModuleLength:

Metrics/PerceivedComplexity:
Enabled: false

Metrics/ParameterLists:
Enabled: false

Naming:
Enabled: false

Security/Eval:
Enabled: false

Security/MarshalLoad:
Enabled: false

Style:
Enabled: false
3 changes: 2 additions & 1 deletion train.lic
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@ class CrossingTrain

def setup
@settings = get_settings
hometown_data = get_data('town')[@settings.hometown]
hometown = @settings.fang_cove_override_town || @settings.hometown
hometown_data = get_data('town')[hometown]

current_stats = {
'strength' => DRStats.strength,
Expand Down

0 comments on commit f684ebe

Please sign in to comment.