From 05ac5811c9dfc2e9693d568ea45d3ae09de19965 Mon Sep 17 00:00:00 2001 From: Leander Scherer Date: Mon, 9 Mar 2026 00:59:06 +0100 Subject: feat(assets): add collision to tailsets --- assets/maps/debug.tmx | 61 ++++-- assets/tiled/dungeon crawler.tiled-session | 64 ++++-- assets/tilesets/animated_props.tsx | 46 ++++ assets/tilesets/elf.tsx | 99 +++++++++ assets/tilesets/pickup_items_animated.tsx | 24 +++ assets/tilesets/props.tsx | 156 ++++++++++++++ assets/tilesets/walls.tsx | 335 +++++++++++++++++++++++++++++ 7 files changed, 746 insertions(+), 39 deletions(-) create mode 100644 assets/tilesets/elf.tsx (limited to 'assets') diff --git a/assets/maps/debug.tmx b/assets/maps/debug.tmx index ef60b1a..32d2037 100644 --- a/assets/maps/debug.tmx +++ b/assets/maps/debug.tmx @@ -1,5 +1,5 @@ - + @@ -17,7 +17,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,252,212,212,212,220,221,221,221,221,209,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,252,212,212,212,212,212,212,212,212,209,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,210,0,0,0,0,0,0,0,0,240,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,210,0,0,0,0,0,0,0,0,240,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,210,0,0,0,0,0,0,0,0,240,0,0,0,0,0,0,0,0,0,0, @@ -86,13 +86,47 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,451,499,0,499,433,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,462,510,0,510,0,440,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,440,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,477,0,444,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,466,0,0,0,0,0,0,488,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,466,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,453,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,553,0,444,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,444,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + + + + +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,462,510,0,510,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,488,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -141,21 +175,4 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - - - - - - - - - - - - - - - - - diff --git a/assets/tiled/dungeon crawler.tiled-session b/assets/tiled/dungeon crawler.tiled-session index 23d5411..5013c8b 100644 --- a/assets/tiled/dungeon crawler.tiled-session +++ b/assets/tiled/dungeon crawler.tiled-session @@ -3,7 +3,7 @@ "height": 4300, "width": 2 }, - "activeFile": "/home/schererleander/Developer/raylib-shooter/assets/maps/debug.tmx", + "activeFile": "/home/schererleander/Developer/dungeon-crawler/assets/maps/debug.tmx", "expandedProjectPaths": [ ], "file.lastUsedOpenFilter": "Alle Dateien (*)", @@ -11,6 +11,37 @@ "": { "scaleInDock": 1 }, + "/home/schererleander/Developer/dungeon-crawler/assets/maps/debug.tmx": { + "scale": 5.5, + "selectedLayer": 0, + "viewCenter": { + "x": 239.9090909090909, + "y": 239.9090909090909 + } + }, + "/home/schererleander/Developer/dungeon-crawler/assets/tilesets/animated_props.tsx": { + "scaleInDock": 1, + "scaleInEditor": 3 + }, + "/home/schererleander/Developer/dungeon-crawler/assets/tilesets/elf.tsx": { + "scaleInDock": 1, + "scaleInEditor": 4 + }, + "/home/schererleander/Developer/dungeon-crawler/assets/tilesets/grounds.tsx": { + "scaleInDock": 1 + }, + "/home/schererleander/Developer/dungeon-crawler/assets/tilesets/pickup_items_animated.tsx": { + "scaleInDock": 5.5, + "scaleInEditor": 3 + }, + "/home/schererleander/Developer/dungeon-crawler/assets/tilesets/props.tsx": { + "scaleInDock": 1, + "scaleInEditor": 3 + }, + "/home/schererleander/Developer/dungeon-crawler/assets/tilesets/walls.tsx": { + "scaleInDock": 3, + "scaleInEditor": 3 + }, "/home/schererleander/Developer/raylib-shooter/assets/maps/debug.tmx": { "scale": 5.5, "selectedLayer": 2, @@ -70,36 +101,35 @@ "frame.defaultDuration": 200, "last.exportedFilePath": "/home/schererleander/Developer/raylib-shooter/assets/maps", "last.externalTilesetPath": "/home/schererleander/Developer/raylib-shooter/assets/tilesets", - "last.imagePath": "/home/schererleander/Developer/raylib-shooter/assets/sprites", + "last.imagePath": "/home/schererleander/Developer/dungeon-crawler/assets/sprites", "map.height": 30, "map.lastUsedExportFilter": "JSON-Kartendateien (*.tmj *.json)", "map.lastUsedFormat": "tmx", "map.tileHeight": 16, "map.tileWidth": 16, "openFiles": [ - "/home/schererleander/Developer/raylib-shooter/assets/maps/debug.tmx", - "/home/schererleander/Developer/raylib-shooter/assets/tilesets/grounds.tsx", - "/home/schererleander/Developer/raylib-shooter/assets/tilesets/props.tsx", - "/home/schererleander/Developer/raylib-shooter/assets/tilesets/surground.tsx", - "/home/schererleander/Developer/raylib-shooter/assets/tilesets/walls.tsx", - "/home/schererleander/Developer/raylib-shooter/assets/tilesets/animated_props.tsx", - "/home/schererleander/Developer/raylib-shooter/assets/tilesets/bat.tsx", - "/home/schererleander/Developer/raylib-shooter/assets/tilesets/projectiles_animated.tsx", - "/home/schererleander/Developer/raylib-shooter/assets/tilesets/pickup_items_animated.tsx" + "/home/schererleander/Developer/dungeon-crawler/assets/maps/debug.tmx", + "/home/schererleander/Developer/dungeon-crawler/assets/tilesets/walls.tsx", + "/home/schererleander/Developer/dungeon-crawler/assets/tilesets/animated_props.tsx", + "/home/schererleander/Developer/dungeon-crawler/assets/tilesets/pickup_items_animated.tsx", + "/home/schererleander/Developer/dungeon-crawler/assets/tilesets/props.tsx", + "/home/schererleander/Developer/dungeon-crawler/assets/tilesets/elf.tsx" ], "project": "dungeon crawler.tiled-project", - "property.type": "bool", + "property.type": "string", "recentFiles": [ + "/home/schererleander/Developer/dungeon-crawler/assets/tilesets/elf.tsx", + "/home/schererleander/Developer/dungeon-crawler/assets/tilesets/props.tsx", + "/home/schererleander/Developer/dungeon-crawler/assets/tilesets/pickup_items_animated.tsx", + "/home/schererleander/Developer/dungeon-crawler/assets/tilesets/animated_props.tsx", + "/home/schererleander/Developer/dungeon-crawler/assets/tilesets/walls.tsx", + "/home/schererleander/Developer/dungeon-crawler/assets/maps/debug.tmx", "/home/schererleander/Developer/raylib-shooter/assets/tilesets/pickup_items_animated.tsx", "/home/schererleander/Developer/raylib-shooter/assets/tilesets/projectiles_animated.tsx", "/home/schererleander/Developer/raylib-shooter/assets/tilesets/bat.tsx", "/home/schererleander/Developer/raylib-shooter/assets/tilesets/animated_props.tsx", "/home/schererleander/Developer/raylib-shooter/assets/tilesets/walls.tsx", - "/home/schererleander/Developer/raylib-shooter/assets/tilesets/surground.tsx", - "/home/schererleander/Developer/raylib-shooter/assets/tilesets/props.tsx", - "/home/schererleander/Developer/raylib-shooter/assets/tilesets/grounds.tsx", - "/home/schererleander/Developer/raylib-shooter/assets/maps/debug.tmx", - "/home/schererleander/Developer/raylib-shooter/assets/tilesets/weapons_animated.tsx" + "/home/schererleander/Developer/raylib-shooter/assets/tilesets/surground.tsx" ], "tileset.lastUsedFormat": "tsx", "tileset.tileSize": { diff --git a/assets/tilesets/animated_props.tsx b/assets/tilesets/animated_props.tsx index 78a59da..4f7a6e4 100644 --- a/assets/tilesets/animated_props.tsx +++ b/assets/tilesets/animated_props.tsx @@ -10,6 +10,9 @@ + + + @@ -17,6 +20,9 @@ + + + @@ -33,6 +39,9 @@ + + + @@ -40,12 +49,18 @@ + + + + + + @@ -60,6 +75,9 @@ + + + @@ -67,6 +85,9 @@ + + + @@ -81,6 +102,9 @@ + + + @@ -102,6 +126,10 @@ + + + + @@ -115,6 +143,9 @@ + + + @@ -123,18 +154,27 @@ + + + + + + + + + @@ -149,12 +189,18 @@ + + + + + + diff --git a/assets/tilesets/elf.tsx b/assets/tilesets/elf.tsx new file mode 100644 index 0000000..2729dae --- /dev/null +++ b/assets/tilesets/elf.tsx @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/tilesets/pickup_items_animated.tsx b/assets/tilesets/pickup_items_animated.tsx index e521833..d1d56a6 100644 --- a/assets/tilesets/pickup_items_animated.tsx +++ b/assets/tilesets/pickup_items_animated.tsx @@ -2,6 +2,9 @@ + + + @@ -10,6 +13,9 @@ + + + @@ -18,6 +24,9 @@ + + + @@ -26,6 +35,9 @@ + + + @@ -34,6 +46,9 @@ + + + @@ -42,6 +57,9 @@ + + + @@ -50,6 +68,9 @@ + + + @@ -58,6 +79,9 @@ + + + diff --git a/assets/tilesets/props.tsx b/assets/tilesets/props.tsx index 147adf9..9df3c13 100644 --- a/assets/tilesets/props.tsx +++ b/assets/tilesets/props.tsx @@ -1,4 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/tilesets/walls.tsx b/assets/tilesets/walls.tsx index 8f1f64c..56532ac 100644 --- a/assets/tilesets/walls.tsx +++ b/assets/tilesets/walls.tsx @@ -1,4 +1,339 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.3.1