Merge branch 'main' of https://github.com/MarcEricMartel/Game-Jam-A23
This commit is contained in:
Victor Turgeon
commit
0ff57d48cb
@ -1,9 +1,35 @@
|
||||
[gd_scene load_steps=2 format=3 uid="uid://uoyiei4wyig3"]
|
||||
[gd_scene load_steps=4 format=3 uid="uid://uoyiei4wyig3"]
|
||||
|
||||
[ext_resource type="PackedScene" uid="uid://b8s2seg2lf7wo" path="res://Scenes/Tilemaps/tileset_1.tscn" id="1_4n82n"]
|
||||
[ext_resource type="PackedScene" uid="uid://dgtscjxcqoxls" path="res://Scenes/Props/candle_1.tscn" id="2_5hdq4"]
|
||||
[ext_resource type="PackedScene" uid="uid://cf7al5uln33rn" path="res://Scenes/Props/candle_2.tscn" id="2_o33c4"]
|
||||
|
||||
[node name="Level1" type="Node2D"]
|
||||
|
||||
[node name="TileSet1" parent="." instance=ExtResource("1_4n82n")]
|
||||
|
||||
[node name="Decor" type="Node2D" parent="."]
|
||||
|
||||
[node name="Candles" parent="Decor" instance=ExtResource("2_o33c4")]
|
||||
position = Vector2(160, 416)
|
||||
|
||||
[node name="Candles2" parent="Decor" instance=ExtResource("2_o33c4")]
|
||||
position = Vector2(160, 160)
|
||||
|
||||
[node name="Candles3" parent="Decor" instance=ExtResource("2_o33c4")]
|
||||
position = Vector2(797.153, 158.518)
|
||||
|
||||
[node name="Candles4" parent="Decor" instance=ExtResource("2_o33c4")]
|
||||
position = Vector2(800.365, 417.055)
|
||||
|
||||
[node name="Candle" parent="Decor" instance=ExtResource("2_5hdq4")]
|
||||
position = Vector2(432, 256)
|
||||
|
||||
[node name="Candle2" parent="Decor" instance=ExtResource("2_5hdq4")]
|
||||
position = Vector2(432, 352)
|
||||
|
||||
[node name="Candle3" parent="Decor" instance=ExtResource("2_5hdq4")]
|
||||
position = Vector2(528, 256)
|
||||
|
||||
[node name="Candle4" parent="Decor" instance=ExtResource("2_5hdq4")]
|
||||
position = Vector2(528, 352)
|
||||
|
||||
@ -1,35 +1,39 @@
|
||||
[gd_scene load_steps=9 format=3 uid="uid://dgtscjxcqoxls"]
|
||||
|
||||
[ext_resource type="Texture2D" uid="uid://dvtntmnfw83ms" path="res://Assets/RF_Catacombs_v1.0/candleA_02.png" id="1_24qhp"]
|
||||
[ext_resource type="Texture2D" uid="uid://biomqy201h4yk" path="res://Assets/RF_Catacombs_v1.0/candleA_03.png" id="2_ntbip"]
|
||||
[ext_resource type="Texture2D" uid="uid://dri12hbajn7f7" path="res://Assets/RF_Catacombs_v1.0/candleA_04.png" id="3_hqrx1"]
|
||||
[ext_resource type="Texture2D" uid="uid://c0wvpyvnm1xyq" path="res://Assets/RF_Catacombs_v1.0/candleA_01.png" id="4_6sycj"]
|
||||
[ext_resource type="Material" uid="uid://id4bl5ph4sbj" path="res://candle_part_material.tres" id="5_g2xr2"]
|
||||
[ext_resource type="Texture2D" uid="uid://dvtntmnfw83ms" path="res://Assets/RF_Catacombs_v1.0/candleA_02.png" id="1_2uqmc"]
|
||||
[ext_resource type="Texture2D" uid="uid://biomqy201h4yk" path="res://Assets/RF_Catacombs_v1.0/candleA_03.png" id="2_dgnwu"]
|
||||
[ext_resource type="Texture2D" uid="uid://dri12hbajn7f7" path="res://Assets/RF_Catacombs_v1.0/candleA_04.png" id="3_48snu"]
|
||||
[ext_resource type="Texture2D" uid="uid://c0wvpyvnm1xyq" path="res://Assets/RF_Catacombs_v1.0/candleA_01.png" id="4_jljuk"]
|
||||
[ext_resource type="Material" uid="uid://id4bl5ph4sbj" path="res://candle_part_material.tres" id="5_ygew0"]
|
||||
|
||||
[sub_resource type="SpriteFrames" id="SpriteFrames_mdrfm"]
|
||||
animations = [{
|
||||
"frames": [{
|
||||
"duration": 1.0,
|
||||
"texture": ExtResource("1_24qhp")
|
||||
"texture": ExtResource("1_2uqmc")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": ExtResource("2_ntbip")
|
||||
"texture": ExtResource("2_dgnwu")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": ExtResource("3_hqrx1")
|
||||
"texture": ExtResource("3_48snu")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": ExtResource("4_6sycj")
|
||||
"texture": ExtResource("4_jljuk")
|
||||
}],
|
||||
"loop": true,
|
||||
"name": &"default",
|
||||
"speed": 8.0
|
||||
}]
|
||||
|
||||
[sub_resource type="Gradient" id="Gradient_0u7ax"]
|
||||
[sub_resource type="Gradient" id="Gradient_sm8o0"]
|
||||
offsets = PackedFloat32Array(0, 0.736573)
|
||||
colors = PackedColorArray(1, 1, 1, 1, 0, 0, 0, 1)
|
||||
|
||||
[sub_resource type="GradientTexture2D" id="GradientTexture2D_pb6np"]
|
||||
gradient = SubResource("Gradient_0u7ax")
|
||||
[sub_resource type="GradientTexture2D" id="GradientTexture2D_mton1"]
|
||||
gradient = SubResource("Gradient_sm8o0")
|
||||
fill = 1
|
||||
fill_from = Vector2(0.5, 0.5)
|
||||
|
||||
[node name="Candle" type="Node2D"]
|
||||
|
||||
@ -38,14 +42,18 @@ position = Vector2(-1.05837e-13, 4.76837e-07)
|
||||
rotation = -3.14159
|
||||
scale = Vector2(1.14286, 1.10476)
|
||||
sprite_frames = SubResource("SpriteFrames_mdrfm")
|
||||
frame_progress = 0.87695
|
||||
frame_progress = 0.394521
|
||||
centered = false
|
||||
offset = Vector2(-3.5, -7)
|
||||
flip_v = true
|
||||
|
||||
[node name="PointLight2D" type="PointLight2D" parent="."]
|
||||
texture = SubResource("GradientTexture2D_pb6np")
|
||||
|
||||
[node name="Particles2D" type="GPUParticles2D" parent="."]
|
||||
amount = 16
|
||||
process_material = ExtResource("5_g2xr2")
|
||||
position = Vector2(0, -4)
|
||||
process_material = ExtResource("5_ygew0")
|
||||
preprocess = 1.0
|
||||
visibility_rect = Rect2(0, 0, 0, 0)
|
||||
|
||||
[node name="PointLight2D" type="PointLight2D" parent="."]
|
||||
color = Color(1, 0.698039, 0.2, 1)
|
||||
texture = SubResource("GradientTexture2D_mton1")
|
||||
texture_scale = 1.5
|
||||
64
Scenes/Props/candle_2.tscn
Normal file
64
Scenes/Props/candle_2.tscn
Normal file
@ -0,0 +1,64 @@
|
||||
[gd_scene load_steps=9 format=3 uid="uid://cf7al5uln33rn"]
|
||||
|
||||
[ext_resource type="Texture2D" uid="uid://phrnbrk3bl0g" path="res://Assets/RF_Catacombs_v1.0/candleB_01.png" id="1_r5efy"]
|
||||
[ext_resource type="Texture2D" uid="uid://dbyoqh34wf5ix" path="res://Assets/RF_Catacombs_v1.0/candleB_02.png" id="2_lpcc8"]
|
||||
[ext_resource type="Texture2D" uid="uid://bluucopg1uude" path="res://Assets/RF_Catacombs_v1.0/candleB_03.png" id="3_cfvnv"]
|
||||
[ext_resource type="Texture2D" uid="uid://bvgwpukrjl7k6" path="res://Assets/RF_Catacombs_v1.0/candleB_04.png" id="4_expwi"]
|
||||
[ext_resource type="Material" uid="uid://id4bl5ph4sbj" path="res://candle_part_material.tres" id="5_s1888"]
|
||||
|
||||
[sub_resource type="SpriteFrames" id="SpriteFrames_mdrfm"]
|
||||
animations = [{
|
||||
"frames": [{
|
||||
"duration": 1.0,
|
||||
"texture": ExtResource("1_r5efy")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": ExtResource("2_lpcc8")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": ExtResource("3_cfvnv")
|
||||
}, {
|
||||
"duration": 1.0,
|
||||
"texture": ExtResource("4_expwi")
|
||||
}],
|
||||
"loop": true,
|
||||
"name": &"default",
|
||||
"speed": 8.0
|
||||
}]
|
||||
|
||||
[sub_resource type="Gradient" id="Gradient_sm8o0"]
|
||||
offsets = PackedFloat32Array(0, 0.736573)
|
||||
colors = PackedColorArray(1, 1, 1, 1, 0, 0, 0, 1)
|
||||
|
||||
[sub_resource type="GradientTexture2D" id="GradientTexture2D_mton1"]
|
||||
gradient = SubResource("Gradient_sm8o0")
|
||||
fill = 1
|
||||
fill_from = Vector2(0.5, 0.5)
|
||||
|
||||
[node name="Candle" type="Node2D"]
|
||||
|
||||
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
|
||||
position = Vector2(4, 0)
|
||||
rotation = -3.14159
|
||||
scale = Vector2(1.14286, 1.10476)
|
||||
sprite_frames = SubResource("SpriteFrames_mdrfm")
|
||||
centered = false
|
||||
offset = Vector2(-3.5, -7)
|
||||
flip_v = true
|
||||
|
||||
[node name="Particles2D1" type="GPUParticles2D" parent="."]
|
||||
position = Vector2(-4, 0)
|
||||
process_material = ExtResource("5_s1888")
|
||||
preprocess = 1.0
|
||||
visibility_rect = Rect2(0, 0, 0, 0)
|
||||
|
||||
[node name="Particles2D2" type="GPUParticles2D" parent="."]
|
||||
position = Vector2(4, -4)
|
||||
process_material = ExtResource("5_s1888")
|
||||
preprocess = 1.0
|
||||
visibility_rect = Rect2(0, 0, 0, 0)
|
||||
|
||||
[node name="PointLight2D" type="PointLight2D" parent="."]
|
||||
color = Color(1, 0.698039, 0.2, 1)
|
||||
texture = SubResource("GradientTexture2D_mton1")
|
||||
texture_scale = 2.5
|
||||
File diff suppressed because one or more lines are too long
@ -44,7 +44,6 @@ func _ready():
|
||||
atk1r.set_disabled(true)
|
||||
atk2l.set_disabled(true)
|
||||
atk2r.set_disabled(true)
|
||||
pass # Replace with function body.
|
||||
|
||||
|
||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
||||
@ -55,13 +54,35 @@ func _process(delta):
|
||||
setAnimState("Run")
|
||||
|
||||
if state != "Attack" && state != "Attack2":
|
||||
is_facing_left = velocity.x >= 0
|
||||
is_facing_left = velocity.x > 0 && !(velocity.x < 0)
|
||||
|
||||
# AI STUFF
|
||||
#velocity += processAI(list,delta)
|
||||
var x = 0
|
||||
var y = 0
|
||||
|
||||
if Input.is_action_pressed("ui_left"):
|
||||
# Move as long as the key/button is pressed.
|
||||
x -= delta * 50
|
||||
elif Input.is_action_pressed("ui_right"):
|
||||
# Move as long as the key/button is pressed.
|
||||
x += delta * 50
|
||||
else:
|
||||
velocity.x *= 0.8
|
||||
if Input.is_action_pressed("ui_up"):
|
||||
# Move as long as the key/button is pressed.
|
||||
y -= delta * 50
|
||||
elif Input.is_action_pressed("ui_down"):
|
||||
# Move as long as the key/button is pressed.
|
||||
y += delta * 50
|
||||
else:
|
||||
velocity.y *= 0.8
|
||||
|
||||
velocity.x += x
|
||||
velocity.y += y
|
||||
|
||||
|
||||
|
||||
velocity.x += delta * 4
|
||||
velocity.y += delta * 4
|
||||
|
||||
if !hitanim.is_emitting():
|
||||
anim.modulate.a = 1
|
||||
@ -85,26 +106,11 @@ func attack():
|
||||
else:
|
||||
atkR.set_disabled(false)
|
||||
|
||||
#if (level > 3):
|
||||
# setAnimState("Attack2")
|
||||
# if is_facing_left:
|
||||
# atk2r.set_disabled(false)
|
||||
# else:
|
||||
# atk2l.set_disabled(false)
|
||||
# else:
|
||||
# setAnimState("Attack")
|
||||
# if is_facing_left:
|
||||
# atk1r.set_disabled(false)
|
||||
# else:
|
||||
# atk1l.set_disabled(false)
|
||||
|
||||
|
||||
func stop_attack():
|
||||
is_attacking = false
|
||||
atkL.set_disabled(true)
|
||||
atkR.set_disabled(true)
|
||||
#atk2l.set_disabled(true)
|
||||
#atk2r.set_disabled(true)
|
||||
|
||||
|
||||
func setAnimState(newstate):
|
||||
|
||||
@ -1,13 +1,21 @@
|
||||
[gd_resource type="ParticleProcessMaterial" format=3 uid="uid://id4bl5ph4sbj"]
|
||||
[gd_resource type="ParticleProcessMaterial" load_steps=3 format=3 uid="uid://id4bl5ph4sbj"]
|
||||
|
||||
[sub_resource type="Gradient" id="Gradient_uvo2g"]
|
||||
offsets = PackedFloat32Array(0, 0.754717, 0.822102)
|
||||
colors = PackedColorArray(1, 0.67197, 0.176527, 1, 0.988235, 0, 0.0470588, 1, 0.321728, 0.321728, 0.321728, 1)
|
||||
|
||||
[sub_resource type="GradientTexture1D" id="GradientTexture1D_luts5"]
|
||||
gradient = SubResource("Gradient_uvo2g")
|
||||
|
||||
[resource]
|
||||
particle_flag_disable_z = true
|
||||
direction = Vector3(0, -1, 0)
|
||||
spread = 12.0
|
||||
gravity = Vector3(0, 0, 0)
|
||||
initial_velocity_min = 25.0
|
||||
initial_velocity_max = 25.0
|
||||
initial_velocity_min = 15.0
|
||||
initial_velocity_max = 20.0
|
||||
orbit_velocity_min = 0.0
|
||||
orbit_velocity_max = 0.0
|
||||
damping_min = 4.0
|
||||
damping_max = 10.0
|
||||
damping_max = 12.0
|
||||
color_ramp = SubResource("GradientTexture1D_luts5")
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user