Code tidying with Rubocop

This commit is contained in:
Maruno17
2023-07-18 22:42:10 +01:00
parent 6053363715
commit a5734eaf46
68 changed files with 276 additions and 232 deletions

View File

@@ -19,10 +19,6 @@ class Trainer
return _INTL("{1} {2}", trainer_type_name, @name)
end
def skill_level
return GameData::TrainerType.try_get(self.trainer_type)&.skill_level || 0
end
#=============================================================================
# Portion of the ID which is visible on the Trainer Card
@@ -46,13 +42,13 @@ class Trainer
#=============================================================================
def trainer_type_name; return GameData::TrainerType.get(self.trainer_type).name; end
def base_money; return GameData::TrainerType.get(self.trainer_type).base_money; end
def gender; return GameData::TrainerType.get(self.trainer_type).gender; end
def male?; return GameData::TrainerType.get(self.trainer_type).male?; end
def female?; return GameData::TrainerType.get(self.trainer_type).female?; end
def skill_level; return GameData::TrainerType.get(self.trainer_type).skill_level; end
def flags; return GameData::TrainerType.get(self.trainer_type).flags; end
def trainer_type_name; return GameData::TrainerType.get(self.trainer_type).name; end
def base_money; return GameData::TrainerType.get(self.trainer_type).base_money; end
def gender; return GameData::TrainerType.get(self.trainer_type).gender; end
def male?; return GameData::TrainerType.get(self.trainer_type).male?; end
def female?; return GameData::TrainerType.get(self.trainer_type).female?; end
def skill_level; return GameData::TrainerType.get(self.trainer_type).skill_level; end
def flags; return GameData::TrainerType.get(self.trainer_type).flags; end
def has_flag?(flag); return GameData::TrainerType.get(self.trainer_type).has_flag?(flag); end
#=============================================================================

View File

@@ -35,7 +35,8 @@ class TrainerWalkingCharSprite < Sprite
end
end
def altcharset=(value) # Used for box icon in the naming screen
# Used for the box icon in the naming screen.
def altcharset=(value)
@animbitmap&.dispose
@animbitmap = nil
@charset = pbResolveBitmap(value)