 8ddb49f071
			
		
	
	8ddb49f071
	
	
	
		
			
			* MMBN3: Press program now has proper color index when received remotely * Initial commit of OSRS untangled from MMBN3 branch * Fixes some broken region connections * Removes some locations * Rearranges locations to fill in slots left by removed locations * Adds starting area rando * Moves Oak and Willow trees to resource regions * Fixes various PEP8 violations * Refactor of regions * Fixes variable capture issue with region rules * Partial completion of brutal grind logic * Finishes can_reach_skill function * Adds skill requirements to location rules, fixes regions rules * Adds documentation for OSRS * Removes match statement * Updates Data Version to test mode to prevent item name caching * Fixes starting spawn logic for east varrock * Fixes river lum crossing logic to not assume you can phase across water * Prevents equipping items when you haven't unlocked them * Changes canoe logic to not require huge levels * Skeletoning out some data I'll need for variable task system * Adds csvs and parser for logic * Adds Items parsing * Fixes the spawning logic to not default to Chunksanity when you didn't pick it * Begins adding generation rules for data-driven logic * Moves region handling and location creating to different methods * Adds logic limits to Options * Begun the location generation has * Randomly generates tasks for each skill until populated * Mopping up improper names, adding custom logic, and fixes location rolling * Drastically cleans up the location rolling loop * Modifies generation to properly use local variables and pass unit tests * Game is now generating, but rules don't seem to work * Lambda capture, my old nemesis. We meet again * Fixes issue with Corsair Cove item requirement causing logic loop * Okay one more fix, another variable capture * On second thought lets not have skull sceptre tasks. 'Tis a silly place * Removes QP from item pool (they're events not items) * Removes Stronghold floor tasks, no varbit to track them * Loads CSV with pkutil so it can be used in apworld * Fixes logic of skill tasks and adds QP requirements to long grinds * Fixes pathing in pkgutil call * Better handling for empty task categories, no longer throws errors * Fixes order for progressive tasks, removes un-checkable spider task * Fixes logic issues related to stew and the Blurite caves * Fixes issues generating causing tests to sporadically fail * Adds missing task that caused off-by-one error * Updates to new Options API * Updates generation to function properly with the Universal Tracker (Thanks Faris) * Replaces runtime CSV parsing with pre-made python files generated from CSVs * Switches to self.random and uses random.choice instead of doing it manually * Fixes to typing, variable names, iterators, and continue conditions * Replaces Name classes with Enums * Fixes parse error on region special rules * Skill requirements check now returns an accessrule instead of being one that checks options * Updates documentation and setup guide * Adjusts maximum numbers for combat and general tasks * Fixes region names so dictionary lookup works for chunksanity * Update worlds/osrs/docs/en_Old School Runescape.md Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com> * Update worlds/osrs/docs/en_Old School Runescape.md Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com> * Updates readme.md and codeowners doc * Removes erroneous East Varrock -> Al Kharid connection * Changes to canoe logic to account for woodcutting level options * Fixes embarassing typo on 'Edgeville' * Moves Logic CSVs to separate repository, addresses suggested changes on PR * Fixes logic error in east/west lumbridge regions. Fixes incorrect List typing in main * Removes task types with weight 0 from the list of rollable tasks * Missed another place that the task type had to be removed if 0 weight * Prevents adding an empty task weight if levels are too restrictive for tasks to be added * Removes giant blank space in error message * Adds player name to error for not having enough available tasks --------- Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
		
			
				
	
	
		
			55 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			55 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| """
 | |
| This file was auto generated by LogicCSVToPython.py
 | |
| """
 | |
| from ..Regions import ResourceRow
 | |
| 
 | |
| resource_rows = [
 | |
| 	ResourceRow('Mind Runes'),
 | |
| 	ResourceRow('Spinning Wheel'),
 | |
| 	ResourceRow('Sheep'),
 | |
| 	ResourceRow('Furnace'),
 | |
| 	ResourceRow('Chisel'),
 | |
| 	ResourceRow('Bronze Ores'),
 | |
| 	ResourceRow('Iron Ore'),
 | |
| 	ResourceRow('Silver Ore'),
 | |
| 	ResourceRow('Coal Ore'),
 | |
| 	ResourceRow('Gold Ore'),
 | |
| 	ResourceRow('Bronze Anvil'),
 | |
| 	ResourceRow('Anvil'),
 | |
| 	ResourceRow('Shrimp Spot'),
 | |
| 	ResourceRow('Fly Fishing Spot'),
 | |
| 	ResourceRow('Lobster Spot'),
 | |
| 	ResourceRow('Redberry Bush'),
 | |
| 	ResourceRow('Bowl'),
 | |
| 	ResourceRow('Meat'),
 | |
| 	ResourceRow('Cooking Apple'),
 | |
| 	ResourceRow('Pie Dish'),
 | |
| 	ResourceRow('Cake Tin'),
 | |
| 	ResourceRow('Wheat'),
 | |
| 	ResourceRow('Windmill'),
 | |
| 	ResourceRow('Egg'),
 | |
| 	ResourceRow('Milk'),
 | |
| 	ResourceRow('Cheese'),
 | |
| 	ResourceRow('Tomato'),
 | |
| 	ResourceRow('Oak Tree'),
 | |
| 	ResourceRow('Willow Tree'),
 | |
| 	ResourceRow('Canoe Tree'),
 | |
| 	ResourceRow('Goblin'),
 | |
| 	ResourceRow('Barbarian'),
 | |
| 	ResourceRow('Zombie'),
 | |
| 	ResourceRow('Guard'),
 | |
| 	ResourceRow('Hill Giant'),
 | |
| 	ResourceRow('Deadly Red Spider'),
 | |
| 	ResourceRow('Moss Giant'),
 | |
| 	ResourceRow('Ice Giant'),
 | |
| 	ResourceRow('Lesser Demon'),
 | |
| 	ResourceRow('Rune Essence'),
 | |
| 	ResourceRow('Crafting Moulds'),
 | |
| 	ResourceRow('Nature Runes'),
 | |
| 	ResourceRow('Law Runes'),
 | |
| 	ResourceRow('Imps'),
 | |
| 	ResourceRow('Clay Ore'),
 | |
| 	ResourceRow('Onion'),
 | |
| 	ResourceRow('Potato'),
 | |
| ]
 |