Merge pull request #6 from fenath/improve-map

Improve map

Author: fenath

prefabs/enemy.tscn

@@ -1,6 +1,7 @@
-[gd_scene load_steps=23 format=3 uid="uid://cqndhocdt7dso"]
+[gd_scene load_steps=24 format=3 uid="uid://cqndhocdt7dso"]
 
 [ext_resource type="Texture2D" uid="uid://dvotad0vy67hq" path="res://assets/Factions/Goblins/Troops/Torch/Red/Torch_Red.png" id="1_6jcrq"]
+[ext_resource type="Script" path="res://scripts/enemy.gd" id="1_jwbne"]
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_ge2oi"]
 radius = 23.0217
@@ -104,7 +105,7 @@ animations = [{
 }],
 "loop": true,
 "name": &"attack",
-"speed": 5.0
+"speed": 10.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -130,7 +131,7 @@ animations = [{
 }],
 "loop": true,
 "name": &"idle",
-"speed": 5.0
+"speed": 10.0
 }, {
 "frames": [{
 "duration": 1.0,
@@ -153,14 +154,22 @@ animations = [{
 }],
 "loop": true,
 "name": &"run",
-"speed": 5.0
+"speed": 10.0
 }]
 
 [node name="enemy" type="CharacterBody2D"]
+script = ExtResource("1_jwbne")
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 shape = SubResource("CircleShape2D_ge2oi")
 
 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
 sprite_frames = SubResource("SpriteFrames_dcaq6")
 animation = &"run"
+frame_progress = 0.176552
+
+[node name="NavigationAgent" type="NavigationAgent2D" parent="."]
+path_desired_distance = 10.0
+path_postprocessing = 1
+avoidance_enabled = true
+debug_enabled = true

prefabs/tree.tscn

@@ -0,0 +1,90 @@
+[gd_scene load_steps=13 format=3 uid="uid://bm5i5qwn085kf"]
+
+[ext_resource type="Texture2D" uid="uid://dfhun0rxuho42" path="res://assets/Resources/Trees/Tree.png" id="1_ev32q"]
+[ext_resource type="Script" path="res://scripts/tree.gd" id="1_r4wqh"]
+[ext_resource type="Script" path="res://scripts/health_component.gd" id="3_536mh"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_aja1u"]
+atlas = ExtResource("1_ev32q")
+region = Rect2(0, 384, 192, 192)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_4ret0"]
+atlas = ExtResource("1_ev32q")
+region = Rect2(0, 192, 192, 192)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_n62uk"]
+atlas = ExtResource("1_ev32q")
+region = Rect2(192, 192, 192, 192)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_aawt1"]
+atlas = ExtResource("1_ev32q")
+region = Rect2(192, 0, 192, 192)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_480w5"]
+atlas = ExtResource("1_ev32q")
+region = Rect2(384, 0, 192, 192)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_jo6ls"]
+atlas = ExtResource("1_ev32q")
+region = Rect2(576, 0, 192, 192)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_0y7tt"]
+atlas = ExtResource("1_ev32q")
+region = Rect2(0, 0, 192, 192)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_7dcf2"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_aja1u")
+}],
+"loop": false,
+"name": &"chopped",
+"speed": 5.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_4ret0")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_n62uk")
+}],
+"loop": false,
+"name": &"hit",
+"speed": 10.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_aawt1")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_480w5")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_jo6ls")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_0y7tt")
+}],
+"loop": true,
+"name": &"idle",
+"speed": 10.0
+}]
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_onxyc"]
+size = Vector2(25, 40)
+
+[node name="Tree" type="StaticBody2D"]
+collision_mask = 3
+script = ExtResource("1_r4wqh")
+
+[node name="Sprite" type="AnimatedSprite2D" parent="."]
+sprite_frames = SubResource("SpriteFrames_7dcf2")
+animation = &"chopped"
+
+[node name="HealthComponent" type="Node2D" parent="."]
+script = ExtResource("3_536mh")
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+position = Vector2(1.5, 54)
+shape = SubResource("RectangleShape2D_onxyc")

project.godot

@@ -20,6 +20,24 @@ config/icon="res://icon-tower-guard.svg"
 resources=""
 player=""
 
+[input]
+
+attack={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":90,"key_label":0,"unicode":122,"location":0,"echo":false,"script":null)
+]
+}
+interact={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":88,"key_label":0,"unicode":120,"location":0,"echo":false,"script":null)
+]
+}
+eat={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":67,"key_label":0,"unicode":99,"location":0,"echo":false,"script":null)
+]
+}
+
 [rendering]
 
 textures/canvas_textures/default_texture_filter=0

scenes/components/health_component.tscn

@@ -0,0 +1,6 @@
+[gd_scene load_steps=2 format=3 uid="uid://bbwglqm1aagrv"]
+
+[ext_resource type="Script" path="res://scripts/health_component.gd" id="1_6r0q1"]
+
+[node name="HealthComponent" type="Node2D"]
+script = ExtResource("1_6r0q1")

scenes/main.tscn

@@ -1,117 +1,15 @@
-[gd_scene load_steps=35 format=3 uid="uid://djaltvt06unu0"]
+[gd_scene load_steps=20 format=3 uid="uid://djaltvt06unu0"]
 
 [ext_resource type="PackedScene" uid="uid://bjhjupefmfgqs" path="res://scenes/tiles.tscn" id="1_d6p3j"]
-[ext_resource type="Script" path="res://scripts/character_body_2d.gd" id="2_v3nol"]
-[ext_resource type="Texture2D" uid="uid://deo0js5p0gxx7" path="res://assets/Factions/Knights/Troops/Warrior/Blue/Warrior_Blue.png" id="2_w4gtl"]
 [ext_resource type="PackedScene" uid="uid://c7jm2yuaacdqh" path="res://scenes/hud.tscn" id="3_617g2"]
-[ext_resource type="Script" path="res://scripts/follow_camera.gd" id="4_tcs51"]
+[ext_resource type="PackedScene" uid="uid://7lsouk5v2cwt" path="res://scenes/player.tscn" id="3_el764"]
 [ext_resource type="PackedScene" uid="uid://dsb8p4ysfqkdi" path="res://prefabs/meat.tscn" id="5_w7uh3"]
 [ext_resource type="Script" path="res://scripts/gold_entity.gd" id="6_jgvlv"]
 [ext_resource type="PackedScene" uid="uid://buky2dgx2kia3" path="res://prefabs/gold.tscn" id="6_mytpp"]
 [ext_resource type="Texture2D" uid="uid://bunj2btgrwyu3" path="res://assets/Resources/Resources/G_Idle.png" id="7_52rrg"]
 [ext_resource type="PackedScene" uid="uid://br5nrp3rtcimi" path="res://prefabs/wood.tscn" id="7_m1s7h"]
 [ext_resource type="Texture2D" uid="uid://cco37rio8rbnf" path="res://assets/Resources/Resources/G_Spawn.png" id="8_xnn5u"]
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_q0c52"]
-atlas = ExtResource("2_w4gtl")
-region = Rect2(0, 0, 192, 192)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_j6wva"]
-atlas = ExtResource("2_w4gtl")
-region = Rect2(192, 0, 192, 192)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_jivnv"]
-atlas = ExtResource("2_w4gtl")
-region = Rect2(384, 0, 192, 192)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_euptx"]
-atlas = ExtResource("2_w4gtl")
-region = Rect2(576, 0, 192, 192)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_ndmye"]
-atlas = ExtResource("2_w4gtl")
-region = Rect2(768, 0, 192, 192)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_g4vkm"]
-atlas = ExtResource("2_w4gtl")
-region = Rect2(960, 0, 192, 192)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_rb4no"]
-atlas = ExtResource("2_w4gtl")
-region = Rect2(0, 192, 192, 192)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_k54yu"]
-atlas = ExtResource("2_w4gtl")
-region = Rect2(192, 192, 192, 192)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_rui1o"]
-atlas = ExtResource("2_w4gtl")
-region = Rect2(384, 192, 192, 192)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_anl6s"]
-atlas = ExtResource("2_w4gtl")
-region = Rect2(576, 192, 192, 192)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_t7npc"]
-atlas = ExtResource("2_w4gtl")
-region = Rect2(768, 192, 192, 192)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_anj4k"]
-atlas = ExtResource("2_w4gtl")
-region = Rect2(960, 192, 192, 192)
-
-[sub_resource type="SpriteFrames" id="SpriteFrames_lh52o"]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_q0c52")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_j6wva")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_jivnv")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_euptx")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_ndmye")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_g4vkm")
-}],
-"loop": true,
-"name": &"idle",
-"speed": 12.0
-}, {
-"frames": [{
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_rb4no")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_k54yu")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_rui1o")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_anl6s")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_t7npc")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_anj4k")
-}],
-"loop": true,
-"name": &"walking",
-"speed": 12.0
-}]
-
-[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_xesxe"]
-radius = 18.0
-height = 44.0
+[ext_resource type="PackedScene" uid="uid://bm5i5qwn085kf" path="res://prefabs/tree.tscn" id="12_53pmu"]
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_uk4ba"]
 radius = 25.0
@@ -182,34 +80,15 @@ animations = [{
 }]
 
 [node name="main" type="Node2D"]
+y_sort_enabled = true
 
 [node name="World" parent="." instance=ExtResource("1_d6p3j")]
 
 [node name="CanvasLayer" type="CanvasLayer" parent="."]
 
 [node name="Hud" parent="CanvasLayer" instance=ExtResource("3_617g2")]
 
-[node name="player" type="Node2D" parent="."]
-position = Vector2(371, 465)
-
-[node name="CharacterBody2D" type="CharacterBody2D" parent="player"]
-collision_mask = 3
-script = ExtResource("2_v3nol")
-
-[node name="followCamera" type="Camera2D" parent="player/CharacterBody2D"]
-process_callback = 0
-limit_left = 0
-limit_top = 0
-limit_right = 2000
-script = ExtResource("4_tcs51")
-
-[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="player/CharacterBody2D"]
-sprite_frames = SubResource("SpriteFrames_lh52o")
-animation = &"idle"
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="player/CharacterBody2D"]
-position = Vector2(0, 12)
-shape = SubResource("CapsuleShape2D_xesxe")
+[node name="player" parent="." instance=ExtResource("3_el764")]
 
 [node name="resources" type="Node2D" parent="."]
 
@@ -235,3 +114,6 @@ sprite_frames = SubResource("SpriteFrames_ouhmi")
 animation = &"spawn"
 frame = 6
 frame_progress = 1.0
+
+[node name="Tree" parent="." instance=ExtResource("12_53pmu")]
+position = Vector2(969, 943)