 5f73c245fc
			
		
	
	5f73c245fc
	
	
	
		
			
			* Init * remove submodule * Init * Update docs * Fix tests * Update to use apcivvi * Update Readme and codeowners * Minor changes * Remove .value from options (except starting hint) * Minor updates * remove unnecessary property * Cleanup Rules and Region * Fix output file generation * Implement feedback * Remove 'AP' tag and fix issue with format strings and using same quotes * Update worlds/civ_6/__init__.py Co-authored-by: Scipio Wright <scipiowright@gmail.com> * Minor docs changes * minor updates * Small rework of create items * Minor updates * Remove unused variable * Move client to Launcher Components with rest of similar clients * Revert "Move client to Launcher Components with rest of similar clients" This reverts commit f9fd5df9fdf19eaf4f1de54e21e3c33a74f02364. * modify component * Fix generation issues * Fix tests * Minor change * Add improvement and test case * Minor options changes * . * Preliminary Review * Fix failing test due to slot data serialization * Format json * Remove exclude missable boosts * Update options (update goody hut text, make research multiplier a range) * Update docs punctuation and slot data init * Move priority/excluded locations into options * Implement docs PR feedback * PR Feedback for options * PR feedback misc * Update location classification and fix client type * Fix typings * Update research cost multiplier * Remove unnecessary location priority code * Remove extrenous use of items() * WIP PR Feedback * WIP PR Feedback * Add victory event * Add option set for death link effect * PR improvements * Update post fill hint to support items with multiple classifications * remove unnecessary len * Move location exclusion logic * Update test to use set instead of accidental dict * Update docs around progressive eras and boost locations * Update docs for options to be more readable * Fix issue with filler items and prehints * Update filler_data to be static * Update links in docs * Minor updates and PR feedback * Update boosts data * Update era required items * Update existing techs * Update existing techs * move boost data class * Update reward data * Update prereq data * Update new items and progressive districts * Remove unused code * Make filler item name func more efficient * Update death link text * Move Civ6 to the end of readme * Fix bug with hidden locations and location.name * Partial PR Feedback Implementation * Format changes * Minor review feedback * Modify access rules to use list created in generate_early * Modify boost rules to precalculate requirements * Remove option checks from access rules * Fix issue with pre initialized dicts * Add inno setup for civ6 client * Update inno_setup.iss --------- Co-authored-by: Scipio Wright <scipiowright@gmail.com> Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com> Co-authored-by: Exempt-Medic <ExemptMedic@Gmail.com> Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
		
			
				
	
	
		
			115 lines
		
	
	
		
			4.0 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			115 lines
		
	
	
		
			4.0 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| from typing import Dict
 | |
| from BaseClasses import ItemClassification
 | |
| from Fill import distribute_items_restrictive
 | |
| from ..Items import FillerItemRarity, filler_data
 | |
| from . import CivVITestBase
 | |
| 
 | |
| 
 | |
| class TestGoodyHutsIncluded(CivVITestBase):
 | |
|     auto_construct = False
 | |
|     options = {
 | |
|         "progressive_eras": "true",
 | |
|         "progressive_districts": "true",
 | |
|         "shuffle_goody_hut_rewards": "true",
 | |
|     }
 | |
| 
 | |
|     def test_goody_huts_get_included(self) -> None:
 | |
|         self.world_setup()
 | |
|         self.world.generate_early()
 | |
|         distribute_items_restrictive(self.multiworld)
 | |
|         expected_goody_huts = 10
 | |
|         found = 0
 | |
|         for location in self.multiworld.get_locations(self.player):
 | |
|             if location.name.startswith("GOODY_HUT_"):
 | |
|                 found += 1
 | |
|         self.assertEqual(found, expected_goody_huts)
 | |
| 
 | |
| 
 | |
| class TestGoodyHutsExcluded(CivVITestBase):
 | |
|     auto_construct = False
 | |
|     options = {
 | |
|         "progressive_eras": "true",
 | |
|         "progressive_districts": "true",
 | |
|         "shuffle_goody_hut_rewards": "false",
 | |
|     }
 | |
| 
 | |
|     def test_goody_huts_are_not_included(self) -> None:
 | |
|         self.world_setup()
 | |
|         self.world.generate_early()
 | |
|         distribute_items_restrictive(self.multiworld)
 | |
|         found_goody_huts = 0
 | |
|         for location in self.multiworld.get_locations(self.player):
 | |
|             if location.name.startswith("GOODY_HUT_"):
 | |
|                 found_goody_huts += 1
 | |
|         self.assertEqual(found_goody_huts, 0)
 | |
| 
 | |
| 
 | |
| class TestFillerItemsIncludedByRarity(CivVITestBase):
 | |
|     auto_construct = False
 | |
|     options = {
 | |
|         "progressive_eras": "true",
 | |
|         "progressive_districts": "true",
 | |
|         "shuffle_goody_hut_rewards": "true",
 | |
|         "boostsanity": "true"
 | |
|     }
 | |
| 
 | |
|     def test_filler_items_are_included_by_rarity(self) -> None:
 | |
|         self.world_setup()
 | |
|         self.world.generate_early()
 | |
|         distribute_items_restrictive(self.multiworld)
 | |
|         rarity_counts: Dict[FillerItemRarity, int] = {
 | |
|             FillerItemRarity.COMMON: 0,
 | |
|             FillerItemRarity.UNCOMMON: 0,
 | |
|             FillerItemRarity.RARE: 0,
 | |
|         }
 | |
|         total_filler_items = 0
 | |
|         for item in self.multiworld.itempool:
 | |
|             if item.classification == ItemClassification.filler:
 | |
|                 rarity = filler_data[item.name].rarity
 | |
|                 rarity_counts[rarity] += 1
 | |
|                 total_filler_items += 1
 | |
| 
 | |
|         expected_counts = {
 | |
|             FillerItemRarity.COMMON: 101,
 | |
|             FillerItemRarity.UNCOMMON: 27,
 | |
|             FillerItemRarity.RARE: 4,
 | |
|         }
 | |
| 
 | |
|         for rarity, expected in expected_counts.items():
 | |
|             self.assertEqual(rarity_counts[rarity], expected, f"Expected {expected} {rarity} items, found {rarity_counts[rarity]}")
 | |
| 
 | |
| 
 | |
| class TestFillerItemsIncludedByRarityWithoutBoostsanity(CivVITestBase):
 | |
|     auto_construct = False
 | |
|     options = {
 | |
|         "progressive_eras": "true",
 | |
|         "progressive_districts": "true",
 | |
|         "shuffle_goody_hut_rewards": "true",
 | |
|         "boostsanity": "false"
 | |
|     }
 | |
| 
 | |
|     def test_filler_items_are_included_by_rarity_without_boostsanity(self) -> None:
 | |
|         self.world_setup()
 | |
|         self.world.generate_early()
 | |
|         distribute_items_restrictive(self.multiworld)
 | |
|         rarity_counts: Dict[FillerItemRarity, int] = {
 | |
|             FillerItemRarity.COMMON: 0,
 | |
|             FillerItemRarity.UNCOMMON: 0,
 | |
|             FillerItemRarity.RARE: 0,
 | |
|         }
 | |
|         total_filler_items = 0
 | |
|         for item in self.multiworld.itempool:
 | |
|             if item.classification == ItemClassification.filler:
 | |
|                 rarity = filler_data[item.name].rarity
 | |
|                 rarity_counts[rarity] += 1
 | |
|                 total_filler_items += 1
 | |
| 
 | |
|         expected_counts = {
 | |
|             FillerItemRarity.COMMON: 7,
 | |
|             FillerItemRarity.UNCOMMON: 2,
 | |
|             FillerItemRarity.RARE: 1,
 | |
|         }
 | |
| 
 | |
|         for rarity, expected in expected_counts.items():
 | |
|             self.assertEqual(rarity_counts[rarity], expected, f"Expected {expected} {rarity} items, found {rarity_counts[rarity]}")
 |