Skip to content

Commit

Permalink
Merge branch 'main' into test-groups-not-empty
Browse files Browse the repository at this point in the history
  • Loading branch information
black-sliver authored Jan 21, 2024
2 parents c9978c8 + aa72f67 commit 61cfb0f
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
2 changes: 1 addition & 1 deletion worlds/soe/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
# item helpers
_ingredients = (
'Wax', 'Water', 'Vinegar', 'Root', 'Oil', 'Mushroom', 'Mud Pepper', 'Meteorite', 'Limestone', 'Iron',
'Gunpowder', 'Grease', 'Feather', 'Ethanol', 'Dry Ice', 'Crystal', 'Clay', 'Brimstone', 'Bone', 'Atlas Amulet',
'Gunpowder', 'Grease', 'Feather', 'Ethanol', 'Dry Ice', 'Crystal', 'Clay', 'Brimstone', 'Bone', 'Atlas Medallion',
'Ash', 'Acorn'
)
_other_items = (
Expand Down
21 changes: 21 additions & 0 deletions worlds/soe/test/test_item_mapping.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
from unittest import TestCase
from .. import SoEWorld


class TestMapping(TestCase):
def test_atlas_medallion_name_group(self) -> None:
"""
Test that we used the pyevermizer name for Atlas Medallion (not Amulet) in item groups.
"""
self.assertIn("Any Atlas Medallion", SoEWorld.item_name_groups)

def test_atlas_medallion_name_items(self) -> None:
"""
Test that we used the pyevermizer name for Atlas Medallion (not Amulet) in items.
"""
found_medallion = False
for name in SoEWorld.item_name_to_id:
self.assertNotIn("Atlas Amulet", name, "Expected Atlas Medallion, not Amulet")
if "Atlas Medallion" in name:
found_medallion = True
self.assertTrue(found_medallion, "Did not find Atlas Medallion in items")

0 comments on commit 61cfb0f

Please sign in to comment.