mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
Fixes HMs getting randomized when random gym types are enabled
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -481,7 +481,8 @@ module Settings
|
|||||||
[561, 50, :FLETCHINDER,32,45], #Mt. Ember
|
[561, 50, :FLETCHINDER,32,45], #Mt. Ember
|
||||||
[562, 50, :NINJASK,45,50], #Boon Island
|
[562, 50, :NINJASK,45,50], #Boon Island
|
||||||
[603, 50, :KECLEON,45,50], #Chrono 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
|
||||||
]
|
]
|
||||||
|
|
||||||
#=============================================================================
|
#=============================================================================
|
||||||
|
|||||||
@@ -887,9 +887,9 @@ def pbReceiveItem(item, quantity = 1, item_name = "", music = nil, canRandom = t
|
|||||||
if item == :LEFTOVERS
|
if item == :LEFTOVERS
|
||||||
pbMessage(_INTL("\\me[{1}]You obtained some \\c[1]{2}\\c[0]!\\wtnp[30]", meName, itemname))
|
pbMessage(_INTL("\\me[{1}]You obtained some \\c[1]{2}\\c[0]!\\wtnp[30]", meName, itemname))
|
||||||
elsif item.is_machine? # TM or HM
|
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
|
# 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))
|
# item = GameData::Item.get(randomizeGymTM(item))
|
||||||
end
|
# end
|
||||||
pbMessage(_INTL("\\me[{1}]You obtained \\c[1]{2} {3}\\c[0]!\\wtnp[30]", meName, itemname, GameData::Move.get(move).name))
|
pbMessage(_INTL("\\me[{1}]You obtained \\c[1]{2} {3}\\c[0]!\\wtnp[30]", meName, itemname, GameData::Move.get(move).name))
|
||||||
elsif quantity > 1
|
elsif quantity > 1
|
||||||
pbMessage(_INTL("\\me[{1}]You obtained {2} #{text_color}{3}\\c[0]!\\wtnp[30]", meName, quantity, itemname))
|
pbMessage(_INTL("\\me[{1}]You obtained {2} #{text_color}{3}\\c[0]!\\wtnp[30]", meName, quantity, itemname))
|
||||||
|
|||||||
@@ -317,8 +317,9 @@ module GameData
|
|||||||
end
|
end
|
||||||
echoln body_entry
|
echoln body_entry
|
||||||
echoln head_entry
|
echoln head_entry
|
||||||
|
combined_entry = split_and_combine_text(body_entry, head_entry, ".")
|
||||||
return split_and_combine_text(body_entry, head_entry, ".")
|
combined_entry += "." unless combined_entry.end_with?(".")
|
||||||
|
return combined_entry
|
||||||
end
|
end
|
||||||
|
|
||||||
def calculate_egg_groups
|
def calculate_egg_groups
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1 +1 @@
|
|||||||
1735012654
|
1735358913
|
||||||
Binary file not shown.
Reference in New Issue
Block a user