Skip to content

grasslands map + asset reorganization #12

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

Open
M4DM4N56 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

grasslands map + asset reorganization #12

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
6bafbbf
grasslands map + reorganizing assets
M4DM4N56 Jul 15, 2024
8390e5a
more file organization
M4DM4N56 Jul 15, 2024
87e6fcc
re-added the missing door tsx/tmx/png
M4DM4N56 Jul 16, 2024
29566ec
last minute fixes to other files calling the tmx/tsx/png files
M4DM4N56 Jul 16, 2024
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
Binary file added [level tester]/interactables/door.png
View file
Open in desktop
Copy link
Copy Markdown
Collaborator

@swatkinson swatkinson Jul 16, 2024

Choose a reason for hiding this comment

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

Looks super good :)

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions [level tester]/interactables/door.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.10" tiledversion="1.10.1" name="door" tilewidth="16" tileheight="16" tilecount="24" columns="6">
<image source="door.png" width="96" height="64"/>
</tileset>
Binary file modified [level tester]/trial green/grasslands.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.
326 changes: 326 additions & 0 deletions [level tester]/trial green/grasslands.tmx
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions [level tester]/trial green/grasslands.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.10" tiledversion="1.10.1" name="updated green" tilewidth="16" tileheight="16" tilecount="50" columns="6">
<image source="grasslands.png" width="96" height="80"/>
<tile id="8" probability="10"/>
<tile id="9" probability="10"/>
</tileset>
Binary file added [level tester]/trial green/trial_green_map/map_grasslands.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.
4 changes: 4 additions & 0 deletions [level tester]/trial green/trial_green_map/map_grasslands.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.10" tiledversion="1.10.1" name="map_grasslands" tilewidth="16" tileheight="16" tilecount="30" columns="6">
<image source="map_grasslands.png" width="96" height="80"/>
</tileset>
325 changes: 0 additions & 325 deletions [level tester]/trial green/unbound_green.tmx
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions [level tester]/trial green/updated green.tsx
View file
Open in desktop

This file was deleted.

0 [level tester]/trial_blue/updated blue.png → [level tester]/trial_blue/dungeon.png
View file
Open in desktop
File renamed without changes
13 changes: 7 additions & 6 deletions [level tester]/trial_blue/unbound_blue.tmx → [level tester]/trial_blue/dungeon.tmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="60" height="60" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="3">
<editorsettings>
<export target="unbound_blue.tmx" format="tmx"/>
<export target="dungeon.tmx" format="tmx"/>
</editorsettings>
<tileset firstgid="1" source="unbound_blue.tsx"/>
<tileset firstgid="1" source="dungeon.tsx"/>
<tileset firstgid="51" source="../dev/dev-pack.tsx"/>
<tileset firstgid="61" source="../interactables/door.tsx"/>
<layer id="1" name="floor" width="60" height="60" locked="1">
<data encoding="csv">
31,21,31,31,11,31,11,41,31,41,11,31,41,41,21,11,21,21,11,21,21,21,31,31,11,31,21,41,41,31,41,21,21,21,21,31,11,31,41,41,11,21,31,31,31,21,21,11,41,11,11,11,11,31,41,21,41,41,41,41,
Expand Down Expand Up @@ -310,10 +311,10 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,61,62,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,67,68,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73,74,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,79,80,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
Expand Down
4 changes: 4 additions & 0 deletions [level tester]/trial_blue/dungeon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.10" tiledversion="1.10.2" name="dungeon" tilewidth="16" tileheight="16" tilecount="46" columns="10">
<image source="./dungeon.png" width="160" height="80"/>
</tileset>
0 [level tester]/trial_blue/blue_trial.tmx → ...ester]/trial_blue/outdated/blue_trial.tmx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion [level tester]/trial_blue/updated blue.tsx → ...ter]/trial_blue/outdated/updated blue.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.10" tiledversion="1.10.2" name="updated blue" tilewidth="16" tileheight="16" tilecount="46" columns="10">
<image source="./updated blue.png" width="160" height="80"/>
<image source="./dungeon.png" width="160" height="80"/>
</tileset>
0 ..._blue/trial_blue_map/map_unbound_blue.png → ...trial_blue/trial_blue_map/map_dungeon.png
View file
Open in desktop
File renamed without changes
2 changes: 1 addition & 1 deletion ..._blue/trial_blue_map/map_unbound_blue.tmx → ...trial_blue/trial_blue_map/map_dungeon.tmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="60" height="60" tilewidth="16" tileheight="16" infinite="0" nextlayerid="2" nextobjectid="1">
<tileset firstgid="1" source="map_unbound_blue.tsx"/>
<tileset firstgid="1" source="map_dungeon.tsx"/>
<layer id="1" name="Tile Layer 1" width="60" height="60" offsetx="100" offsety="18">
<data encoding="csv">
12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
Expand Down
2 changes: 1 addition & 1 deletion ..._blue/trial_blue_map/map_unbound_blue.tsx → ...trial_blue/trial_blue_map/map_dungeon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.10" tiledversion="1.10.1" name="map_tileset" tilewidth="16" tileheight="16" tilecount="50" columns="10">
<image source="./map_unbound_blue.png" width="160" height="80"/>
<image source="./map_dungeon.png" width="160" height="80"/>
</tileset>
4 changes: 0 additions & 4 deletions [level tester]/trial_blue/unbound_blue.tsx
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from random import randint

current_dir = os.path.dirname(os.path.dirname(__file__))
uitImagePath = os.path.join(current_dir,"[level tester]", "trial_blue", "unbound_blue.tmx")
uitImagePath = os.path.join(current_dir,"[level tester]", "trial_blue", "dungeon.tmx")
map_path = uitImagePath

#this should be moved else where
Expand Down