Update 6.8

This commit is contained in:
chardub
2026-07-10 15:42:06 -04:00
parent 5b85e72cb2
commit 6a6f126a18
7871 changed files with 493194 additions and 224826 deletions
@@ -5,14 +5,14 @@ class HatsMartAdapter < OutfitsMartAdapter
DEFAULT_NAME = "[unknown]"
DEFAULT_DESCRIPTION = "A headgear that trainers can wear."
def initialize(stock = nil, isShop = nil, isSecondaryHat = false)
super(stock,isShop,isSecondaryHat)
@worn_clothes = $Trainer.hat
@worn_clothes2 = $Trainer.hat2
def initialize(stock = nil, isShop = nil, isSecondaryHat = false, prices_override = {})
super(stock, isShop, isSecondaryHat, prices_override)
@worn_clothes = $Trainer.hat
@worn_clothes2 = $Trainer.hat2
@second_hat_visible = true
end
#Used in shops only
# Used in shops only
def toggleSecondHat()
@second_hat_visible = !@second_hat_visible
$Trainer.hat2 = @second_hat_visible ? @worn_clothes2 : nil
@@ -22,7 +22,7 @@ class HatsMartAdapter < OutfitsMartAdapter
if isShop?
toggleSecondHat
else
$Trainer.set_hat(nil,@is_secondary_hat)
$Trainer.set_hat(nil, @is_secondary_hat)
@worn_clothes = nil
end
end
@@ -42,7 +42,7 @@ class HatsMartAdapter < OutfitsMartAdapter
# return "Remove hat: #{toggleKey}"
end
def switchVersion(item,delta=1)
def switchVersion(item, delta = 1)
pbSEPlay("GUI storage put down", 80, 100)
return toggleSecondHat if isShop?
@is_secondary_hat = !@is_secondary_hat
@@ -67,12 +67,12 @@ class HatsMartAdapter < OutfitsMartAdapter
hat1 = @is_secondary_hat ? get_hat_by_id($Trainer.hat) : item
hat2 = @is_secondary_hat ? item : get_hat_by_id($Trainer.hat2)
previewWindow.set_hat(hat1.id,false) if hat1
previewWindow.set_hat(hat2.id,true) if hat2
previewWindow.set_hat(nil,true) if !@second_hat_visible #for toggling in shops
previewWindow.set_hat(hat1.id, false) if hat1
previewWindow.set_hat(hat2.id, true) if hat2
previewWindow.set_hat(nil, true) if !@second_hat_visible # for toggling in shops
hat1_color=0
hat2_color=0
hat1_color = 0
hat2_color = 0
hat1_color = $Trainer.dyed_hats[hat1.id] if hat1 && $Trainer.dyed_hats.include?(hat1.id)
hat2_color = $Trainer.dyed_hats[hat2.id] if hat2 && $Trainer.dyed_hats.include?(hat2.id)
previewWindow.hat_color = hat1_color
@@ -84,36 +84,34 @@ class HatsMartAdapter < OutfitsMartAdapter
$Trainer.hat2_color = hat2_color
else
$Trainer.set_hat(nil,@is_secondary_hat)
previewWindow.set_hat(nil,@is_secondary_hat)
$Trainer.set_hat(nil, @is_secondary_hat)
previewWindow.set_hat(nil, @is_secondary_hat)
end
pbRefreshSceneMap
previewWindow.updatePreview()
end
def get_dye_color(item_id)
return if !item_id
return 0 if isShop?
$Trainer.dyed_hats= {} if ! $Trainer.dyed_hats
$Trainer.dyed_hats = {} if !$Trainer.dyed_hats
if $Trainer.dyed_hats.include?(item_id)
return $Trainer.dyed_hats[item_id]
end
return 0
end
def set_dye_color(item,previewWindow,is_secondary_hat=false)
def set_dye_color(item, previewWindow, is_secondary_hat = false)
return if !item
if !isShop?
else
$Trainer.set_hat_color(0,is_secondary_hat)
previewWindow.hat_color=0
$Trainer.set_hat_color(0, is_secondary_hat)
previewWindow.hat_color = 0
end
end
# def set_dye_color(item,previewWindow,is_secondary_hat=false)
# return if !item
# if !isShop?
@@ -138,10 +136,9 @@ class HatsMartAdapter < OutfitsMartAdapter
# end
# end
def addItem(item)
return unless item.is_a?(Outfit)
changed_clothes = obtainHat(item.id,@is_secondary_hat)
changed_clothes = obtainHat(item.id, @is_secondary_hat)
if changed_clothes
@worn_clothes = item.id
end
@@ -159,8 +156,8 @@ class HatsMartAdapter < OutfitsMartAdapter
def putOnSelectedOutfit()
putOnHat($Trainer.hat,true,false) if $Trainer.hat
putOnHat($Trainer.hat2,true,true) if $Trainer.hat2
putOnHat($Trainer.hat, true, false) if $Trainer.hat
putOnHat($Trainer.hat2, true, true) if $Trainer.hat2
@worn_clothes = $Trainer.hat
@worn_clothes2 = $Trainer.hat2
@@ -171,16 +168,16 @@ class HatsMartAdapter < OutfitsMartAdapter
def putOnOutfit(item)
return unless item.is_a?(Outfit)
putOnHat(item.id,false,@is_secondary_hat)
putOnHat(item.id, false, @is_secondary_hat)
@worn_clothes = item.id
end
def reset_player_clothes()
$Trainer.set_hat(@worn_clothes,false)
$Trainer.set_hat(@worn_clothes2,true)
$Trainer.set_hat(@worn_clothes, false)
$Trainer.set_hat(@worn_clothes2, true)
$Trainer.set_hat_color($Trainer.dyed_hats[@worn_clothes],false) if $Trainer.dyed_hats && $Trainer.dyed_hats[@worn_clothes]
$Trainer.set_hat_color($Trainer.dyed_hats[@worn_clothes2],true) if $Trainer.dyed_hats && $Trainer.dyed_hats[@worn_clothes2]
$Trainer.set_hat_color($Trainer.dyed_hats[@worn_clothes], false) if $Trainer.dyed_hats && $Trainer.dyed_hats[@worn_clothes]
$Trainer.set_hat_color($Trainer.dyed_hats[@worn_clothes2], true) if $Trainer.dyed_hats && $Trainer.dyed_hats[@worn_clothes2]
end
def get_unlocked_items_list()
@@ -190,7 +187,7 @@ class HatsMartAdapter < OutfitsMartAdapter
def getSpecialItemCaption(specialType)
case specialType
when :REMOVE_HAT
return "Remove hat"
return _INTL("Remove hat")
end
return nil
end
@@ -210,13 +207,18 @@ class HatsMartAdapter < OutfitsMartAdapter
end
return nil
end
def isBald?
return true unless $Trainer.hair
bald_ids = [HAIR_BALD, HAIR_BALD_POLISHED]
hair_id = getSimplifiedHairIdFromFullID($Trainer.hair)
return bald_ids.include?(hair_id)
end
def getSpecialItemDescription(specialType)
hair_situation = !$Trainer.hair || getSimplifiedHairIdFromFullID($Trainer.hair) == HAIR_BALD ? "bald head" : "fabulous hair"
return "Go without a hat and show off your #{hair_situation}!"
hair_situation = isBald?() ? "bald head" : "fabulous hair"
return _INTL("Go without a hat and show off your {1}!",hair_situation)
end
def doSpecialItemAction(specialType,item=nil)
def doSpecialItemAction(specialType, item = nil)
toggleEvent(item)
end
end