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

updates to version 6.1

Browse Source
This commit is contained in:
infinitefusion
2024-03-28 17:14:35 -04:00
parent e952a6f574
commit 1635409e6d
1151 changed files with 509422 additions and 5972 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Data/Scripts/025-Randomizer/RandomizerSettings.rb
View File

@@ -358,37 +358,38 @@ class RandomizerItemOptionsScene < PokemonOption_Scene
def pbGetOptions(inloadscreen = false)
options = [
EnumOption.new(_INTL("Type"), [_INTL("Mapped"), _INTL("Dynamic")],
proc {
if $game_switches[SWITCH_RANDOM_ITEMS_DYNAMIC]
1
else
0
end
},
proc { |value|
if value == 0
$game_switches[SWITCH_RANDOM_ITEMS_MAPPED] = true
$game_switches[SWITCH_RANDOM_ITEMS_DYNAMIC] = false
else
value == 1
$game_switches[SWITCH_RANDOM_ITEMS_MAPPED] = false
$game_switches[SWITCH_RANDOM_ITEMS_DYNAMIC] = true
end
},
[
"Random items are decided at the start of the game",
"Random items are decided as you obtain them"],
# EnumOption.new(_INTL("Type"), [_INTL("Mapped"), _INTL("Dynamic")],
# proc {
# if $game_switches[SWITCH_RANDOM_ITEMS_DYNAMIC]
# 1
# else
# 0
# end
# },
# proc { |value|
# if value == 0
# $game_switches[SWITCH_RANDOM_ITEMS_MAPPED] = true
# $game_switches[SWITCH_RANDOM_ITEMS_DYNAMIC] = false
# else
# value == 1
# $game_switches[SWITCH_RANDOM_ITEMS_MAPPED] = false
# $game_switches[SWITCH_RANDOM_ITEMS_DYNAMIC] = true
# end
# },
# [
# "Random items are decided at the start of the game",
# "Random items are decided as you obtain them"],
# proc { $game_switches[SWITCH_RANDOM_ITEMS_FULL] ? 0 : 1 },
# proc { |value|
# $game_switches[SWITCH_RANDOM_ITEMS_MAPPED] = value == 0
# $game_switches[SWITCH_RANDOM_ITEMS_FULL] = value == 1
# }, ["Random items are decided at the start of the game", "Random items are decided as you obtain them"]
),
#),
EnumOption.new(_INTL("Found items"), [_INTL("On"), _INTL("Off")],
proc { $game_switches[SWITCH_RANDOM_FOUND_ITEMS] ? 0 : 1 },
proc { |value|
$game_switches[SWITCH_RANDOM_FOUND_ITEMS] = value == 0
$game_switches[SWITCH_RANDOM_ITEMS_MAPPED] = value == 0
$game_switches[SWITCH_RANDOM_ITEMS] = $game_switches[SWITCH_RANDOM_FOUND_ITEMS] || $game_switches[SWITCH_RANDOM_GIVEN_ITEMS]
}, "Randomize the items picked up on the ground"
),

59
Data/Scripts/025-Randomizer/RandomizerUtils.rb
View File

@@ -31,9 +31,9 @@ def getRandomGivenTM(item)
newItem = $PokemonGlobal.randomTMsHash[item.id]
return GameData::Item.get(newItem) if newItem != nil
end
if $game_switches[SWITCH_RANDOM_ITEMS_DYNAMIC]
return pbGetRandomTM
end
# if $game_switches[SWITCH_RANDOM_ITEMS_DYNAMIC]
# return pbGetRandomTM
# end
return item
end
@@ -57,30 +57,31 @@ def getMappedRandomItem(item)
end
def getDynamicRandomItem(item)
#keyItem ou HM -> on randomize pas
return item if item.is_key_item?
return item if item.is_HM?
return item if NON_RANDOMIZE_ITEMS.include?(item.id)
#TM
if (item.is_TM?)
return $game_switches[SWITCH_RANDOM_TMS] ? pbGetRandomTM() : item
end
#item normal
return item if !$game_switches[SWITCH_RANDOM_ITEMS_DYNAMIC] || !$game_switches[SWITCH_RANDOM_ITEMS]
#berries
return pbGetRandomBerry() if item.is_berry?
items_list = GameData::Item.list_all
newItem_id = items_list.keys.sample
newItem = GameData::Item.get(newItem_id)
while (newItem.is_machine? || newItem.is_key_item? || INVALID_ITEMS.include?(newItem))
newItem_id = items_list.keys.sample
newItem = GameData::Item.get(newItem_id)
end
return newItem
return item
# #keyItem ou HM -> on randomize pas
# return item if item.is_key_item?
# return item if item.is_HM?
# return item if NON_RANDOMIZE_ITEMS.include?(item.id)
#
# #TM
# if (item.is_TM?)
# return $game_switches[SWITCH_RANDOM_TMS] ? pbGetRandomTM() : item
# end
# #item normal
# return item if !$game_switches[SWITCH_RANDOM_ITEMS_DYNAMIC] || !$game_switches[SWITCH_RANDOM_ITEMS]
#
#
# #berries
# return pbGetRandomBerry() if item.is_berry?
#
# items_list = GameData::Item.list_all
# newItem_id = items_list.keys.sample
# newItem = GameData::Item.get(newItem_id)
# while (newItem.is_machine? || newItem.is_key_item? || INVALID_ITEMS.include?(newItem))
# newItem_id = items_list.keys.sample
# newItem = GameData::Item.get(newItem_id)
# end
# return newItem
end
def pbGetRandomItem(item_id)
@@ -89,8 +90,8 @@ def pbGetRandomItem(item_id)
return item if !($game_switches[SWITCH_RANDOM_ITEMS] || $game_switches[SWITCH_RANDOM_TMS])
if $game_switches[SWITCH_RANDOM_ITEMS_MAPPED]
return getMappedRandomItem(item)
elsif $game_switches[SWITCH_RANDOM_ITEMS_DYNAMIC]
return getDynamicRandomItem(item)
# elsif $game_switches[SWITCH_RANDOM_ITEMS_DYNAMIC]
# return getDynamicRandomItem(item)
end
return item
end

2
Data/Scripts/025-Randomizer/randomizer gym leader edit.rb
View File

@@ -303,6 +303,8 @@ def getTrainersDataMode
mode = GameData::Trainer
if $game_switches && $game_switches[SWITCH_MODERN_MODE]
mode = GameData::TrainerModern
elsif $game_switches && $game_switches[SWITCH_EXPERT_MODE]
mode = GameData::TrainerExpert
end
return mode
end