DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-08 05:34:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed potential slight irregularities in effect chances of elemental Fang moves, tweaked how credits are gathered,

Browse Source
This commit is contained in:
Maruno17
2023-06-27 19:16:14 +01:00
parent aecd9e5bb6
commit 60f8a0cf7b
9 changed files with 51 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Data/Scripts/001_Settings.rb
View File

@@ -439,10 +439,10 @@ module Settings
"Maruno", "Maruno",
"", "",
_INTL("Also involved were:"), _INTL("Also involved were:"),
"Anon<s>Ecksam Pell", "A. Lee Uss<s>Anne O'Nymus",
"Jane Doe<s>Nameless", "Ecksam Pell<s>Jane Doe",
"Sue Donnim<s>Unknown", "Joe Dan<s>Nick Nayme",
"Untitled<s>", "Sue Donnim<s>",
"", "",
_INTL("Special thanks to:"), _INTL("Special thanks to:"),
"Pizza" "Pizza"

1
Data/Scripts/011_Battle/003_Move/003_Move_UsageCalculations.rb
View File

@@ -489,6 +489,7 @@ class Battle::Move
def pbAdditionalEffectChance(user, target, effectChance = 0) def pbAdditionalEffectChance(user, target, effectChance = 0)
return 0 if target.hasActiveAbility?(:SHIELDDUST) && !@battle.moldBreaker return 0 if target.hasActiveAbility?(:SHIELDDUST) && !@battle.moldBreaker
ret = (effectChance > 0) ? effectChance : @addlEffect ret = (effectChance > 0) ? effectChance : @addlEffect
return ret if ret > 100
if (Settings::MECHANICS_GENERATION >= 6 || @function_code != "EffectDependsOnEnvironment") && if (Settings::MECHANICS_GENERATION >= 6 || @function_code != "EffectDependsOnEnvironment") &&
(user.hasActiveAbility?(:SERENEGRACE) || user.pbOwnSide.effects[PBEffects::Rainbow] > 0) (user.hasActiveAbility?(:SERENEGRACE) || user.pbOwnSide.effects[PBEffects::Rainbow] > 0)
ret *= 2 ret *= 2

55
Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb
View File

@@ -43,69 +43,66 @@ class Scene_Credits
TEXT_BASE_COLOR = Color.new(255, 255, 255, 255) TEXT_BASE_COLOR = Color.new(255, 255, 255, 255)
TEXT_SHADOW_COLOR = Color.new(0, 0, 0, 100) TEXT_SHADOW_COLOR = Color.new(0, 0, 0, 100)
def convert_names_to_credits_text(names, with_final_new_line = true) def add_names_to_credits(credits, names, with_final_new_line = true)
ret = ""
if names.length >= 5 if names.length >= 5
i = 0 i = 0
loop do loop do
ret += names[i] + "<s>" + (names[i + 1] || "") + "\n" credits.push(names[i] + "<s>" + (names[i + 1] || ""))
i += 2 i += 2
break if i >= names.length break if i >= names.length
end end
else else
names.each { |name| ret += name + "\n" } names.each { |name| credits.push(name) }
end end
ret += "\n" if with_final_new_line credits.push("") if with_final_new_line
return ret
end end
def get_text def get_text
ret = "" ret = Settings.game_credits || []
Settings.game_credits.each { |line| ret += line + "\n" }
# Add plugin credits # Add plugin credits
if PluginManager.plugins.length > 0 if PluginManager.plugins.length > 0
ret += "\n\n\n" ret.push("", "", "")
PluginManager.plugins.each do |plugin| PluginManager.plugins.each do |plugin|
pcred = PluginManager.credits(plugin) pcred = PluginManager.credits(plugin)
ret += _INTL("\"{1}\" v.{2} by:", plugin, PluginManager.version(plugin)) + "\n" ret.push(_INTL("\"{1}\" v.{2} by:", plugin, PluginManager.version(plugin)))
ret += convert_names_to_credits_text(pcred) add_names_to_credits(ret, pcred)
end end
end end
# Add Essentials credits # Add Essentials credits
ret += "\n\n\n" ret.push("", "", "")
ret += _INTL("\"Pokémon Essentials\" was created by:") + "\n" ret.push(_INTL("\"Pokémon Essentials\" was created by:"))
ret += convert_names_to_credits_text([ add_names_to_credits(ret, [
"Poccil (Peter O.)", "Poccil (Peter O.)",
"Maruno", "Maruno",
_INTL("Inspired by work by Flameguru") _INTL("Inspired by work by Flameguru")
]) ])
ret += _INTL("With contributions from:") + "\n" ret.push(_INTL("With contributions from:"))
ret += convert_names_to_credits_text([ add_names_to_credits(ret, [
"AvatarMonkeyKirby", "Boushy", "Brother1440", "FL.", "Genzai Kawakami", "AvatarMonkeyKirby", "Boushy", "Brother1440", "FL.", "Genzai Kawakami",
"Golisopod User", "help-14", "IceGod64", "Jacob O. Wobbrock", "KitsuneKouta", "Golisopod User", "help-14", "IceGod64", "Jacob O. Wobbrock", "KitsuneKouta",
"Lisa Anthony", "Luka S.J.", "Marin", "MiDas Mike", "Near Fantastica", "Lisa Anthony", "Luka S.J.", "Marin", "MiDas Mike", "Near Fantastica",
"PinkMan", "Popper", "Rataime", "Savordez", "SoundSpawn", "PinkMan", "Popper", "Rataime", "Savordez", "SoundSpawn",
"the__end", "Venom12", "Wachunga" "the__end", "Venom12", "Wachunga"
], false) ], false)
ret += _INTL("and everyone else who helped out") + "\n" ret.push(_INTL("and everyone else who helped out"))
ret += "\n" ret.push("")
ret += _INTL("\"mkxp-z\" by:") + "\n" ret.push(_INTL("\"mkxp-z\" by:"))
ret += convert_names_to_credits_text([ add_names_to_credits(ret, [
"Roza", "Roza",
_INTL("Based on \"mkxp\" by Ancurio et al.") _INTL("Based on \"mkxp\" by Ancurio et al.")
]) ])
ret += _INTL("\"RPG Maker XP\" by:") + "\n" ret.push(_INTL("\"RPG Maker XP\" by:"))
ret += convert_names_to_credits_text(["Enterbrain"]) add_names_to_credits(ret, ["Enterbrain"])
ret += _INTL("Pokémon is owned by:") + "\n" ret.push(_INTL("Pokémon is owned by:"))
ret += convert_names_to_credits_text([ add_names_to_credits(ret, [
"The Pokémon Company", "The Pokémon Company",
"Nintendo", "Nintendo",
_INTL("Affiliated with Game Freak") _INTL("Affiliated with Game Freak")
]) ])
ret += "\n\n" ret.push("", "")
ret += _INTL("This is a non-profit fan-made game.") + "\n" ret.push(_INTL("This is a non-profit fan-made game."),
ret += _INTL("No copyright infringements intended.") + "\n" _INTL("No copyright infringements intended."),
ret += _INTL("Please support the official games!") _INTL("Please support the official games!"))
return ret return ret
end end
@@ -123,7 +120,7 @@ class Scene_Credits
#------------------------------- #-------------------------------
# Credits text Setup # Credits text Setup
#------------------------------- #-------------------------------
credit_lines = get_text.split(/\n/) credit_lines = get_text
#------------------------------- #-------------------------------
# Make background and text sprites # Make background and text sprites
#------------------------------- #-------------------------------

12
Essentials Docs Wiki.URL
View File

@@ -1,9 +1,5 @@
[InternetShortcut]
URL=http://essentialsdocs.wikia.com/
IDList=
HotKey=0
[{000214A0-0000-0000-C000-000000000046}] [{000214A0-0000-0000-C000-000000000046}]
[{000214A0-0000-0000-C000-000000000046}] Prop3=19,11
Prop3=19,2 [InternetShortcut]
[InternetShortcut.A] URL=https://essentialsdocs.fandom.com/wiki/Essentials_Docs_Wiki
[InternetShortcut.W] IDList=

6
PBS/Gen 5/moves.txt
View File

@@ -898,7 +898,7 @@ TotalPP = 15
Target = NearOther Target = NearOther
FunctionCode = ParalyzeFlinchTarget FunctionCode = ParalyzeFlinchTarget
Flags = Contact,CanProtect,CanMirrorMove,Biting 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. Description = The user bites with electrified fangs. It may also make the target flinch or leave it with paralysis.
#------------------------------- #-------------------------------
[SHOCKWAVE] [SHOCKWAVE]
@@ -1722,7 +1722,7 @@ TotalPP = 15
Target = NearOther Target = NearOther
FunctionCode = BurnFlinchTarget FunctionCode = BurnFlinchTarget
Flags = Contact,CanProtect,CanMirrorMove,Biting 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. Description = The user bites with flame-cloaked fangs. It may also make the target flinch or leave it burned.
#------------------------------- #-------------------------------
[FLAMEWHEEL] [FLAMEWHEEL]
@@ -2986,7 +2986,7 @@ TotalPP = 15
Target = NearOther Target = NearOther
FunctionCode = FreezeFlinchTarget FunctionCode = FreezeFlinchTarget
Flags = Contact,CanProtect,CanMirrorMove,Biting 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. Description = The user bites with cold-infused fangs. It may also make the target flinch or leave it frozen.
#------------------------------- #-------------------------------
[AVALANCHE] [AVALANCHE]

6
PBS/Gen 6/moves.txt
View File

@@ -989,7 +989,7 @@ TotalPP = 15
Target = NearOther Target = NearOther
FunctionCode = ParalyzeFlinchTarget FunctionCode = ParalyzeFlinchTarget
Flags = Contact,CanProtect,CanMirrorMove,Biting 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. Description = The user bites with electrified fangs. It may also make the target flinch or leave it with paralysis.
#------------------------------- #-------------------------------
[SHOCKWAVE] [SHOCKWAVE]
@@ -2131,7 +2131,7 @@ TotalPP = 15
Target = NearOther Target = NearOther
FunctionCode = BurnFlinchTarget FunctionCode = BurnFlinchTarget
Flags = Contact,CanProtect,CanMirrorMove,Biting 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. Description = The user bites with flame-cloaked fangs. It may also make the target flinch or leave it burned.
#------------------------------- #-------------------------------
[FLAMEWHEEL] [FLAMEWHEEL]
@@ -3545,7 +3545,7 @@ TotalPP = 15
Target = NearOther Target = NearOther
FunctionCode = FreezeFlinchTarget FunctionCode = FreezeFlinchTarget
Flags = Contact,CanProtect,CanMirrorMove,Biting 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. Description = The user bites with cold-infused fangs. It may also make the target flinch or leave it frozen.
#------------------------------- #-------------------------------
[AVALANCHE] [AVALANCHE]

6
PBS/Gen 7/moves.txt
View File

@@ -1137,7 +1137,7 @@ TotalPP = 15
Target = NearOther Target = NearOther
FunctionCode = ParalyzeFlinchTarget FunctionCode = ParalyzeFlinchTarget
Flags = Contact,CanProtect,CanMirrorMove,Biting 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. Description = The user bites with electrified fangs. It may also make the target flinch or leave it with paralysis.
#------------------------------- #-------------------------------
[SHOCKWAVE] [SHOCKWAVE]
@@ -2364,7 +2364,7 @@ TotalPP = 15
Target = NearOther Target = NearOther
FunctionCode = BurnFlinchTarget FunctionCode = BurnFlinchTarget
Flags = Contact,CanProtect,CanMirrorMove,Biting 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. Description = The user bites with flame-cloaked fangs. It may also make the target flinch or leave it burned.
#------------------------------- #-------------------------------
[FLAMEWHEEL] [FLAMEWHEEL]
@@ -3935,7 +3935,7 @@ TotalPP = 15
Target = NearOther Target = NearOther
FunctionCode = FreezeFlinchTarget FunctionCode = FreezeFlinchTarget
Flags = Contact,CanProtect,CanMirrorMove,Biting 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. Description = The user bites with cold-infused fangs. It may also make the target flinch or leave it frozen.
#------------------------------- #-------------------------------
[AVALANCHE] [AVALANCHE]

6
PBS/Gen 8/moves.txt
View File

@@ -1367,7 +1367,7 @@ TotalPP = 15
Target = NearOther Target = NearOther
FunctionCode = ParalyzeFlinchTarget FunctionCode = ParalyzeFlinchTarget
Flags = Contact,CanProtect,CanMirrorMove,Biting 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. Description = The user bites with electrified fangs. It may also make the target flinch or leave it with paralysis.
#------------------------------- #-------------------------------
[SHOCKWAVE] [SHOCKWAVE]
@@ -2738,7 +2738,7 @@ TotalPP = 15
Target = NearOther Target = NearOther
FunctionCode = BurnFlinchTarget FunctionCode = BurnFlinchTarget
Flags = Contact,CanProtect,CanMirrorMove,Biting 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. Description = The user bites with flame-cloaked fangs. It may also make the target flinch or leave it burned.
#------------------------------- #-------------------------------
[FLAMEWHEEL] [FLAMEWHEEL]
@@ -4456,7 +4456,7 @@ TotalPP = 15
Target = NearOther Target = NearOther
FunctionCode = FreezeFlinchTarget FunctionCode = FreezeFlinchTarget
Flags = Contact,CanProtect,CanMirrorMove,Biting 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. Description = The user bites with cold-infused fangs. It may also make the target flinch or leave it frozen.
#------------------------------- #-------------------------------
[AVALANCHE] [AVALANCHE]

6
PBS/moves.txt
View File

@@ -1367,7 +1367,7 @@ TotalPP = 15
Target = NearOther Target = NearOther
FunctionCode = ParalyzeFlinchTarget FunctionCode = ParalyzeFlinchTarget
Flags = Contact,CanProtect,CanMirrorMove,Biting 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. Description = The user bites with electrified fangs. It may also make the target flinch or leave it with paralysis.
#------------------------------- #-------------------------------
[SHOCKWAVE] [SHOCKWAVE]
@@ -2738,7 +2738,7 @@ TotalPP = 15
Target = NearOther Target = NearOther
FunctionCode = BurnFlinchTarget FunctionCode = BurnFlinchTarget
Flags = Contact,CanProtect,CanMirrorMove,Biting 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. Description = The user bites with flame-cloaked fangs. It may also make the target flinch or leave it burned.
#------------------------------- #-------------------------------
[FLAMEWHEEL] [FLAMEWHEEL]
@@ -4456,7 +4456,7 @@ TotalPP = 15
Target = NearOther Target = NearOther
FunctionCode = FreezeFlinchTarget FunctionCode = FreezeFlinchTarget
Flags = Contact,CanProtect,CanMirrorMove,Biting 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. Description = The user bites with cold-infused fangs. It may also make the target flinch or leave it frozen.
#------------------------------- #-------------------------------
[AVALANCHE] [AVALANCHE]