Kurayami updated the mod

kurayamiblackheart · Jun 24, 2023 · d1db746 · d1db746
1 parent cdfc77d
commit d1db746
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 7 deletions.
diff --git a/Data/Scripts/011_Battle/005_Battle scene/004_PokeBattle_SceneElements.rb b/Data/Scripts/011_Battle/005_Battle scene/004_PokeBattle_SceneElements.rb
@@ -259,7 +259,8 @@ def refresh
       shinyX = (@battler.opposes?(0)) ? 206 : -6   # Foe's/player's
       #KurayX
       # pokeRadarShiny= [email protected]? && [email protected]?
-      addShinyStarsToGraphicsArray(imagePos,@spriteBaseX+shinyX,35, @battler.pokemon.bodyShiny?,@battler.pokemon.headShiny?,@battler.pokemon.debugShiny?,nil,nil,nil,nil,false,false)
+      #KurayX new ShinyStars
+      addShinyStarsToGraphicsArray(imagePos,@spriteBaseX+shinyX,35, @battler.pokemon.bodyShiny?,@battler.pokemon.headShiny?,@battler.pokemon.debugShiny?,nil,nil,nil,nil,false,false,[@battler.pokemon.shinyR?,@battler.pokemon.shinyG?,@battler.pokemon.shinyB?])
     end
     # Draw Mega Evolution/Primal Reversion icon
     if @battler.mega?

diff --git a/Data/Scripts/016_UI/005_UI_Party.rb b/Data/Scripts/016_UI/005_UI_Party.rb
@@ -451,7 +451,8 @@ def refresh
         # Draw shiny icon
         if @pokemon.shiny?
           # imagePos=[]
-          addShinyStarsToGraphicsArray(imagePos,80,48,@pokemon.bodyShiny?,@pokemon.headShiny?,@pokemon.debugShiny?,0,0,16,16,false,false)
+          #KurayX new ShinyStars
+          addShinyStarsToGraphicsArray(imagePos,80,48,@pokemon.bodyShiny?,@pokemon.headShiny?,@pokemon.debugShiny?,0,0,16,16,false,false,[@pokemon.shinyR?,@pokemon.shinyG?,@pokemon.shinyB?])
           # pbDrawImagePositions(@overlaysprite.bitmap,imagePos)
         end
         if imagePos

diff --git a/Data/Scripts/016_UI/006_UI_Summary.rb b/Data/Scripts/016_UI/006_UI_Summary.rb
@@ -340,7 +340,8 @@ def drawPage(page)
     end
     # Show shininess star
     if @pokemon.shiny?
-      addShinyStarsToGraphicsArray(imagepos,2,134,@pokemon.bodyShiny?,@pokemon.headShiny?,@pokemon.debugShiny?,nil,nil,nil,nil,true,false)
+      #KurayX new ShinyStars
+      addShinyStarsToGraphicsArray(imagepos,2,134,@pokemon.bodyShiny?,@pokemon.headShiny?,@pokemon.debugShiny?,nil,nil,nil,nil,true,false,[@pokemon.shinyR?,@pokemon.shinyG?,@pokemon.shinyB?])
       #imagepos.push([sprintf("Graphics/Pictures/shiny"), 2, 134])
     end
     # Draw all images

diff --git a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
@@ -2408,7 +2408,8 @@ def pbUpdateOverlay(selection, party = nil)
         textstrings.push([_INTL("No item"), 86, 336, 2, nonbase, nonshadow])
       end
       if pokemon.shiny?
-        addShinyStarsToGraphicsArray(imagepos,156,198,pokemon.bodyShiny?,pokemon.headShiny?,pokemon.debugShiny?,nil,nil,nil,nil,false,true)
+        #KurayX new ShinyStars
+        addShinyStarsToGraphicsArray(imagepos,156,198,pokemon.bodyShiny?,pokemon.headShiny?,pokemon.debugShiny?,nil,nil,nil,nil,false,true,[pokemon.shinyR?,pokemon.shinyG?,pokemon.shinyB?])
         #imagepos.push(["Graphics/Pictures/shiny", 156, 198])
       end
       typebitmap = AnimatedBitmap.new(_INTL("Graphics/Pictures/types"))

diff --git a/Data/Scripts/050_AddOns/GeneralUtils.rb b/Data/Scripts/050_AddOns/GeneralUtils.rb
@@ -166,10 +166,24 @@ def getRandomCustomFusionForIntro(returnRandomPokemonIfNoneFound = true, customP
   return randPoke
 end
 
+#KurayX new ShinyStars
 def addShinyStarsToGraphicsArray(imageArray, xPos, yPos, shinyBody, shinyHead, debugShiny, srcx=nil, srcy=nil, width=nil, height=nil,
-                                 showSecondStarUnder=false, showSecondStarAbove=false)
+                                 showSecondStarUnder=false, showSecondStarAbove=false, kuraxRGB=[0,0,0])
   # color = debugShiny ? Color.new(0,0,0,255) : nil
-  color = nil
+  # if debugShiny
+  #   color = Color.new(0,0,0,255)
+  if [9,10,11].include?(kuraxRGB[0]) || [9,10,11].include?(kuraxRGB[1]) || [9,10,11].include?(kuraxRGB[2])
+    color = Color.new(0,255,255,255)
+    #Inverted Magenta/Cyan/Yellow
+  elsif [3,4,5].include?(kuraxRGB[0]) || [3,4,5].include?(kuraxRGB[1]) || [3,4,5].include?(kuraxRGB[2])
+    color = Color.new(255,255,0,255)
+    #Magenta/Cyan/Yellow
+  elsif [6,7,8].include?(kuraxRGB[0]) || [6,7,8].include?(kuraxRGB[1]) || [6,7,8].include?(kuraxRGB[2])
+    color = Color.new(0,0,0,255)
+    #Inverted Red/Blue/Green
+  else
+    color = nil
+  end
   imageloc = "Graphics/Pictures/shiny"
   imageArray.push([imageloc,xPos,yPos,srcx,srcy,width,height,color])
   if shinyBody && shinyHead

diff --git a/Data/Scripts/050_AddOns/IntroScreen.rb b/Data/Scripts/050_AddOns/IntroScreen.rb
@@ -8,7 +8,7 @@
 ###SCRIPTEDIT1
 # Config value for selecting title screen style
 SCREENSTYLE = 1
-KURAYVERSION = "0.6.27"
+KURAYVERSION = "0.6.28"
 # 1 - FR/LG
 # 2 - R/S/E