Skip to content

Commit

Permalink
Merge pull request #102 from randovania/feature/compat-new-rds
Browse files Browse the repository at this point in the history
Use Spine.from_bytes
  • Loading branch information
duncathan authored Jun 24, 2024
2 parents 8d4a5a4 + bb324d6 commit a3b85da
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions src/open_prime_rando/echoes/dock_lock_rando/dock_type.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ def patch_door(self, editor: PatcherEditor, world_name: str, area_name: str, doc
with door.edit_properties(Door) as door_props:
door_props.vulnerability = self.vulnerability


@dataclasses.dataclass
class BlastShieldActors:
door: ScriptInstance
Expand Down Expand Up @@ -173,9 +174,9 @@ def find_attached_instance(
raise TypeError(f"No {name} connected to {source}")

def get_spline(self) -> Spline:
return Spline(
data=b'\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x02'
b'\x02A \x00\x00?\x80\x00\x00\x02\x02\x01\x00\x00\x00\x00?\x80\x00\x00'
return Spline.from_bytes(
b'\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x02'
b'\x02A \x00\x00?\x80\x00\x00\x02\x02\x01\x00\x00\x00\x00?\x80\x00\x00'
)

def create_trigger(self,
Expand All @@ -186,7 +187,7 @@ def create_trigger(self,
active: bool = True,
seeker_lock_on: bool = True,
orbitable: bool = False,
):
):
pos = Vector(
door_xfm.position.x,
door_xfm.position.y,
Expand Down Expand Up @@ -460,7 +461,6 @@ def patch_door(self, editor: PatcherEditor, world_name: str, area_name: str, doc
door.vulnerability = resist_all_vuln
door_xfm = door.editor_properties.transform


with actors.lock.edit_properties(Actor) as lock:
lock.vulnerability = resist_all_vuln

Expand Down Expand Up @@ -547,7 +547,6 @@ def patch_door(self, editor: PatcherEditor, world_name: str, area_name: str, doc

actors.relay.add_connection(State.Active, Message.Deactivate, hud_hint)


if not low_memory:
beacon_loop = default.add_instance_with(Sound(
editor_properties=EditorProperties(
Expand Down

0 comments on commit a3b85da

Please sign in to comment.