diff --git a/Assets/Characters/72 Character Free/Char 5/Character 5.png.import b/Assets/Characters/72 Character Free/Char 5/Character 5.png.import index 907fcc3..57f6edf 100644 --- a/Assets/Characters/72 Character Free/Char 5/Character 5.png.import +++ b/Assets/Characters/72 Character Free/Char 5/Character 5.png.import @@ -3,25 +3,26 @@ importer="texture" type="CompressedTexture2D" uid="uid://d38rvmky1mr5f" -path="res://.godot/imported/Character 5.png-e8c35410fad61c8e0b57612479895096.ctex" +path.s3tc="res://.godot/imported/Character 5.png-e8c35410fad61c8e0b57612479895096.s3tc.ctex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc_bptc"], +"vram_texture": true } [deps] source_file="res://Assets/Characters/72 Character Free/Char 5/Character 5.png" -dest_files=["res://.godot/imported/Character 5.png-e8c35410fad61c8e0b57612479895096.ctex"] +dest_files=["res://.godot/imported/Character 5.png-e8c35410fad61c8e0b57612479895096.s3tc.ctex"] [params] -compress/mode=0 +compress/mode=2 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/generate=true mipmaps/limit=-1 roughness/mode=0 roughness/src_normal="" @@ -31,4 +32,4 @@ 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 +detect_3d/compress_to=0 diff --git a/Assets/Icones/Spritesheet_Cakes_WITH_OUTLINE.png b/Assets/Icones/Spritesheet_Cakes_WITH_OUTLINE.png new file mode 100644 index 0000000..1bb6395 Binary files /dev/null and b/Assets/Icones/Spritesheet_Cakes_WITH_OUTLINE.png differ diff --git a/Assets/Icones/Spritesheet_Cakes_WITH_OUTLINE.png.import b/Assets/Icones/Spritesheet_Cakes_WITH_OUTLINE.png.import new file mode 100644 index 0000000..f18c183 --- /dev/null +++ b/Assets/Icones/Spritesheet_Cakes_WITH_OUTLINE.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b7jiyk3w5tl02" +path="res://.godot/imported/Spritesheet_Cakes_WITH_OUTLINE.png-00f0215c11d11c1d402c62a26586b42d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Icones/Spritesheet_Cakes_WITH_OUTLINE.png" +dest_files=["res://.godot/imported/Spritesheet_Cakes_WITH_OUTLINE.png-00f0215c11d11c1d402c62a26586b42d.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/Enemies/Scenes/boss-james.tscn b/Enemies/Scenes/boss-james.tscn index 6b9a1f7..705ccf1 100644 --- a/Enemies/Scenes/boss-james.tscn +++ b/Enemies/Scenes/boss-james.tscn @@ -1,10 +1,14 @@ -[gd_scene load_steps=9 format=3 uid="uid://dyl4wiga2goi"] +[gd_scene load_steps=10 format=3 uid="uid://dyl4wiga2goi"] [ext_resource type="PackedScene" uid="uid://dg8bjkjuddnhg" path="res://Enemies/enemy.tscn" id="1_ohyx6"] [ext_resource type="Script" uid="uid://dw53e0rr7qc02" path="res://Enemies/boss.gd" id="2_vnmiq"] [ext_resource type="Texture2D" uid="uid://d38rvmky1mr5f" path="res://Assets/Characters/72 Character Free/Char 5/Character 5.png" id="3_831fr"] [ext_resource type="Script" uid="uid://ddgbr0n8kic3y" path="res://Towers/Projectiles/ProjectileResource.gd" id="3_vnmiq"] -[ext_resource type="Texture2D" uid="uid://dqyhhvxpwtpsy" path="res://Assets/Emotes/emote_star.png" id="4_831fr"] +[ext_resource type="Texture2D" uid="uid://b7jiyk3w5tl02" path="res://Assets/Icones/Spritesheet_Cakes_WITH_OUTLINE.png" id="4_831fr"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_tviqb"] +atlas = ExtResource("4_831fr") +region = Rect2(161, 33, 28, 31) [sub_resource type="Resource" id="Resource_831fr"] script = ExtResource("3_vnmiq") @@ -13,14 +17,14 @@ damage = 3 maxTargets = 1 type = 4 allowedTargets = 2 -sprite = ExtResource("4_831fr") +sprite = SubResource("AtlasTexture_tviqb") metadata/_custom_type_script = "uid://ddgbr0n8kic3y" [sub_resource type="ViewportTexture" id="ViewportTexture_mw235"] viewport_path = NodePath("Enemy/HealthBar3D/SubViewport") -[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_tviqb"] -points = PackedVector3Array(0, 0, 0, -1.5, 1, -2.5, 1.5, 1, -2.5, 1.5, 0, -2.5, -1.5, 0, -2.5) +[sub_resource type="SphereShape3D" id="SphereShape3D_831fr"] +radius = 2.0 [node name="PathFollow3D" instance=ExtResource("1_ohyx6")] @@ -30,7 +34,7 @@ script = ExtResource("2_vnmiq") projectile = SubResource("Resource_831fr") speed = 0.7 base_attack_damage = 10 -max_life = 20 +max_life = 300 money = 120 [node name="Sprite3D" parent="Enemy" index="1"] @@ -46,7 +50,7 @@ collision_layer = 0 collision_mask = 4 [node name="CollisionShape3D" type="CollisionShape3D" parent="Enemy/TowerAttackRange" index="0"] -shape = SubResource("ConvexPolygonShape3D_tviqb") +shape = SubResource("SphereShape3D_831fr") debug_color = Color(0.419608, 0, 0.584314, 0.419608) [connection signal="body_entered" from="Enemy/TowerAttackRange" to="Enemy" method="onAttackRangeBodyEntered"] diff --git a/Levels/Map 1/level_1.tres b/Levels/Map 1/level_1.tres index a780445..fb2a2f5 100644 --- a/Levels/Map 1/level_1.tres +++ b/Levels/Map 1/level_1.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" script_class="Level" load_steps=19 format=3 uid="uid://ob41fnhkjr3o"] +[gd_resource type="Resource" script_class="Level" load_steps=21 format=3 uid="uid://ob41fnhkjr3o"] [ext_resource type="Script" uid="uid://cuhq6u67cbbqm" path="res://Levels/Scripts/Resource/Level.gd" id="1_ftl6b"] [ext_resource type="Script" uid="uid://chu8s12rtdeqx" path="res://Levels/Scripts/Resource/Wave.gd" id="2_457yt"] @@ -110,6 +110,18 @@ pack_delay = 0.5 script = ExtResource("2_457yt") troops = Array[ExtResource("3_ub8wd")]([SubResource("Resource_7vcps"), SubResource("Resource_3kmde"), SubResource("Resource_xfp51"), SubResource("Resource_lvuiw"), SubResource("Resource_q3d8d"), SubResource("Resource_1514p")]) +[sub_resource type="Resource" id="Resource_1nx3f"] +script = ExtResource("3_ub8wd") +enemy = "uid://dyl4wiga2goi" +number_to_spawn = 1 +lane_to_spawn = 0 +spawn_delay = 1.0 +pack_delay = 0.15 + +[sub_resource type="Resource" id="Resource_0nx55"] +script = ExtResource("2_457yt") +troops = Array[ExtResource("3_ub8wd")]([SubResource("Resource_1nx3f")]) + [resource] script = ExtResource("1_ftl6b") auto_start = false @@ -118,5 +130,5 @@ tier_max = 1 allowedTowers = Array[int]([1, 2, 3]) laneCount = 1 startingMoney = 110 -waves = Array[ExtResource("2_457yt")]([SubResource("Resource_457yt"), SubResource("Resource_qeljc"), SubResource("Resource_46oi2"), SubResource("Resource_p2jl5")]) +waves = Array[ExtResource("2_457yt")]([SubResource("Resource_457yt"), SubResource("Resource_qeljc"), SubResource("Resource_46oi2"), SubResource("Resource_p2jl5"), SubResource("Resource_0nx55")]) metadata/_custom_type_script = "uid://cuhq6u67cbbqm" diff --git a/Towers/Projectiles/Projectile.gd b/Towers/Projectiles/Projectile.gd index fe8e3ca..edcba2d 100644 --- a/Towers/Projectiles/Projectile.gd +++ b/Towers/Projectiles/Projectile.gd @@ -50,7 +50,7 @@ func _physics_process(_delta: float) -> void: func shouldQueueFree() -> bool: match type: TYPE.PIERCING: return vectorTarget.distance_squared_to(global_position) < .4 - _ when target is Tower: return not target.visible + _ when allowedTargets & TARGET_ALLY && target is Tower: return not target.visible _ when !is_instance_valid(target): return true return false