steffo/lihzahrd
steffo/lihzahrd
1
Fork 0
mirror of https://github.com/Steffo99/lihzahrd.git synced 2024-11-21 23:54:23 +00:00
Code Activity

Start work on chests data

Browse source
This commit is contained in:
Steffo 2019-08-11 14:41:58 +02:00
parent 47b5c62533
commit b34ed326d0
2 changed files with 37 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
lihzahrd/chests/__init__.py Normal file
View file

45
lihzahrd/world.py
View file

@ -1,9 +1,10 @@
import uuid import uuid
import math import math
import typing import typing
from .header import *
from .fileutils import * from .fileutils import *
from .header import *
from .tiles import * from .tiles import *
from .chests import *
from .timer import Timer from .timer import Timer
@ -39,7 +40,11 @@ class World:
bosses_defeated: BossesDefeated, bosses_defeated: BossesDefeated,
anglers_quest: AnglerQuest, anglers_quest: AnglerQuest,
clouds: Clouds, clouds: Clouds,
cultist_delay: int): cultist_delay: int,
tiles: typing.List[typing.List[Tile]],
unknown_file_format_data: bytearray,
unknown_world_header_data: bytearray,
unknown_world_tiles_data: bytearray):
self.version: Version = version self.version: Version = version
"""The game version when this savefile was last saved.""" """The game version when this savefile was last saved."""
@ -122,8 +127,13 @@ class World:
self.anglers_quest: AnglerQuest = anglers_quest self.anglers_quest: AnglerQuest = anglers_quest
"""Information about today's Angler's Quest.""" """Information about today's Angler's Quest."""
self.tiles: typing.List[typing.List[Tile]] = tiles
self.clouds: Clouds = clouds self.clouds: Clouds = clouds
self.cultist_delay: int = cultist_delay self.cultist_delay: int = cultist_delay
self.unknown_file_format_data: bytearray = unknown_file_format_data
self.unknown_world_header_data: bytearray = unknown_world_header_data
self.unknown_world_tiles_data: bytearray = unknown_world_tiles_data
def __repr__(self): def __repr__(self):
return f'<World "{self.name}">' return f'<World "{self.name}">'
@ -463,17 +473,33 @@ class World:
unknown_world_header_data = f.read_until(pointers.world_tiles) unknown_world_header_data = f.read_until(pointers.world_tiles)
with Timer("World Tiles", display=True): with Timer("World Tiles", display=True):
tiledata = [] tiles = []
while len(tiledata) < world_size.x: while len(tiles) < world_size.x:
# Read a column # Read a column
column = [] column = []
while len(column) < world_size.y: while len(column) < world_size.y:
tiles = cls._read_tiles(f, tileframeimportant) readtiles = cls._read_tiles(f, tileframeimportant)
column = [*column, *tiles] column = [*column, *readtiles]
tiledata.append(column) tiles.append(column)
unknown_world_tiles_data = f.read_until(pointers.chests) unknown_world_tiles_data = f.read_until(pointers.chests)
with Timer("Chests", display=True):
chests = []
chests_count = f.int2()
chests_max_items = f.int2()
for _ in range(chests_max_items):
chest_x = f.int4()
chest_y = f.int4()
chest_name = f.string()
item_count = f.int2()
if item_count > 0:
item_id = f.int4()
item_prefix = f.uint1()
breakpoint() breakpoint()
world = World(version=version, savefile_type=savefile_type, revision=revision, is_favorite=is_favorite, world = World(version=version, savefile_type=savefile_type, revision=revision, is_favorite=is_favorite,
@ -483,5 +509,8 @@ class World:
time=time, events=events, dungeon_point=dungeon_point, world_evil=world_evil, time=time, events=events, dungeon_point=dungeon_point, world_evil=world_evil,
saved_npcs=saved_npcs, altars_smashed=altars_smashed, is_hardmode=is_hardmode, saved_npcs=saved_npcs, altars_smashed=altars_smashed, is_hardmode=is_hardmode,
shadow_orbs=shadow_orbs, bosses_defeated=bosses_defeated, anglers_quest=anglers_quest, shadow_orbs=shadow_orbs, bosses_defeated=bosses_defeated, anglers_quest=anglers_quest,
clouds=clouds, cultist_delay=cultist_delay) clouds=clouds, cultist_delay=cultist_delay, tiles=tiles,
unknown_file_format_data=unknown_file_format_data,
unknown_world_header_data=unknown_world_header_data,
unknown_world_tiles_data=unknown_world_tiles_data)
return world return world