diff --git a/ItemList.py b/ItemList.py index 2518ccf9..59ce0641 100644 --- a/ItemList.py +++ b/ItemList.py @@ -32,7 +32,7 @@ easyfourth5extra = ['Rupees (50)'] * 2 + ['Bombs (3)'] * 2 + ['Arrows (10)'] easyfinal25extra = ['Rupees (50)'] * 4 + ['Rupees (20)'] * 14 + ['Rupee (1)'] + ['Arrows (10)'] * 4 + ['Rupees (5)'] * 2 normalbaseitems = (['Single Arrow', 'Sanctuary Heart Container', 'Arrows (10)', 'Bombs (10)'] + - ['Rupees (300)'] * 4 + ['Boss Heart Container'] * 10 + ['Piece of Heart'] * 24) + ['Rupees (300)'] * 3 + ['Boss Heart Container'] * 10 + ['Piece of Heart'] * 24) normalfirst15extra = ['Rupees (100)', 'Rupees (300)', 'Rupees (50)'] + ['Arrows (10)'] * 6 + ['Bombs (3)'] * 6 normalsecond15extra = ['Bombs (3)'] * 10 + ['Rupees (50)'] * 2 + ['Arrows (10)'] * 2 + ['Rupee (1)'] normalthird10extra = ['Rupees (50)'] * 4 + ['Rupees (20)'] * 3 + ['Arrows (10)', 'Rupee (1)', 'Rupees (5)'] @@ -90,8 +90,8 @@ difficulties = { progressivearmor=['Progressive Armor'] * 2, basicarmor=['Blue Mail', 'Red Mail'], swordless=['Rupees (20)'] * 4, - progressivemagic=['Magic Upgrade (1/2)'], - basicmagic=['Magic Upgrade (1/2)'], + progressivemagic=['Magic Upgrade (1/2)', 'Rupees (300)'], + basicmagic=['Magic Upgrade (1/2)', 'Rupees (300)'], progressivesword=['Progressive Sword'] * 4, basicsword=['Fighter Sword', 'Master Sword', 'Tempered Sword', 'Golden Sword'], progressivebow=["Progressive Bow"] * 2, @@ -119,8 +119,8 @@ difficulties = { progressivearmor=['Progressive Armor'] * 2, basicarmor=['Progressive Armor'] * 2, # neither will count swordless=['Rupees (20)'] * 4, - progressivemagic=['Magic Upgrade (1/2)'], - basicmagic=['Magic Upgrade (1/2)'], + progressivemagic=['Magic Upgrade (1/2)', 'Rupees (300)'], + basicmagic=['Magic Upgrade (1/2)', 'Rupees (300)'], progressivesword=['Progressive Sword'] * 4, basicsword=['Fighter Sword', 'Master Sword', 'Master Sword', 'Tempered Sword'], progressivebow=["Progressive Bow"] * 2, @@ -149,8 +149,8 @@ difficulties = { progressivearmor=['Progressive Armor'] * 2, # neither will count basicarmor=['Progressive Armor'] * 2, # neither will count swordless=['Rupees (20)'] * 4, - progressivemagic=['Magic Upgrade (1/2)'], - basicmagic=['Magic Upgrade (1/2)'], + progressivemagic=['Magic Upgrade (1/2)', 'Rupees (300)'], + basicmagic=['Magic Upgrade (1/2)', 'Rupees (300)'], progressivesword=['Progressive Sword'] * 4, basicsword=['Fighter Sword', 'Fighter Sword', 'Master Sword', 'Master Sword'], progressivebow=["Progressive Bow"] * 2, diff --git a/test/items/TestDifficulty.py b/test/items/TestDifficulty.py index 75b96d7b..54e0126b 100644 --- a/test/items/TestDifficulty.py +++ b/test/items/TestDifficulty.py @@ -1,7 +1,7 @@ from ItemList import difficulties from test.TestBase import TestBase -base_items = 43 +base_items = 41 extra_counts = (15, 15, 10, 5, 25)