update 6.7

This commit is contained in:
chardub
2025-09-28 15:53:01 -04:00
parent ef5e023ae0
commit 318ff90d8d
696 changed files with 111759 additions and 198230 deletions

View File

@@ -5,7 +5,7 @@ BASE_TRAINER_FOLDER = "trainer"
def getBaseOverworldSpriteFilename(action = "walk", skinTone = "default")
base_path = Settings::PLAYER_GRAPHICS_FOLDER + BASE_FOLDER + "/" + BASE_OVERWORLD_FOLDER
dynamic_path = _INTL("/{1}/{2}_{1}", skinTone, action)
dynamic_path = "/#{skinTone}/#{action}_#{skinTone}"
full_path = base_path + dynamic_path
return full_path if pbResolveBitmap(full_path)
return getBaseOverworldSpriteFilename(action) if skinTone != "default" #try again with default skintone
@@ -14,7 +14,7 @@ end
def getBaseTrainerSpriteFilename(skinTone = "default")
base_path = Settings::PLAYER_GRAPHICS_FOLDER + BASE_FOLDER + "/" + BASE_TRAINER_FOLDER
dynamic_path = _INTL("/{1}_{2}", BASE_TRAINER_FOLDER, skinTone)
dynamic_path = "/#{BASE_TRAINER_FOLDER}_#{skinTone}"
full_path = base_path + dynamic_path
return full_path if pbResolveBitmap(full_path)
return getBaseTrainerSpriteFilename() #default skintone
@@ -28,8 +28,8 @@ end
def getOverworldOutfitFilename(outfit_id, action="walk")
base_path = Settings::PLAYER_GRAPHICS_FOLDER + Settings::PLAYER_CLOTHES_FOLDER
dynamic_path = _INTL("/{1}/", outfit_id)
filename = _INTL(Settings::PLAYER_CLOTHES_FOLDER + "_{1}_{2}", action, outfit_id)
dynamic_path = "/#{outfit_id}/"
filename = Settings::PLAYER_CLOTHES_FOLDER + "_#{action}_#{outfit_id}"
full_path = base_path + dynamic_path + filename
#echoln full_path
return full_path
@@ -66,7 +66,7 @@ def getSplitHairFilenameAndVersionFromID(hairstyle_id)
end
def getFullHairId(hairstyle,version)
return _INTL("{1}_{2}",version,hairstyle)
return "#{version}_#{hairstyle}"
end
@@ -76,8 +76,8 @@ def getOverworldHairFilename(hairstyle_id)
version= hairstyle_split[-2]
base_path = Settings::PLAYER_GRAPHICS_FOLDER + Settings::PLAYER_HAIR_FOLDER
dynamic_path = _INTL("/{1}/", name)
filename = _INTL(Settings::PLAYER_HAIR_FOLDER + "_{1}_{2}",version, name)
dynamic_path = "/#{name}/"
filename = Settings::PLAYER_HAIR_FOLDER + "_#{version}_#{name}"
full_path = base_path + dynamic_path + filename
return full_path
end
@@ -91,8 +91,8 @@ def getTrainerSpriteHairFilename(hairstyle_id)
base_path = Settings::PLAYER_GRAPHICS_FOLDER + Settings::PLAYER_HAIR_FOLDER
dynamic_path = _INTL("/{1}/", name)
filename = _INTL(Settings::PLAYER_HAIR_FOLDER + "_trainer_{1}_{2}",version, name)
dynamic_path = "/#{name}/"
filename = Settings::PLAYER_HAIR_FOLDER + "_trainer_#{version}_#{name}"
full_path = base_path + dynamic_path + filename
return full_path
end
@@ -105,16 +105,16 @@ end
def getOverworldHatFilename(hat_id)
base_path = Settings::PLAYER_GRAPHICS_FOLDER + Settings::PLAYER_HAT_FOLDER
dynamic_path = _INTL("/{1}/", hat_id)
filename = _INTL(Settings::PLAYER_HAT_FOLDER + "_{1}", hat_id)
dynamic_path = "/#{hat_id}/"
filename = Settings::PLAYER_HAT_FOLDER + "_#{hat_id}"
full_path = base_path + dynamic_path + filename
return full_path
end
def getTrainerSpriteHatFilename(hat_id)
base_path = Settings::PLAYER_GRAPHICS_FOLDER + Settings::PLAYER_HAT_FOLDER
dynamic_path = _INTL("/{1}/", hat_id)
filename = _INTL(Settings::PLAYER_HAT_FOLDER + "_trainer_{1}", hat_id)
dynamic_path = "/#{hat_id}/"
filename = Settings::PLAYER_HAT_FOLDER + "_trainer_#{hat_id}"
full_path = base_path + dynamic_path + filename
return full_path
end

View File

@@ -10,12 +10,12 @@ def obtainHat(outfit_id,secondary=false)
echoln "obtained new hat: " + outfit_id
outfit = get_hat_by_id(outfit_id)
if !outfit
pbMessage(_INTL("The hat #{outfit_id} is invalid."))
pbMessage(_INTL("The hat {1} is invalid.", outfit_id))
return
end
$Trainer.unlocked_hats << outfit_id if !$Trainer.unlocked_hats.include?(outfit_id)
obtainOutfitMessage(outfit)
if pbConfirmMessage("Would you like to put it on right now?")
if pbConfirmMessage(_INTL("Would you like to put it on right now?"))
putOnHat(outfit_id, false, false) if !secondary
putOnHat(outfit_id, false, true) if secondary
return true
@@ -28,7 +28,7 @@ def unlockHat(outfit_id)
echoln "obtained new hat: " + outfit_id
outfit = get_hat_by_id(outfit_id)
if !outfit
pbMessage(_INTL("The hat #{outfit_id} is invalid."))
pbMessage(_INTL("The hat {1} is invalid.", outfit_id))
return
end
$Trainer.unlocked_hats << outfit_id if !$Trainer.unlocked_hats.include?(outfit_id)
@@ -39,13 +39,13 @@ def obtainClothes(outfit_id)
echoln "obtained new clothes: " + outfit_id
outfit = get_clothes_by_id(outfit_id)
if !outfit
pbMessage(_INTL("The clothes #{outfit_id} are invalid."))
pbMessage(_INTL("The clothes {1} are invalid.", outfit_id))
return
end
return if !outfit
$Trainer.unlocked_clothes << outfit_id if !$Trainer.unlocked_clothes.include?(outfit_id)
obtainOutfitMessage(outfit)
if pbConfirmMessage("Would you like to put it on right now?")
if pbConfirmMessage(_INTL("Would you like to put it on right now?"))
putOnClothes(outfit_id)
return true
end
@@ -56,7 +56,7 @@ def obtainNewHairstyle(full_outfit_id)
split_outfit_id = getSplitHairFilenameAndVersionFromID(full_outfit_id)
hairstyle_id = split_outfit_id[1]
hairstyle = get_hair_by_id(hairstyle_id)
musical_effect = "Key item get"
musical_effect = _INTL("Key item get")
pbMessage(_INTL("\\me[{1}]Your hairstyle was changed to \\c[1]{2}\\c[0] hairstyle!\\wtnp[30]", musical_effect, hairstyle.name))
return true
end
@@ -152,7 +152,7 @@ end
def obtainOutfitMessage(outfit)
pictureViewport = showOutfitPicture(outfit)
musical_effect = "Key item get"
musical_effect = _INTL("Key item get")
pbMessage(_INTL("\\me[{1}]You obtained a \\c[1]{2}\\c[0]!\\wtnp[30]", musical_effect, outfit.name))
pictureViewport.dispose if pictureViewport
end
@@ -274,6 +274,22 @@ def export_current_outfit()
Input.clipboard = exportedString
end
def export_current_outfit_to_json
appearance = {
skin_color: $Trainer.skin_tone || 0,
hat: $Trainer.hat || nil,
hat2: $Trainer.hat2 || nil,
clothes: $Trainer.clothes,
hair: $Trainer.hair,
hair_color: $Trainer.hair_color || 0,
clothes_color: $Trainer.clothes_color || 0,
hat_color: $Trainer.hat_color || 0,
hat2_color: $Trainer.hat2_color || 0
}
return appearance
end
def clearEventCustomAppearance(event_id)
return if !$scene.is_a?(Scene_Map)
event_sprite = $scene.spriteset.character_sprites[@event_id]
@@ -288,7 +304,7 @@ end
def setEventAppearance(event_id, trainerAppearance)
return if !$scene.is_a?(Scene_Map)
event_sprite = $scene.spriteset.character_sprites[@event_id]
event_sprite = $scene.spriteset.character_sprites[event_id]
for sprite in $scene.spriteset.character_sprites
if sprite.character.id == event_id
event_sprite = sprite