Kurayami updated the mod

kurayamiblackheart · Jun 27, 2023 · ee9f721 · ee9f721
1 parent ae3bf83
commit ee9f721
Show file tree

Hide file tree

Showing 58 changed files with 61 additions and 15 deletions.
diff --git a/Data/Scripts/001_Technical/001_MKXP_Compatibility.rb b/Data/Scripts/001_Technical/001_MKXP_Compatibility.rb
@@ -7,24 +7,27 @@
   "130a","150a","150b","150d","150g","150i","150l","150o","15b","17d","1a","212b","212d","215g","284d",
   "284f","287g","287p","300c","310c","310d","336c","354g","357c","415z","94j","94l","92a","93c","94d","133g","138b","368j","370a",
   "411a","408b","402a","402b","140d","220a","146d","171c","172c","218a","227e","288f","324b","331b","350b","354j","360b","360c","360d","384c","392k","413a",
-  "417c","417d","418b"
+  "417c","417d","418b","194b"
 ]
 $KURAY_COMMONLIST = [
   "390c","132e"
 ] # 30%
 $KURAY_RARELIST = [
-  "390b","68c","115d","132c"
+  "390b","68c","115d","132c","201_kuc","201_kub"
 ] # 6%
 $KURAY_VERYRARELIST = [
   "390a","50a","52i","94g","100a","100c","101b","102a","102d","104c","102a","132a","133d","135b","143e","155b","155f","157g","158a","165b","175d","202a","265e","287d","294b",
   "296d","296f","301c","307a","314h","319d","321c","321d","338i","339g","339f","339b","352b","352m","358a","361a","369c","414c","415b"
 ] # 2% ~Jokes and Alt
 $KURAY_LEGENDLIST = [
   "37a","38l","51a","52j","53g","53h","59b","72a","73a","76a","77a","77c","78a","78g","79f","80c","100d","100f","101d","103a","144b","145a","145b","146b","146g","155e","157a",
-  "157c","195a","217a","245a","315f","336a","336h","338f","348a","399b","399c","411c"
+  "157c","195a","217a","245a","315f","336a","336h","338f","348a","399b","399c","411c",
+  "201_shinya","201_shinyaa","201_shinyab","201_shinyac","201_shinyad","201_shinyae","201_shinyaf","201_shinyag","201_shinyah","201_shinyai","201_shinyaj","201_shinyb","201_shinyba",
+  "201_shinybb","201_shinybc","201_shinybd","201_shinybe","201_shinybf","201_shinybg","201_shinybh","201_shinybj","201_shinyc","201_shinyd","201_shinye","201_shinyf","201_shinyi"
 ] # 0.5% ~Regional
 $KURAY_MYTHICLIST = [
-  "249c","249k","249l","290b","315e","381e"
+  "249c","249k","249l","290b","315e","381e",
+  "201_shinyg","201_shinyh"
 ] # 0.1% ~Shadow Lugia etc
 
 #Potential fusions mistakes:
@@ -98,6 +101,31 @@ def kurayPlayerBlackList(dex_number, filename)
   end
 end
 
+def isKurayDefaultSprite(dex_number, filename)
+  return false if dex_number == nil
+  return false if filename == nil
+  if dex_number <= Settings::NB_POKEMON
+    #Check for non fusions
+    filefile = File.basename(filename)
+    dexname = filefile.split('.png')[0]
+    return true if dexname.to_s == dex_number.to_s
+    return false
+  else
+    if dex_number >= Settings::ZAPMOLCUNO_NB
+      return false
+    else
+      # Check for double fusion
+      body_id = getBodyID(dex_number)
+      head_id = getHeadID(dex_number, body_id)
+      filefile = File.basename(filename)
+      dexname = filefile.split('.png')[0]
+      return true if dexname.to_s == head_id.to_s + "." + body_id.to_s
+      return false
+    end
+  end
+  return nil
+end
+
 def kurayRNGSprite(dex_number, usedefault=0)
   $DEFAULTSPRITES = {} if !$DEFAULTSPRITES
   if usedefault != 0 && $DEFAULTSPRITES.has_key?(dex_number.to_s)

diff --git a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb
@@ -1941,9 +1941,13 @@ def pbRerollSprite(selected, heldpoke)
             pokemon.kuraycustomfile = newfile
             pbHardRefresh
             pbDisplay(_INTL("Oh! Its sprite changed!"))
+            #Best option to refresh sprites so far \/
+            break
           else
             pbDisplay(_INTL("Maybe it can't do that..."))
             $Trainer.money += 5000
+            #Best option to refresh sprites so far \/
+            break
           end
         when 1
           break
@@ -1974,14 +1978,24 @@ def pbDefaultSprite(selected, heldpoke)
         else
           pokemon = @storage.boxes[selected[0]][selected[1]]
         end
-        newfile = kurayGetCustomSprite(pokemon.dexNum, 1)
-        if newfile != pokemon.kuraycustomfile? && newfile != nil
-          pokemon.kuraycustomfile = newfile
-          pbHardRefresh
-          pbDisplay(_INTL("Its sprite went back to default!"))
+        if pokemon.kuraycustomfile == nil
+          pbPlayBuzzerSE
+          pbDisplay(_INTL("No Custom Sprite!"))
         else
-          pbDisplay(_INTL("Maybe it can't do that..."))
-          $Trainer.money += 500
+          if isKurayDefaultSprite(pokemon.dexNum, pokemon.kuraycustomfile)
+            pbDisplay(_INTL("Already on default!"))
+            $Trainer.money += 500
+          else
+            newfile = kurayGetCustomSprite(pokemon.dexNum, 1)
+            if newfile != pokemon.kuraycustomfile? && newfile != nil
+              pokemon.kuraycustomfile = newfile
+              pbHardRefresh
+              pbDisplay(_INTL("Its sprite went back to default!"))
+            else
+              pbDisplay(_INTL("Maybe it can't do that..."))
+              $Trainer.money += 500
+            end
+          end
         end
       end
     end
@@ -2009,9 +2023,13 @@ def pbBlackList(selected, heldpoke)
       case kuraychoice
       when 0
         if pbConfirmMessageSerious(_INTL("Are you sure?"))
-          pokemon.kuraycustomfile = kurayPlayerBlackList(pokemon.dexNum, pokemon.kuraycustomfile)
-          pbHardRefresh
-          pbDisplay(_INTL("Sprite blacklisted!"))
+          if isKurayDefaultSprite(pokemon.dexNum, pokemon.kuraycustomfile)
+            pbDisplay(_INTL("Cannot blacklist default!"))
+          else
+            pokemon.kuraycustomfile = kurayPlayerBlackList(pokemon.dexNum, pokemon.kuraycustomfile)
+            pbHardRefresh
+            pbDisplay(_INTL("Sprite blacklisted!"))
+          end
         end
       end
     end

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.61"
+KURAYVERSION = "0.6.62"
 # 1 - FR/LG
 # 2 - R/S/E
 

diff --git a/Graphics/KuraySprites/201_kua.png b/Graphics/KuraySprites/201_kua.png
diff --git a/Graphics/KuraySprites/201_kuaa.png b/Graphics/KuraySprites/201_kuaa.png
diff --git a/Graphics/KuraySprites/201_kuab.png b/Graphics/KuraySprites/201_kuab.png
diff --git a/Graphics/KuraySprites/201_kuac.png b/Graphics/KuraySprites/201_kuac.png
diff --git a/Graphics/KuraySprites/201_kuad.png b/Graphics/KuraySprites/201_kuad.png
diff --git a/Graphics/KuraySprites/201_kuae.png b/Graphics/KuraySprites/201_kuae.png
diff --git a/Graphics/KuraySprites/201_kuaf.png b/Graphics/KuraySprites/201_kuaf.png
diff --git a/Graphics/KuraySprites/201_kuag.png b/Graphics/KuraySprites/201_kuag.png
diff --git a/Graphics/KuraySprites/201_kuah.png b/Graphics/KuraySprites/201_kuah.png
diff --git a/Graphics/KuraySprites/201_kuai.png b/Graphics/KuraySprites/201_kuai.png
diff --git a/Graphics/KuraySprites/201_kuaj.png b/Graphics/KuraySprites/201_kuaj.png
diff --git a/Graphics/KuraySprites/201_kub.png b/Graphics/KuraySprites/201_kub.png
diff --git a/Graphics/KuraySprites/201_kuba.png b/Graphics/KuraySprites/201_kuba.png
diff --git a/Graphics/KuraySprites/201_kubb.png b/Graphics/KuraySprites/201_kubb.png
diff --git a/Graphics/KuraySprites/201_kubc.png b/Graphics/KuraySprites/201_kubc.png
diff --git a/Graphics/KuraySprites/201_kubd.png b/Graphics/KuraySprites/201_kubd.png
diff --git a/Graphics/KuraySprites/201_kube.png b/Graphics/KuraySprites/201_kube.png
diff --git a/Graphics/KuraySprites/201_kubf.png b/Graphics/KuraySprites/201_kubf.png
diff --git a/Graphics/KuraySprites/201_kubg.png b/Graphics/KuraySprites/201_kubg.png
diff --git a/Graphics/KuraySprites/201_kubj.png b/Graphics/KuraySprites/201_kubj.png
diff --git a/Graphics/KuraySprites/201_kuc.png b/Graphics/KuraySprites/201_kuc.png
diff --git a/Graphics/KuraySprites/201_kud.png b/Graphics/KuraySprites/201_kud.png
diff --git a/Graphics/KuraySprites/201_kue.png b/Graphics/KuraySprites/201_kue.png
diff --git a/Graphics/KuraySprites/201_kuf.png b/Graphics/KuraySprites/201_kuf.png
diff --git a/Graphics/KuraySprites/201_kug.png b/Graphics/KuraySprites/201_kug.png
diff --git a/Graphics/KuraySprites/201_kuh.png b/Graphics/KuraySprites/201_kuh.png
diff --git a/Graphics/KuraySprites/201_kui.png b/Graphics/KuraySprites/201_kui.png
diff --git a/Graphics/KuraySprites/201_shinya.png b/Graphics/KuraySprites/201_shinya.png
diff --git a/Graphics/KuraySprites/201_shinyaa.png b/Graphics/KuraySprites/201_shinyaa.png
diff --git a/Graphics/KuraySprites/201_shinyab.png b/Graphics/KuraySprites/201_shinyab.png
diff --git a/Graphics/KuraySprites/201_shinyac.png b/Graphics/KuraySprites/201_shinyac.png
diff --git a/Graphics/KuraySprites/201_shinyad.png b/Graphics/KuraySprites/201_shinyad.png
diff --git a/Graphics/KuraySprites/201_shinyae.png b/Graphics/KuraySprites/201_shinyae.png
diff --git a/Graphics/KuraySprites/201_shinyaf.png b/Graphics/KuraySprites/201_shinyaf.png
diff --git a/Graphics/KuraySprites/201_shinyag.png b/Graphics/KuraySprites/201_shinyag.png
diff --git a/Graphics/KuraySprites/201_shinyah.png b/Graphics/KuraySprites/201_shinyah.png
diff --git a/Graphics/KuraySprites/201_shinyai.png b/Graphics/KuraySprites/201_shinyai.png
diff --git a/Graphics/KuraySprites/201_shinyaj.png b/Graphics/KuraySprites/201_shinyaj.png
diff --git a/Graphics/KuraySprites/201_shinyb.png b/Graphics/KuraySprites/201_shinyb.png
diff --git a/Graphics/KuraySprites/201_shinyba.png b/Graphics/KuraySprites/201_shinyba.png
diff --git a/Graphics/KuraySprites/201_shinybb.png b/Graphics/KuraySprites/201_shinybb.png
diff --git a/Graphics/KuraySprites/201_shinybc.png b/Graphics/KuraySprites/201_shinybc.png
diff --git a/Graphics/KuraySprites/201_shinybd.png b/Graphics/KuraySprites/201_shinybd.png
diff --git a/Graphics/KuraySprites/201_shinybe.png b/Graphics/KuraySprites/201_shinybe.png
diff --git a/Graphics/KuraySprites/201_shinybf.png b/Graphics/KuraySprites/201_shinybf.png
diff --git a/Graphics/KuraySprites/201_shinybg.png b/Graphics/KuraySprites/201_shinybg.png
diff --git a/Graphics/KuraySprites/201_shinybh.png b/Graphics/KuraySprites/201_shinybh.png
diff --git a/Graphics/KuraySprites/201_shinybj.png b/Graphics/KuraySprites/201_shinybj.png
diff --git a/Graphics/KuraySprites/201_shinyc.png b/Graphics/KuraySprites/201_shinyc.png
diff --git a/Graphics/KuraySprites/201_shinyd.png b/Graphics/KuraySprites/201_shinyd.png
diff --git a/Graphics/KuraySprites/201_shinye.png b/Graphics/KuraySprites/201_shinye.png
diff --git a/Graphics/KuraySprites/201_shinyf.png b/Graphics/KuraySprites/201_shinyf.png
diff --git a/Graphics/KuraySprites/201_shinyg.png b/Graphics/KuraySprites/201_shinyg.png
diff --git a/Graphics/KuraySprites/201_shinyh.png b/Graphics/KuraySprites/201_shinyh.png
diff --git a/Graphics/KuraySprites/201_shinyi.png b/Graphics/KuraySprites/201_shinyi.png