From 906cd2587194c16cef48b3b168bedf16b5f8de49 Mon Sep 17 00:00:00 2001 From: Florian Date: Tue, 16 Sep 2025 16:13:14 +0200 Subject: [PATCH] Made Every building come with a ghost --- buildings/building.gd | 3 +++ buildings/building.tscn | 7 ++++++- buildings/haunted_house.tscn | 6 ++++++ enemies/ghost.gd | 4 ++-- main.tscn | 1 - player/player_walk.png.import | 6 ++++++ project.godot | 2 +- 7 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 buildings/haunted_house.tscn diff --git a/buildings/building.gd b/buildings/building.gd index 9732c04..538cb31 100644 --- a/buildings/building.gd +++ b/buildings/building.gd @@ -12,6 +12,9 @@ func _ready() -> void: var height = grid.ground_radius + location.y * grid.cell_height; position = height * Vector2.from_angle(angle) grid.buildings.append(self) + + for enemy in $EnemyList.get_children(): + enemy.reparent(get_parent()) func overlaps(other : Building): # heights don't overlap diff --git a/buildings/building.tscn b/buildings/building.tscn index 3b36e84..9466248 100644 --- a/buildings/building.tscn +++ b/buildings/building.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=6 format=3 uid="uid://djawvtdwp423v"] +[gd_scene load_steps=7 format=3 uid="uid://djawvtdwp423v"] [ext_resource type="Script" uid="uid://b2ji03ekijjnn" path="res://buildings/building.gd" id="1_5j34s"] [ext_resource type="Texture2D" uid="uid://cy70quh6k3s1j" path="res://icon.svg" id="2_2yopf"] [ext_resource type="Shader" uid="uid://c7gb1nqwvkr37" path="res://buildings/building.gdshader" id="2_f1gjg"] [ext_resource type="Script" uid="uid://dj7d4d2xs3nci" path="res://buildings/building_mesh.gd" id="4_qnfc1"] +[ext_resource type="PackedScene" uid="uid://chu67ci7sl488" path="res://enemies/ghost.tscn" id="5_xr4t5"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_qnfc1"] resource_local_to_scene = true @@ -21,3 +22,7 @@ material = SubResource("ShaderMaterial_qnfc1") scale = Vector2(25, 25) texture = ExtResource("2_2yopf") script = ExtResource("4_qnfc1") + +[node name="EnemyList" type="Node2D" parent="."] + +[node name="Ghost" parent="EnemyList" instance=ExtResource("5_xr4t5")] diff --git a/buildings/haunted_house.tscn b/buildings/haunted_house.tscn new file mode 100644 index 0000000..b780589 --- /dev/null +++ b/buildings/haunted_house.tscn @@ -0,0 +1,6 @@ +[gd_scene load_steps=2 format=3 uid="uid://bno6flekdwx88"] + +[ext_resource type="Script" uid="uid://b2ji03ekijjnn" path="res://buildings/building.gd" id="1_q3nfb"] + +[node name="HauntedHouse" type="Node2D"] +script = ExtResource("1_q3nfb") diff --git a/enemies/ghost.gd b/enemies/ghost.gd index 0cebf27..37a6de7 100644 --- a/enemies/ghost.gd +++ b/enemies/ghost.gd @@ -6,8 +6,8 @@ var player : CharacterBody2D var current_knockback = Vector2.ZERO var knockback_weight = 800 -func _ready() -> void: - player = get_parent().get_node("Player") +func _ready(): + player = get_tree().get_root().get_node("main/Player") func _physics_process(delta: float) -> void: var motion = -(position - player.position).normalized() * speed diff --git a/main.tscn b/main.tscn index 1355601..d39848e 100644 --- a/main.tscn +++ b/main.tscn @@ -1,7 +1,6 @@ [gd_scene load_steps=7 format=3 uid="uid://cxo6bq26huau7"] [ext_resource type="PackedScene" uid="uid://cmaovvr15b3qk" path="res://player/player.tscn" id="2_1bvp3"] - [ext_resource type="Script" uid="uid://vgxh2xdevat7" path="res://world/earth.gd" id="2_lquwl"] [ext_resource type="PackedScene" uid="uid://chu67ci7sl488" path="res://enemies/ghost.tscn" id="3_h2yge"] [ext_resource type="PackedScene" uid="uid://jjoyj1ldafkf" path="res://world/earth.tscn" id="3_lquwl"] diff --git a/player/player_walk.png.import b/player/player_walk.png.import index 418970e..ab112ae 100644 --- a/player/player_walk.png.import +++ b/player/player_walk.png.import @@ -18,6 +18,8 @@ dest_files=["res://.godot/imported/player_walk.png-59515d82f701e5545419ecd7b3460 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 @@ -25,6 +27,10 @@ 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 diff --git a/project.godot b/project.godot index 78ec4ac..4b1244b 100644 --- a/project.godot +++ b/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="The Dark Side of Earth" run/main_scene="uid://cxo6bq26huau7" -config/features=PackedStringArray("4.4", "Forward Plus") +config/features=PackedStringArray("4.5", "Forward Plus") config/icon="res://icon.svg" [display]