diff --git a/flake.nix b/flake.nix index a786ac2..81ccef0 100644 --- a/flake.nix +++ b/flake.nix @@ -34,6 +34,7 @@ ])) pkgs.yt-dlp + pkgs.krita ]; }; }; diff --git a/godot/assets/car2.png.import b/godot/assets/car2.png.import index f00bcbe..b463d54 100644 --- a/godot/assets/car2.png.import +++ b/godot/assets/car2.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://citlv5h8tt34j" +uid="uid://bgyu04eg6ro82" path="res://.godot/imported/car2.png-2d854d6b76c2d71cdaa3a98ce017438f.ctex" metadata={ "vram_texture": false diff --git a/godot/assets/firetruck.png.import b/godot/assets/firetruck.png.import index c07c503..3b77234 100644 --- a/godot/assets/firetruck.png.import +++ b/godot/assets/firetruck.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://by8phc8f7326l" +uid="uid://b5rjr5ekp4ve3" path="res://.godot/imported/firetruck.png-37906aa78538ee7211d385c01b57794f.ctex" metadata={ "vram_texture": false diff --git a/godot/assets/police_car_black.png.import b/godot/assets/police_car_black.png.import index 52dc033..0540310 100644 --- a/godot/assets/police_car_black.png.import +++ b/godot/assets/police_car_black.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://d0535uo0espho" +uid="uid://bcrwe74y6hyby" path="res://.godot/imported/police_car_black.png-992534324259fa49e324289a5ac7cf75.ctex" metadata={ "vram_texture": false diff --git a/godot/assets/police_car_white.png.import b/godot/assets/police_car_white.png.import index bde93e7..e85d63a 100644 --- a/godot/assets/police_car_white.png.import +++ b/godot/assets/police_car_white.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://debp76xh0q088" +uid="uid://cl4nm8ajleyjy" path="res://.godot/imported/police_car_white.png-2e13f493d123eb3e2c891046222f4297.ctex" metadata={ "vram_texture": false diff --git a/godot/assets/tank.png.import b/godot/assets/tank.png.import index 9a29b71..bca4853 100644 --- a/godot/assets/tank.png.import +++ b/godot/assets/tank.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dvbc1bayyhvga" +uid="uid://budjggb7ss7t6" path="res://.godot/imported/tank.png-44e29c25b935427e1d3fe5ee8f405436.ctex" metadata={ "vram_texture": false diff --git a/godot/assets/textures/building_side.png.import b/godot/assets/textures/building_side.png.import index 73d1063..d5aa5a8 100644 --- a/godot/assets/textures/building_side.png.import +++ b/godot/assets/textures/building_side.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://covhntw61q76k" +uid="uid://qx8x5tckqcow" path="res://.godot/imported/building_side.png-94fdb60bb77a682f16b6a5d6fbdec748.ctex" metadata={ "vram_texture": false diff --git a/godot/assets/textures/curb_1.png b/godot/assets/textures/curb_1.png new file mode 100644 index 0000000..a0a0572 Binary files /dev/null and b/godot/assets/textures/curb_1.png differ diff --git a/godot/assets/textures/curb_1.png.import b/godot/assets/textures/curb_1.png.import new file mode 100644 index 0000000..ead7c0d --- /dev/null +++ b/godot/assets/textures/curb_1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bxwhirvk4jjpl" +path="res://.godot/imported/curb_1.png-32d9adb34fcada5764c0d02257e023a3.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/textures/curb_1.png" +dest_files=["res://.godot/imported/curb_1.png-32d9adb34fcada5764c0d02257e023a3.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/godot/assets/textures/grass_1.png b/godot/assets/textures/grass_1.png new file mode 100644 index 0000000..c759aa7 Binary files /dev/null and b/godot/assets/textures/grass_1.png differ diff --git a/godot/assets/textures/grass_1.png.import b/godot/assets/textures/grass_1.png.import new file mode 100644 index 0000000..f44f018 --- /dev/null +++ b/godot/assets/textures/grass_1.png.import @@ -0,0 +1,20 @@ +[remap] + +importer="texture_atlas" +type="Texture2D" +uid="uid://cxk58eyp2gr6t" +path="res://.godot/imported/grass_1.png-23c784dbe1fde2623686f6175058e43c.res" +group_file="res://atlases/roads.png" +valid=true +[deps] + + +source_file="res://assets/textures/grass_1.png" +dest_files=["res://.godot/imported/grass_1.png-23c784dbe1fde2623686f6175058e43c.res"] + +[params] + +atlas_file="res://atlases/roads.png" +import_mode=0 +crop_to_region=true +trim_alpha_border_from_region=false diff --git a/godot/assets/textures/road.png.import b/godot/assets/textures/road.png.import index 3503b00..80d8589 100644 --- a/godot/assets/textures/road.png.import +++ b/godot/assets/textures/road.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://d1c4if4giceh" +uid="uid://iwo3ssuytwr7" path="res://.godot/imported/road.png-d477774f72907c6d431b3440dca2d9fc.ctex" metadata={ "vram_texture": false diff --git a/godot/assets/textures/road_1.png b/godot/assets/textures/road_1.png new file mode 100644 index 0000000..c1d85e6 Binary files /dev/null and b/godot/assets/textures/road_1.png differ diff --git a/godot/assets/textures/road_1.png.import b/godot/assets/textures/road_1.png.import new file mode 100644 index 0000000..b5f6d0f --- /dev/null +++ b/godot/assets/textures/road_1.png.import @@ -0,0 +1,20 @@ +[remap] + +importer="texture_atlas" +type="Texture2D" +uid="uid://dtfhvbp4vov3l" +path="res://.godot/imported/road_1.png-1caa8cec8532678d3356399b1d00bd41.res" +group_file="res://atlases/roads.png" +valid=true +[deps] + + +source_file="res://assets/textures/road_1.png" +dest_files=["res://.godot/imported/road_1.png-1caa8cec8532678d3356399b1d00bd41.res"] + +[params] + +atlas_file="res://atlases/roads.png" +import_mode=0 +crop_to_region=true +trim_alpha_border_from_region=false diff --git a/godot/assets/textures/sidewalk.png.import b/godot/assets/textures/sidewalk.png.import index 752b73c..7386970 100644 --- a/godot/assets/textures/sidewalk.png.import +++ b/godot/assets/textures/sidewalk.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://djm6j26ffj4ms" +uid="uid://boku1251l3foe" path="res://.godot/imported/sidewalk.png-1e6af73b64c179cc13b1246077265c0c.ctex" metadata={ "vram_texture": false diff --git a/godot/atlases/roads.png b/godot/atlases/roads.png new file mode 100644 index 0000000..b7beee7 Binary files /dev/null and b/godot/atlases/roads.png differ diff --git a/godot/atlases/roads.png.import b/godot/atlases/roads.png.import new file mode 100644 index 0000000..a8244c9 --- /dev/null +++ b/godot/atlases/roads.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cu0fea76lytwd" +path="res://.godot/imported/roads.png-9afd569cd04ff0eeda89f25e4ac47ea4.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://atlases/roads.png" +dest_files=["res://.godot/imported/roads.png-9afd569cd04ff0eeda89f25e4ac47ea4.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/godot/atlases/test.png b/godot/atlases/test.png new file mode 100644 index 0000000..7298a39 Binary files /dev/null and b/godot/atlases/test.png differ diff --git a/godot/atlases/test.png.import b/godot/atlases/test.png.import new file mode 100644 index 0000000..373d681 --- /dev/null +++ b/godot/atlases/test.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dd3nv8l28i3qg" +path="res://.godot/imported/test.png-439d7737dc48e98f89d2df73d92e9391.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://atlases/test.png" +dest_files=["res://.godot/imported/test.png-439d7737dc48e98f89d2df73d92e9391.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/godot/car.tscn b/godot/car.tscn index fbeb445..d0ed049 100644 --- a/godot/car.tscn +++ b/godot/car.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://ukvcgdjxtkqw"] -[ext_resource type="Texture2D" uid="uid://by4cbmcpktbmf" path="res://assets/car.png" id="1_7822p"] +[ext_resource type="Texture2D" uid="uid://k54om3777nse" path="res://assets/top_down_references/car.png" id="1_7822p"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_37kl0"] size = Vector2(194, 493) diff --git a/godot/game.tscn b/godot/game.tscn index 5d9dea3..f73713e 100644 --- a/godot/game.tscn +++ b/godot/game.tscn @@ -1,7 +1,17 @@ -[gd_scene load_steps=3 format=3 uid="uid://7713s03g7nxw"] +[gd_scene load_steps=5 format=4 uid="uid://7713s03g7nxw"] [ext_resource type="PackedScene" uid="uid://ukvcgdjxtkqw" path="res://car.tscn" id="1_80nbo"] -[ext_resource type="TileSet" uid="uid://cnqxooqer5ehf" path="res://world_tileset.tres" id="2_e2o6t"] +[ext_resource type="Texture2D" uid="uid://dd3nv8l28i3qg" path="res://atlases/test.png" id="1_e2o6t"] + +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_feb5d"] +texture = ExtResource("1_e2o6t") +texture_region_size = Vector2i(256, 256) +0:0/0 = 0 +1:0/0 = 0 + +[sub_resource type="TileSet" id="TileSet_fc0e3"] +tile_size = Vector2i(256, 256) +sources/6 = SubResource("TileSetAtlasSource_feb5d") [node name="Node2D" type="Node2D"] @@ -9,7 +19,12 @@ position = Vector2(0, -1) zoom = Vector2(0.077, 0.077) -[node name="Car" parent="." instance=ExtResource("1_80nbo")] +[node name="Roads" type="TileMapLayer" parent="."] +tile_map_data = PackedByteArray("AAD+/wAAAwAAAAAAAAD+////AwAAAAAAAAD9/wAAAgAAAAAAAFD9////AgAAAAAAAFD9/wEAAgAAAAAAAFD+/wIAAgAAAAAAAAD//wIAAgAAAAAAAAAAAAIAAgAAAAAAAAABAAIAAgAAAAAAAAD+/wEAAwAAAAAAAAD//wEAAwAAAAAAAAA=") +tile_set = SubResource("TileSet_fc0e3") -[node name="TileMapLayer" type="TileMapLayer" parent="."] -tile_set = ExtResource("2_e2o6t") +[node name="Roads2" type="TileMapLayer" parent="."] +tile_map_data = PackedByteArray("AAD+/wAABgAAAAAAAAD+////BgAAAAAAAAD9/wAABgABAAAAAAD9////BgABAAAAAAD9/wEABgABAAAAAAD+/wIABgABAAAAAAD//wIABgABAAAAAAAAAAIABgABAAAAAAABAAIABgABAAAAAAD+/wEABgAAAAAAAAD//wEABgAAAAAAAAA=") +tile_set = SubResource("TileSet_fc0e3") + +[node name="Car" parent="." instance=ExtResource("1_80nbo")] diff --git a/godot/world_tileset.tres b/godot/world_tileset.tres deleted file mode 100644 index 4ef1150..0000000 --- a/godot/world_tileset.tres +++ /dev/null @@ -1,4 +0,0 @@ -[gd_resource type="TileSet" format=3 uid="uid://cnqxooqer5ehf"] - -[resource] -tile_size = Vector2i(64, 64) diff --git a/justfile b/justfile index ba89269..126feac 100644 --- a/justfile +++ b/justfile @@ -33,3 +33,7 @@ watch-figures: # Download audio from youtube rip-youtube-audio URL: yt-dlp --audio-quality 0 --extract-audio {{ URL }} + +# Listen to the radio +radio: + mpv --shuffle radio/