morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 12:11:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use logic when placing non-excluded items

Browse Source
This commit is contained in:
Brad Humphrey
2022-01-31 14:23:01 -07:00
committed by Fabian Dill
parent feba54d5d2
commit 2361f8f9d3
3 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
test/general/TestFill.py
View File

@@ -3,7 +3,7 @@ import unittest
from worlds.AutoWorld import World
from Fill import FillError, balance_multiworld_progression, fill_restrictive, distribute_items_restrictive
from BaseClasses import Entrance, LocationProgressType, MultiWorld, Region, RegionType, Item, Location
from worlds.generic.Rules import CollectionRule, set_rule
from worlds.generic.Rules import CollectionRule, locality_rules, set_rule
def generate_multi_world(players: int = 1) -> MultiWorld:
@@ -370,9 +370,13 @@ class TestDistributeItemsRestrictive(unittest.TestCase):
distribute_items_restrictive(multi_world)
self.assertEqual(locations[0].item, basic_items[0])
self.assertFalse(locations[0].event)
self.assertEqual(locations[1].item, prog_items[0])
self.assertTrue(locations[1].event)
self.assertEqual(locations[2].item, prog_items[1])
self.assertTrue(locations[2].event)
self.assertEqual(locations[3].item, basic_items[1])
self.assertFalse(locations[3].event)
def test_excluded_distribute(self):
multi_world = generate_multi_world()
@@ -557,6 +561,27 @@ class TestDistributeItemsRestrictive(unittest.TestCase):
self.assertEqual(location.item, items[4])
def test_non_excluded_local_items(self):
multi_world = generate_multi_world(2)
player1 = generate_player_data(
multi_world, 1, location_count=5, basic_item_count=5)
player2 = generate_player_data(
multi_world, 2, location_count=5, basic_item_count=5)
for item in multi_world.get_items():
item.never_exclude = True
multi_world.local_items[player1.id].value = set(names(player1.basic_items))
multi_world.local_items[player2.id].value = set(names(player2.basic_items))
locality_rules(multi_world, player1.id)
locality_rules(multi_world, player2.id)
distribute_items_restrictive(multi_world)
for item in multi_world.get_items():
self.assertEqual(item.player, item.location.player)
self.assertFalse(item.location.event, False)
class TestBalanceMultiworldProgression(unittest.TestCase):
def assertRegionContains(self, region: Region, item: Item):