Fix collission issues and add missing reference to cutscenes

This commit is contained in:
Raxki 2024-10-28 18:47:02 -04:00
parent 99f018cb0a
commit f873730598
2 changed files with 16 additions and 19 deletions

View file

@ -1,24 +1,10 @@
[gd_scene load_steps=4 format=3 uid="uid://c503u0i421w34"]
[gd_scene load_steps=3 format=3 uid="uid://c503u0i421w34"]
[ext_resource type="Texture2D" uid="uid://d0aw0q6fvgk1o" path="res://world/wood pillar.png" id="1_wjgo2"]
[ext_resource type="Texture2D" uid="uid://dywy1nhojkpuq" path="res://world/long wood pillar .png" id="2_q108x"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_nsmbw"]
size = Vector2(8, 24)
[node name="Node2D" type="Node2D"]
[node name="StaticBody2D" type="StaticBody2D" parent="."]
texture_filter = 1
position = Vector2(0, -22)
collision_layer = 49
collision_mask = 17
[node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D"]
texture_filter = 1
position = Vector2(0, 10)
shape = SubResource("RectangleShape2D_nsmbw")
[node name="WoodPillar" type="Sprite2D" parent="."]
visible = false
y_sort_enabled = true
@ -30,3 +16,14 @@ texture = ExtResource("1_wjgo2")
texture_filter = 1
position = Vector2(0, -32)
texture = ExtResource("2_q108x")
[node name="StaticBody2D" type="StaticBody2D" parent="."]
texture_filter = 1
position = Vector2(0, -22)
collision_layer = 49
collision_mask = 17
[node name="CollisionShape2D" type="CollisionPolygon2D" parent="StaticBody2D"]
texture_filter = 1
position = Vector2(0, 10)
polygon = PackedVector2Array(-4, 10, -2, 12, 2, 12, 4, 10, 4, -5, 2, -8, -2, -8, -4, -5)

View file

@ -6,7 +6,7 @@
[ext_resource type="FontFile" uid="uid://bgqotudi6bifk" path="res://UI/Gundam 00 font gaufont.ttf" id="2_64thh"]
[ext_resource type="Script" path="res://Scripts/UI/pause_menu.gd" id="2_nw73f"]
[ext_resource type="PackedScene" uid="uid://bcwkugn6v3oy7" path="res://addons/godot_state_charts/utilities/state_chart_debugger.tscn" id="2_o5str"]
[ext_resource type="Resource" uid="uid://bj3rm1r1ouq0r" path="res://Cutscenes/prototype_start.tres" id="3_s1wqq"]
[ext_resource type="Resource" uid="uid://bj3rm1r1ouq0r" path="res://Cutscenes/prototype_start.tres" id="3_0opva"]
[ext_resource type="Texture2D" uid="uid://b40la2vyf4rn6" path="res://world/Fighting Dojo BG.png" id="4_elb6q"]
[ext_resource type="AudioStream" uid="uid://b72f2jvv2283j" path="res://Audio/SFX/dialog_page.wav" id="6_vecai"]
[ext_resource type="AudioStream" uid="uid://drossx2nhgeue" path="res://Audio/SFX/dialog_open.wav" id="7_lglyc"]
@ -137,7 +137,7 @@ script = ExtResource("1_y634h")
[node name="CutsceneManager" type="Node" parent="."]
script = ExtResource("19_5yvrq")
cutscene = ExtResource("3_s1wqq")
cutscene = ExtResource("3_0opva")
[node name="MusicManager" parent="." instance=ExtResource("24_03wyf")]
@ -318,7 +318,7 @@ position = Vector2(176, 280)
[node name="Walls" type="Sprite2D" parent="MapElements"]
z_index = 1
texture_filter = 1
position = Vector2(137, 199)
position = Vector2(138, 199)
texture = ExtResource("7_pp5dn")
[node name="HiroPlayer" parent="." instance=ExtResource("1_c1gpq")]
@ -429,7 +429,7 @@ position = Vector2(-107.5, -19.5)
shape = SubResource("RectangleShape2D_c5p72")
[node name="CollisionShape2D2" type="CollisionShape2D" parent="Barrier"]
position = Vector2(113, -20)
position = Vector2(111, -19)
shape = SubResource("RectangleShape2D_ledaf")
[node name="CollisionShape2D3" type="CollisionShape2D" parent="Barrier"]