Skip to content

Commit d76aef4

Browse files
committed
Se modificaron algunos sprites y se implemente el reincio del nivel al morir
1 parent e3e04ff commit d76aef4

11 files changed

Lines changed: 61 additions & 13 deletions

File tree

Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="CompressedTexture2D"
5+
uid="uid://ci7dyv08stjiv"
6+
path="res://.godot/imported/Cliff_Tiles.png-b6067beddd35eca5eb848a8a09312eac.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://assets/first_party/spacerage/Cliff_Tiles.png"
14+
dest_files=["res://.godot/imported/Cliff_Tiles.png-b6067beddd35eca5eb848a8a09312eac.ctex"]
15+
16+
[params]
17+
18+
compress/mode=0
19+
compress/high_quality=false
20+
compress/lossy_quality=0.7
21+
compress/hdr_compression=1
22+
compress/normal_map=0
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
28+
process/fix_alpha_border=true
29+
process/premult_alpha=false
30+
process/normal_map_invert_y=false
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1
36.6 KB
Binary file not shown.

bala_enemiga_peon.gd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func _ready():
1515

1616

1717
if detector:
18-
detector.connect("body_entered", Callable(self, "_on_body_entered"))
18+
detector.connect("area_entered", Callable(self, "_on_area_entered"))
1919

2020

2121
await get_tree().create_timer(0.1).timeout
@@ -30,7 +30,7 @@ func _physics_process(delta):
3030
if is_on_wall():
3131
queue_free()
3232

33-
func _on_body_entered(body):
33+
func _on_area_entered(body):
3434
print("Bala tocó a: ", body.name)
3535
print("¿Tiene recibir_daño?: ", body.has_method("recibir_daño"))
3636
if body.has_method("recibir_daño"):

character_body_2d.gd

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@ func _ready():
1616
func _disparar():
1717

1818
var jugador = get_tree().current_scene.get_node_or_null("Player")
19-
if jugador.global_position >= Vector2(2256.683, 368.451):
20-
canIshoot = 1
21-
2219
if jugador == null:
2320
print("Jugador no encontrado")
2421
return
22+
if jugador.global_position >= Vector2(2256.683, 368.451):
23+
canIshoot = 1
2524

2625
if canIshoot == 1:
2726
var bala = bala_escena.instantiate()

scenes/quests/story_quests/spacerage/1_spacerage_stealth/template_stealth.tscn

Lines changed: 12 additions & 4 deletions
Large diffs are not rendered by default.

scenes/quests/story_quests/spacerage/pruebas/bala.tscn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[gd_scene load_steps=5 format=3 uid="uid://bymisq8wulo6a"]
22

3-
[ext_resource type="Script" uid="uid://s12chvf10aiw" path="res://bala.gd" id="1_cbs21"]
3+
[ext_resource type="Script" path="res://bala.gd" id="1_cbs21"]
44
[ext_resource type="Texture2D" uid="uid://b3m3gaajt2r82" path="res://scenes/quests/story_quests/spacerage/pruebas/bala.png" id="2_grp7d"]
55

66
[sub_resource type="CircleShape2D" id="CircleShape2D_v6wwq"]

scenes/quests/story_quests/spacerage/pruebas/bala_enemiga_peon.tscn

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ radius = 14.0
1010
radius = 11.0
1111

1212
[node name="bala_enemiga_peon" type="CharacterBody2D"]
13+
collision_layer = 0
1314
script = ExtResource("1_008v7")
1415

1516
[node name="Sprite2D" type="Sprite2D" parent="."]

scenes/quests/story_quests/spacerage/pruebas/julian.gd

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,6 @@ func recibir_daño(cantidad):
1515
if vida <= 0:
1616
print("Jugador murió")
1717
emit_signal("jugador_muerto")
18-
get_parent().queue_free()
18+
#get_parent().queue_free()
19+
SceneSwitcher.reload_with_transition()
20+

scenes/quests/story_quests/spacerage/pruebas/julian.tscn

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ height = 50.0
1010

1111
[node name="julian" type="Area2D"]
1212
light_mask = 2
13+
collision_mask = 0
1314
script = ExtResource("1_d3r83")
1415

1516
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]

0 commit comments

Comments
 (0)