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

Merge branch 'e19-release-beta1-storyRevamp' into e19-release-beta1

Browse Source 
# Conflicts:
#	Data/CommonEvents.rxdata
#	Data/Map019.rxdata
#	Data/Map058.rxdata
#	Data/Map154.rxdata
#	Data/Map208.rxdata
#	Data/Map561.rxdata
#	Data/Map721.rxdata
#	Data/MapInfos.rxdata
#	Data/Scripts/025-Randomizer/RandomizerUtils.rb
#	Data/System.rxdata
This commit is contained in:
infinitefusion
2022-06-09 18:30:16 -04:00
parent 625c7f94d9 9a215a0947
commit ca8e35083c
25 changed files with 16 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,7 @@ HELD_ITEMS = [:AIRBALLOON, :BRIGHTPOWDER, :EVIOLITE, :FLOATSTONE, :DESTINYKNOT,
:PETAYABERRY, :APICOTBERRY, :LANSATBERRY, :STARFBERRY, :ENIGMABERRY, :MICLEBERRY, :CUSTAPBERRY,
:JABOCABERRY, :ROWAPBERRY, :FAIRYGEM]
REMOVED_ITEMS=[:COVERFOSSIL,:PLUMEFOSSIL,:DAMAGEUP,:ACCURACYUP,:ANCIENTSTONE,:ODDKEYSTONE_FULL]
ITEM_EXCEPTIONS= [:COVERFOSSIL, :PLUMEFOSSIL, :ACCURACYUP,:DAMAGEUP,:ANCIENTSTONE,:ODDKEYSTONE_FULL,:TM00 ]
def pbGetRandomItem(item_id)
return nil if item_id == nil
@@ -43,7 +43,7 @@ def pbGetRandomItem(item_id)
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? || REMOVED_ITEMS.include?(item))
while (newItem.is_machine? || newItem.is_key_item? || ITEM_EXCEPTIONS.include?(newItem))
newItem_id = items_list.keys.sample
newItem = GameData::Item.get(newItem_id)
end