 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>
		
			
				
	
	
		
			373 lines
		
	
	
		
			8.1 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			373 lines
		
	
	
		
			8.1 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| from typing import List
 | |
| from ..ItemData import NewItemData
 | |
| 
 | |
| 
 | |
| new_civics: List[NewItemData] = [
 | |
|     {
 | |
|         "Type": "CIVIC_AP_ANCIENT_00",
 | |
|         "Cost": 20,
 | |
|         "UITreeRow": 0,
 | |
|         "EraType": "ERA_ANCIENT",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_ANCIENT_01",
 | |
|         "Cost": 40,
 | |
|         "UITreeRow": -2,
 | |
|         "EraType": "ERA_ANCIENT",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_ANCIENT_02",
 | |
|         "Cost": 40,
 | |
|         "UITreeRow": 2,
 | |
|         "EraType": "ERA_ANCIENT",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_ANCIENT_03",
 | |
|         "Cost": 50,
 | |
|         "UITreeRow": -3,
 | |
|         "EraType": "ERA_ANCIENT",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_ANCIENT_04",
 | |
|         "Cost": 70,
 | |
|         "UITreeRow": 0,
 | |
|         "EraType": "ERA_ANCIENT",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_ANCIENT_05",
 | |
|         "Cost": 70,
 | |
|         "UITreeRow": 1,
 | |
|         "EraType": "ERA_ANCIENT",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_ANCIENT_06",
 | |
|         "Cost": 50,
 | |
|         "UITreeRow": 3,
 | |
|         "EraType": "ERA_ANCIENT",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_CLASSICAL_07",
 | |
|         "Cost": 110,
 | |
|         "UITreeRow": -2,
 | |
|         "EraType": "ERA_CLASSICAL",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_CLASSICAL_08",
 | |
|         "Cost": 110,
 | |
|         "UITreeRow": 0,
 | |
|         "EraType": "ERA_CLASSICAL",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_CLASSICAL_09",
 | |
|         "Cost": 110,
 | |
|         "UITreeRow": 2,
 | |
|         "EraType": "ERA_CLASSICAL",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_CLASSICAL_10",
 | |
|         "Cost": 120,
 | |
|         "UITreeRow": -3,
 | |
|         "EraType": "ERA_CLASSICAL",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_CLASSICAL_11",
 | |
|         "Cost": 175,
 | |
|         "UITreeRow": -1,
 | |
|         "EraType": "ERA_CLASSICAL",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_CLASSICAL_12",
 | |
|         "Cost": 175,
 | |
|         "UITreeRow": 1,
 | |
|         "EraType": "ERA_CLASSICAL",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_CLASSICAL_13",
 | |
|         "Cost": 120,
 | |
|         "UITreeRow": 3,
 | |
|         "EraType": "ERA_CLASSICAL",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_MEDIEVAL_14",
 | |
|         "Cost": 220,
 | |
|         "UITreeRow": -2,
 | |
|         "EraType": "ERA_MEDIEVAL",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_MEDIEVAL_15",
 | |
|         "Cost": 300,
 | |
|         "UITreeRow": -1,
 | |
|         "EraType": "ERA_MEDIEVAL",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_MEDIEVAL_16",
 | |
|         "Cost": 300,
 | |
|         "UITreeRow": 1,
 | |
|         "EraType": "ERA_MEDIEVAL",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_MEDIEVAL_17",
 | |
|         "Cost": 340,
 | |
|         "UITreeRow": -3,
 | |
|         "EraType": "ERA_MEDIEVAL",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_MEDIEVAL_18",
 | |
|         "Cost": 420,
 | |
|         "UITreeRow": -1,
 | |
|         "EraType": "ERA_MEDIEVAL",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_MEDIEVAL_19",
 | |
|         "Cost": 420,
 | |
|         "UITreeRow": 1,
 | |
|         "EraType": "ERA_MEDIEVAL",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_MEDIEVAL_20",
 | |
|         "Cost": 340,
 | |
|         "UITreeRow": 3,
 | |
|         "EraType": "ERA_MEDIEVAL",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_RENAISSANCE_21",
 | |
|         "Cost": 440,
 | |
|         "UITreeRow": -3,
 | |
|         "EraType": "ERA_RENAISSANCE",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_RENAISSANCE_22",
 | |
|         "Cost": 600,
 | |
|         "UITreeRow": -1,
 | |
|         "EraType": "ERA_RENAISSANCE",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_RENAISSANCE_23",
 | |
|         "Cost": 600,
 | |
|         "UITreeRow": 1,
 | |
|         "EraType": "ERA_RENAISSANCE",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_RENAISSANCE_24",
 | |
|         "Cost": 440,
 | |
|         "UITreeRow": 3,
 | |
|         "EraType": "ERA_RENAISSANCE",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_RENAISSANCE_25",
 | |
|         "Cost": 720,
 | |
|         "UITreeRow": -1,
 | |
|         "EraType": "ERA_RENAISSANCE",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_RENAISSANCE_26",
 | |
|         "Cost": 720,
 | |
|         "UITreeRow": 1,
 | |
|         "EraType": "ERA_RENAISSANCE",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_INDUSTRIAL_27",
 | |
|         "Cost": 800,
 | |
|         "UITreeRow": -3,
 | |
|         "EraType": "ERA_INDUSTRIAL",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_INDUSTRIAL_28",
 | |
|         "Cost": 1010,
 | |
|         "UITreeRow": -1,
 | |
|         "EraType": "ERA_INDUSTRIAL",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_INDUSTRIAL_29",
 | |
|         "Cost": 1010,
 | |
|         "UITreeRow": 0,
 | |
|         "EraType": "ERA_INDUSTRIAL",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_INDUSTRIAL_30",
 | |
|         "Cost": 800,
 | |
|         "UITreeRow": 2,
 | |
|         "EraType": "ERA_INDUSTRIAL",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_INDUSTRIAL_31",
 | |
|         "Cost": 1050,
 | |
|         "UITreeRow": -3,
 | |
|         "EraType": "ERA_INDUSTRIAL",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_INDUSTRIAL_32",
 | |
|         "Cost": 1210,
 | |
|         "UITreeRow": 2,
 | |
|         "EraType": "ERA_INDUSTRIAL",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_INDUSTRIAL_33",
 | |
|         "Cost": 1210,
 | |
|         "UITreeRow": -1,
 | |
|         "EraType": "ERA_INDUSTRIAL",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_MODERN_34",
 | |
|         "Cost": 1540,
 | |
|         "UITreeRow": -3,
 | |
|         "EraType": "ERA_MODERN",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_MODERN_35",
 | |
|         "Cost": 1580,
 | |
|         "UITreeRow": -2,
 | |
|         "EraType": "ERA_MODERN",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_MODERN_36",
 | |
|         "Cost": 1715,
 | |
|         "UITreeRow": -2,
 | |
|         "EraType": "ERA_MODERN",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_MODERN_37",
 | |
|         "Cost": 1540,
 | |
|         "UITreeRow": -1,
 | |
|         "EraType": "ERA_MODERN",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_MODERN_38",
 | |
|         "Cost": 1540,
 | |
|         "UITreeRow": 1,
 | |
|         "EraType": "ERA_MODERN",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_MODERN_39",
 | |
|         "Cost": 1640,
 | |
|         "UITreeRow": -1,
 | |
|         "EraType": "ERA_MODERN",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_MODERN_40",
 | |
|         "Cost": 1640,
 | |
|         "UITreeRow": 0,
 | |
|         "EraType": "ERA_MODERN",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_MODERN_41",
 | |
|         "Cost": 1640,
 | |
|         "UITreeRow": 2,
 | |
|         "EraType": "ERA_MODERN",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_MODERN_42",
 | |
|         "Cost": 1640,
 | |
|         "UITreeRow": 3,
 | |
|         "EraType": "ERA_MODERN",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_ATOMIC_43",
 | |
|         "Cost": 2185,
 | |
|         "UITreeRow": -1,
 | |
|         "EraType": "ERA_ATOMIC",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_ATOMIC_44",
 | |
|         "Cost": 2185,
 | |
|         "UITreeRow": 2,
 | |
|         "EraType": "ERA_ATOMIC",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_ATOMIC_45",
 | |
|         "Cost": 1955,
 | |
|         "UITreeRow": -3,
 | |
|         "EraType": "ERA_ATOMIC",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_ATOMIC_46",
 | |
|         "Cost": 2415,
 | |
|         "UITreeRow": -1,
 | |
|         "EraType": "ERA_ATOMIC",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_ATOMIC_47",
 | |
|         "Cost": 2415,
 | |
|         "UITreeRow": 1,
 | |
|         "EraType": "ERA_ATOMIC",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_INFORMATION_48",
 | |
|         "Cost": 2880,
 | |
|         "UITreeRow": 0,
 | |
|         "EraType": "ERA_INFORMATION",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_INFORMATION_49",
 | |
|         "Cost": 2880,
 | |
|         "UITreeRow": 2,
 | |
|         "EraType": "ERA_INFORMATION",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_FUTURE_50",
 | |
|         "Cost": 3200,
 | |
|         "UITreeRow": 3,
 | |
|         "EraType": "ERA_FUTURE",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_INFORMATION_51",
 | |
|         "Cost": 2880,
 | |
|         "UITreeRow": -2,
 | |
|         "EraType": "ERA_INFORMATION",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_INFORMATION_52",
 | |
|         "Cost": 3000,
 | |
|         "UITreeRow": 0,
 | |
|         "EraType": "ERA_INFORMATION",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_INFORMATION_53",
 | |
|         "Cost": 3000,
 | |
|         "UITreeRow": 1,
 | |
|         "EraType": "ERA_INFORMATION",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_INFORMATION_54",
 | |
|         "Cost": 3000,
 | |
|         "UITreeRow": 2,
 | |
|         "EraType": "ERA_INFORMATION",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_INFORMATION_55",
 | |
|         "Cost": 3100,
 | |
|         "UITreeRow": -1,
 | |
|         "EraType": "ERA_INFORMATION",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_FUTURE_56",
 | |
|         "Cost": 3200,
 | |
|         "UITreeRow": -2,
 | |
|         "EraType": "ERA_FUTURE",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_FUTURE_57",
 | |
|         "Cost": 3200,
 | |
|         "UITreeRow": -1,
 | |
|         "EraType": "ERA_FUTURE",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_FUTURE_58",
 | |
|         "Cost": 3200,
 | |
|         "UITreeRow": 0,
 | |
|         "EraType": "ERA_FUTURE",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_FUTURE_59",
 | |
|         "Cost": 3200,
 | |
|         "UITreeRow": 1,
 | |
|         "EraType": "ERA_FUTURE",
 | |
|     },
 | |
|     {
 | |
|         "Type": "CIVIC_AP_FUTURE_60",
 | |
|         "Cost": 3200,
 | |
|         "UITreeRow": 2,
 | |
|         "EraType": "ERA_FUTURE",
 | |
|     },
 | |
| ]
 |