3002102
/
gae_wild_jam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: 3002102:44d83f30f199a7a6e8132b3090644d84faf92308
Branches Tags
3002102:main
3002102:feat/damage-system
3002102:better-perk-display
3002102:menuing_and_audio
..
compare: 3002102:a2a9ca7f5f848b0852e9a5ec959f792783bdedef
Branches Tags
3002102:main
3002102:feat/damage-system
3002102:better-perk-display
3002102:menuing_and_audio

No commits in common. "44d83f30f199a7a6e8132b3090644d84faf92308" and "a2a9ca7f5f848b0852e9a5ec959f792783bdedef" have entirely different histories.
44d83f30f1 ... a2a9ca7f5f

2 changed files with 2 additions and 20 deletions
Show Stats Expand all files Collapse all files

20
scenes/player.tscn
View File

@ -681,23 +681,6 @@ animations = [{
}, { }, {
"frames": [{ "frames": [{
"duration": 1.0, "duration": 1.0,
"texture": SubResource("AtlasTexture_mwp2n")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ry8ed")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_au8ao")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_fr8ja")
}],
"loop": true,
"name": &"spinning",
"speed": 20.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_giy8y") "texture": SubResource("AtlasTexture_giy8y")
}, { }, {
"duration": 1.0, "duration": 1.0,
@ -805,8 +788,7 @@ script = ExtResource("1_3vyb7")
texture_filter = 1 texture_filter = 1
position = Vector2(0, -2) position = Vector2(0, -2)
sprite_frames = SubResource("SpriteFrames_giy8y") sprite_frames = SubResource("SpriteFrames_giy8y")
animation = &"spinning" animation = &"run_down"
frame_progress = 0.6005584
[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=896441301] [node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=896441301]
position = Vector2(0, 2) position = Vector2(0, 2)

2
scripts/cauldron_bar.gd
View File

@ -11,7 +11,7 @@ var burning_colors: Array[AtlasTexture] = []
var slot_states = [0, 0, 0] var slot_states = [0, 0, 0]
var progres_index = 0 var progres_index = 0
var is_brewing var is_brewing
var brew_explosion = false var brew_explosion = true
@onready var witch = get_parent() @onready var witch = get_parent()
@onready var player = get_node("/root/Game/World/Player") @onready var player = get_node("/root/Game/World/Player")
var explosion_scene = preload("res://scenes/explosion.tscn") var explosion_scene = preload("res://scenes/explosion.tscn")