diff --git a/assets/LoseGame.jpeg b/assets/LoseGame.jpeg new file mode 100644 index 0000000..48bcf7d Binary files /dev/null and b/assets/LoseGame.jpeg differ diff --git a/assets/LoseGame.jpeg.import b/assets/LoseGame.jpeg.import new file mode 100644 index 0000000..18829ee --- /dev/null +++ b/assets/LoseGame.jpeg.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ccbdsbteef3cs" +path="res://.godot/imported/LoseGame.jpeg-bea62e54d6bb932d2fc0c97398854ad4.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/LoseGame.jpeg" +dest_files=["res://.godot/imported/LoseGame.jpeg-bea62e54d6bb932d2fc0c97398854ad4.ctex"] + +[params] + +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 +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 +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/assets/ThirdLevelEnemy.jpeg b/assets/ThirdLevelEnemy.jpeg new file mode 100644 index 0000000..ca70f17 Binary files /dev/null and b/assets/ThirdLevelEnemy.jpeg differ diff --git a/assets/ThirdLevelEnemy.jpeg.import b/assets/ThirdLevelEnemy.jpeg.import new file mode 100644 index 0000000..43aab19 --- /dev/null +++ b/assets/ThirdLevelEnemy.jpeg.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c335dn481ctxu" +path="res://.godot/imported/ThirdLevelEnemy.jpeg-283cc2c1ead2d9769e11fd7206d21703.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/ThirdLevelEnemy.jpeg" +dest_files=["res://.godot/imported/ThirdLevelEnemy.jpeg-283cc2c1ead2d9769e11fd7206d21703.ctex"] + +[params] + +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 +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 +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/assets/Tutorial_LeatherArmor.jpeg b/assets/Tutorial_LeatherArmor.jpeg index 5a7b79e..f11d90f 100644 Binary files a/assets/Tutorial_LeatherArmor.jpeg and b/assets/Tutorial_LeatherArmor.jpeg differ diff --git a/assets/Tutorial_LeatherBoots.jpeg b/assets/Tutorial_LeatherBoots.jpeg index 9324ce8..117b9cc 100644 Binary files a/assets/Tutorial_LeatherBoots.jpeg and b/assets/Tutorial_LeatherBoots.jpeg differ diff --git a/assets/Tutorial_StartGame.jpeg b/assets/Tutorial_StartGame.jpeg index c451ff6..3063296 100644 Binary files a/assets/Tutorial_StartGame.jpeg and b/assets/Tutorial_StartGame.jpeg differ diff --git a/assets/Tutorial_shield.jpeg.import b/assets/Tutorial_shield.jpeg.import index 2721869..0434bc8 100644 --- a/assets/Tutorial_shield.jpeg.import +++ b/assets/Tutorial_shield.jpeg.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://baeea1yfs0cnn" -path="res://.godot/imported/Tutorial_Shield.jpeg-6b96e6b9716aced42153397e827ce868.ctex" +path="res://.godot/imported/Tutorial_shield.jpeg-d9b563c9ca34dc1a19e82a0ec964c1b9.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://assets/Tutorial_Shield.jpeg" -dest_files=["res://.godot/imported/Tutorial_Shield.jpeg-6b96e6b9716aced42153397e827ce868.ctex"] +source_file="res://assets/Tutorial_shield.jpeg" +dest_files=["res://.godot/imported/Tutorial_shield.jpeg-d9b563c9ca34dc1a19e82a0ec964c1b9.ctex"] [params] diff --git a/assets/VictoryScreen.jpeg b/assets/VictoryScreen.jpeg new file mode 100644 index 0000000..f9aa370 Binary files /dev/null and b/assets/VictoryScreen.jpeg differ diff --git a/assets/VictoryScreen.jpeg.import b/assets/VictoryScreen.jpeg.import new file mode 100644 index 0000000..198116b --- /dev/null +++ b/assets/VictoryScreen.jpeg.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cqo3yiuu4kwdk" +path="res://.godot/imported/VictoryScreen.jpeg-36aa76d727e7a226d71b97af302cccc0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/VictoryScreen.jpeg" +dest_files=["res://.godot/imported/VictoryScreen.jpeg-36aa76d727e7a226d71b97af302cccc0.ctex"] + +[params] + +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 +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 +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/scripts/GameSettings.gd b/scripts/GameSettings.gd index da6d3a9..89dd939 100644 --- a/scripts/GameSettings.gd +++ b/scripts/GameSettings.gd @@ -5,7 +5,7 @@ class_name GameSettings static var difficulty: String = "immortal" ## enemy spawn interval in seconds -static var enemy_spawn_interval: float = 10.0 +static var enemy_spawn_interval: float = 6.0 ## item (rock/stick) respawn delay in seconds -static var item_respawn_delay: float = 20.0 +static var item_respawn_delay: float = 10.0 diff --git a/scripts/Main.gd b/scripts/Main.gd index d116e4a..13a8bb5 100644 --- a/scripts/Main.gd +++ b/scripts/Main.gd @@ -398,7 +398,7 @@ func _start_boss_phase() -> void: if boss_active or not game_active: return boss_active = true - boss_timer = 90.0 + boss_timer = 120.0 boss_timer_label.visible = true boss_hint_label.visible = true _spawn_portal() diff --git a/scripts/MainMenu.gd b/scripts/MainMenu.gd index 5bb3fac..ae90b3d 100644 --- a/scripts/MainMenu.gd +++ b/scripts/MainMenu.gd @@ -208,9 +208,9 @@ func _build_difficulty_panel() -> void: vbox.add_child(hbox) var spawn_options := [ - ["Медленно", 15.0, 35.0], - ["Нормально", 10.0, 20.0], - ["Быстро", 5.0, 8.0], + ["Медленно", 10.0, 15.0], + ["Нормально", 8.0, 15.0], + ["Быстро", 6.0, 10.0], ] var spawn_btns: Array[Button] = [] for opt in spawn_options: diff --git a/scripts/Player.gd b/scripts/Player.gd index 37087b4..fbbdb83 100644 --- a/scripts/Player.gd +++ b/scripts/Player.gd @@ -180,7 +180,7 @@ func _do_kick() -> void: var obj_toughness: int = best.get("toughness_tier") if best.get("toughness_tier") != null else 0 var diff_tier := kick_tier - obj_toughness var force: float - if GameSettings.difficulty == "survival": + if GameSettings.difficulty == "immortal": force = 50.0 elif diff_tier < 0: force = 15.0