meowo
/
LD54
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor Fix

main
Luna Brovchuk 2023-10-02 17:42:26 +02:00
parent 0364fc179b
commit 8fcb652f17
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
res/themes/default.tres
View File

@ -3,7 +3,6 @@
[ext_resource path="res://res/fonts/silkscreen/Silkscreen-Regular.ttf" type="DynamicFontData" id=1] [ext_resource path="res://res/fonts/silkscreen/Silkscreen-Regular.ttf" type="DynamicFontData" id=1]
[sub_resource type="DynamicFont" id=1] [sub_resource type="DynamicFont" id=1]
size = 8
font_data = ExtResource( 1 ) font_data = ExtResource( 1 )
[resource] [resource]

1
src/models/enemies/bat/Bat.tscn
View File

@ -22,6 +22,7 @@ script = ExtResource( 2 )
use_parent_material = true use_parent_material = true
frames = ExtResource( 1 ) frames = ExtResource( 1 )
animation = "idle" animation = "idle"
frame = 1
playing = true playing = true
centered = false centered = false

21
src/scenes/game/Game.tscn
View File

@ -1,4 +1,4 @@
[gd_scene load_steps=31 format=2] [gd_scene load_steps=30 format=2]
[ext_resource path="res://src/scenes/menu/background/background.png" type="Texture" id=1] [ext_resource path="res://src/scenes/menu/background/background.png" type="Texture" id=1]
[ext_resource path="res://src/scenes/game/sprites/background_houses.png" type="Texture" id=2] [ext_resource path="res://src/scenes/game/sprites/background_houses.png" type="Texture" id=2]
@ -7,7 +7,6 @@
[ext_resource path="res://src/models/player/Player.tscn" type="PackedScene" id=5] [ext_resource path="res://src/models/player/Player.tscn" type="PackedScene" id=5]
[ext_resource path="res://src/scenes/game/sprites/health/health.png" type="Texture" id=6] [ext_resource path="res://src/scenes/game/sprites/health/health.png" type="Texture" id=6]
[ext_resource path="res://src/scenes/game/sprites/cast_time.png" type="Texture" id=7] [ext_resource path="res://src/scenes/game/sprites/cast_time.png" type="Texture" id=7]
[ext_resource path="res://src/scenes/game/sprites/damage.png" type="Texture" id=8]
[ext_resource path="res://src/scenes/game/card_placeholder.gd" type="Script" id=8] [ext_resource path="res://src/scenes/game/card_placeholder.gd" type="Script" id=8]
[ext_resource path="res://src/scenes/game/sprites/player_icon.png" type="Texture" id=10] [ext_resource path="res://src/scenes/game/sprites/player_icon.png" type="Texture" id=10]
[ext_resource path="res://src/scenes/game/game.gd" type="Script" id=11] [ext_resource path="res://src/scenes/game/game.gd" type="Script" id=11]
@ -30,14 +29,14 @@ extents = Vector2( 140, 10.125 )
atlas = ExtResource( 6 ) atlas = ExtResource( 6 )
region = Rect2( 155, 0, 31, 11 ) region = Rect2( 155, 0, 31, 11 )
[sub_resource type="AtlasTexture" id=9]
atlas = ExtResource( 6 )
region = Rect2( 93, 0, 31, 11 )
[sub_resource type="AtlasTexture" id=8] [sub_resource type="AtlasTexture" id=8]
atlas = ExtResource( 6 ) atlas = ExtResource( 6 )
region = Rect2( 124, 0, 31, 11 ) region = Rect2( 124, 0, 31, 11 )
[sub_resource type="AtlasTexture" id=9]
atlas = ExtResource( 6 )
region = Rect2( 93, 0, 31, 11 )
[sub_resource type="AtlasTexture" id=10] [sub_resource type="AtlasTexture" id=10]
atlas = ExtResource( 6 ) atlas = ExtResource( 6 )
region = Rect2( 62, 0, 31, 11 ) region = Rect2( 62, 0, 31, 11 )
@ -52,10 +51,10 @@ region = Rect2( 0, 0, 31, 11 )
[sub_resource type="SpriteFrames" id=4] [sub_resource type="SpriteFrames" id=4]
animations = [ { animations = [ {
"frames": [ SubResource( 7 ), SubResource( 9 ), SubResource( 8 ), SubResource( 10 ), SubResource( 11 ), SubResource( 12 ) ], "frames": [ SubResource( 7 ), SubResource( 8 ), SubResource( 9 ), SubResource( 10 ), SubResource( 11 ), SubResource( 12 ) ],
"loop": false, "loop": true,
"name": "idle", "name": "default",
"speed": 0.0 "speed": 5.0
} ] } ]
[sub_resource type="Animation" id=5] [sub_resource type="Animation" id=5]
@ -219,7 +218,6 @@ margin_bottom = 40.0
[node name="HealthSprite" type="AnimatedSprite" parent="UIWrapper/UI/Left/Health"] [node name="HealthSprite" type="AnimatedSprite" parent="UIWrapper/UI/Left/Health"]
position = Vector2( 52, 156 ) position = Vector2( 52, 156 )
frames = SubResource( 4 ) frames = SubResource( 4 )
animation = "idle"
centered = false centered = false
[node name="PlayerIcon" type="Sprite" parent="UIWrapper/UI/Left"] [node name="PlayerIcon" type="Sprite" parent="UIWrapper/UI/Left"]
@ -280,7 +278,6 @@ margin_bottom = 40.0
[node name="Damage" type="Sprite" parent="UIWrapper/UI/Right/Damage"] [node name="Damage" type="Sprite" parent="UIWrapper/UI/Right/Damage"]
position = Vector2( 256, 160 ) position = Vector2( 256, 160 )
texture = ExtResource( 8 )
[node name="Cards" type="Control" parent="UIWrapper/UI"] [node name="Cards" type="Control" parent="UIWrapper/UI"]
visible = false visible = false

2
src/scripts/enemy_class.gd
View File

@ -1,7 +1,7 @@
extends KinematicBody2D extends KinematicBody2D
onready var player = $"../../Player" onready var player = $"../../Player"
var empty_material = load("res://res/shaders/empty_material.tscn") var empty_material = load("res://res/shaders/empty_material.tres")
var hp var hp
var dead = false var dead = false
var dead_timer = .0 var dead_timer = .0