diff --git a/graphics/tiles/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png b/graphics/tiles/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png new file mode 100644 index 0000000..d5ba93a Binary files /dev/null and b/graphics/tiles/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png differ diff --git a/graphics/tiles/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png.import b/graphics/tiles/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png.import new file mode 100644 index 0000000..524613e --- /dev/null +++ b/graphics/tiles/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dkco6bp2yelei" +path="res://.godot/imported/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png-a7f4ab763f4d056bc60508fae2c91a2e.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/tiles/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png" +dest_files=["res://.godot/imported/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png-a7f4ab763f4d056bc60508fae2c91a2e.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/scenes/bullet.tscn b/scenes/bullet.tscn index de8fb23..dbabb44 100644 --- a/scenes/bullet.tscn +++ b/scenes/bullet.tscn @@ -7,8 +7,9 @@ size = Vector2(16, 2) [node name="Bullet" type="Area2D"] +z_index = 100 collision_layer = 8 -collision_mask = 14 +collision_mask = 6 script = ExtResource("1_mkf8s") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] diff --git a/scenes/game.tscn b/scenes/game.tscn index 06f9904..5731833 100644 --- a/scenes/game.tscn +++ b/scenes/game.tscn @@ -5,10 +5,10 @@ [ext_resource type="Script" uid="uid://b84pdw14l6gb6" path="res://scripts/scene_manager.gd" id="2_iywne"] [ext_resource type="PackedScene" uid="uid://2pp1gtlflav8" path="res://scenes/trigger.tscn" id="2_yqjtg"] [ext_resource type="PackedScene" uid="uid://d3y1iqmpknpyo" path="res://scenes/player.tscn" id="3_lnu2h"] -[ext_resource type="Texture2D" uid="uid://cf3dxavo2u8yg" path="res://graphics/tiles/25-10-18-godot-course-Terrain (32x32).png" id="3_p57ef"] +[ext_resource type="Texture2D" uid="uid://dkco6bp2yelei" path="res://graphics/tiles/25-10-26-godot-course-Terrain (32x32)-color-exchange-1.png" id="3_u5sy4"] -[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_p57ef"] -texture = ExtResource("3_p57ef") +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_gee14"] +texture = ExtResource("3_u5sy4") texture_region_size = Vector2i(32, 32) 0:0/0 = 0 0:0/0/terrain_set = 0 @@ -394,7 +394,7 @@ physics_layer_0/collision_mask = 13 terrain_set_0/mode = 0 terrain_set_0/terrain_0/name = "Main Terrain" terrain_set_0/terrain_0/color = Color(0.5, 0.34375, 0.25, 1) -sources/1 = SubResource("TileSetAtlasSource_p57ef") +sources/0 = SubResource("TileSetAtlasSource_gee14") [sub_resource type="Gradient" id="Gradient_iywne"] offsets = PackedFloat32Array(0.20666666, 0.66, 0.96666664) @@ -436,7 +436,7 @@ script = ExtResource("2_iywne") [node name="TileMapLayer" type="TileMapLayer" parent="."] z_index = 10 position = Vector2(0, 1) -tile_map_data = PackedByteArray("AADy/wMAAQABAAEAAADy/wQAAQABAAIAAADz/wQAAQABAAIAAADz/wMAAQABAAEAAAD0/wMAAQABAAEAAAD0/wQAAQABAAIAAADx/wQAAQAAAAIAAADx/wMAAQAAAAEAAAD4/wMAAQABAAAAAAD4/wQAAQABAAIAAAD5/wQAAQABAAIAAAD6/wQAAQABAAIAAAD7/wQAAQABAAIAAAD8/wQAAQABAAIAAAD9/wQAAQABAAIAAAD+/wQAAQAHAAAAAAD+/wMAAQABAAAAAAD9/wMAAQABAAAAAAD8/wMAAQABAAAAAAD7/wMAAQABAAAAAAD6/wMAAQABAAAAAAD5/wMAAQABAAAAAAABAAMAAQABAAAAAAABAAQAAQABAAEAAAABAAUAAQABAAIAAAACAAUAAQABAAIAAAADAAUAAQABAAIAAAAEAAUAAQABAAIAAAAEAAQAAQAGAAEAAAAEAAMAAQACAAAAAAADAAMAAQABAAAAAAACAAMAAQABAAAAAAACAAQAAQABAAEAAAADAAQAAQABAAEAAAD3/wMAAQABAAAAAAD2/wMAAQAGAAEAAAD1/wMAAQABAAEAAAD1/wQAAQABAAIAAAD2/wQAAQABAAIAAAD3/wQAAQABAAIAAAAKAAIAAQABAAAAAAAJAAIAAQAAAAAAAAAJAAMAAQAAAAEAAAAMAAEAAQABAAAAAAAMAAIAAQABAAEAAAAMAAMAAQABAAEAAAAMAAQAAQABAAEAAAANAAQAAQABAAEAAAANAAUAAQABAAIAAAAOAAUAAQABAAIAAAAPAAUAAQABAAIAAAAMAAUAAQABAAIAAAANAAEAAQABAAAAAAAOAAEAAQABAAAAAAANAAIAAQABAAEAAAANAAMAAQABAAEAAAAOAAQAAQABAAEAAAAPAAQAAQABAAEAAAAPAAMAAQABAAEAAAAPAAIAAQAGAAEAAAAPAAEAAQACAAAAAAAOAAIAAQABAAEAAAAOAAMAAQABAAEAAAARAAIAAQABAAAAAAARAAMAAQABAAEAAAARAAQAAQABAAEAAAARAAUAAQABAAIAAAASAAUAAQABAAIAAAATAAUAAQABAAIAAAAUAAUAAQABAAIAAAAVAAUAAQABAAIAAAAWAAUAAQABAAIAAAAWAAQAAQABAAEAAAAWAAMAAQAGAAEAAAAVAAMAAQABAAEAAAAVAAIAAQABAAAAAAAUAAIAAQABAAAAAAATAAIAAQABAAAAAAASAAIAAQABAAAAAAASAAMAAQABAAEAAAASAAQAAQABAAEAAAATAAQAAQABAAEAAAAUAAQAAQABAAEAAAAUAAMAAQABAAEAAAATAAMAAQABAAEAAAAVAAQAAQABAAEAAAAWAAIAAQACAAAAAAD4//7/AQABAAQAAAD5//7/AQAKAAMAAAD6//7/AQAHAAEAAAD7//7/AQACAAEAAAD9//3/AQAKAAQAAAD+//3/AQABAAIAAAD///3/AQABAAIAAAAAAP3/AQABAAIAAAAAAPz/AQABAAAAAAD+//z/AQABAAAAAAD///z/AQABAAAAAAACAP3/AQACAAQAAAABAP3/AQAJAAQAAAD5////AQAAAAIAAAD6////AQABAAIAAAD7////AQACAAIAAADx////AQAAAAAAAADy////AQABAAAAAADz////AQACAAAAAADx/wAAAQAAAAEAAADx/wEAAQAAAAEAAADy/wEAAQABAAEAAADz/wEAAQAGAAEAAADz/wAAAQACAAEAAADy/wAAAQABAAEAAADx/wIAAQAAAAEAAADy/wIAAQABAAEAAADz/wIAAQABAAEAAAD0/wIAAQABAAEAAAD1/wIAAQAGAAEAAAD2/wIAAQACAAAAAAD3//7/AQAAAAQAAAD6//3/AQAAAAAAAAD7//3/AQAJAAMAAAABAPz/AQACAAAAAAD9//z/AQAAAAAAAAD8//3/AQABAAQAAAAHAAQAAQABAAAAAAAGAAQAAQABAAAAAAAFAAQAAQABAAAAAAALAAIAAQAHAAEAAAAQAAIAAQABAAAAAAAQAAMAAQABAAEAAAAQAAQAAQABAAEAAAAQAAUAAQABAAIAAAALAAMAAQABAAEAAAAKAAMAAQABAAEAAAAKAAQAAQABAAEAAAAKAAUAAQABAAIAAAAJAAUAAQABAAIAAAAJAAQAAQAHAAEAAAAIAAQAAQABAAAAAAAGAAUAAQABAAIAAAAFAAUAAQABAAIAAAAHAAUAAQABAAIAAAAIAAUAAQABAAIAAAALAAUAAQABAAIAAAALAAQAAQABAAEAAAAAAAQAAQABAAEAAAD//wQAAQABAAEAAAD+/wUAAQAAAAIAAAD//wUAAQABAAIAAAAAAAUAAQABAAIAAAD//wMAAQABAAAAAAAAAAMAAQABAAAAAAALAAEAAQAAAAAAAAD0/wEAAQABAAAAAAD1/wEAAQACAAAAAAALAPv/AQAAAAAAAAALAPz/AQAAAAEAAAALAP3/AQAAAAIAAAAMAPz/AQABAAEAAAANAPz/AQABAAEAAAAOAPz/AQABAAEAAAAOAPv/AQABAAAAAAANAPv/AQABAAAAAAAMAPv/AQABAAAAAAAMAP3/AQABAAIAAAANAP3/AQABAAIAAAAOAP3/AQABAAIAAAAPAPz/AQACAAEAAAAPAPv/AQACAAAAAAAPAP3/AQACAAIAAAAYAAMAAQACAAAAAAAXAAMAAQABAAAAAAAXAAQAAQABAAEAAAAXAAUAAQABAAIAAAAYAAUAAQACAAIAAAAYAAQAAQACAAEAAAAGAP3/AQAAAAQAAAAHAP3/AQACAAQAAAA=") +tile_map_data = PackedByteArray("AADy/wMAAAABAAEAAADy/wQAAAABAAIAAADz/wQAAAABAAIAAADz/wMAAAABAAEAAAD0/wMAAAABAAEAAAD0/wQAAAABAAIAAADx/wQAAAAAAAIAAADx/wMAAAAAAAEAAAD4/wMAAAABAAAAAAD4/wQAAAABAAIAAAD5/wQAAAABAAIAAAD6/wQAAAABAAIAAAD7/wQAAAABAAIAAAD8/wQAAAABAAIAAAD9/wQAAAABAAIAAAD+/wQAAAAHAAAAAAD+/wMAAAABAAAAAAD9/wMAAAABAAAAAAD8/wMAAAABAAAAAAD7/wMAAAABAAAAAAD6/wMAAAABAAAAAAD5/wMAAAABAAAAAAABAAMAAAABAAAAAAABAAQAAAABAAEAAAABAAUAAAABAAIAAAACAAUAAAABAAIAAAADAAUAAAABAAIAAAAEAAUAAAABAAIAAAAEAAQAAAAGAAEAAAAEAAMAAAACAAAAAAADAAMAAAABAAAAAAACAAMAAAABAAAAAAACAAQAAAABAAEAAAADAAQAAAABAAEAAAD3/wMAAAABAAAAAAD2/wMAAAAGAAEAAAD1/wMAAAABAAEAAAD1/wQAAAABAAIAAAD2/wQAAAABAAIAAAD3/wQAAAABAAIAAAAKAAIAAAABAAAAAAAJAAIAAAAAAAAAAAAJAAMAAAAAAAEAAAAMAAEAAAABAAAAAAAMAAIAAAABAAEAAAAMAAMAAAABAAEAAAAMAAQAAAABAAEAAAANAAQAAAABAAEAAAANAAUAAAABAAIAAAAOAAUAAAABAAIAAAAPAAUAAAABAAIAAAAMAAUAAAABAAIAAAANAAEAAAABAAAAAAAOAAEAAAABAAAAAAANAAIAAAABAAEAAAANAAMAAAABAAEAAAAOAAQAAAABAAEAAAAPAAQAAAABAAEAAAAPAAMAAAABAAEAAAAPAAIAAAAGAAEAAAAPAAEAAAACAAAAAAAOAAIAAAABAAEAAAAOAAMAAAABAAEAAAARAAIAAAABAAAAAAARAAMAAAABAAEAAAARAAQAAAABAAEAAAARAAUAAAABAAIAAAASAAUAAAABAAIAAAATAAUAAAABAAIAAAAUAAUAAAABAAIAAAAVAAUAAAABAAIAAAAWAAUAAAABAAIAAAAWAAQAAAABAAEAAAAWAAMAAAAGAAEAAAAVAAMAAAABAAEAAAAVAAIAAAABAAAAAAAUAAIAAAABAAAAAAATAAIAAAABAAAAAAASAAIAAAABAAAAAAASAAMAAAABAAEAAAASAAQAAAABAAEAAAATAAQAAAABAAEAAAAUAAQAAAABAAEAAAAUAAMAAAABAAEAAAATAAMAAAABAAEAAAAVAAQAAAABAAEAAAAWAAIAAAACAAAAAAD4//7/AAABAAQAAAD5//7/AAAKAAMAAAD6//7/AAAHAAEAAAD7//7/AAACAAEAAAD9//3/AAAKAAQAAAD+//3/AAABAAIAAAD///3/AAABAAIAAAAAAP3/AAABAAIAAAAAAPz/AAABAAAAAAD+//z/AAABAAAAAAD///z/AAABAAAAAAACAP3/AAACAAQAAAABAP3/AAAJAAQAAAD5////AAAAAAIAAAD6////AAABAAIAAAD7////AAACAAIAAADx////AAAAAAAAAADy////AAABAAAAAADz////AAACAAAAAADx/wAAAAAAAAEAAADx/wEAAAAAAAEAAADy/wEAAAABAAEAAADz/wEAAAAGAAEAAADz/wAAAAACAAEAAADy/wAAAAABAAEAAADx/wIAAAAAAAEAAADy/wIAAAABAAEAAADz/wIAAAABAAEAAAD0/wIAAAABAAEAAAD1/wIAAAABAAEAAAD2/wIAAAACAAEAAAD3//7/AAAAAAQAAAD6//3/AAAAAAAAAAD7//3/AAAJAAMAAAABAPz/AAACAAAAAAD9//z/AAAAAAAAAAD8//3/AAABAAQAAAAHAAQAAAABAAAAAAAGAAQAAAABAAAAAAAFAAQAAAABAAAAAAALAAIAAAAHAAEAAAAQAAIAAAABAAAAAAAQAAMAAAABAAEAAAAQAAQAAAABAAEAAAAQAAUAAAABAAIAAAALAAMAAAABAAEAAAAKAAMAAAABAAEAAAAKAAQAAAABAAEAAAAKAAUAAAABAAIAAAAJAAUAAAABAAIAAAAJAAQAAAAHAAEAAAAIAAQAAAABAAAAAAAGAAUAAAABAAIAAAAFAAUAAAABAAIAAAAHAAUAAAABAAIAAAAIAAUAAAABAAIAAAALAAUAAAABAAIAAAALAAQAAAABAAEAAAAAAAQAAAABAAEAAAD//wQAAAABAAEAAAD+/wUAAAAAAAIAAAD//wUAAAABAAIAAAAAAAUAAAABAAIAAAD//wMAAAABAAAAAAAAAAMAAAABAAAAAAALAAEAAAAAAAAAAAD0/wEAAAABAAAAAAD1/wEAAAABAAAAAAALAPv/AAAAAAAAAAALAPz/AAAAAAEAAAALAP3/AAAAAAIAAAAMAPz/AAABAAEAAAANAPz/AAABAAEAAAAOAPz/AAABAAEAAAAOAPv/AAABAAAAAAANAPv/AAABAAAAAAAMAPv/AAABAAAAAAAMAP3/AAABAAIAAAANAP3/AAABAAIAAAAOAP3/AAABAAIAAAAPAPz/AAACAAEAAAAPAPv/AAACAAAAAAAPAP3/AAACAAIAAAAYAAMAAAACAAAAAAAXAAMAAAABAAAAAAAXAAQAAAABAAEAAAAXAAUAAAABAAIAAAAYAAUAAAACAAIAAAAYAAQAAAACAAEAAAAGAP3/AAAAAAQAAAAHAP3/AAACAAQAAADx//3/AAAAAAIAAADy//3/AAABAAIAAADz//3/AAACAAIAAADz//z/AAACAAAAAADy//z/AAABAAAAAADx//z/AAAAAAAAAAD2/wEAAAACAAAAAAA=") tile_set = SubResource("TileSet_gee14") [node name="Background" type="Parallax2D" parent="."]