mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
glitched mask obtain method
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -750,6 +750,7 @@ Events.onEndBattle += proc { |_sender,e|
|
||||
pbHoneyGather(pkmn)
|
||||
end
|
||||
pickUpTypeItemSetBonus()
|
||||
qmarkMaskCheck()
|
||||
when 2, 5 # Lose, draw
|
||||
if !canLose
|
||||
$game_system.bgm_unpause
|
||||
|
||||
@@ -32,6 +32,8 @@ class Player < Trainer
|
||||
attr_accessor :card_background
|
||||
attr_accessor :unlocked_card_backgrounds
|
||||
|
||||
attr_accessor :seen_qmarks_sprite
|
||||
|
||||
|
||||
# @return [Array<Boolean>] the player's Gym Badges (true if owned)
|
||||
attr_accessor :badges
|
||||
@@ -293,5 +295,7 @@ class Player < Trainer
|
||||
|
||||
@card_background = Settings::DEFAULT_TRAINER_CARD_BG
|
||||
@unlocked_card_backgrounds = [@card_background]
|
||||
|
||||
@seen_qmarks_sprite = false
|
||||
end
|
||||
end
|
||||
|
||||
@@ -119,6 +119,7 @@ class BattleSpriteLoader
|
||||
new_extractor = get_sprite_extractor_instance(:AUTOGEN)
|
||||
return new_extractor.load_sprite(pif_sprite)
|
||||
else
|
||||
$Trainer.seen_qmarks_sprite=true if $Trainer
|
||||
#If autogen or base sprite aren't able to load a sprite then we have nothing else to load -> show a ? instead.
|
||||
return AnimatedBitmap.new(Settings::DEFAULT_SPRITE_PATH)
|
||||
end
|
||||
|
||||
@@ -48,7 +48,7 @@ HAT_SLOWKING_SHELL = "slowking"
|
||||
HAT_ZOROARK = "banefulfoxmask"
|
||||
HAT_FROG = "froghat"
|
||||
HAT_SANTA = "santa"
|
||||
|
||||
HAT_QMARKS = "glitzerset"
|
||||
|
||||
HAT_BREEDER_1="breedervisor"
|
||||
HAT_BREEDER_2="breederbandana"
|
||||
|
||||
@@ -9,7 +9,7 @@ module GameData
|
||||
else
|
||||
ret = self.front_sprite_bitmap(species, pkmn.shiny?, pkmn.bodyShiny?, pkmn.headShiny?)
|
||||
end
|
||||
ret.scale_bitmap(pkmn.sprite_scale) #for pokemon with size differences
|
||||
ret.scale_bitmap(pkmn.sprite_scale) if ret #for pokemon with size differences
|
||||
return ret
|
||||
end
|
||||
|
||||
|
||||
@@ -1698,4 +1698,12 @@ def failAllIncompleteRocketQuests()
|
||||
finishTRQuest("tr_celadon_3", :FAILURE) if trainer_quest.id == "tr_celadon_3" && !pbCompletedQuest?("tr_celadon_3")
|
||||
finishTRQuest("tr_celadon_4", :FAILURE) if trainer_quest.id == "tr_celadon_4" && !pbCompletedQuest?("tr_celadon_4")
|
||||
end
|
||||
end
|
||||
|
||||
def qmarkMaskCheck()
|
||||
if $Trainer.seen_qmarks_sprite
|
||||
unless hasHat?(HAT_QMARKS)
|
||||
obtainHat(HAT_QMARKS)
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -227,7 +227,11 @@ class GenOneStyle
|
||||
@sprites["2poke"].y = 100
|
||||
|
||||
@sprites["fpoke"] = Sprite.new(@viewport)
|
||||
@sprites["fpoke"].bitmap = @spriteLoader.load_pif_sprite(random_fusion).bitmap
|
||||
|
||||
fusedPoke = @spriteLoader.load_pif_sprite(random_fusion)
|
||||
if fusedPoke
|
||||
@sprites["fpoke"].bitmap = fusedPoke.bitmap
|
||||
end
|
||||
@sprites["fpoke"].x = 125
|
||||
@sprites["fpoke"].y = 100
|
||||
@sprites["fpoke"].z = 999
|
||||
@@ -401,8 +405,10 @@ class GenOneStyle
|
||||
@sprites["2poke"].bitmap = @spriteLoader.load_base_sprite(random_fusion_head).bitmap
|
||||
|
||||
wait(150)
|
||||
|
||||
@sprites["fpoke"].bitmap = @spriteLoader.load_pif_sprite(random_fusion).bitmap
|
||||
fusedPoke = @spriteLoader.load_pif_sprite(random_fusion)
|
||||
if fusedPoke
|
||||
@sprites["fpoke"].bitmap = fusedPoke.bitmap
|
||||
end
|
||||
end
|
||||
|
||||
@sprites["fpoke"].opacity -= 10
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -366,6 +366,13 @@
|
||||
"tags": "hat,trainer",
|
||||
"howToGet": "gym reward"
|
||||
},
|
||||
{
|
||||
"id": "glitzerset",
|
||||
"name": "Glitched Mask",
|
||||
"description": "An odd mask that makes you look like you just stepped out of a corrupted save file. ",
|
||||
"price": 10000,
|
||||
"tags": "mask"
|
||||
},
|
||||
{
|
||||
"id": "glasses",
|
||||
"name": "Round Glasses",
|
||||
@@ -432,9 +439,14 @@
|
||||
"done": "yes",
|
||||
"len": 63,
|
||||
"price": 10000,
|
||||
"tags": "floating,",
|
||||
"tags": "floating,pokemon-shedinja",
|
||||
"howToGet": "reward for beating the ilex forest shedinja encounter? reward for showing a shedinja to someone?"
|
||||
},
|
||||
{
|
||||
"id": "headlacecovering",
|
||||
"name": "Lace Covering",
|
||||
"description": "A delicate seet-hrough lace covering that is worn over the head."
|
||||
},
|
||||
{
|
||||
"id": "headparas",
|
||||
"name": "Head Paras",
|
||||
@@ -813,7 +825,7 @@
|
||||
},
|
||||
{
|
||||
"id": "pikhatchuf",
|
||||
"name": "Head Pikachu",
|
||||
"name": "Head Pikachu (F)",
|
||||
"description": "A female Pikachu that has taken a liking to perching atop a trainer's head.",
|
||||
"done": "yes",
|
||||
"len": 75,
|
||||
@@ -823,7 +835,7 @@
|
||||
},
|
||||
{
|
||||
"id": "pikhatchum",
|
||||
"name": "Head Pikachu",
|
||||
"name": "Head Pikachu (M)",
|
||||
"description": "A male Pikachu that has taken a liking to perching atop a trainer's head.",
|
||||
"done": "yes",
|
||||
"len": 73,
|
||||
@@ -958,6 +970,12 @@
|
||||
"price": 4500,
|
||||
"tags": "glasses,mask,pokemon-budew,pokemon-roselia,pokemon-roserade,celadon"
|
||||
},
|
||||
{
|
||||
"id": "sableyemask",
|
||||
"name": "Sableye Mask",
|
||||
"price": 4500,
|
||||
"tags": "mask,pokemon-sableye"
|
||||
},
|
||||
{
|
||||
"id": "sabrinasballs",
|
||||
"name": "Levitating Balls",
|
||||
@@ -1023,6 +1041,11 @@
|
||||
"price": 3500,
|
||||
"tags": "hat,weather-cold,blackthorn,mahogany"
|
||||
},
|
||||
{
|
||||
"id": "skittyTV",
|
||||
"name": "Skitty TV",
|
||||
"price": 5000
|
||||
},
|
||||
{
|
||||
"id": "sleepmask",
|
||||
"name": "Mareep Sleep Mask",
|
||||
@@ -1140,6 +1163,13 @@
|
||||
"price": 2500,
|
||||
"tags": "glasses,violet,"
|
||||
},
|
||||
{
|
||||
"id": "tvhead",
|
||||
"name": "TV Head",
|
||||
"description": "A TV worn as a helmet that could be used to watch replays of your Pokémon battles... If only it worked!",
|
||||
"price": 4500,
|
||||
"tags": "hat,"
|
||||
},
|
||||
{
|
||||
"id": "veteranM",
|
||||
"name": "Black Flat Cap",
|
||||
|
||||
Reference in New Issue
Block a user