egg sprites

Data/Scripts/001_Settings.rb

@@ -23,7 +23,7 @@ module Settings
   FRONTSPRITE_POSITION_OFFSET = 15
   FRONTSPRITE_SCALE = 0.6666666
   BACKRPSPRITE_SCALE = 1
-
+  EGGSPRITE_SCALE = 1
   BACKSPRITE_POSITION_OFFSET = 20
 
   RIVAL_STARTER_PLACEHOLDER_SPECIES = :MEW #(MEW)

Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb

@@ -57,9 +57,24 @@ module GameData
       return self.check_graphic_file("Graphics/Pokemon/", species, form, gender, shiny, shadow, "Back")
     end
 
+    # def self.egg_sprite_filename(species, form)
+    #   ret = self.check_egg_graphic_file("Graphics/Pokemon/Eggs/", species, form)
+    #   return (ret) ? ret : pbResolveBitmap("Graphics/Pokemon/Eggs/000")
+    # end
     def self.egg_sprite_filename(species, form)
-      ret = self.check_egg_graphic_file("Graphics/Pokemon/Eggs/", species, form)
+      dexNum = getDexNumberForSpecies(species)
-      return (ret) ? ret : pbResolveBitmap("Graphics/Pokemon/Eggs/000")
+      bitmapFileName = sprintf("Graphics/Battlers/Eggs/%03d", dexNum) rescue nil
+      if !pbResolveBitmap(bitmapFileName)
+        if isTripleFusion?(dexNum)
+          bitmapFileName = "Graphics/Battlers/Eggs/egg_base"
+        else
+          bitmapFileName = sprintf("Graphics/Battlers/Eggs/%03d", dexNum)
+          if !pbResolveBitmap(bitmapFileName)
+            bitmapFileName = sprintf("Graphics/Battlers/Eggs/000")
+          end
+        end
+      end
+      return bitmapFileName
     end
 
     def self.sprite_filename(species, form = 0, gender = 0, shiny = false, shadow = false, back = false, egg = false)

Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb

@@ -68,6 +68,10 @@ class Player < Trainer
     end
 
     def isTripleFusion(num)
+      return isTripleFusion?(num)
+    end
+
+    def isTripleFusion?(num)
       return num >= Settings::ZAPMOLCUNO_NB
     end
 

Data/Scripts/016_UI/001_Non-interactive UI/003_UI_EggHatching.rb

@@ -28,8 +28,8 @@ class PokemonEggHatch_Scene
                                          @pokemon.form, @pokemon.shiny?,
                                          false, false, true)   # Egg sprite
     # Load egg cracks bitmap
-    crackfilename = sprintf("Graphics/Pokemon/Eggs/%s_cracks", @pokemon.species)
+    crackfilename = sprintf("Graphics/Battlers/Eggs/%s_cracks", @pokemon.species)
-    crackfilename = sprintf("Graphics/Pokemon/Eggs/000_cracks") if !pbResolveBitmap(crackfilename)
+    crackfilename = sprintf("Graphics/Battlers/Eggs/000_cracks") if !pbResolveBitmap(crackfilename)
     crackfilename=pbResolveBitmap(crackfilename)
     @hatchSheet=AnimatedBitmap.new(crackfilename)
     # Create egg cracks sprite

Data/Scripts/016_UI/006_UI_Summary.rb

@@ -913,6 +913,14 @@ class PokemonSummary_Scene
   def pbChangePokemon
     @pokemon = @party[@partyindex]
     @sprites["pokemon"].setPokemonBitmap(@pokemon)
+    if @pokemon.egg?
+      @sprites["pokemon"].zoom_x = Settings::EGGSPRITE_SCALE
+      @sprites["pokemon"].zoom_y = Settings::EGGSPRITE_SCALE
+    else
+      @sprites["pokemon"].zoom_x = Settings::FRONTSPRITE_SCALE
+      @sprites["pokemon"].zoom_y = Settings::FRONTSPRITE_SCALE
+    end
+
     @sprites["itemicon"].item = @pokemon.item_id
     pbSEStop
     @pokemon.play_cry

Data/Scripts/050_AddOns/GeneralUtils.rb

@@ -123,6 +123,10 @@ def dexNum(species)
   return getDexNumberForSpecies(species)
 end
 
+def isTripleFusion?(num)
+  return num >= Settings::ZAPMOLCUNO_NB
+end
+
 def getRandomCustomFusion(returnRandomPokemonIfNoneFound = true, customPokeList = [], maxPoke = -1, recursionLimit = 3)
   if customPokeList.length == 0
     customPokeList = getCustomSpeciesList()

Data/Scripts/050_AddOns/QuestLogScript.rb

@@ -121,7 +121,6 @@ QUESTS = [
  #Cinnabar Island
  Quest.new(29, "Powder metallurgy", "The scientist at the hotel wants you to find some Metal Powder.", questBranchHotels, "BW (82)","Cinnabar Island", defaultQuestColor), 
  Quest.new(30, "Diamonds and Pearls", "Find a Diamond Necklace to save the man's marriage.", questBranchHotels, "BW (71)","Cinnabar Island", defaultQuestColor), 
- Quest.new(42, "Stolen artifact", "Recover a stolen vase from a burglar in the Pokémon Mansion", questBranchHotels, "BW (21)","Cinnabar Island", defaultQuestColor), 
 
  #Goldenrod City
  Quest.new(31, "Hoenn Pokémon", "A woman wants you to show her a Pokémon native to the Hoenn region.", questBranchHotels, "BW (37)","Goldenrod City", defaultQuestColor), 
@@ -143,10 +142,12 @@ QUESTS = [
  #Kin Island
  Quest.new(40, "Banana Slamma!", "Collect 30 bananas", questBranchHotels, "BW029","Kin Island", defaultQuestColor), 
  Quest.new(41, "Unova Pokémon", "A woman wants you to show her a Pokémon native to the Unova region.", questBranchHotels, "BW (37)","Kin Island", defaultQuestColor),
+ Quest.new(42, "Stolen artifact", "Recover a stolen vase from a burglar in the Pokémon Mansion", questBranchHotels, "BW (21)","Cinnabar Island", defaultQuestColor),
  Quest.new(43, "Fallen Meteor", "Investigate a crater near Bond Bridge.", questBranchHotels, "BW009","Kin Island", defaultQuestColor), 
  Quest.new(44, "First Contact", "Find the missing pieces of a fallen alien spaceship", questBranchHotels, "BW (92)","Bond Bridge", questBranchField), 
  Quest.new(45, "First Contact (Part 2)", "Ask the sailor at Cinnabar Island's harbour to take you to the uncharted island where the spaceship might be located", questBranchHotels, "BW (92)","Bond Bridge", questBranchField), 
 
+ # attention: c'est un array et non un hash... l'id est en fait l'index, donc il est important de garder l'ordre
   #out of order quests
   #42 (cinnabar)
  

PBS/items.txt

@@ -663,4 +663,5 @@
 655,TM118,TM118,TM118s,4,30000,"The target is hit with wings of steel. It may also raise the user's Defense stat.",3,0,0,STEELWING
 656,TM119,TM119,TM119s,4,30000,"The user attacks driven by frustration. Power increases if the user's previous move failed.",3,0,0,STOMPINGTANTRUM
 657,TM120,TM120,TM120s,4,30000,"The user attacks the target's throat. The target cannot use sound-based moves for two turns.",3,0,0,THROATCHOP
+658,TM00,TM00,TM00s,4,0,"A strange TM developped by Team Rocket. It appears to be related to Pokémon fusion.",3,0,0,FUSIONSWAP