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

WiP parsing for extra wallID bytes.

Browse source
This commit is contained in:
Dale Floer 2020-05-31 16:23:10 -07:00 committed by Stefano Pigozzi
parent 257623e09a
commit ffac26d1f8
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lihzahrd/world.py
View file

@ -243,6 +243,7 @@ class World:
liquid_type = LiquidType.from_flags(flags1) liquid_type = LiquidType.from_flags(flags1)
has_extended_block_id = flags1[5] has_extended_block_id = flags1[5]
rle_compression = RLEEncoding.from_flags(flags1) rle_compression = RLEEncoding.from_flags(flags1)
wall_id_extra = False
if flags1[0]: if flags1[0]:
flags2 = fr.bits() flags2 = fr.bits()
block_shape = Shape.from_flags(flags2) block_shape = Shape.from_flags(flags2)
@ -252,6 +253,8 @@ class World:
wiring = Wiring.from_flags(flags2, flags3) wiring = Wiring.from_flags(flags2, flags3)
is_block_painted = flags3[3] is_block_painted = flags3[3]
is_wall_painted = flags3[4] is_wall_painted = flags3[4]
if flags3[5]:
wall_id_extra = fr.int1()
else: else:
is_block_active = True is_block_active = True
wiring = Wiring.from_flags(flags2) wiring = Wiring.from_flags(flags2)
@ -284,7 +287,11 @@ class World:
else: else:
block = None block = None
if has_wall: if has_wall:
wall_id = WallType(fr.uint1()) temp_wall_id = fr.uint1()
wall_id = WallType(x1)
if wall_id_extra:
new_id = (wall_id_extra << 8) | temp_wall_id
wall_id = WallType(new_id)
if is_wall_painted: if is_wall_painted:
wall_paint = fr.uint1() wall_paint = fr.uint1()
else: else: