Cultist enemys renamed to cultist

This commit is contained in:
2026-02-04 23:46:19 +03:00
parent 8d2ce976ec
commit 1e617715f3
29 changed files with 232 additions and 215 deletions
@@ -1,5 +1,5 @@
class_name AbstractColorEnemy
extends AbstractEnemy
class_name AbstractColorCultist
extends AbstractCultist
@onready var collision_switcher : CollisionSwitcher = $CollisionSwitcher
@@ -1,11 +1,11 @@
[gd_scene format=3 uid="uid://d37eyum03h83i"]
[ext_resource type="PackedScene" uid="uid://bx0luh4vdob3q" path="res://game/characters/enemies/abstract_enemy.tscn" id="1_12hr0"]
[ext_resource type="Script" uid="uid://das7ujanefsn0" path="res://game/characters/enemies/abstract_color_enemy.gd" id="2_rd56i"]
[ext_resource type="PackedScene" uid="uid://bx0luh4vdob3q" path="res://game/characters/enemies/abstract_cultist.tscn" id="1_12hr0"]
[ext_resource type="Script" uid="uid://das7ujanefsn0" path="res://game/characters/enemies/abstract_color_cultist.gd" id="2_rd56i"]
[ext_resource type="PackedScene" uid="uid://5qlocc0yu8ug" path="res://game/collision_switcher.tscn" id="3_e5cea"]
[ext_resource type="Shader" uid="uid://lqq1mg6l1qqe" path="res://game/shaders/black_n_white.gdshader" id="3_r5rx0"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_ybui5"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_ejk4w"]
resource_local_to_scene = true
shader = ExtResource("3_r5rx0")
shader_parameter/black_color = Color(0, 0, 0, 1)
@@ -16,11 +16,11 @@ shader_parameter/speed = 5.0
shader_parameter/intensity = 1.0
shader_parameter/scale = 20.0
[node name="AbstractColorEnemy" instance=ExtResource("1_12hr0")]
[node name="AbstractColorCultist" unique_id=644641841 instance=ExtResource("1_12hr0")]
script = ExtResource("2_rd56i")
[node name="AnimatedSprite2D" parent="." index="0"]
material = SubResource("ShaderMaterial_ybui5")
[node name="CultistSprite" parent="." index="0" unique_id=1997264413]
material = SubResource("ShaderMaterial_ejk4w")
[node name="CollisionSwitcher" parent="." index="2" node_paths=PackedStringArray("object") instance=ExtResource("3_e5cea")]
[node name="CollisionSwitcher" parent="." index="2" unique_id=991274552 node_paths=PackedStringArray("object") instance=ExtResource("3_e5cea")]
object = NodePath("..")
@@ -1,4 +1,4 @@
class_name AbstractEnemy
class_name AbstractCultist
extends CharacterBody2D
@@ -45,7 +45,7 @@ var _target_found := false
var _state : State:
set = _set_state
@onready var sprite : AnimatedSprite2D = $AnimatedSprite2D
@onready var sprite : AnimatedSprite2D = $CultistSprite
@onready var left_wall_ray : RayCast2D = $%LeftWallRay
@onready var right_wall_ray : RayCast2D = $%RightWallRay
@@ -180,13 +180,13 @@ func _update_animation() -> void:
if is_zero_approx(velocity.y):
match _state:
State.WalkLeft:
_play_animation(EnemySprite.ANIMATION_WALK_LEFT)
_play_animation(CultistSprite.ANIMATION_WALK_LEFT)
State.WalkRight:
_play_animation(EnemySprite.ANIMATION_WALK_RIGHT)
_play_animation(CultistSprite.ANIMATION_WALK_RIGHT)
State.ChasingLeft:
_play_animation(EnemySprite.ANIMATION_CHASE_LEFT)
_play_animation(CultistSprite.ANIMATION_CHASE_LEFT)
State.ChasingRight:
_play_animation(EnemySprite.ANIMATION_CHASE_RIGHT)
_play_animation(CultistSprite.ANIMATION_CHASE_RIGHT)
State.Idle:
_play_idle_animation()
State.LookAround:
@@ -198,9 +198,9 @@ func _update_animation() -> void:
func _play_idle_animation() -> void:
match facing:
Facing.Front:
_play_animation(EnemySprite.ANIMATION_IDLE_FRONT)
_play_animation(CultistSprite.ANIMATION_IDLE_FRONT)
Facing.Rear:
_play_animation(EnemySprite.ANIMATION_IDLE_REAR)
_play_animation(CultistSprite.ANIMATION_IDLE_REAR)
func _play_look_around_animation() -> void:
@@ -208,35 +208,35 @@ func _play_look_around_animation() -> void:
match facing:
Facing.Front:
var animation := _get_random_animation(EnemySprite.LOOK_AROUND_FRONT_ANIMATIONS)
var animation := _get_random_animation(CultistSprite.LOOK_AROUND_FRONT_ANIMATIONS)
_play_animation(animation)
Facing.Rear:
var animation := _get_random_animation(EnemySprite.LOOK_AROUND_REAR_ANIMATIONS)
var animation := _get_random_animation(CultistSprite.LOOK_AROUND_REAR_ANIMATIONS)
_play_animation(animation)
func _play_fall_animation() -> void:
if is_zero_approx(velocity.x):
if velocity.y < 0:
_play_animation(EnemySprite.ANIMATION_FALL_UP)
_play_animation(CultistSprite.ANIMATION_FALL_UP)
else:
_play_animation(EnemySprite.ANIMATION_FALL_DOWN)
_play_animation(CultistSprite.ANIMATION_FALL_DOWN)
elif velocity.x < 0:
if velocity.y < 0:
_play_animation(EnemySprite.ANIMATION_FALL_UP_LEFT)
_play_animation(CultistSprite.ANIMATION_FALL_UP_LEFT)
else:
_play_animation(EnemySprite.ANIMATION_FALL_DOWN_LEFT)
_play_animation(CultistSprite.ANIMATION_FALL_DOWN_LEFT)
else:
if velocity.y < 0:
_play_animation(EnemySprite.ANIMATION_FALL_UP_RIGHT)
_play_animation(CultistSprite.ANIMATION_FALL_UP_RIGHT)
else:
_play_animation(EnemySprite.ANIMATION_FALL_DOWN_RIGHT)
_play_animation(CultistSprite.ANIMATION_FALL_DOWN_RIGHT)
func _is_current_animation_look_around() -> bool:
if not sprite.is_playing(): return false
if sprite.animation in EnemySprite.LOOK_AROUND_FRONT_ANIMATIONS: return true
if sprite.animation in EnemySprite.LOOK_AROUND_REAR_ANIMATIONS: return true
if sprite.animation in CultistSprite.LOOK_AROUND_FRONT_ANIMATIONS: return true
if sprite.animation in CultistSprite.LOOK_AROUND_REAR_ANIMATIONS: return true
return false
@@ -1,7 +1,7 @@
[gd_scene format=3 uid="uid://bx0luh4vdob3q"]
[ext_resource type="Script" uid="uid://but5aeh7y1s0f" path="res://game/characters/enemies/abstract_enemy.gd" id="1_2wrno"]
[ext_resource type="PackedScene" uid="uid://dtxiercm8dsfm" path="res://game/characters/enemies/enemy_sprite.tscn" id="2_tjvyk"]
[ext_resource type="Script" uid="uid://but5aeh7y1s0f" path="res://game/characters/enemies/abstract_cultist.gd" id="1_2wrno"]
[ext_resource type="PackedScene" uid="uid://dtxiercm8dsfm" path="res://game/characters/enemies/cultist_sprite.tscn" id="2_tjvyk"]
[ext_resource type="PackedScene" uid="uid://dike8xgbqdut2" path="res://game/killing_area.tscn" id="3_tjvyk"]
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_mocsw"]
@@ -15,11 +15,11 @@ size = Vector2(32, 28)
radius = 4.0
height = 28.0
[node name="AbstractEnemy" type="CharacterBody2D" unique_id=1676614852]
[node name="AbstractCultist" type="CharacterBody2D" unique_id=1676614852]
collision_layer = 0
script = ExtResource("1_2wrno")
[node name="AnimatedSprite2D" parent="." unique_id=1997264413 instance=ExtResource("2_tjvyk")]
[node name="CultistSprite" parent="." unique_id=1997264413 instance=ExtResource("2_tjvyk")]
[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=185651284]
position = Vector2(0, 2)
@@ -77,6 +77,6 @@ collision_mask = 0
position = Vector2(0, 2)
shape = SubResource("CapsuleShape2D_tjvyk")
[connection signal="animation_finished" from="AnimatedSprite2D" to="." method="_on_animation_finished"]
[connection signal="animation_looped" from="AnimatedSprite2D" to="." method="_on_animation_looped"]
[connection signal="animation_finished" from="CultistSprite" to="." method="_on_animation_finished"]
[connection signal="animation_looped" from="CultistSprite" to="." method="_on_animation_looped"]
[connection signal="body_entered" from="PlayerTouchArea" to="." method="_on_player_touch_area_entered"]
+2
View File
@@ -0,0 +1,2 @@
class_name BlackCultist
extends AbstractColorCultist
@@ -1,10 +1,10 @@
[gd_scene format=3 uid="uid://cutjutvd8dqqc"]
[ext_resource type="PackedScene" uid="uid://d37eyum03h83i" path="res://game/characters/enemies/abstract_color_enemy.tscn" id="1_gj2ks"]
[ext_resource type="Script" uid="uid://c2knsjcp6faf6" path="res://game/characters/enemies/black_enemy.gd" id="2_332ds"]
[ext_resource type="PackedScene" uid="uid://d37eyum03h83i" path="res://game/characters/enemies/abstract_color_cultist.tscn" id="1_gj2ks"]
[ext_resource type="Script" uid="uid://c2knsjcp6faf6" path="res://game/characters/enemies/black_cultist.gd" id="2_332ds"]
[ext_resource type="Shader" uid="uid://lqq1mg6l1qqe" path="res://game/shaders/black_n_white.gdshader" id="3_3jy5n"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_0u0ii"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_v1if5"]
resource_local_to_scene = true
shader = ExtResource("3_3jy5n")
shader_parameter/black_color = Color(0, 0, 0, 1)
@@ -15,15 +15,15 @@ shader_parameter/speed = 5.0
shader_parameter/intensity = 1.0
shader_parameter/scale = 20.0
[node name="BlackEnemy" unique_id=1910124567 instance=ExtResource("1_gj2ks")]
[node name="BlackCultist" unique_id=1910124567 instance=ExtResource("1_gj2ks")]
collision_layer = 4
collision_mask = 3
script = ExtResource("2_332ds")
[node name="AnimatedSprite2D" parent="." index="0" unique_id=1997264413]
material = SubResource("ShaderMaterial_0u0ii")
[node name="CultistSprite" parent="." index="0" unique_id=1997264413]
material = SubResource("ShaderMaterial_v1if5")
[node name="CollisionSwitcher" parent="." index="2"]
[node name="CollisionSwitcher" parent="." index="2" unique_id=991274552]
initial_state = 0
[node name="LeftWallRay" parent="WallCheck" parent_id_path=PackedInt32Array(782156094) index="0" unique_id=521416854]
-2
View File
@@ -1,2 +0,0 @@
class_name BlackEnemy
extends AbstractColorEnemy
@@ -1,4 +1,4 @@
class_name EnemySprite
class_name CultistSprite
extends AnimatedSprite2D
@@ -1,11 +1,11 @@
[gd_scene format=3 uid="uid://dtxiercm8dsfm"]
[ext_resource type="Shader" uid="uid://lqq1mg6l1qqe" path="res://game/shaders/black_n_white.gdshader" id="1_b6aoy"]
[ext_resource type="Texture2D" uid="uid://drk8j57acajrq" path="res://images/characters/cultist.png" id="2_yjsd7"]
[ext_resource type="Script" uid="uid://dkxmwkjttbf2d" path="res://game/characters/enemies/enemy_sprite.gd" id="3_h0tku"]
[ext_resource type="Shader" uid="uid://lqq1mg6l1qqe" path="res://game/shaders/black_n_white.gdshader" id="1_ew6gn"]
[ext_resource type="Texture2D" uid="uid://drk8j57acajrq" path="res://images/characters/cultist.png" id="2_g4n4l"]
[ext_resource type="Script" uid="uid://dkxmwkjttbf2d" path="res://game/characters/enemies/cultist_sprite.gd" id="3_ef0vi"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_vecdo"]
shader = ExtResource("1_b6aoy")
shader = ExtResource("1_ew6gn")
shader_parameter/black_color = Color(0, 0, 0, 1)
shader_parameter/white_color = Color(1, 1, 1, 1)
shader_parameter/switch_colors = false
@@ -15,171 +15,171 @@ shader_parameter/intensity = 1.0
shader_parameter/scale = 20.0
[sub_resource type="AtlasTexture" id="AtlasTexture_l58xb"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(0, 64, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_jrclg"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(32, 64, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_wwwee"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(64, 64, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_law7y"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(96, 64, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_hme24"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(128, 64, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_qawtf"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(160, 64, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_srxh4"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(192, 64, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_x6npu"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(224, 64, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_xavx3"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(0, 32, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_8t4m8"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(32, 32, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_3seah"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(64, 32, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_koyeg"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(96, 32, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_uw3v1"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(128, 32, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_265lf"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(160, 32, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_tav7c"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(192, 32, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_0xs27"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(224, 32, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_tjvyk"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(128, 96, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_vecdo"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(64, 96, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_qly8p"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(0, 96, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_klrad"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(160, 96, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_rjy0i"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(96, 96, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_ps2ar"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(32, 96, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_ijx3p"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(0, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_nm8xp"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(32, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_mocsw"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(128, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_y256a"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(160, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_yjsd7"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(64, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_b6aoy"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(0, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_voddl"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(96, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_soo8x"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(0, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_vbirv"]
atlas = ExtResource("2_g4n4l")
region = Rect2(0, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_8wpvf"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(64, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_vbirv"]
atlas = ExtResource("2_yjsd7")
region = Rect2(0, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_ntvg2"]
atlas = ExtResource("2_yjsd7")
region = Rect2(96, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_ssc8d"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(96, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_hrljr"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(0, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_ssc8d"]
atlas = ExtResource("2_g4n4l")
region = Rect2(96, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_ng7ok"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(64, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_8s45y"]
atlas = ExtResource("2_yjsd7")
region = Rect2(192, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_qbqct"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(128, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_ga5mk"]
atlas = ExtResource("2_yjsd7")
region = Rect2(224, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_8s45y"]
atlas = ExtResource("2_g4n4l")
region = Rect2(192, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_yu2nn"]
atlas = ExtResource("2_yjsd7")
[sub_resource type="AtlasTexture" id="AtlasTexture_ga5mk"]
atlas = ExtResource("2_g4n4l")
region = Rect2(224, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_g4v8m"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(128, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_yu2nn"]
atlas = ExtResource("2_g4n4l")
region = Rect2(224, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_20lqo"]
atlas = ExtResource("2_yjsd7")
atlas = ExtResource("2_g4n4l")
region = Rect2(192, 0, 32, 32)
[sub_resource type="SpriteFrames" id="SpriteFrames_2wrno"]
@@ -337,6 +337,9 @@ animations = [{
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_vbirv")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_8wpvf")
}, {
"duration": 1.0,
@@ -344,6 +347,9 @@ animations = [{
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ntvg2")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_vbirv")
}],
"loop": false,
"name": &"look_around_front_1",
@@ -351,6 +357,9 @@ animations = [{
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_hrljr")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ssc8d")
}, {
"duration": 1.0,
@@ -358,6 +367,9 @@ animations = [{
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ng7ok")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_hrljr")
}],
"loop": false,
"name": &"look_around_front_2",
@@ -365,6 +377,9 @@ animations = [{
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_qbqct")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_8s45y")
}, {
"duration": 1.0,
@@ -372,6 +387,9 @@ animations = [{
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ga5mk")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_qbqct")
}],
"loop": false,
"name": &"look_around_rear_1",
@@ -379,6 +397,9 @@ animations = [{
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_g4v8m")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_yu2nn")
}, {
"duration": 1.0,
@@ -386,6 +407,9 @@ animations = [{
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_20lqo")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_g4v8m")
}],
"loop": false,
"name": &"look_around_rear_2",
@@ -450,8 +474,8 @@ animations = [{
"speed": 10.0
}]
[node name="EnemySprite" type="AnimatedSprite2D" unique_id=351120861]
[node name="CultistSprite" type="AnimatedSprite2D" unique_id=351120861]
material = SubResource("ShaderMaterial_vecdo")
sprite_frames = SubResource("SpriteFrames_2wrno")
animation = &"look_around"
script = ExtResource("3_h0tku")
animation = &"look_around_front_1"
script = ExtResource("3_ef0vi")
+2
View File
@@ -0,0 +1,2 @@
class_name GrayCultist
extends AbstractCultist
@@ -1,15 +1,15 @@
[gd_scene format=3 uid="uid://cb0w6mt8g4mer"]
[ext_resource type="PackedScene" uid="uid://bx0luh4vdob3q" path="res://game/characters/enemies/abstract_enemy.tscn" id="1_q3s46"]
[ext_resource type="Script" uid="uid://cern5veiqkrkc" path="res://game/characters/enemies/gray_enemy.gd" id="2_olede"]
[ext_resource type="PackedScene" uid="uid://bx0luh4vdob3q" path="res://game/characters/enemies/abstract_cultist.tscn" id="1_q3s46"]
[ext_resource type="Script" uid="uid://cern5veiqkrkc" path="res://game/characters/enemies/gray_cultist.gd" id="2_olede"]
[ext_resource type="Material" uid="uid://dbkn3k0batj5w" path="res://game/materials/enemy_gray.tres" id="3_ho47d"]
[node name="GrayEnemy" unique_id=139812221 instance=ExtResource("1_q3s46")]
[node name="GrayCultist" unique_id=139812221 instance=ExtResource("1_q3s46")]
collision_layer = 16
collision_mask = 35
script = ExtResource("2_olede")
[node name="AnimatedSprite2D" parent="." index="0" unique_id=1997264413]
[node name="CultistSprite" parent="." index="0" unique_id=1997264413]
material = ExtResource("3_ho47d")
[node name="LeftWallRay" parent="WallCheck" parent_id_path=PackedInt32Array(782156094) index="0" unique_id=521416854]
-2
View File
@@ -1,2 +0,0 @@
class_name GrayEnemy
extends AbstractEnemy
+2
View File
@@ -0,0 +1,2 @@
class_name WhiteCultist
extends AbstractColorCultist
@@ -1,10 +1,10 @@
[gd_scene format=3 uid="uid://bv2gahb4wxgb1"]
[ext_resource type="PackedScene" uid="uid://d37eyum03h83i" path="res://game/characters/enemies/abstract_color_enemy.tscn" id="1_3yi7g"]
[ext_resource type="Script" uid="uid://dmcpkytgiuedi" path="res://game/characters/enemies/white_enemy.gd" id="2_c7pdf"]
[ext_resource type="PackedScene" uid="uid://d37eyum03h83i" path="res://game/characters/enemies/abstract_color_cultist.tscn" id="1_3yi7g"]
[ext_resource type="Script" uid="uid://dmcpkytgiuedi" path="res://game/characters/enemies/white_cultist.gd" id="2_c7pdf"]
[ext_resource type="Shader" uid="uid://lqq1mg6l1qqe" path="res://game/shaders/black_n_white.gdshader" id="3_uj6yw"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_gfhm1"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_36f86"]
resource_local_to_scene = true
shader = ExtResource("3_uj6yw")
shader_parameter/black_color = Color(0, 0, 0, 1)
@@ -20,8 +20,8 @@ collision_layer = 64
collision_mask = 33
script = ExtResource("2_c7pdf")
[node name="AnimatedSprite2D" parent="." index="0" unique_id=1997264413]
material = SubResource("ShaderMaterial_gfhm1")
[node name="CultistSprite" parent="." index="0" unique_id=1997264413]
material = SubResource("ShaderMaterial_36f86")
[node name="LeftWallRay" parent="WallCheck" parent_id_path=PackedInt32Array(782156094) index="0" unique_id=521416854]
collision_mask = 33
-2
View File
@@ -1,2 +0,0 @@
class_name WhiteEnemy
extends AbstractColorEnemy
+1 -1
View File
@@ -21,7 +21,7 @@ var is_dead := false
var _is_switching_needed := false
@onready var sprite : AnimatedSprite2D = $AnimatedSprite2D
@onready var sprite : AnimatedSprite2D = $PlayerSprite
@onready var collision_switcher : CollisionSwitcher = $CollisionSwitcher
@onready var pickups : Node2D = $Pickups
@onready var jump_buffer_timer : Timer = $JumpBufferTimer
+1 -1
View File
@@ -29,7 +29,7 @@ collision_layer = 128
collision_mask = 33
script = ExtResource("1_xln5q")
[node name="AnimatedSprite2D" parent="." unique_id=237719081 instance=ExtResource("2_n6ad3")]
[node name="PlayerSprite" parent="." unique_id=237719081 instance=ExtResource("2_n6ad3")]
animation = &"jump_right"
[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=1101386361]
+6 -6
View File
@@ -2,14 +2,14 @@
[ext_resource type="PackedScene" uid="uid://mpsu4g2b5h3a" path="res://game/levels/abstract_level.tscn" id="1_v1h2f"]
[ext_resource type="PackedScene" uid="uid://b7mhdrj3b6loq" path="res://game/doors/door.tscn" id="2_h35x0"]
[ext_resource type="PackedScene" uid="uid://bv2gahb4wxgb1" path="res://game/characters/enemies/white_enemy.tscn" id="3_2vfi4"]
[ext_resource type="PackedScene" uid="uid://bv2gahb4wxgb1" path="res://game/characters/enemies/white_cultist.tscn" id="3_2vfi4"]
[ext_resource type="PackedScene" uid="uid://b7imlh4sl036i" path="res://game/doors/square_door.tscn" id="3_qpxtm"]
[ext_resource type="PackedScene" uid="uid://cvhovmnl050os" path="res://game/objects/wardrobe.tscn" id="4_mpb5r"]
[ext_resource type="PackedScene" uid="uid://ciubf1ttwc133" path="res://game/pickups/square_key_pickup.tscn" id="4_p0pgv"]
[ext_resource type="PackedScene" uid="uid://b8pvlnpdnfmd0" path="res://game/objects/chair_f.tscn" id="5_i374g"]
[ext_resource type="PackedScene" uid="uid://cb0w6mt8g4mer" path="res://game/characters/enemies/gray_enemy.tscn" id="5_p0pgv"]
[ext_resource type="PackedScene" uid="uid://cb0w6mt8g4mer" path="res://game/characters/enemies/gray_cultist.tscn" id="5_p0pgv"]
[ext_resource type="PackedScene" uid="uid://c6qy8uybkn4x" path="res://game/objects/plate.tscn" id="6_gwfl1"]
[ext_resource type="PackedScene" uid="uid://cutjutvd8dqqc" path="res://game/characters/enemies/black_enemy.tscn" id="7_12tya"]
[ext_resource type="PackedScene" uid="uid://cutjutvd8dqqc" path="res://game/characters/enemies/black_cultist.tscn" id="7_12tya"]
[ext_resource type="PackedScene" uid="uid://bdwbdnbenueu1" path="res://game/objects/table_m.tscn" id="7_fxyr3"]
[ext_resource type="PackedScene" uid="uid://d3m8kf7lqmyb8" path="res://game/objects/flask_l.tscn" id="8_pp088"]
[ext_resource type="PackedScene" uid="uid://bt4smb361amjj" path="res://game/objects/flask_s.tscn" id="9_gtr04"]
@@ -244,17 +244,17 @@ position = Vector2(46, 25)
[node name="SquareKeyPickup" parent="Pickups" parent_id_path=PackedInt32Array(1113969064) index="0" unique_id=1818750964 instance=ExtResource("4_p0pgv")]
position = Vector2(1312, 560)
[node name="WhiteEnemy" parent="Enemies" parent_id_path=PackedInt32Array(857989772) index="0" unique_id=1184609649 instance=ExtResource("3_2vfi4")]
[node name="WhiteCultist" parent="Enemies" parent_id_path=PackedInt32Array(857989772) index="0" unique_id=1184609649 instance=ExtResource("3_2vfi4")]
position = Vector2(258, 289)
type = 1
initial_state = 1
[node name="GrayEnemy" parent="Enemies" parent_id_path=PackedInt32Array(857989772) index="1" unique_id=455148405 instance=ExtResource("5_p0pgv")]
[node name="GrayCultist" parent="Enemies" parent_id_path=PackedInt32Array(857989772) index="1" unique_id=455148405 instance=ExtResource("5_p0pgv")]
position = Vector2(796, 592)
type = 1
initial_state = 1
[node name="BlackEnemy" parent="Enemies" parent_id_path=PackedInt32Array(857989772) index="2" unique_id=1794979765 instance=ExtResource("7_12tya")]
[node name="BlackCultist" parent="Enemies" parent_id_path=PackedInt32Array(857989772) index="2" unique_id=1794979765 instance=ExtResource("7_12tya")]
position = Vector2(1162, 592)
type = 1
initial_state = 1
+6 -6
View File
@@ -21,8 +21,8 @@
[ext_resource type="PackedScene" uid="uid://d330w1ygg6uxy" path="res://game/objects/painting_v_l.tscn" id="19_l40pv"]
[ext_resource type="PackedScene" uid="uid://ciubf1ttwc133" path="res://game/pickups/square_key_pickup.tscn" id="20_uffr2"]
[ext_resource type="PackedScene" uid="uid://dqgmfpv2mhdpn" path="res://game/pickups/triangle_key_pickup.tscn" id="21_jk2b3"]
[ext_resource type="PackedScene" uid="uid://cutjutvd8dqqc" path="res://game/characters/enemies/black_enemy.tscn" id="22_b1xny"]
[ext_resource type="PackedScene" uid="uid://bv2gahb4wxgb1" path="res://game/characters/enemies/white_enemy.tscn" id="23_8555i"]
[ext_resource type="PackedScene" uid="uid://cutjutvd8dqqc" path="res://game/characters/enemies/black_cultist.tscn" id="22_b1xny"]
[ext_resource type="PackedScene" uid="uid://bv2gahb4wxgb1" path="res://game/characters/enemies/white_cultist.tscn" id="23_8555i"]
[ext_resource type="PackedScene" uid="uid://dike8xgbqdut2" path="res://game/killing_area.tscn" id="24_te27h"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_cjy8w"]
@@ -315,22 +315,22 @@ position = Vector2(1113, 344)
[node name="TriangleKeyPickup" parent="Pickups" parent_id_path=PackedInt32Array(1113969064) index="1" unique_id=85412946 instance=ExtResource("21_jk2b3")]
position = Vector2(857, 136)
[node name="BlackEnemy" parent="Enemies" parent_id_path=PackedInt32Array(857989772) index="0" unique_id=129671926 instance=ExtResource("22_b1xny")]
[node name="BlackCultist1" parent="Enemies" parent_id_path=PackedInt32Array(857989772) index="0" unique_id=129671926 instance=ExtResource("22_b1xny")]
position = Vector2(1041, 352)
type = 1
initial_state = 1
[node name="BlackEnemy2" parent="Enemies" parent_id_path=PackedInt32Array(857989772) index="1" unique_id=1222909487 instance=ExtResource("22_b1xny")]
[node name="BlackCultist2" parent="Enemies" parent_id_path=PackedInt32Array(857989772) index="1" unique_id=1222909487 instance=ExtResource("22_b1xny")]
position = Vector2(477, 160)
type = 1
initial_state = 1
[node name="WhiteEnemy" parent="Enemies" parent_id_path=PackedInt32Array(857989772) index="2" unique_id=503464276 instance=ExtResource("23_8555i")]
[node name="WhiteCultist1" parent="Enemies" parent_id_path=PackedInt32Array(857989772) index="2" unique_id=503464276 instance=ExtResource("23_8555i")]
position = Vector2(587, 368)
type = 1
initial_state = 2
[node name="WhiteEnemy2" parent="Enemies" parent_id_path=PackedInt32Array(857989772) index="3" unique_id=624398972 instance=ExtResource("23_8555i")]
[node name="WhiteCultist2" parent="Enemies" parent_id_path=PackedInt32Array(857989772) index="3" unique_id=624398972 instance=ExtResource("23_8555i")]
position = Vector2(493, 160)
type = 1
initial_state = 2
+7 -7
View File
@@ -30,11 +30,11 @@ var _function_by_phase : Dictionary[int, Callable] = {
@onready var cutscene_haze_timer : Timer = $Cutscene/HazeTimer
@onready var cutscene_player_timer : Timer = $Cutscene/PlayerTimer
@onready var cutscene_enemy_timer : Timer = $Cutscene/EnemyTimer
@onready var cutscene_cultist_timer : Timer = $Cutscene/CultistTimer
@onready var cutscene_end_timer : Timer = $Cutscene/EndTimer
@onready var cutscene_fake_player : AnimatedSprite2D = $Cutscene/FakePlayer
@onready var cutscene_fake_enemy : AnimatedSprite2D = $Cutscene/FakeEnemy
@onready var cutscene_fake_cultist : AnimatedSprite2D = $Cutscene/FakeCultist
@onready var enemy_waves_by_phase : Dictionary[int, Node2D] = {
3: $Cutscene/EnemyWaves/WaveOne,
@@ -49,7 +49,7 @@ var _function_by_phase : Dictionary[int, Callable] = {
3: $Cutscene/PlayerTargetPositions/PhaseThree.global_position,
4: $Cutscene/PlayerTargetPositions/PhaseFour.global_position,
5: $Cutscene/PlayerTargetPositions/PhaseFive.global_position,
6: $Cutscene/FakeEnemy.global_position,
6: $Cutscene/FakeCultist.global_position,
}
@@ -58,7 +58,7 @@ func _ready() -> void:
_player_walk_speed = player.max_speed
cutscene_haze.hide()
cutscene_fake_player.hide()
cutscene_fake_enemy.hide()
cutscene_fake_cultist.hide()
cutscene_thanks.hide()
for phase in enemy_waves_by_phase:
enemy_waves_by_phase[phase].hide()
@@ -134,9 +134,9 @@ func _on_haze_timer_timeout() -> void:
func _on_player_timer_timeout() -> void:
_show_cutscene_haze(CUTSCENE_HAZE_TIME)
cutscene_fake_player.queue_free()
cutscene_fake_enemy.show()
cutscene_fake_enemy.play("look_around", 0.5)
cutscene_enemy_timer.start()
cutscene_fake_cultist.show()
cutscene_fake_cultist.play("look_around", 0.5)
cutscene_cultist_timer.start()
func _on_enemy_timer_timeout() -> void:
File diff suppressed because one or more lines are too long
+3 -3
View File
@@ -16,9 +16,9 @@
[ext_resource type="PackedScene" uid="uid://dqgmfpv2mhdpn" path="res://game/pickups/triangle_key_pickup.tscn" id="10_dea75"]
[ext_resource type="PackedScene" uid="uid://b7mhdrj3b6loq" path="res://game/doors/door.tscn" id="11_g1txn"]
[ext_resource type="PackedScene" uid="uid://dx1yasi8wlaye" path="res://game/objects/bookstand.tscn" id="13_g3b4m"]
[ext_resource type="PackedScene" uid="uid://cb0w6mt8g4mer" path="res://game/characters/enemies/gray_enemy.tscn" id="18_blgb8"]
[ext_resource type="PackedScene" uid="uid://cutjutvd8dqqc" path="res://game/characters/enemies/black_enemy.tscn" id="19_ohfy3"]
[ext_resource type="PackedScene" uid="uid://bv2gahb4wxgb1" path="res://game/characters/enemies/white_enemy.tscn" id="20_rt0xo"]
[ext_resource type="PackedScene" uid="uid://cb0w6mt8g4mer" path="res://game/characters/enemies/gray_cultist.tscn" id="18_blgb8"]
[ext_resource type="PackedScene" uid="uid://cutjutvd8dqqc" path="res://game/characters/enemies/black_cultist.tscn" id="19_ohfy3"]
[ext_resource type="PackedScene" uid="uid://bv2gahb4wxgb1" path="res://game/characters/enemies/white_cultist.tscn" id="20_rt0xo"]
[node name="TestLevel" instance=ExtResource("1_15okj")]
+1 -1
View File
@@ -5,7 +5,7 @@ extends Control
@onready var grid : GridContainer = $%GridContainer
func _ready() -> void:
func _ready() -> void:
for i in range(LevelManager.levels.size()):
var level := LevelManager.levels[i]
var disable := SaveManager.completed_levels < i