Skip to content

Commit

Permalink
Address some suggestions/problems.
Browse files Browse the repository at this point in the history
  • Loading branch information
LiquidCat64 committed May 15, 2024
1 parent 4c099d5 commit 4c70adb
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 9 deletions.
2 changes: 1 addition & 1 deletion worlds/cvcotm/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from .rules import CVCotMRules
from .data import iname, lname
from .presets import cvcotm_options_presets
from ..AutoWorld import WebWorld, World
from worlds.AutoWorld import WebWorld, World

from .aesthetics import shuffle_sub_weapons, get_location_data, get_countdown_flags, populate_enemy_drops
from .rom import RomData, patch_rom, get_base_rom_path, CVCotMProcedurePatch, CVCOTM_CT_US_HASH, CVCOTM_AC_US_HASH, \
Expand Down
11 changes: 6 additions & 5 deletions worlds/cvcotm/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -173,12 +173,13 @@ async def game_watcher(self, ctx: "BizHawkClientContext") -> None:

# Update the Dracula II and Battle Arena events already being done on past separate sessions for if the
# player is running the Battle Arena and Dracula goal.
if ctx.stored_data[f"castlevania_cotm_events_{ctx.team}_{ctx.slot}"] is not None:
if ctx.stored_data[f"castlevania_cotm_events_{ctx.team}_{ctx.slot}"] & 0x1:
self.won_battle_arena = True
if f"castlevania_cotm_events_{ctx.team}_{ctx.slot}" in ctx.stored_data:
if ctx.stored_data[f"castlevania_cotm_events_{ctx.team}_{ctx.slot}"] is not None:
if ctx.stored_data[f"castlevania_cotm_events_{ctx.team}_{ctx.slot}"] & 0x1:
self.won_battle_arena = True

if ctx.stored_data[f"castlevania_cotm_events_{ctx.team}_{ctx.slot}"] & 0x800:
self.killed_dracula_2 = True
if ctx.stored_data[f"castlevania_cotm_events_{ctx.team}_{ctx.slot}"] & 0x800:
self.killed_dracula_2 = True

# Capture all the Locations with local DSS Cards, so we can trigger the Location check off the Card being
# put in the inventory by the game.
Expand Down
3 changes: 3 additions & 0 deletions worlds/cvcotm/docs/en_Castlevania - Circle of the Moon.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ A textbox announcing the item being received and the player who sent it will pop
Similar to the outgoing item textbox, it will be accompanied by a sound depending on the item received being filler or progression/useful.

## What are the item name groups?

When you attempt to hint for items in Archipelago you can use either the name for the specific item, or the name of a group
of items. Hinting for a group will choose a random item from the group that you do not currently have and hint for it. The
groups you can use for Castlevania: Circle of the Moon are as follows:
Expand All @@ -67,10 +68,12 @@ groups you can use for Castlevania: Circle of the Moon are as follows:
* `Attribute Freeze`: Either Attribute Card that logically lets you freeze enemies.

## What are the location name groups?

In Castlevania: Circle of the Moon, every location is part of a location group under that location's area name.
So if you want to exclude all of, say, Underground Waterway, you can do so by just excluding "Underground Waterway" as a whole.

## Why do magic items sometimes look glitched?

This is to do with the fact that the magic item's graphics cannot be loaded at the same time as some special action objects
that might be in that same room, such as crumbling platforms and push/tackle blocks. It will still function as expected when
picked up, it just looks weird.
Expand Down
6 changes: 3 additions & 3 deletions worlds/cvcotm/presets.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"disable_battle_arena_mp_drain": "random",
"require_all_bosses": "random",
"early_double": "random",
"death_link": "random",
"death_link": DeathLink.option_off,
"completion_goal": "random",
}

Expand Down Expand Up @@ -126,7 +126,7 @@
}

hardcore_mode_options = {
"progression_balancing": 0,
"progression_balancing": ProgressionBalancing.default,
"accessibility": Accessibility.option_locations,
"ignore_cleansing": IgnoreCleansing.option_true,
"auto_run": AutoRun.option_false,
Expand All @@ -145,7 +145,7 @@
"disable_battle_arena_mp_drain": DisableBattleArenaMPDrain.option_false,
"require_all_bosses": RequireAllBosses.option_false,
"early_double": EarlyDouble.option_false,
"death_link": DeathLink.option_on,
"death_link": DeathLink.option_off,
"completion_goal": CompletionGoal.option_battle_arena_and_dracula,
}

Expand Down

0 comments on commit 4c70adb

Please sign in to comment.