ruslan/CultManor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cultist enemys renamed to cultist

Browse Source
This commit is contained in:
Ruslan Ignatov
2026-02-04 23:46:19 +03:00
parent 8d2ce976ec
commit 1e617715f3
29 changed files with 232 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/levels/level_4.tscn
+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
game/levels/level_6.tscn
+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
game/levels/level_7.gd
+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:
game/levels/level_7.tscn
+66 -73
View File
File diff suppressed because one or more lines are too long
game/levels/test_level.tscn
+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")]