DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-07 21:24:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes HMs getting randomized when random gym types are enabled

Browse Source
This commit is contained in:
infinitefusion
2024-12-29 12:43:26 -05:00
parent de8f9603dc
commit 3415c85618
22 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Data/Scripts/001_Settings.rb
View File

@@ -481,7 +481,8 @@ module Settings
[561, 50, :FLETCHINDER,32,45], #Mt. Ember
[562, 50, :NINJASK,45,50], #Boon Island
[603, 50, :KECLEON,45,50], #Chrono Island
[654, 50, :WHIMSICOTT,32,45] #Brine Road
[654, 50, :WHIMSICOTT,32,45], #Brine Road
[654, 50, :SCRAGGY,32,45] #Kindle Road
]
#=============================================================================

6
Data/Scripts/012_Overworld/001_Overworld.rb
View File

@@ -887,9 +887,9 @@ def pbReceiveItem(item, quantity = 1, item_name = "", music = nil, canRandom = t
if item == :LEFTOVERS
pbMessage(_INTL("\\me[{1}]You obtained some \\c[1]{2}\\c[0]!\\wtnp[30]", meName, itemname))
elsif item.is_machine? # TM or HM
if $game_switches[SWITCH_RANDOMIZE_GYMS_SEPARATELY] && $game_switches[SWITCH_RANDOMIZED_GYM_TYPES] && $game_variables[VAR_CURRENT_GYM_TYPE] > -1
item = GameData::Item.get(randomizeGymTM(item))
end
# if $game_switches[SWITCH_RANDOMIZE_GYMS_SEPARATELY] && $game_switches[SWITCH_RANDOMIZED_GYM_TYPES] && $game_variables[VAR_CURRENT_GYM_TYPE] > -1
# item = GameData::Item.get(randomizeGymTM(item))
# end
pbMessage(_INTL("\\me[{1}]You obtained \\c[1]{2} {3}\\c[0]!\\wtnp[30]", meName, itemname, GameData::Move.get(move).name))
elsif quantity > 1
pbMessage(_INTL("\\me[{1}]You obtained {2} #{text_color}{3}\\c[0]!\\wtnp[30]", meName, quantity, itemname))

5
Data/Scripts/048_Fusion/FusedSpecies.rb
View File

@@ -317,8 +317,9 @@ module GameData
end
echoln body_entry
echoln head_entry
return split_and_combine_text(body_entry, head_entry, ".")
combined_entry = split_and_combine_text(body_entry, head_entry, ".")
combined_entry += "." unless combined_entry.end_with?(".")
return combined_entry
end
def calculate_egg_groups