Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases

Data/Scripts/048_Fusion/SplitNames.rb

@@ -387,19 +387,19 @@ module GameData
     ["Ray", "quaza"],
     ["Ji", "rachi"],
     ["Deo", "xys"],
-    ["Turt", "wig"],
-    ["Gro", "otle"],
-    ["Tort", "terra"],
+    ["Tur", "wig"],
+    ["Gro", "tle"],
+    ["Tor", "terra"],
     ["Chim", "char"],
     ["Mon", "ferno"],
-    ["Infern", "nape"],
+    ["Infer", "nape"],
     ["Pip", "lup"],
     ["Prin", "plup"],
     ["Empo", "leon"],
     ["Starl", "arly"],
     ["Starav", "avia"],
     ["Starap", "raptor"],
-    ["Bid", "doof"],
+    ["Bi", "doof"],
     ["Biba", "rel"],
     ["Kri", "ketot"],
     ["Kricke", "tune"],
@@ -409,8 +409,8 @@ module GameData
     ["Bu", "dew"],
     ["Rose", "rade"],
     ["Cran", "idos"],
-    ["Ramp", "pardos"],
-    ["Shield", "don"],
+    ["Ram", "pardos"],
+    ["Shiel", "don"],
     ["Bastio", "don"],
     ["Bur", "my"],
     ["Worma", "dam"],

Data/Scripts/050_AddOns/MultiSaves.rb

@@ -333,7 +333,28 @@ class PokemonLoadScreen
     end
   end
 
+  def detectFakeDownload()
+    blacklist = ["pokemoninfinitefusion.net"]
+    current_user_directory=Dir.pwd
+    for keyword in blacklist
+      if current_user_directory.include?(keyword)
+        pbMessage("The game has detected that it has been installed from an illegitimate source which likely contains viruses.")
+        pbMessage("Please delete the game and reinstall it from the Discord or subreddit")
+        pbMessage("discord.gg/infinitefusion\nreddit.com/r/pokemoninfinitefusion")
+
+        pbMessage("Please also make sure to report the website you originally downloaded the game from to Google.")
+        return true
+      end
+    end
+    return false
+  end
+  def fakeWebsiteDisclaimer()
+    pbMessage("Reminder: This game does NOT have an official website. The ONLY official sources for the game are game's official discord or subreddit.")
+  end
+
   def pbStartLoadScreen
+    return if detectFakeDownload
+    fakeWebsiteDisclaimer()
     updateHttpSettingsFile
     updateCreditsFile
     newer_version = find_newer_available_version

Data/Scripts/050_AddOns/WonderTrade_names.rb

@@ -1,4 +1,3 @@
-
 RandTrainerNames_male = [
   "Mikaël",
   "James",
@@ -1067,5 +1066,6 @@ RandPokeNick = [
   "Term",
   "Vince",
   "Thorns",
-  "Xillo"
+  "Xillo",
+  "Froggywoggy"
 ]

Data/Scripts/999_Main/999_Main.rb

@@ -43,6 +43,8 @@ def handleReplaceExistingSprites()
   end
 end
 
+
+
 def pbCallTitle
   #return Scene_DebugIntro.new if $DEBUG
   return Scene_Intro.new