walk anim, death anim ja loading screen

This commit is contained in:
2026-08-09 23:05:55 +03:00
parent 6414b2e7cc
commit 3cd347d420
9 changed files with 69 additions and 48 deletions
BIN
View File
Binary file not shown.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 MiB

-40
View File
@@ -1,40 +0,0 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://b12qek2dvwok"
path="res://.godot/imported/loadingScreen.png-4a07e122007517dac631d2ce58b2f3c9.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Assets/loadingScreen.png"
dest_files=["res://.godot/imported/loadingScreen.png-4a07e122007517dac631d2ce58b2f3c9.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 MiB

After

Width:  |  Height:  |  Size: 3.5 MiB

+27
View File
@@ -35,4 +35,31 @@ script = ExtResource("2_camera_iso")
[node name="bull" parent="." unique_id=1386495166 instance=ExtResource("4_e80uo")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.655, 0.23)
[node name="Skeleton3D" parent="bull/Armature" parent_id_path=PackedInt32Array(1386495166, 547304299) index="0" unique_id=2096877109]
bones/0/position = Vector3(0, 0, 0.009963839)
bones/0/rotation = Quaternion(-0.733504, -0.0036974847, 0.0013620416, -0.67967373)
bones/0/scale = Vector3(1, 0.99999994, 0.99999994)
bones/1/position = Vector3(0.0035266252, -0.0043296535, 0.0040827994)
bones/1/rotation = Quaternion(0.020680686, 0.45675468, 0.8716418, -0.1766016)
bones/2/rotation = Quaternion(0.3289326, -0.03432299, -0.06047997, 0.94178957)
bones/4/position = Vector3(0.0045358227, -0.0021376952, -0.004238624)
bones/4/rotation = Quaternion(-0.2448651, -0.018126775, 0.96885973, -0.0319902)
bones/4/scale = Vector3(1.0000001, 1, 1.0000001)
bones/5/rotation = Quaternion(-0.7492961, -0.32333943, -0.24235487, 0.5246629)
bones/5/scale = Vector3(1, 1, 1)
bones/6/rotation = Quaternion(0.32210493, 0.15572408, 0.14126852, 0.9230611)
bones/6/scale = Vector3(0.9999998, 1, 1)
bones/17/position = Vector3(-2.3283064e-12, 0.0009373817, 0.007552617)
bones/17/rotation = Quaternion(-5.3357535e-08, 0.7071068, 0.7071067, -5.3357535e-08)
bones/19/position = Vector3(-0.0035266252, -0.0043296525, 0.0040827994)
bones/19/rotation = Quaternion(0.07793758, -0.2513099, 0.94914854, 0.1728764)
bones/20/rotation = Quaternion(-0.3791731, -0.08821739, 0.07153107, 0.91832936)
bones/22/position = Vector3(-0.0045358227, -0.0021376943, -0.004238624)
bones/22/rotation = Quaternion(0.20629132, 0.46411392, 0.84344316, 0.17506008)
bones/22/scale = Vector3(1.0000001, 1.0000001, 1.0000001)
bones/23/rotation = Quaternion(-0.7287124, 0.31838557, 0.209407, 0.5689971)
bones/23/scale = Vector3(1.0000001, 1.0000002, 1.0000002)
bones/24/rotation = Quaternion(0.71033937, -0.13944183, -0.049755, 0.6881123)
bones/24/scale = Vector3(0.9999999, 1, 1.0000001)
[editable path="bull"]
+9 -3
View File
@@ -14,7 +14,9 @@ const _ANIM_IDLE: StringName = &"Armature|IDLE"
const _ANIM_KICK: StringName = &"Armature|KICK"
const _ANIM_SLAM: StringName = &"Armature|SLAM"
const _ANIM_DASH: StringName = &"Armature|DASH"
const _ANIM_WALK: StringName = &"Armature|WALK"
const _ANIM_ROLL: StringName = &"Armature|ROLL"
const _ANIM_DEATH: StringName = &"Armature|DEATH"
@onready var camera_pivot: Node3D = $Camera3D
@onready var cube_guy: Node3D = $bull
@@ -306,9 +308,11 @@ func _update_locomotion_anim(moving: bool) -> void:
return
_locomotion_moving = moving
if moving:
if _bull_anim.has_animation(_ANIM_DASH):
_bull_anim.speed_scale = 1.0
_bull_anim.play(_ANIM_DASH, 0.25)
if _bull_anim.has_animation(_ANIM_WALK):
_bull_anim.speed_scale = 2.0
_bull_anim.play(_ANIM_WALK, 1)
var anim = _bull_anim.get_animation(_ANIM_WALK)
anim.loop_mode = Animation.LOOP_LINEAR
else:
_play_idle()
@@ -1085,6 +1089,8 @@ func take_sword_hit(cause: String = "", hit_pos: Vector3 = Vector3.ZERO) -> void
_huff_player.pitch_scale = randf_range(0.7, 0.9)
_huff_player.play()
if _hp <= 0:
if _bull_anim.current_animation != _ANIM_DEATH:
_bull_anim.play(_ANIM_DEATH)
_dead = true
died.emit(cause)
+3 -4
View File
@@ -14,12 +14,10 @@ config/name="Bullosseum"
config/version="0.2.0"
run/main_scene="res://MainMenu.tscn"
config/features=PackedStringArray("4.7", "Forward Plus")
config/icon="res://icon.svg"
config/run/main_scene="res://MainMenu.tscn"
boot_splash/bg_color=Color(0, 0, 0, 1)
boot_splash/image="res://Assets/loading_screen.png"
boot_splash/fullsize=true
boot_splash/use_filter=true
config/icon="res://icon.svg"
config/run/main_scene="res://MainMenu.tscn"
[autoload]
@@ -118,4 +116,5 @@ pointing/emulate_touch_from_mouse=true
[rendering]
rendering_device/driver.windows="d3d12"
renderer/rendering_method="gl_compatibility"
anti_aliasing/quality/use_taa=true
+30 -1
View File
@@ -47,6 +47,35 @@ fov = 50.0
near = 2.636
far = 0.01
[node name="Skeleton3D" parent="Player/bull/Armature" parent_id_path=PackedInt32Array(165510044, 1386495166, 547304299) index="0" unique_id=2096877109]
bones/1/scale = Vector3(1.0000021, 1.0000001, 1.0000006)
bones/2/position = Vector3(-5.853537e-11, 0.002669535, -1.489375e-10)
bones/2/scale = Vector3(1, 1.0000001, 0.9999999)
bones/5/position = Vector3(1.264555e-10, 0.0028599252, -2.4303243e-10)
bones/6/position = Vector3(-7.092306e-11, 0.003274492, 4.6413304e-10)
bones/8/position = Vector3(2.259811e-19, 0.0010177285, -0.008495503)
bones/8/rotation = Quaternion(-0.70710677, 0, 0, 0.70710677)
bones/8/scale = Vector3(1, 1, 1)
bones/9/position = Vector3(4.814825e-35, 0.0017711426, 0)
bones/10/position = Vector3(4.814825e-35, 0.0018082206, 0)
bones/11/position = Vector3(0, 0.0019911951, 0)
bones/11/scale = Vector3(1, 1, 1)
bones/12/position = Vector3(0, 0.002023485, 0)
bones/12/scale = Vector3(1, 1, 1)
bones/13/position = Vector3(0, 0.0016682985, 0)
bones/13/scale = Vector3(1, 1, 1)
bones/14/position = Vector3(0, 0.0014960878, 0)
bones/14/scale = Vector3(1, 1, 1)
bones/15/position = Vector3(0, 0.0010996431, 0)
bones/19/scale = Vector3(1.0000021, 1.0000001, 1.0000006)
bones/20/position = Vector3(5.853537e-11, 0.002669535, -1.489375e-10)
bones/20/scale = Vector3(1, 1.0000001, 0.9999999)
bones/22/rotation = Quaternion(0.21561885, 0.36444604, 0.8930564, 0.1521117)
bones/23/position = Vector3(-1.264555e-10, 0.0028599252, -2.4303243e-10)
bones/23/rotation = Quaternion(-0.72871244, 0.3183856, 0.20940702, 0.568997)
bones/24/position = Vector3(7.092306e-11, 0.003274492, 4.6413304e-10)
bones/24/rotation = Quaternion(0.7103394, -0.13944182, -0.049754977, 0.6881122)
[node name="Node3D" type="Node3D" parent="." unique_id=1081100876]
[node name="StaticBody3D" type="StaticBody3D" parent="Node3D" unique_id=2072095624]
@@ -112,7 +141,7 @@ spot_range = 32.90586
[node name="SUN_DirectionalLight3D2" type="DirectionalLight3D" parent="Lights" unique_id=1706919950]
transform = Transform3D(0.45811793, 0.34843865, -0.81775206, 0.5316611, 0.62986195, 0.56622505, 0.7123655, -0.69416475, 0.10329977, 0, 8.980043, 0)
light_energy = 1.199
light_energy = 0.106
shadow_enabled = true
shadow_blur = 10.0