Compare commits
5 Commits
9066eecf1e
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 174e9dfb08 | |||
| 95bd7bb3be | |||
| 5ff0b1108e | |||
| 5f5f0f54f1 | |||
| 297233c48e |
@@ -0,0 +1,29 @@
|
|||||||
|
[gd_scene format=3 uid="uid://cayybawvw26cm"]
|
||||||
|
|
||||||
|
[ext_resource type="Script" path="res://scripts/EnchantedSphere.gd" id="1_sphere"]
|
||||||
|
|
||||||
|
[sub_resource type="SphereMesh" id="SphereMesh_1"]
|
||||||
|
radius = 0.28
|
||||||
|
height = 0.56
|
||||||
|
|
||||||
|
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_1"]
|
||||||
|
albedo_color = Color(0.8, 0.3, 1.0, 1)
|
||||||
|
emission_enabled = true
|
||||||
|
emission = Color(0.6, 0.1, 1.0, 1)
|
||||||
|
emission_energy_multiplier = 3.0
|
||||||
|
|
||||||
|
[node name="EnchantedSphere" type="Node3D"]
|
||||||
|
script = ExtResource("1_sphere")
|
||||||
|
|
||||||
|
[node name="SphereMesh" type="MeshInstance3D" parent="."]
|
||||||
|
mesh = SubResource("SphereMesh_1")
|
||||||
|
material_override = SubResource("StandardMaterial3D_1")
|
||||||
|
|
||||||
|
[node name="Tooltip" type="Label3D" parent="."]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.1, 0)
|
||||||
|
billboard = 1
|
||||||
|
double_sided = true
|
||||||
|
text = "[E] Enchanted Sphere
|
||||||
|
+1 Tier"
|
||||||
|
font_size = 32
|
||||||
|
outline_size = 6
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
[gd_scene format=3 uid="uid://bjk2mastaopd8"]
|
||||||
|
|
||||||
|
[ext_resource type="Script" path="res://scripts/Essence.gd" id="1_essence"]
|
||||||
|
|
||||||
|
[sub_resource type="SphereMesh" id="SphereMesh_1"]
|
||||||
|
radius = 0.18
|
||||||
|
height = 0.36
|
||||||
|
|
||||||
|
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_1"]
|
||||||
|
albedo_color = Color(0.7, 0.2, 1.0, 1)
|
||||||
|
emission_enabled = true
|
||||||
|
emission = Color(0.5, 0.0, 1.0, 1)
|
||||||
|
emission_energy_multiplier = 2.0
|
||||||
|
|
||||||
|
[sub_resource type="SphereShape3D" id="SphereShape3D_1"]
|
||||||
|
radius = 0.18
|
||||||
|
|
||||||
|
[node name="Essence" type="CharacterBody3D"]
|
||||||
|
script = ExtResource("1_essence")
|
||||||
|
|
||||||
|
[node name="EssenceMesh" type="MeshInstance3D" parent="."]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.22, 0)
|
||||||
|
mesh = SubResource("SphereMesh_1")
|
||||||
|
material_override = SubResource("StandardMaterial3D_1")
|
||||||
|
|
||||||
|
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.22, 0)
|
||||||
|
shape = SubResource("SphereShape3D_1")
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
[gd_scene format=3 uid="uid://g7iron5etp8u"]
|
||||||
|
|
||||||
|
[ext_resource type="Script" uid="uid://0wdmbocpe2ir" path="res://scripts/Iron.gd" id="1_iron"]
|
||||||
|
|
||||||
|
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_1"]
|
||||||
|
albedo_color = Color(0.55, 0.58, 0.62, 1)
|
||||||
|
metallic = 0.7
|
||||||
|
metallic_specular = 0.8
|
||||||
|
roughness = 0.4
|
||||||
|
|
||||||
|
[sub_resource type="BoxMesh" id="BoxMesh_1"]
|
||||||
|
size = Vector3(0.38, 0.22, 0.5)
|
||||||
|
|
||||||
|
[sub_resource type="BoxShape3D" id="BoxShape3D_1"]
|
||||||
|
size = Vector3(0.38, 0.22, 0.5)
|
||||||
|
|
||||||
|
[node name="Iron" type="CharacterBody3D" unique_id=611454609]
|
||||||
|
script = ExtResource("1_iron")
|
||||||
|
|
||||||
|
[node name="IronMesh" type="MeshInstance3D" parent="." unique_id=1832879739]
|
||||||
|
transform = Transform3D(3.5611715, 0, 0, 0, 2.7614622, 0, 0, 0, 1, 0, 0.2, 0)
|
||||||
|
material_override = SubResource("StandardMaterial3D_1")
|
||||||
|
mesh = SubResource("BoxMesh_1")
|
||||||
|
|
||||||
|
[node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=665808333]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.2, 0)
|
||||||
|
shape = SubResource("BoxShape3D_1")
|
||||||
@@ -62,6 +62,40 @@ radius = 1.0966797
|
|||||||
[sub_resource type="BoxShape3D" id="BoxShape3D_qifjx"]
|
[sub_resource type="BoxShape3D" id="BoxShape3D_qifjx"]
|
||||||
size = Vector3(2.2670898, 1, 3.7305298)
|
size = Vector3(2.2670898, 1, 3.7305298)
|
||||||
|
|
||||||
|
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_forge"]
|
||||||
|
albedo_color = Color(0.28, 0.24, 0.2, 1)
|
||||||
|
roughness = 0.95
|
||||||
|
|
||||||
|
[sub_resource type="BoxMesh" id="BoxMesh_forge"]
|
||||||
|
size = Vector3(2, 1.8, 2)
|
||||||
|
|
||||||
|
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_chimney"]
|
||||||
|
albedo_color = Color(0.2, 0.18, 0.16, 1)
|
||||||
|
|
||||||
|
[sub_resource type="BoxMesh" id="BoxMesh_chimney"]
|
||||||
|
size = Vector3(0.6, 1, 0.6)
|
||||||
|
|
||||||
|
[sub_resource type="BoxShape3D" id="BoxShape3D_forge"]
|
||||||
|
size = Vector3(2, 1.8, 2)
|
||||||
|
|
||||||
|
[sub_resource type="BoxMesh" id="BoxMesh_etable"]
|
||||||
|
size = Vector3(1.4, 0.9, 1.4)
|
||||||
|
|
||||||
|
[sub_resource type="BoxMesh" id="BoxMesh_ebook"]
|
||||||
|
size = Vector3(0.7, 0.12, 0.5)
|
||||||
|
|
||||||
|
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_etable"]
|
||||||
|
albedo_color = Color(0.12, 0.08, 0.22, 1)
|
||||||
|
roughness = 0.6
|
||||||
|
metallic = 0.2
|
||||||
|
|
||||||
|
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ebook"]
|
||||||
|
albedo_color = Color(0.55, 0.08, 0.08, 1)
|
||||||
|
roughness = 0.9
|
||||||
|
|
||||||
|
[sub_resource type="BoxShape3D" id="BoxShape3D_etable"]
|
||||||
|
size = Vector3(1.4, 0.9, 1.4)
|
||||||
|
|
||||||
[node name="Level" type="Node3D" unique_id=696519]
|
[node name="Level" type="Node3D" unique_id=696519]
|
||||||
script = ExtResource("1_ppgk2")
|
script = ExtResource("1_ppgk2")
|
||||||
show_grid = false
|
show_grid = false
|
||||||
@@ -210,3 +244,35 @@ shape = SubResource("CylinderShape3D_6vs76")
|
|||||||
[node name="CollisionShape3D3" type="CollisionShape3D" parent="stone_big_static_body" unique_id=1397239926]
|
[node name="CollisionShape3D3" type="CollisionShape3D" parent="stone_big_static_body" unique_id=1397239926]
|
||||||
transform = Transform3D(1.9385185, 0, -0.69275445, 0, 2.0585828, 0, 0.69275445, 0, 1.9385185, 60.670692, 1.6238549, 36.420376)
|
transform = Transform3D(1.9385185, 0, -0.69275445, 0, 2.0585828, 0, 0.69275445, 0, 1.9385185, 60.670692, 1.6238549, 36.420376)
|
||||||
shape = SubResource("CylinderShape3D_6vs76")
|
shape = SubResource("CylinderShape3D_6vs76")
|
||||||
|
|
||||||
|
[node name="Forge" type="StaticBody3D" parent="." unique_id=734179063]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 0.9, -8)
|
||||||
|
metadata/is_forge = true
|
||||||
|
|
||||||
|
[node name="ForgeMesh" type="MeshInstance3D" parent="Forge" unique_id=1062255408]
|
||||||
|
material_override = SubResource("StandardMaterial3D_forge")
|
||||||
|
mesh = SubResource("BoxMesh_forge")
|
||||||
|
|
||||||
|
[node name="ChimneyMesh" type="MeshInstance3D" parent="Forge" unique_id=1649367044]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, 1.4, -0.4)
|
||||||
|
material_override = SubResource("StandardMaterial3D_chimney")
|
||||||
|
mesh = SubResource("BoxMesh_chimney")
|
||||||
|
|
||||||
|
[node name="CollisionShape3D" type="CollisionShape3D" parent="Forge" unique_id=726531191]
|
||||||
|
shape = SubResource("BoxShape3D_forge")
|
||||||
|
|
||||||
|
[node name="EnchantingTable" type="StaticBody3D" parent="."]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8, 0.45, -8)
|
||||||
|
metadata/is_enchanting_table = true
|
||||||
|
|
||||||
|
[node name="TableMesh" type="MeshInstance3D" parent="EnchantingTable"]
|
||||||
|
mesh = SubResource("BoxMesh_etable")
|
||||||
|
material_override = SubResource("StandardMaterial3D_etable")
|
||||||
|
|
||||||
|
[node name="BookMesh" type="MeshInstance3D" parent="EnchantingTable"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.51, 0)
|
||||||
|
mesh = SubResource("BoxMesh_ebook")
|
||||||
|
material_override = SubResource("StandardMaterial3D_ebook")
|
||||||
|
|
||||||
|
[node name="CollisionShape3D" type="CollisionShape3D" parent="EnchantingTable"]
|
||||||
|
shape = SubResource("BoxShape3D_etable")
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
[gd_scene format=3 uid="uid://h8armor4fura"]
|
||||||
|
|
||||||
|
[ext_resource type="Script" path="res://scripts/MetalArmor.gd" id="1_armor"]
|
||||||
|
|
||||||
|
[sub_resource type="BoxMesh" id="BoxMesh_1"]
|
||||||
|
size = Vector3(0.55, 0.7, 0.25)
|
||||||
|
|
||||||
|
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_1"]
|
||||||
|
albedo_color = Color(0.55, 0.60, 0.68, 1)
|
||||||
|
roughness = 0.3
|
||||||
|
metallic = 0.85
|
||||||
|
metallic_specular = 1.0
|
||||||
|
|
||||||
|
[node name="MetalArmor" type="Node3D"]
|
||||||
|
script = ExtResource("1_armor")
|
||||||
|
|
||||||
|
[node name="ArmorMesh" type="MeshInstance3D" parent="."]
|
||||||
|
mesh = SubResource("BoxMesh_1")
|
||||||
|
material_override = SubResource("StandardMaterial3D_1")
|
||||||
|
|
||||||
|
[node name="Tooltip" type="Label3D" parent="."]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.0, 0)
|
||||||
|
billboard = 1
|
||||||
|
double_sided = true
|
||||||
|
text = "[E] Metal Armor
|
||||||
|
+1 Tier"
|
||||||
|
font_size = 32
|
||||||
|
outline_size = 6
|
||||||
@@ -63,6 +63,11 @@ func _fly(delta: float) -> void:
|
|||||||
_take_damage(speed_now * WALL_SELF_DMG)
|
_take_damage(speed_now * WALL_SELF_DMG)
|
||||||
handled = true
|
handled = true
|
||||||
break
|
break
|
||||||
|
elif col3d.is_in_group("player"):
|
||||||
|
col3d.call("take_damage", int(speed_now * damage_modifier))
|
||||||
|
fly_vel *= 0.3
|
||||||
|
handled = true
|
||||||
|
break
|
||||||
elif col3d.is_in_group("enemies") or col3d.is_in_group("kickable"):
|
elif col3d.is_in_group("enemies") or col3d.is_in_group("kickable"):
|
||||||
if col3d == self:
|
if col3d == self:
|
||||||
continue
|
continue
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
extends Node3D
|
||||||
|
|
||||||
|
@onready var tooltip: Label3D = $Tooltip
|
||||||
|
@onready var mesh_node: MeshInstance3D = $SphereMesh
|
||||||
|
|
||||||
|
func _ready() -> void:
|
||||||
|
add_to_group("interactable")
|
||||||
|
tooltip.visible = false
|
||||||
|
var tw := create_tween().set_loops()
|
||||||
|
tw.tween_property(self, "position:y", 0.7, 0.9)
|
||||||
|
tw.tween_property(self, "position:y", 0.3, 0.9)
|
||||||
|
|
||||||
|
func _process(delta: float) -> void:
|
||||||
|
rotation.y += delta * 1.8
|
||||||
|
mesh_node.rotation.x += delta * 0.9
|
||||||
|
var players := get_tree().get_nodes_in_group("player")
|
||||||
|
if players.is_empty():
|
||||||
|
tooltip.visible = false
|
||||||
|
return
|
||||||
|
var p := players[0] as Node3D
|
||||||
|
tooltip.visible = p != null and global_position.distance_to(p.global_position) < 2.5
|
||||||
|
|
||||||
|
func interact(player: Node) -> void:
|
||||||
|
player.call("apply_upgrade_enchant")
|
||||||
|
queue_free()
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
uid://c4d11cs4fcqib
|
||||||
+83
-20
@@ -1,8 +1,10 @@
|
|||||||
class_name Enemy
|
class_name Enemy
|
||||||
extends CharacterBody3D
|
extends CharacterBody3D
|
||||||
|
|
||||||
const PICKUP_SCENE := preload("res://scenes/Pickup.tscn")
|
const PICKUP_SCENE := preload("res://scenes/Pickup.tscn")
|
||||||
const LEATHER_SCENE := preload("res://scenes/Leather.tscn")
|
const LEATHER_SCENE := preload("res://scenes/Leather.tscn")
|
||||||
|
const IRON_SCENE := preload("res://scenes/Iron.tscn")
|
||||||
|
const ESSENCE_SCENE := preload("res://scenes/Essence.tscn")
|
||||||
|
|
||||||
signal died(points: int)
|
signal died(points: int)
|
||||||
signal merged(upgrade: bool)
|
signal merged(upgrade: bool)
|
||||||
@@ -10,6 +12,8 @@ signal merged(upgrade: bool)
|
|||||||
enum State { CHASING, FLYING, STUNNED, DEAD, MERGING }
|
enum State { CHASING, FLYING, STUNNED, DEAD, MERGING }
|
||||||
|
|
||||||
static var first_leather_spawned: bool = false
|
static var first_leather_spawned: bool = false
|
||||||
|
static var first_iron_spawned: bool = false
|
||||||
|
static var first_essence_spawned: bool = false
|
||||||
|
|
||||||
var kickable_type: String = ""
|
var kickable_type: String = ""
|
||||||
var tier: int = 1
|
var tier: int = 1
|
||||||
@@ -25,6 +29,11 @@ var stun_time: float = 0.5
|
|||||||
var base_scale: float = 1.0
|
var base_scale: float = 1.0
|
||||||
var wave_num: int = 1
|
var wave_num: int = 1
|
||||||
var damage_modifier: float = 0.75
|
var damage_modifier: float = 0.75
|
||||||
|
var enemy_kick_timer: float = 0.0
|
||||||
|
var kickable_kick_timer: float = 0.0
|
||||||
|
const ENEMY_KICK_COOLDOWN := 1.2
|
||||||
|
const KICKABLE_KICK_COOLDOWN := 2.5
|
||||||
|
const ENEMY_KICK_RANGE := 2.2
|
||||||
|
|
||||||
var state: State = State.CHASING
|
var state: State = State.CHASING
|
||||||
var fly_vel: Vector3 = Vector3.ZERO
|
var fly_vel: Vector3 = Vector3.ZERO
|
||||||
@@ -54,7 +63,6 @@ func setup(type: String, wave: int) -> void:
|
|||||||
enemy_type = type
|
enemy_type = type
|
||||||
kickable_type = type
|
kickable_type = type
|
||||||
wave_num = wave
|
wave_num = wave
|
||||||
tier = enemy_level
|
|
||||||
match type:
|
match type:
|
||||||
"slime":
|
"slime":
|
||||||
move_speed = 2.8 + wave * 0.12
|
move_speed = 2.8 + wave * 0.12
|
||||||
@@ -82,6 +90,7 @@ func setup(type: String, wave: int) -> void:
|
|||||||
COLOR_CHASE = Color(0.3, 0.7, 0.3)
|
COLOR_CHASE = Color(0.3, 0.7, 0.3)
|
||||||
mat.albedo_color = COLOR_CHASE
|
mat.albedo_color = COLOR_CHASE
|
||||||
enemy_level = 3
|
enemy_level = 3
|
||||||
|
tier = enemy_level
|
||||||
|
|
||||||
func _physics_process(delta: float) -> void:
|
func _physics_process(delta: float) -> void:
|
||||||
match state:
|
match state:
|
||||||
@@ -94,6 +103,8 @@ func _chase(delta: float) -> void:
|
|||||||
if not is_instance_valid(target):
|
if not is_instance_valid(target):
|
||||||
return
|
return
|
||||||
contact_timer = max(0.0, contact_timer - delta)
|
contact_timer = max(0.0, contact_timer - delta)
|
||||||
|
enemy_kick_timer = max(0.0, enemy_kick_timer - delta)
|
||||||
|
kickable_kick_timer = max(0.0, kickable_kick_timer - delta)
|
||||||
var diff := target.global_position - global_position
|
var diff := target.global_position - global_position
|
||||||
diff.y = 0.0
|
diff.y = 0.0
|
||||||
var dist := diff.length()
|
var dist := diff.length()
|
||||||
@@ -101,32 +112,68 @@ func _chase(delta: float) -> void:
|
|||||||
contact_timer = CONTACT_CD
|
contact_timer = CONTACT_CD
|
||||||
if target.has_method("take_damage"):
|
if target.has_method("take_damage"):
|
||||||
target.take_damage(damage_to_player)
|
target.take_damage(damage_to_player)
|
||||||
|
if enemy_kick_timer <= 0.0:
|
||||||
|
_try_enemy_kick()
|
||||||
if dist > 0.05:
|
if dist > 0.05:
|
||||||
var dir := diff.normalized()
|
var dir := diff.normalized()
|
||||||
dir = _avoid_rocks(dir)
|
|
||||||
velocity.x = dir.x * move_speed
|
velocity.x = dir.x * move_speed
|
||||||
velocity.z = dir.z * move_speed
|
velocity.z = dir.z * move_speed
|
||||||
rotation.y = lerp_angle(rotation.y, atan2(dir.x, dir.z), 8.0 * delta)
|
rotation.y = lerp_angle(rotation.y, atan2(dir.x, dir.z), 8.0 * delta)
|
||||||
velocity.y = 0.0
|
velocity.y = 0.0
|
||||||
move_and_slide()
|
move_and_slide()
|
||||||
|
|
||||||
const AVOID_RADIUS := 1.6
|
func _try_enemy_kick() -> void:
|
||||||
const AVOID_STRENGTH := 2.2
|
if not is_instance_valid(target):
|
||||||
|
return
|
||||||
|
var player_pos := target.global_position
|
||||||
|
var to_player := player_pos - global_position
|
||||||
|
to_player.y = 0.0
|
||||||
|
var kick_dir := to_player.normalized() if to_player.length() > 0.01 else -global_transform.basis.z
|
||||||
|
|
||||||
func _avoid_rocks(desired: Vector3) -> Vector3:
|
# 1. Kick nearest kickable towards player
|
||||||
var push := Vector3.ZERO
|
if kickable_kick_timer <= 0.0:
|
||||||
for rock in get_tree().get_nodes_in_group("kickable"):
|
var nearest_kickable: Node3D = null
|
||||||
if not is_instance_valid(rock):
|
var nearest_dist := ENEMY_KICK_RANGE
|
||||||
continue
|
for node in get_tree().get_nodes_in_group("kickable"):
|
||||||
var away := global_position - (rock as Node3D).global_position
|
var k := node as Node3D
|
||||||
away.y = 0.0
|
if k == null or not is_instance_valid(k):
|
||||||
var d := away.length()
|
continue
|
||||||
if d < AVOID_RADIUS and d > 0.01:
|
var d := (k.global_position - global_position)
|
||||||
push += away.normalized() * (1.0 - d / AVOID_RADIUS)
|
d.y = 0.0
|
||||||
if push.length() < 0.01:
|
if d.length() < nearest_dist:
|
||||||
return desired
|
nearest_dist = d.length()
|
||||||
var steered := desired + push * AVOID_STRENGTH
|
nearest_kickable = k
|
||||||
return steered.normalized() if steered.length() > 0.01 else desired
|
if nearest_kickable != null:
|
||||||
|
nearest_kickable.call("receive_kick", kick_dir, 35.0 + tier * 8.0)
|
||||||
|
kickable_kick_timer = KICKABLE_KICK_COOLDOWN
|
||||||
|
return
|
||||||
|
|
||||||
|
# 2. Kick lower-tier enemy nearest to player direction
|
||||||
|
if tier > 0:
|
||||||
|
var nearest_enemy: Node3D = null
|
||||||
|
var nearest_enemy_dist := ENEMY_KICK_RANGE
|
||||||
|
for node in get_tree().get_nodes_in_group("enemies"):
|
||||||
|
var en := node as Node3D
|
||||||
|
if en == null or en == self or not is_instance_valid(en):
|
||||||
|
continue
|
||||||
|
if (en.get("tier") if en.get("tier") != null else 0) >= tier:
|
||||||
|
continue
|
||||||
|
var d := (en.global_position - global_position)
|
||||||
|
d.y = 0.0
|
||||||
|
if d.length() < nearest_enemy_dist:
|
||||||
|
nearest_enemy_dist = d.length()
|
||||||
|
nearest_enemy = en
|
||||||
|
if nearest_enemy != null:
|
||||||
|
nearest_enemy.call("receive_kick", kick_dir, 40.0 + tier * 10.0)
|
||||||
|
enemy_kick_timer = ENEMY_KICK_COOLDOWN
|
||||||
|
return
|
||||||
|
|
||||||
|
# 3. Kick player directly if lower tier and in range
|
||||||
|
if tier > 0 and to_player.length() < ENEMY_KICK_RANGE:
|
||||||
|
var player_tier: int = target.get("tier") if target.get("tier") != null else 0
|
||||||
|
if player_tier < tier:
|
||||||
|
target.call("receive_kick", kick_dir, 35.0 + tier * 8.0)
|
||||||
|
enemy_kick_timer = ENEMY_KICK_COOLDOWN
|
||||||
|
|
||||||
func _fly(delta: float) -> void:
|
func _fly(delta: float) -> void:
|
||||||
var speed_now := Vector2(fly_vel.x, fly_vel.z).length()
|
var speed_now := Vector2(fly_vel.x, fly_vel.z).length()
|
||||||
@@ -267,6 +314,22 @@ func _try_drop_pickup() -> void:
|
|||||||
get_parent().add_child(leather)
|
get_parent().add_child(leather)
|
||||||
leather.global_position = global_position
|
leather.global_position = global_position
|
||||||
|
|
||||||
|
if enemy_level == 2:
|
||||||
|
var drop_iron := not first_iron_spawned or randf() < 0.20
|
||||||
|
if drop_iron:
|
||||||
|
first_iron_spawned = true
|
||||||
|
var iron := IRON_SCENE.instantiate() as Node3D
|
||||||
|
get_parent().add_child(iron)
|
||||||
|
iron.global_position = global_position
|
||||||
|
|
||||||
|
if enemy_level == 3:
|
||||||
|
var drop_essence := not first_essence_spawned or randf() < 0.20
|
||||||
|
if drop_essence:
|
||||||
|
first_essence_spawned = true
|
||||||
|
var essence := ESSENCE_SCENE.instantiate() as Node3D
|
||||||
|
get_parent().add_child(essence)
|
||||||
|
essence.global_position = global_position
|
||||||
|
|
||||||
var roll := randf()
|
var roll := randf()
|
||||||
var p_type := ""
|
var p_type := ""
|
||||||
var p_heal := 0
|
var p_heal := 0
|
||||||
|
|||||||
@@ -0,0 +1,105 @@
|
|||||||
|
extends CharacterBody3D
|
||||||
|
|
||||||
|
const ENCHANTED_SPHERE_SCENE := preload("res://scenes/EnchantedSphere.tscn")
|
||||||
|
|
||||||
|
signal destroyed
|
||||||
|
|
||||||
|
enum State { IDLE, FLYING }
|
||||||
|
|
||||||
|
const AIR_FRICTION := 0.88
|
||||||
|
const MIN_SPEED := 0.3
|
||||||
|
const WALL_BOUNCE := 0.6
|
||||||
|
const WALL_SELF_DMG := 0.0
|
||||||
|
|
||||||
|
var kickable_type: String = "essence"
|
||||||
|
var tier: int = 3
|
||||||
|
var state: State = State.IDLE
|
||||||
|
var fly_vel: Vector3 = Vector3.ZERO
|
||||||
|
var health: float = 999.0
|
||||||
|
var dead: bool = false
|
||||||
|
var damage_modifier: float = 0.0
|
||||||
|
|
||||||
|
@onready var mesh_node: MeshInstance3D = $EssenceMesh
|
||||||
|
var essence_mat: StandardMaterial3D
|
||||||
|
|
||||||
|
func _ready() -> void:
|
||||||
|
add_to_group("kickable")
|
||||||
|
essence_mat = mesh_node.material_override.duplicate() as StandardMaterial3D
|
||||||
|
mesh_node.material_override = essence_mat
|
||||||
|
var tw := create_tween().set_loops()
|
||||||
|
tw.tween_property(self, "position:y", 0.35, 0.6)
|
||||||
|
tw.tween_property(self, "position:y", 0.15, 0.6)
|
||||||
|
|
||||||
|
func apply_collision_damage(_dmg: float) -> void:
|
||||||
|
pass
|
||||||
|
|
||||||
|
func receive_kick(direction: Vector3, force: float) -> void:
|
||||||
|
fly_vel = direction * force
|
||||||
|
fly_vel.y = 0.0
|
||||||
|
state = State.FLYING
|
||||||
|
|
||||||
|
func _physics_process(delta: float) -> void:
|
||||||
|
if state == State.IDLE:
|
||||||
|
mesh_node.rotation.y += delta * 1.5
|
||||||
|
return
|
||||||
|
_fly(delta)
|
||||||
|
|
||||||
|
func _fly(delta: float) -> void:
|
||||||
|
var speed_now := Vector2(fly_vel.x, fly_vel.z).length()
|
||||||
|
velocity = fly_vel
|
||||||
|
velocity.y = 0.0
|
||||||
|
move_and_slide()
|
||||||
|
|
||||||
|
var handled := false
|
||||||
|
for i in get_slide_collision_count():
|
||||||
|
var col := get_slide_collision(i)
|
||||||
|
var col3d := col.get_collider() as Node3D
|
||||||
|
if col3d == null:
|
||||||
|
continue
|
||||||
|
if col3d.has_meta("is_enchanting_table"):
|
||||||
|
_hit_table(col3d)
|
||||||
|
return
|
||||||
|
if col3d.has_meta("is_wall"):
|
||||||
|
var normal := col.get_normal()
|
||||||
|
normal.y = 0.0
|
||||||
|
if normal.length() > 0.01:
|
||||||
|
fly_vel = fly_vel.bounce(normal.normalized()) * WALL_BOUNCE
|
||||||
|
else:
|
||||||
|
fly_vel = Vector3.ZERO
|
||||||
|
handled = true
|
||||||
|
break
|
||||||
|
elif col3d.is_in_group("enemies") or col3d.is_in_group("kickable"):
|
||||||
|
if col3d == self:
|
||||||
|
continue
|
||||||
|
KickSystem.resolve(self, col3d, fly_vel)
|
||||||
|
fly_vel *= 0.4
|
||||||
|
handled = true
|
||||||
|
break
|
||||||
|
|
||||||
|
if not handled:
|
||||||
|
fly_vel = velocity
|
||||||
|
fly_vel.y = 0.0
|
||||||
|
|
||||||
|
fly_vel *= pow(AIR_FRICTION, delta * 60.0)
|
||||||
|
|
||||||
|
if Vector2(fly_vel.x, fly_vel.z).length() < MIN_SPEED:
|
||||||
|
fly_vel = Vector3.ZERO
|
||||||
|
velocity = Vector3.ZERO
|
||||||
|
state = State.IDLE
|
||||||
|
|
||||||
|
mesh_node.rotation.y += delta * speed_now * 0.4
|
||||||
|
|
||||||
|
func _hit_table(table: Node3D) -> void:
|
||||||
|
if dead:
|
||||||
|
return
|
||||||
|
dead = true
|
||||||
|
state = State.IDLE
|
||||||
|
set_physics_process(false)
|
||||||
|
var parent := get_parent()
|
||||||
|
var spawn_pos := table.global_position + Vector3(0, 0.5, 0)
|
||||||
|
queue_free()
|
||||||
|
if parent == null:
|
||||||
|
return
|
||||||
|
var sphere := ENCHANTED_SPHERE_SCENE.instantiate() as Node3D
|
||||||
|
parent.add_child(sphere)
|
||||||
|
sphere.global_position = spawn_pos
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
uid://bk2vad35jr81c
|
||||||
+139
@@ -0,0 +1,139 @@
|
|||||||
|
extends CharacterBody3D
|
||||||
|
|
||||||
|
const METAL_ARMOR_SCENE := preload("res://scenes/MetalArmor.tscn")
|
||||||
|
|
||||||
|
signal destroyed
|
||||||
|
|
||||||
|
enum State { IDLE, FLYING }
|
||||||
|
|
||||||
|
const AIR_FRICTION := 0.86
|
||||||
|
const MIN_SPEED := 0.5
|
||||||
|
const WALL_BOUNCE := 0.45
|
||||||
|
const WALL_SELF_DMG := 0.5
|
||||||
|
|
||||||
|
var kickable_type: String = "iron"
|
||||||
|
var tier: int = 2
|
||||||
|
var state: State = State.IDLE
|
||||||
|
var fly_vel: Vector3 = Vector3.ZERO
|
||||||
|
var health: float = 80.0
|
||||||
|
var dead: bool = false
|
||||||
|
var damage_modifier: float = 0.9
|
||||||
|
|
||||||
|
@onready var mesh_node: MeshInstance3D = $IronMesh
|
||||||
|
var iron_mat: StandardMaterial3D
|
||||||
|
|
||||||
|
const COLOR_IDLE := Color(0.55, 0.58, 0.62)
|
||||||
|
const COLOR_IMPACT := Color(1.0, 1.0, 1.0)
|
||||||
|
|
||||||
|
func _ready() -> void:
|
||||||
|
add_to_group("kickable")
|
||||||
|
iron_mat = mesh_node.material_override.duplicate() as StandardMaterial3D
|
||||||
|
mesh_node.material_override = iron_mat
|
||||||
|
|
||||||
|
func apply_collision_damage(dmg: float) -> void:
|
||||||
|
_take_damage(dmg)
|
||||||
|
|
||||||
|
func receive_kick(direction: Vector3, force: float) -> void:
|
||||||
|
fly_vel = direction * force
|
||||||
|
fly_vel.y = 0.0
|
||||||
|
state = State.FLYING
|
||||||
|
|
||||||
|
func _physics_process(delta: float) -> void:
|
||||||
|
if state == State.IDLE:
|
||||||
|
return
|
||||||
|
_fly(delta)
|
||||||
|
|
||||||
|
func _fly(delta: float) -> void:
|
||||||
|
var speed_now := Vector2(fly_vel.x, fly_vel.z).length()
|
||||||
|
velocity = fly_vel
|
||||||
|
velocity.y = 0.0
|
||||||
|
move_and_slide()
|
||||||
|
|
||||||
|
var handled := false
|
||||||
|
for i in get_slide_collision_count():
|
||||||
|
var col := get_slide_collision(i)
|
||||||
|
var col3d := col.get_collider() as Node3D
|
||||||
|
if col3d == null:
|
||||||
|
continue
|
||||||
|
if col3d.has_meta("is_forge"):
|
||||||
|
_hit_forge(col3d)
|
||||||
|
return
|
||||||
|
if col3d.has_meta("is_wall"):
|
||||||
|
var normal := col.get_normal()
|
||||||
|
normal.y = 0.0
|
||||||
|
if normal.length() > 0.01:
|
||||||
|
fly_vel = fly_vel.bounce(normal.normalized()) * WALL_BOUNCE
|
||||||
|
else:
|
||||||
|
fly_vel = Vector3.ZERO
|
||||||
|
_take_damage(speed_now * WALL_SELF_DMG)
|
||||||
|
handled = true
|
||||||
|
break
|
||||||
|
elif col3d.is_in_group("player"):
|
||||||
|
col3d.call("take_damage", int(speed_now * damage_modifier))
|
||||||
|
fly_vel *= 0.3
|
||||||
|
handled = true
|
||||||
|
break
|
||||||
|
elif col3d.is_in_group("enemies") or col3d.is_in_group("kickable"):
|
||||||
|
if col3d == self:
|
||||||
|
continue
|
||||||
|
KickSystem.resolve(self, col3d, fly_vel)
|
||||||
|
if not dead and is_instance_valid(col3d):
|
||||||
|
var kick_dir := col3d.global_position - global_position
|
||||||
|
kick_dir.y = 0.0
|
||||||
|
if kick_dir.length() > 0.01:
|
||||||
|
col3d.call("receive_kick", kick_dir.normalized(), speed_now * 0.65)
|
||||||
|
fly_vel *= 0.45
|
||||||
|
handled = true
|
||||||
|
break
|
||||||
|
|
||||||
|
if not handled:
|
||||||
|
fly_vel = velocity
|
||||||
|
fly_vel.y = 0.0
|
||||||
|
|
||||||
|
fly_vel *= pow(AIR_FRICTION, delta * 60.0)
|
||||||
|
|
||||||
|
if Vector2(fly_vel.x, fly_vel.z).length() < MIN_SPEED:
|
||||||
|
fly_vel = Vector3.ZERO
|
||||||
|
velocity = Vector3.ZERO
|
||||||
|
state = State.IDLE
|
||||||
|
|
||||||
|
mesh_node.rotation.y += delta * speed_now * 0.3
|
||||||
|
|
||||||
|
func _hit_forge(forge: Node3D) -> void:
|
||||||
|
if dead:
|
||||||
|
return
|
||||||
|
dead = true
|
||||||
|
state = State.IDLE
|
||||||
|
set_physics_process(false)
|
||||||
|
var parent := get_parent()
|
||||||
|
var spawn_pos := forge.global_position + Vector3(5, 0, 0)
|
||||||
|
queue_free()
|
||||||
|
if parent == null:
|
||||||
|
return
|
||||||
|
var armor := METAL_ARMOR_SCENE.instantiate() as Node3D
|
||||||
|
parent.add_child(armor)
|
||||||
|
armor.global_position = spawn_pos
|
||||||
|
|
||||||
|
func _take_damage(dmg: float) -> void:
|
||||||
|
if dead:
|
||||||
|
return
|
||||||
|
health -= dmg
|
||||||
|
_flash()
|
||||||
|
if health <= 0.0:
|
||||||
|
_die()
|
||||||
|
|
||||||
|
func _die() -> void:
|
||||||
|
dead = true
|
||||||
|
state = State.IDLE
|
||||||
|
set_physics_process(false)
|
||||||
|
emit_signal("destroyed")
|
||||||
|
var tw := create_tween()
|
||||||
|
tw.tween_property(self, "scale", Vector3(1.6, 0.1, 1.6), 0.12)
|
||||||
|
tw.tween_property(self, "scale", Vector3(0.0, 0.0, 0.0), 0.1)
|
||||||
|
tw.tween_callback(queue_free)
|
||||||
|
|
||||||
|
func _flash() -> void:
|
||||||
|
var tw := create_tween()
|
||||||
|
tw.tween_property(iron_mat, "albedo_color", COLOR_IMPACT, 0.04)
|
||||||
|
var target_color := COLOR_IDLE.lerp(Color.RED, clampf(1.0 - health / 80.0, 0.0, 0.6))
|
||||||
|
tw.tween_property(iron_mat, "albedo_color", target_color, 0.18)
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
uid://0wdmbocpe2ir
|
||||||
@@ -171,6 +171,8 @@ func _start_game() -> void:
|
|||||||
kills = 0
|
kills = 0
|
||||||
kills_for_next = 10
|
kills_for_next = 10
|
||||||
Enemy.first_leather_spawned = false
|
Enemy.first_leather_spawned = false
|
||||||
|
Enemy.first_iron_spawned = false
|
||||||
|
Enemy.first_essence_spawned = false
|
||||||
_update_labels()
|
_update_labels()
|
||||||
spawn_timer.wait_time = 1.4
|
spawn_timer.wait_time = 1.4
|
||||||
spawn_timer.connect("timeout", _on_spawn_timer)
|
spawn_timer.connect("timeout", _on_spawn_timer)
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
extends Node3D
|
||||||
|
|
||||||
|
@onready var tooltip: Label3D = $Tooltip
|
||||||
|
|
||||||
|
func _ready() -> void:
|
||||||
|
add_to_group("interactable")
|
||||||
|
tooltip.visible = false
|
||||||
|
var tw := create_tween().set_loops()
|
||||||
|
tw.tween_property(self, "position:y", 0.5, 0.7)
|
||||||
|
tw.tween_property(self, "position:y", 0.2, 0.7)
|
||||||
|
|
||||||
|
func _process(delta: float) -> void:
|
||||||
|
rotation.y += delta * 1.4
|
||||||
|
var players := get_tree().get_nodes_in_group("player")
|
||||||
|
if players.is_empty():
|
||||||
|
tooltip.visible = false
|
||||||
|
return
|
||||||
|
var p := players[0] as Node3D
|
||||||
|
tooltip.visible = p != null and global_position.distance_to(p.global_position) < 2.5
|
||||||
|
|
||||||
|
func interact(player: Node) -> void:
|
||||||
|
player.call("apply_upgrade_armor")
|
||||||
|
queue_free()
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
uid://cqp1ucyvnno7i
|
||||||
+50
-18
@@ -136,9 +136,9 @@ func _do_kick() -> void:
|
|||||||
forward.y = 0.0
|
forward.y = 0.0
|
||||||
forward = forward.normalized() if forward.length() > 0.01 else Vector3(0.0, 0.0, -1.0)
|
forward = forward.normalized() if forward.length() > 0.01 else Vector3(0.0, 0.0, -1.0)
|
||||||
var half_cos: float = cos(deg_to_rad(kick_angle * 0.5))
|
var half_cos: float = cos(deg_to_rad(kick_angle * 0.5))
|
||||||
var targets := get_tree().get_nodes_in_group("enemies") + get_tree().get_nodes_in_group("kickable")
|
var candidates: Array[Node3D] = []
|
||||||
var kicked_any := false
|
var candidate_dists: Array[float] = []
|
||||||
for e in targets:
|
for e in get_tree().get_nodes_in_group("enemies") + get_tree().get_nodes_in_group("kickable"):
|
||||||
if not is_instance_valid(e):
|
if not is_instance_valid(e):
|
||||||
continue
|
continue
|
||||||
var en := e as Node3D
|
var en := e as Node3D
|
||||||
@@ -150,21 +150,34 @@ func _do_kick() -> void:
|
|||||||
if dist < 0.1 or dist > kick_range:
|
if dist < 0.1 or dist > kick_range:
|
||||||
continue
|
continue
|
||||||
if (diff / dist).dot(forward) >= half_cos:
|
if (diff / dist).dot(forward) >= half_cos:
|
||||||
var obj_tier: int = en.get("tier") if en.get("tier") != null else 0
|
candidates.append(en)
|
||||||
var diff_tier := tier - obj_tier
|
candidate_dists.append(dist)
|
||||||
var force: float
|
|
||||||
if diff_tier < 0:
|
if candidates.is_empty():
|
||||||
force = 15.0
|
return
|
||||||
elif diff_tier == 0:
|
|
||||||
force = 50.0
|
var nearest_idx := 0
|
||||||
elif diff_tier == 1:
|
for i in range(1, candidates.size()):
|
||||||
force = 70.0
|
if candidate_dists[i] < candidate_dists[nearest_idx]:
|
||||||
else:
|
nearest_idx = i
|
||||||
force = 80.0
|
|
||||||
en.call("receive_kick", diff / dist, force)
|
var best := candidates[nearest_idx]
|
||||||
kicked_any = true
|
var best_diff := best.global_position - global_position
|
||||||
if kicked_any:
|
best_diff.y = 0.0
|
||||||
_squish_effect()
|
var best_dir := best_diff.normalized()
|
||||||
|
var obj_tier: int = best.get("tier") if best.get("tier") != null else 0
|
||||||
|
var diff_tier := tier - obj_tier
|
||||||
|
var force: float
|
||||||
|
if diff_tier < 0:
|
||||||
|
force = 15.0
|
||||||
|
elif diff_tier == 0:
|
||||||
|
force = 50.0
|
||||||
|
elif diff_tier == 1:
|
||||||
|
force = 70.0
|
||||||
|
else:
|
||||||
|
force = 80.0
|
||||||
|
best.call("receive_kick", best_dir, force)
|
||||||
|
_squish_effect()
|
||||||
|
|
||||||
func _try_interact() -> void:
|
func _try_interact() -> void:
|
||||||
var best: Node3D = null
|
var best: Node3D = null
|
||||||
@@ -189,6 +202,13 @@ func _squish_effect() -> void:
|
|||||||
tw.tween_property(mesh_node, "scale", Vector3(1.3, 0.55, 1.3), 0.07)
|
tw.tween_property(mesh_node, "scale", Vector3(1.3, 0.55, 1.3), 0.07)
|
||||||
tw.tween_property(mesh_node, "scale", Vector3(1.0, 1.0, 1.0), 0.18)
|
tw.tween_property(mesh_node, "scale", Vector3(1.0, 1.0, 1.0), 0.18)
|
||||||
|
|
||||||
|
func receive_kick(direction: Vector3, force: float) -> void:
|
||||||
|
if not is_alive or invincible_timer > 0.0:
|
||||||
|
return
|
||||||
|
velocity.x = direction.x * force
|
||||||
|
velocity.z = direction.z * force
|
||||||
|
invincible_timer = IFRAMES_DURATION * 0.5
|
||||||
|
|
||||||
func take_damage(amount: int) -> void:
|
func take_damage(amount: int) -> void:
|
||||||
if not is_alive or invincible_timer > 0.0:
|
if not is_alive or invincible_timer > 0.0:
|
||||||
return
|
return
|
||||||
@@ -235,3 +255,15 @@ func apply_upgrade_boots(speed_bonus: float, _tier: int) -> void:
|
|||||||
var tw := create_tween()
|
var tw := create_tween()
|
||||||
tw.tween_property(player_mat, "albedo_color", Color(1.0, 0.85, 0.2), 0.1)
|
tw.tween_property(player_mat, "albedo_color", Color(1.0, 0.85, 0.2), 0.1)
|
||||||
tw.tween_property(player_mat, "albedo_color", BASE_COLOR, 0.4)
|
tw.tween_property(player_mat, "albedo_color", BASE_COLOR, 0.4)
|
||||||
|
|
||||||
|
func apply_upgrade_armor() -> void:
|
||||||
|
tier += 1
|
||||||
|
var tw := create_tween()
|
||||||
|
tw.tween_property(player_mat, "albedo_color", Color(0.7, 0.8, 1.0), 0.1)
|
||||||
|
tw.tween_property(player_mat, "albedo_color", BASE_COLOR, 0.5)
|
||||||
|
|
||||||
|
func apply_upgrade_enchant() -> void:
|
||||||
|
tier += 1
|
||||||
|
var tw := create_tween()
|
||||||
|
tw.tween_property(player_mat, "albedo_color", Color(0.8, 0.2, 1.0), 0.1)
|
||||||
|
tw.tween_property(player_mat, "albedo_color", BASE_COLOR, 0.6)
|
||||||
|
|||||||
@@ -66,6 +66,11 @@ func _fly(delta: float) -> void:
|
|||||||
_take_damage(speed_now * WALL_SELF_DMG)
|
_take_damage(speed_now * WALL_SELF_DMG)
|
||||||
handled = true
|
handled = true
|
||||||
break
|
break
|
||||||
|
elif col3d.is_in_group("player"):
|
||||||
|
col3d.call("take_damage", int(speed_now * damage_modifier))
|
||||||
|
fly_vel *= 0.3
|
||||||
|
handled = true
|
||||||
|
break
|
||||||
elif col3d.is_in_group("enemies") or col3d.is_in_group("kickable"):
|
elif col3d.is_in_group("enemies") or col3d.is_in_group("kickable"):
|
||||||
if col3d == self:
|
if col3d == self:
|
||||||
continue
|
continue
|
||||||
|
|||||||
@@ -63,6 +63,11 @@ func _fly(delta: float) -> void:
|
|||||||
_take_damage(speed_now * WALL_SELF_DMG)
|
_take_damage(speed_now * WALL_SELF_DMG)
|
||||||
handled = true
|
handled = true
|
||||||
break
|
break
|
||||||
|
elif col3d.is_in_group("player"):
|
||||||
|
col3d.call("take_damage", int(speed_now * damage_modifier))
|
||||||
|
fly_vel *= 0.3
|
||||||
|
handled = true
|
||||||
|
break
|
||||||
elif col3d.is_in_group("enemies") or col3d.is_in_group("kickable"):
|
elif col3d.is_in_group("enemies") or col3d.is_in_group("kickable"):
|
||||||
if col3d == self:
|
if col3d == self:
|
||||||
continue
|
continue
|
||||||
|
|||||||
Reference in New Issue
Block a user