From 60f8a0cf7b25f039a864d2c79486473af8644d51 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Tue, 27 Jun 2023 19:16:14 +0100 Subject: [PATCH] Fixed potential slight irregularities in effect chances of elemental Fang moves, tweaked how credits are gathered, --- Data/Scripts/001_Settings.rb | 8 +-- .../003_Move/003_Move_UsageCalculations.rb | 1 + .../001_Non-interactive UI/007_UI_Credits.rb | 55 +++++++++---------- Essentials Docs Wiki.URL | 14 ++--- PBS/Gen 5/moves.txt | 6 +- PBS/Gen 6/moves.txt | 6 +- PBS/Gen 7/moves.txt | 6 +- PBS/Gen 8/moves.txt | 6 +- PBS/moves.txt | 6 +- 9 files changed, 51 insertions(+), 57 deletions(-) diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb index ab55fbca7..88d114c8f 100644 --- a/Data/Scripts/001_Settings.rb +++ b/Data/Scripts/001_Settings.rb @@ -439,10 +439,10 @@ module Settings "Maruno", "", _INTL("Also involved were:"), - "AnonEcksam Pell", - "Jane DoeNameless", - "Sue DonnimUnknown", - "Untitled", + "A. Lee UssAnne O'Nymus", + "Ecksam PellJane Doe", + "Joe DanNick Nayme", + "Sue Donnim", "", _INTL("Special thanks to:"), "Pizza" diff --git a/Data/Scripts/011_Battle/003_Move/003_Move_UsageCalculations.rb b/Data/Scripts/011_Battle/003_Move/003_Move_UsageCalculations.rb index 5ada40660..342abdfb6 100644 --- a/Data/Scripts/011_Battle/003_Move/003_Move_UsageCalculations.rb +++ b/Data/Scripts/011_Battle/003_Move/003_Move_UsageCalculations.rb @@ -489,6 +489,7 @@ class Battle::Move def pbAdditionalEffectChance(user, target, effectChance = 0) return 0 if target.hasActiveAbility?(:SHIELDDUST) && !@battle.moldBreaker ret = (effectChance > 0) ? effectChance : @addlEffect + return ret if ret > 100 if (Settings::MECHANICS_GENERATION >= 6 || @function_code != "EffectDependsOnEnvironment") && (user.hasActiveAbility?(:SERENEGRACE) || user.pbOwnSide.effects[PBEffects::Rainbow] > 0) ret *= 2 diff --git a/Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb b/Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb index ebbcf806c..56a889df3 100644 --- a/Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb +++ b/Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb @@ -43,69 +43,66 @@ class Scene_Credits TEXT_BASE_COLOR = Color.new(255, 255, 255, 255) TEXT_SHADOW_COLOR = Color.new(0, 0, 0, 100) - def convert_names_to_credits_text(names, with_final_new_line = true) - ret = "" + def add_names_to_credits(credits, names, with_final_new_line = true) if names.length >= 5 i = 0 loop do - ret += names[i] + "" + (names[i + 1] || "") + "\n" + credits.push(names[i] + "" + (names[i + 1] || "")) i += 2 break if i >= names.length end else - names.each { |name| ret += name + "\n" } + names.each { |name| credits.push(name) } end - ret += "\n" if with_final_new_line - return ret + credits.push("") if with_final_new_line end def get_text - ret = "" - Settings.game_credits.each { |line| ret += line + "\n" } + ret = Settings.game_credits || [] # Add plugin credits if PluginManager.plugins.length > 0 - ret += "\n\n\n" + ret.push("", "", "") PluginManager.plugins.each do |plugin| pcred = PluginManager.credits(plugin) - ret += _INTL("\"{1}\" v.{2} by:", plugin, PluginManager.version(plugin)) + "\n" - ret += convert_names_to_credits_text(pcred) + ret.push(_INTL("\"{1}\" v.{2} by:", plugin, PluginManager.version(plugin))) + add_names_to_credits(ret, pcred) end end # Add Essentials credits - ret += "\n\n\n" - ret += _INTL("\"Pokémon Essentials\" was created by:") + "\n" - ret += convert_names_to_credits_text([ + ret.push("", "", "") + ret.push(_INTL("\"Pokémon Essentials\" was created by:")) + add_names_to_credits(ret, [ "Poccil (Peter O.)", "Maruno", _INTL("Inspired by work by Flameguru") ]) - ret += _INTL("With contributions from:") + "\n" - ret += convert_names_to_credits_text([ + ret.push(_INTL("With contributions from:")) + add_names_to_credits(ret, [ "AvatarMonkeyKirby", "Boushy", "Brother1440", "FL.", "Genzai Kawakami", "Golisopod User", "help-14", "IceGod64", "Jacob O. Wobbrock", "KitsuneKouta", "Lisa Anthony", "Luka S.J.", "Marin", "MiDas Mike", "Near Fantastica", "PinkMan", "Popper", "Rataime", "Savordez", "SoundSpawn", "the__end", "Venom12", "Wachunga" ], false) - ret += _INTL("and everyone else who helped out") + "\n" - ret += "\n" - ret += _INTL("\"mkxp-z\" by:") + "\n" - ret += convert_names_to_credits_text([ + ret.push(_INTL("and everyone else who helped out")) + ret.push("") + ret.push(_INTL("\"mkxp-z\" by:")) + add_names_to_credits(ret, [ "Roza", _INTL("Based on \"mkxp\" by Ancurio et al.") ]) - ret += _INTL("\"RPG Maker XP\" by:") + "\n" - ret += convert_names_to_credits_text(["Enterbrain"]) - ret += _INTL("Pokémon is owned by:") + "\n" - ret += convert_names_to_credits_text([ + ret.push(_INTL("\"RPG Maker XP\" by:")) + add_names_to_credits(ret, ["Enterbrain"]) + ret.push(_INTL("Pokémon is owned by:")) + add_names_to_credits(ret, [ "The Pokémon Company", "Nintendo", _INTL("Affiliated with Game Freak") ]) - ret += "\n\n" - ret += _INTL("This is a non-profit fan-made game.") + "\n" - ret += _INTL("No copyright infringements intended.") + "\n" - ret += _INTL("Please support the official games!") + ret.push("", "") + ret.push(_INTL("This is a non-profit fan-made game."), + _INTL("No copyright infringements intended."), + _INTL("Please support the official games!")) return ret end @@ -123,7 +120,7 @@ class Scene_Credits #------------------------------- # Credits text Setup #------------------------------- - credit_lines = get_text.split(/\n/) + credit_lines = get_text #------------------------------- # Make background and text sprites #------------------------------- diff --git a/Essentials Docs Wiki.URL b/Essentials Docs Wiki.URL index b15528b70..21c27ec09 100644 --- a/Essentials Docs Wiki.URL +++ b/Essentials Docs Wiki.URL @@ -1,9 +1,5 @@ -[InternetShortcut] -URL=http://essentialsdocs.wikia.com/ IDList= -HotKey=0 - -[{000214A0-0000-0000-C000-000000000046}] -Prop3=19,2 -[InternetShortcut.A] -[InternetShortcut.W] -URL=http://pokemonessentials.wikia.com/wiki/Pok+AOk-mon+AF8-Essentials+AF8-Wiki +[{000214A0-0000-0000-C000-000000000046}] +Prop3=19,11 +[InternetShortcut] +URL=https://essentialsdocs.fandom.com/wiki/Essentials_Docs_Wiki +IDList= diff --git a/PBS/Gen 5/moves.txt b/PBS/Gen 5/moves.txt index 674c29114..1df2e3c5b 100644 --- a/PBS/Gen 5/moves.txt +++ b/PBS/Gen 5/moves.txt @@ -898,7 +898,7 @@ TotalPP = 15 Target = NearOther FunctionCode = ParalyzeFlinchTarget Flags = Contact,CanProtect,CanMirrorMove,Biting -EffectChance = 100 +EffectChance = 101 Description = The user bites with electrified fangs. It may also make the target flinch or leave it with paralysis. #------------------------------- [SHOCKWAVE] @@ -1722,7 +1722,7 @@ TotalPP = 15 Target = NearOther FunctionCode = BurnFlinchTarget Flags = Contact,CanProtect,CanMirrorMove,Biting -EffectChance = 100 +EffectChance = 101 Description = The user bites with flame-cloaked fangs. It may also make the target flinch or leave it burned. #------------------------------- [FLAMEWHEEL] @@ -2986,7 +2986,7 @@ TotalPP = 15 Target = NearOther FunctionCode = FreezeFlinchTarget Flags = Contact,CanProtect,CanMirrorMove,Biting -EffectChance = 100 +EffectChance = 101 Description = The user bites with cold-infused fangs. It may also make the target flinch or leave it frozen. #------------------------------- [AVALANCHE] diff --git a/PBS/Gen 6/moves.txt b/PBS/Gen 6/moves.txt index 7e16fe5a4..302ad4275 100644 --- a/PBS/Gen 6/moves.txt +++ b/PBS/Gen 6/moves.txt @@ -989,7 +989,7 @@ TotalPP = 15 Target = NearOther FunctionCode = ParalyzeFlinchTarget Flags = Contact,CanProtect,CanMirrorMove,Biting -EffectChance = 100 +EffectChance = 101 Description = The user bites with electrified fangs. It may also make the target flinch or leave it with paralysis. #------------------------------- [SHOCKWAVE] @@ -2131,7 +2131,7 @@ TotalPP = 15 Target = NearOther FunctionCode = BurnFlinchTarget Flags = Contact,CanProtect,CanMirrorMove,Biting -EffectChance = 100 +EffectChance = 101 Description = The user bites with flame-cloaked fangs. It may also make the target flinch or leave it burned. #------------------------------- [FLAMEWHEEL] @@ -3545,7 +3545,7 @@ TotalPP = 15 Target = NearOther FunctionCode = FreezeFlinchTarget Flags = Contact,CanProtect,CanMirrorMove,Biting -EffectChance = 100 +EffectChance = 101 Description = The user bites with cold-infused fangs. It may also make the target flinch or leave it frozen. #------------------------------- [AVALANCHE] diff --git a/PBS/Gen 7/moves.txt b/PBS/Gen 7/moves.txt index 6782167ab..f497d1f4a 100644 --- a/PBS/Gen 7/moves.txt +++ b/PBS/Gen 7/moves.txt @@ -1137,7 +1137,7 @@ TotalPP = 15 Target = NearOther FunctionCode = ParalyzeFlinchTarget Flags = Contact,CanProtect,CanMirrorMove,Biting -EffectChance = 100 +EffectChance = 101 Description = The user bites with electrified fangs. It may also make the target flinch or leave it with paralysis. #------------------------------- [SHOCKWAVE] @@ -2364,7 +2364,7 @@ TotalPP = 15 Target = NearOther FunctionCode = BurnFlinchTarget Flags = Contact,CanProtect,CanMirrorMove,Biting -EffectChance = 100 +EffectChance = 101 Description = The user bites with flame-cloaked fangs. It may also make the target flinch or leave it burned. #------------------------------- [FLAMEWHEEL] @@ -3935,7 +3935,7 @@ TotalPP = 15 Target = NearOther FunctionCode = FreezeFlinchTarget Flags = Contact,CanProtect,CanMirrorMove,Biting -EffectChance = 100 +EffectChance = 101 Description = The user bites with cold-infused fangs. It may also make the target flinch or leave it frozen. #------------------------------- [AVALANCHE] diff --git a/PBS/Gen 8/moves.txt b/PBS/Gen 8/moves.txt index 0bf64190e..0ee30413b 100644 --- a/PBS/Gen 8/moves.txt +++ b/PBS/Gen 8/moves.txt @@ -1367,7 +1367,7 @@ TotalPP = 15 Target = NearOther FunctionCode = ParalyzeFlinchTarget Flags = Contact,CanProtect,CanMirrorMove,Biting -EffectChance = 100 +EffectChance = 101 Description = The user bites with electrified fangs. It may also make the target flinch or leave it with paralysis. #------------------------------- [SHOCKWAVE] @@ -2738,7 +2738,7 @@ TotalPP = 15 Target = NearOther FunctionCode = BurnFlinchTarget Flags = Contact,CanProtect,CanMirrorMove,Biting -EffectChance = 100 +EffectChance = 101 Description = The user bites with flame-cloaked fangs. It may also make the target flinch or leave it burned. #------------------------------- [FLAMEWHEEL] @@ -4456,7 +4456,7 @@ TotalPP = 15 Target = NearOther FunctionCode = FreezeFlinchTarget Flags = Contact,CanProtect,CanMirrorMove,Biting -EffectChance = 100 +EffectChance = 101 Description = The user bites with cold-infused fangs. It may also make the target flinch or leave it frozen. #------------------------------- [AVALANCHE] diff --git a/PBS/moves.txt b/PBS/moves.txt index 0bf64190e..0ee30413b 100644 --- a/PBS/moves.txt +++ b/PBS/moves.txt @@ -1367,7 +1367,7 @@ TotalPP = 15 Target = NearOther FunctionCode = ParalyzeFlinchTarget Flags = Contact,CanProtect,CanMirrorMove,Biting -EffectChance = 100 +EffectChance = 101 Description = The user bites with electrified fangs. It may also make the target flinch or leave it with paralysis. #------------------------------- [SHOCKWAVE] @@ -2738,7 +2738,7 @@ TotalPP = 15 Target = NearOther FunctionCode = BurnFlinchTarget Flags = Contact,CanProtect,CanMirrorMove,Biting -EffectChance = 100 +EffectChance = 101 Description = The user bites with flame-cloaked fangs. It may also make the target flinch or leave it burned. #------------------------------- [FLAMEWHEEL] @@ -4456,7 +4456,7 @@ TotalPP = 15 Target = NearOther FunctionCode = FreezeFlinchTarget Flags = Contact,CanProtect,CanMirrorMove,Biting -EffectChance = 100 +EffectChance = 101 Description = The user bites with cold-infused fangs. It may also make the target flinch or leave it frozen. #------------------------------- [AVALANCHE]