Skip to content
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

add arrow-poison tilecodes #1032

Merged
merged 4 commits into from
Oct 9, 2023
Merged

add arrow-poison tilecodes #1032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1688238
add arrow-poison tilecodes
estebanfer Sep 26, 2023
df8abc9
format
estebanfer Sep 26, 2023
53088b7
change arrow tilecodes to load game assets
estebanfer Oct 7, 2023
0e75ecc
add tilecodes to valid, fix poison sheet
estebanfer Oct 7, 2023
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
5 changes: 5 additions & 0 deletions src/modlunky2/levels/tile_codes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,11 @@
"punishball_attach_top",
"punishball_attach_left",
"punishball_attach_right",
"arrow_wooden",
"arrow_metal",
"arrow_wooden_poison",
"arrow_metal_poison",
"venom",
]
)

Expand Down
4 changes: 4 additions & 0 deletions src/modlunky2/sprites/items.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ class ItemSheet(BaseSpriteLoader):
"goldbars": (15, 0, 16, 1),
"rock": (0, 1, 1, 2),
"arrow_wood": (1, 1, 2, 2),
"arrow_wooden": (1, 1, 2, 2),
"arrow_stub": (2, 1, 3, 2),
"urn_tall": (3, 1, 4, 2),
"urn_short": (4, 1, 5, 2),
Expand Down Expand Up @@ -94,8 +95,11 @@ class ItemSheet(BaseSpriteLoader):
"crossbow_empty_held": (2, 4, 3, 5),
"crosbow_loaded_held": (3, 4, 4, 5),
"metal_arrow": (4, 4, 5, 5),
"arrow_metal": (4, 4, 5, 5),
"wood_arrow_poisoned": (5, 4, 6, 5),
"metal_arrow_poisoned": (6, 4, 7, 5),
"arrow_wooden_poison": (5, 4, 6, 5),
"arrow_metal_poison": (6, 4, 7, 5),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all of these (and venom) need to be added to VALID_TILE_CODES in src\modlunky2\levels\tile_codes.py

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

"telepack": (7, 4, 8, 5),
"back_telepack": (7, 4, 8, 5),
"telepack_on_rope": (8, 4, 9, 5),
Expand Down
9 changes: 9 additions & 0 deletions src/modlunky2/sprites/tilecode_extras.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,18 @@ class StickyTrapSheet(BaseSpriteLoader):
}


class PoisonSheet(BaseSpriteLoader):
_sprite_sheet_path = Path("static/images/venom.png")
_chunk_size = 128
_chunk_map = {
"venom": (0, 0, 1, 1),
}


EXTRA_TILECODE_CLASSES = [
ChainAndBlocksCeilingSheet,
SpikeballTrapSheet,
StickyTrapSheet,
TreasureVaultChestSheet,
PoisonSheet,
]
Binary file added src/modlunky2/static/images/venom.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.