Skip to content

Fix craftsanity rules #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lepideble merged 1 commit into from
Jul 22, 2026
Merged

Fix craftsanity rules #69

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions base/world/locations/factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
from random import Random

from rule_builder.rules import CanReachLocation, Rule

from ...config import items_required_for_automation, items_required_for_research
from ...data.lookup import recipes_by
from ...data.raw import science_packs, surfaces
from ...data.utils import craftable_items_at_start
from ...data.utils import craftable_items_at_start, unlockable_recipes
from ..options import FactorioOptions
from ..rules import All, Any, HasProduction, Rule
from ..rules import All, Any, HasProduction
from .classes import FactorioCraftLocation, FactorioLocation, FactorioScienceLocation
from .pool import craftsanity_item_pool, science_location_pools

Expand Down Expand Up @@ -80,9 +82,10 @@ def get_locations(options: FactorioOptions, random: Random, location_count: int)
return [(
craftsanity_location,
Any([
All([HasProduction(ingredient, surface) for ingredient in recipe.ingredients])
CanReachLocation(f'Craft {recipe.name} output 1 on {surface.name}')
for surface in surfaces
for recipe in recipes_by(product=craftsanity_location.item_name, surface=surface)
if recipe.name in unlockable_recipes
])
) for craftsanity_location in craftsanity_locations] + [(
science_location,
Expand Down