Skip to content

Allow no Reports Reveal Items for Points hints #340

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

Open
paulblessing wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow no Reports Reveal Items for Points hints #340

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
31 changes: 18 additions & 13 deletions Module/hints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,17 @@
import json
import random
import textwrap
from itertools import permutations, chain
from typing import Optional, Any
from zipfile import ZipFile

from Class.exceptions import HintException,SettingsException
from Class.exceptions import HintException, SettingsException
from Class.itemClass import KH2Item
from Class.newLocationClass import KH2Location
from List.ItemList import Items
from List.configDict import itemType, locationType, locationCategory, HintType
from List.inventory import ability, form, magic, misc, storyunlock, summon, proof
from List.configDict import locationType, locationCategory, HintType
from List.inventory import ability
from List.location import weaponslot
from Module import version
from Module.Hints.HintOutput import HintOutput
from Module.Hints.HintUtils import (
CommonTrackerInfo,
HintUtils,
Expand All @@ -28,7 +26,6 @@
from Module.newRandomize import Randomizer
from Module.seedmod import SeedModBuilder


HintData = dict[str, Any]


Expand Down Expand Up @@ -273,10 +270,16 @@ def generate_hints_v2(randomizer: Randomizer, settings: RandomizerSettings) -> H
point_data.append(
PointHintData(settings, common_tracker_data, world_items, world)
)
hint_datas[hint_data_index]["Reports"] = HintUtils.point_hint_report_assignment(
settings, world_items, point_data
)
hint_data_index+=1

# If _any_ item types are chosen to be reveal-able, it's expected that there are enough such that each
# report can reveal an item.
# If _no_ item types are chosen to be reveal-able, we just skip doing the report assignment altogether.
if len(settings.spoiler_reveal_checks) > 0:
hint_datas[hint_data_index]["Reports"] = HintUtils.point_hint_report_assignment(
settings, world_items, point_data
)

hint_data_index += 1
if HintType.SPOILER in generate_hint_type_list:
hint_names.append(HintType.SPOILER)
hint_datas[hint_data_index]["hintsType"] = HintType.SPOILER
Expand Down Expand Up @@ -341,7 +344,6 @@ def generate_hints_v2(randomizer: Randomizer, settings: RandomizerSettings) -> H
else:
raise SettingsException("Unknown coop hint type")


Hints.generator_journal_hints(location_item_tuples, settings, hint_data)
return hint_data

Expand Down Expand Up @@ -394,8 +396,11 @@ def hinted_world_text(input_hinted_world: Any) -> str:
hint_text.append(report_data["Text"])

if hint_data["hintsType"] == HintType.POINTS:
hinted_world = report_data["World"]
hint_text.append(f"{hinted_world_text(hinted_world)} has {report_data['itemName']}.")
# These could be None if reports aren't allowed to reveal any item types
hinted_world = report_data.get("World", None)
revealed_item = report_data.get("itemName", None)
if hinted_world is not None and revealed_item is not None:
hint_text.append(f"{hinted_world_text(hinted_world)} has {revealed_item}.")

if hint_data["hintsType"] == HintType.SPOILER:
hinted_world = report_data["World"]
Expand Down