diff --git a/Assets/Sprites/Characters/Player/player_death.ase b/Assets/Sprites/Characters/Player/player_death.ase new file mode 100644 index 0000000..218faa7 Binary files /dev/null and b/Assets/Sprites/Characters/Player/player_death.ase differ diff --git a/Assets/Sprites/Characters/Player/player_death.png b/Assets/Sprites/Characters/Player/player_death.png new file mode 100644 index 0000000..d7ab153 Binary files /dev/null and b/Assets/Sprites/Characters/Player/player_death.png differ diff --git a/Assets/Sprites/Characters/Player/player_death.png.import b/Assets/Sprites/Characters/Player/player_death.png.import new file mode 100644 index 0000000..e661f12 --- /dev/null +++ b/Assets/Sprites/Characters/Player/player_death.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cxqqoao45y8i1" +path="res://.godot/imported/player_death.png-10ebbf5b6d7b1b9ad8158c841bf58192.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Sprites/Characters/Player/player_death.png" +dest_files=["res://.godot/imported/player_death.png-10ebbf5b6d7b1b9ad8158c841bf58192.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +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/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/Code/Characters/NPC/Ally/ally.gd b/Code/Characters/NPC/Ally/ally.gd index bee7256..8178dc2 100644 --- a/Code/Characters/NPC/Ally/ally.gd +++ b/Code/Characters/NPC/Ally/ally.gd @@ -11,3 +11,10 @@ func _on_vision_area_body_exited(body): if body.is_in_group("enemies") and target != null: target = null $NavTimer.stop() + +func hit(): + dead = true + emit_signal("is_dead") + sprite.texture = load("res://Assets/Sprites/Characters/Player/player_death.png") + sprite.z_index = 0 + remove_colisions() diff --git a/Code/Characters/Player/Player.gd b/Code/Characters/Player/Player.gd index 914dba0..d9d7389 100644 --- a/Code/Characters/Player/Player.gd +++ b/Code/Characters/Player/Player.gd @@ -28,7 +28,7 @@ func hit(): emit_signal("is_dead") set_collision_layer_value(1, false) $HUD/CenterContainer.visible = true - sprite.texture = load("res://Assets/Sprites/Characters/NPC/Enemy/enemy_death.png") + sprite.texture = load("res://Assets/Sprites/Characters/Player/player_death.png") sprite.z_index = 0 dead = true diff --git a/Code/Dialog/cap_3_fim_jogo.gd b/Code/Dialog/cap_3_fim_jogo.gd index 595c019..c81dd55 100644 --- a/Code/Dialog/cap_3_fim_jogo.gd +++ b/Code/Dialog/cap_3_fim_jogo.gd @@ -5,4 +5,4 @@ func _ready(): func goto_next(): - get_tree().change_scene_to_file("res://Scenes/Dialog/cap_1_prologo.tscn") + get_tree().change_scene_to_file("res://Scenes/UI/menu_inicial.tscn") diff --git a/Scenes/Characters/Player/Player.tscn b/Scenes/Characters/Player/Player.tscn index b1574ed..c5a3e78 100644 --- a/Scenes/Characters/Player/Player.tscn +++ b/Scenes/Characters/Player/Player.tscn @@ -130,9 +130,6 @@ texture = ExtResource("3_u630a") collision_layer = 1 collision_mask = 4 -[node name="EspadaColision" parent="Espada" index="1"] -disabled = false - [node name="Camera2DPlus" type="Camera2D" parent="." index="4"] zoom = Vector2(0.6, 0.6) position_smoothing_enabled = true @@ -245,7 +242,7 @@ theme_override_font_sizes/font_size = 30 text = "Defenda o forte matando os holandeses." [node name="CenterContainer" type="CenterContainer" parent="HUD" index="2"] -modulate = Color(1, 1, 1, 0) +visible = false anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 @@ -261,7 +258,7 @@ layout_mode = 2 theme_override_colors/font_color = Color(1, 0.509804, 0.454902, 1) theme_override_colors/font_shadow_color = Color(0.0745098, 0.00784314, 0.0313726, 1) theme_override_font_sizes/font_size = 50 -text = "Objetivo concluído!" +text = "Pressione \"R\" para reiniciar." [node name="BlackFade" type="ColorRect" parent="HUD" index="3"] anchors_preset = 15 diff --git a/Scenes/Dialog/fim.tscn b/Scenes/Dialog/fim.tscn index c4dc68f..6516319 100644 --- a/Scenes/Dialog/fim.tscn +++ b/Scenes/Dialog/fim.tscn @@ -83,6 +83,19 @@ tracks/3/keys = { "method": &"goto_next" }] } +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath(".:text") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": ["Nova Amsterdã, 12 de dezembro de 1633 +Castelo Ceullen"] +} [sub_resource type="AnimationLibrary" id="AnimationLibrary_rstvp"] _data = { @@ -108,6 +121,7 @@ grow_horizontal = 2 grow_vertical = 2 [node name="Label" type="Label" parent="CenterContainer"] +modulate = Color(1, 1, 1, 0) layout_mode = 2 theme_override_colors/font_color = Color(0.835294, 0.235294, 0.415686, 1) theme_override_colors/font_shadow_color = Color(1, 0.509804, 0.454902, 1) diff --git a/Scenes/Dialog/fim_2.tscn b/Scenes/Dialog/fim_2.tscn index f54070c..47085b4 100644 --- a/Scenes/Dialog/fim_2.tscn +++ b/Scenes/Dialog/fim_2.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" path="res://Code/Dialog/fim_2.gd" id="1_s313b"] [ext_resource type="Texture2D" uid="uid://cptlibwhggl6q" path="res://Assets/Sprites/Dialog/forte.jpg" id="2_2mqdo"] -[ext_resource type="PackedScene" uid="uid://bkpwgt4hjgxjj" path="res://Scenes/Dialog/cap_1_prologo.tscn" id="2_h2hvg"] +[ext_resource type="PackedScene" uid="uid://k85070732lu" path="res://Scenes/Dialog/cap_3_fim_jogo.tscn" id="2_16ht3"] [ext_resource type="Texture2D" uid="uid://cjogeblnh0m4v" path="res://Assets/Sprites/Dialog/dialogpatch.png" id="3_14hsv"] [ext_resource type="Texture2D" uid="uid://dt2xvl1m2gv8y" path="res://Assets/Sprites/Dialog/comandante.png" id="4_h05uf"] @@ -81,7 +81,7 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_s313b") -nextScene = ExtResource("2_h2hvg") +nextScene = ExtResource("2_16ht3") fotos = [ExtResource("4_h05uf")] [node name="Fundo" type="TextureRect" parent="."] diff --git a/Scenes/Stages/forte.tscn b/Scenes/Stages/forte.tscn index fa13e07..f063767 100644 --- a/Scenes/Stages/forte.tscn +++ b/Scenes/Stages/forte.tscn @@ -27,15 +27,15 @@ autostart = true position = Vector2(5975, -828) [node name="Spawn02" type="Marker2D" parent="EnemySpawn/SpawnPoints"] -position = Vector2(5885, 556) +position = Vector2(6042, 575) [node name="ReachPoints" type="Node" parent="EnemySpawn"] [node name="Reach01" type="Marker2D" parent="EnemySpawn/ReachPoints"] -position = Vector2(3111, -859) +position = Vector2(2997, -828) [node name="Reach02" type="Marker2D" parent="EnemySpawn/ReachPoints"] -position = Vector2(3124, 575) +position = Vector2(2550, 439) [node name="Enemies" type="Node" parent="EnemySpawn"] @@ -46,6 +46,17 @@ layer_0/z_index = -2 [node name="Ally" parent="." instance=ExtResource("3_e4lu1")] position = Vector2(2267, -501) +[node name="Ally2" parent="." instance=ExtResource("3_e4lu1")] +position = Vector2(2318, 427) + +[node name="Ally3" parent="." instance=ExtResource("3_e4lu1")] +position = Vector2(2538, -52) +rotation = -0.773579 + +[node name="Ally4" parent="." instance=ExtResource("3_e4lu1")] +position = Vector2(2763, 287) +rotation = 0.699926 + [node name="Player" parent="." instance=ExtResource("2_m3hpg")] position = Vector2(2249, 1) objetivoText = "Defenda o forte matando os holandeses." diff --git a/Scenes/Stages/mapa_segundo_mesmo.tscn b/Scenes/Stages/mapa_segundo_mesmo.tscn index 705f65d..6fe4fe0 100644 --- a/Scenes/Stages/mapa_segundo_mesmo.tscn +++ b/Scenes/Stages/mapa_segundo_mesmo.tscn @@ -71,7 +71,19 @@ autostart = true [node name="Ally" parent="." instance=ExtResource("6_c1ens")] position = Vector2(2434, -277) -rotation = 3.0613 +rotation = 5.59687 + +[node name="Ally4" parent="." instance=ExtResource("6_c1ens")] +position = Vector2(2850, -781) +rotation = 6.26468 + +[node name="Ally3" parent="." instance=ExtResource("6_c1ens")] +position = Vector2(2234, 171) +rotation = 6.76869 + +[node name="Ally2" parent="." instance=ExtResource("6_c1ens")] +position = Vector2(2498, 835) +rotation = 5.60885 [node name="Player" parent="." instance=ExtResource("4_esk6h")] position = Vector2(2714, 105) diff --git a/project.godot b/project.godot index 3e7d67d..4dbd0c6 100644 --- a/project.godot +++ b/project.godot @@ -11,7 +11,7 @@ config_version=5 [application] config/name="Nova Amsterdãs" -run/main_scene="res://Scenes/Dialog/cap_1_prologo.tscn" +run/main_scene="res://Scenes/UI/menu_inicial.tscn" config/features=PackedStringArray("4.1", "Forward Plus") boot_splash/bg_color=Color(0.0745098, 0.00784314, 0.0313726, 1) config/icon="res://icon.svg"