zenayi/GameJamDungeon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: zenayi:575a565a2cf9695415daa2af160bff0a5f9615f4
Branches Tags
zenayi:main
..
compare: zenayi:dc3c458414bef37e7f1aa36c300fca58d5a8eeb9
Branches Tags
zenayi:main

2 Commits
575a565a2c ... dc3c458414

Author SHA1 Message Date
Pal
dc3c458414 merge 2025-10-30 15:59:01 -07:00
Pal
ba38c6443c merging stuff 2025-10-30 15:58:19 -07:00
5 changed files with 139 additions and 13 deletions
Expand all files Collapse all files

6
Zennysoft.Game.Ma/src/audio/AMB/amb_beach.wav.import
View File

@@ -3,12 +3,12 @@
importer="wav"
type="AudioStreamWAV"
uid="uid://ddii3pi8x75xc"
path="res://.godot/imported/amb_beach.wav-046e4f838e50e43a1aba1a754b92aad6.sample"
path="res://.godot/imported/amb_beach.wav-e64adf8f733e6a108ae15edd5f0499ab.sample"
[deps]
source_file="res://src/audio/AMB/amb_beach.wav"
dest_files=["res://.godot/imported/amb_beach.wav-046e4f838e50e43a1aba1a754b92aad6.sample"]
source_file="res://src/audio/amb/amb_beach.wav"
dest_files=["res://.godot/imported/amb_beach.wav-e64adf8f733e6a108ae15edd5f0499ab.sample"]
[params]

6
Zennysoft.Game.Ma/src/audio/AMB/amb_perlin.wav.import
View File

@@ -3,12 +3,12 @@
importer="wav"
type="AudioStreamWAV"
uid="uid://ym4ur8a2qxhp"
path="res://.godot/imported/amb_perlin.wav-ba6da0d5591f392e4aca7d2f85c4dfc2.sample"
path="res://.godot/imported/amb_perlin.wav-dea63667b2a56d37d48ba209f56f8900.sample"
[deps]
source_file="res://src/audio/AMB/amb_perlin.wav"
dest_files=["res://.godot/imported/amb_perlin.wav-ba6da0d5591f392e4aca7d2f85c4dfc2.sample"]
source_file="res://src/audio/amb/amb_perlin.wav"
dest_files=["res://.godot/imported/amb_perlin.wav-dea63667b2a56d37d48ba209f56f8900.sample"]
[params]

6
Zennysoft.Game.Ma/src/audio/AMB/amb_white_noise.wav.import
View File

@@ -3,12 +3,12 @@
importer="wav"
type="AudioStreamWAV"
uid="uid://b7wxddjx3qw5o"
path="res://.godot/imported/amb_white_noise.wav-d316dd05afe429f6bcdda594285ad718.sample"
path="res://.godot/imported/amb_white_noise.wav-c98b45aa94120bc0c660bf2d6af1c696.sample"
[deps]
source_file="res://src/audio/AMB/amb_white_noise.wav"
dest_files=["res://.godot/imported/amb_white_noise.wav-d316dd05afe429f6bcdda594285ad718.sample"]
source_file="res://src/audio/amb/amb_white_noise.wav"
dest_files=["res://.godot/imported/amb_white_noise.wav-c98b45aa94120bc0c660bf2d6af1c696.sample"]
[params]

6
Zennysoft.Game.Ma/src/audio/AMB/amb_wind_loop_altar.wav.import
View File

@@ -3,12 +3,12 @@
importer="wav"
type="AudioStreamWAV"
uid="uid://bmiitw4fcs68e"
path="res://.godot/imported/amb_wind_loop_altar.wav-e766e3db29faa01ad6dbaa8cb18d7de6.sample"
path="res://.godot/imported/amb_wind_loop_altar.wav-b9d60e3c3c10ec00833903539a7f3796.sample"
[deps]
source_file="res://src/audio/AMB/amb_wind_loop_altar.wav"
dest_files=["res://.godot/imported/amb_wind_loop_altar.wav-e766e3db29faa01ad6dbaa8cb18d7de6.sample"]
source_file="res://src/audio/amb/amb_wind_loop_altar.wav"
dest_files=["res://.godot/imported/amb_wind_loop_altar.wav-b9d60e3c3c10ec00833903539a7f3796.sample"]
[params]

128
Zennysoft.Game.Ma/src/enemy/enemy_types/04. sara/SaraModelView.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=230 format=3 uid="uid://bli0t0d6ommvi"]
[gd_scene load_steps=232 format=3 uid="uid://bli0t0d6ommvi"]
[ext_resource type="Script" uid="uid://cvr1qimxpignl" path="res://src/enemy/EnemyModelView2D.cs" id="1_oh25a"]
[ext_resource type="Texture2D" uid="uid://nps7rrvkgews" path="res://src/enemy/enemy_types/04. sara/animations/IDLE+MOVE/FRONT/0001.png" id="2_8j76g"]
@@ -161,7 +161,9 @@
[ext_resource type="Texture2D" uid="uid://bflrknmtl1ju5" path="res://src/enemy/enemy_types/04. sara/animations/ATTACK2/SIDE R/0016.png" id="159_4o5f2"]
[ext_resource type="Texture2D" uid="uid://n2c8kfwt6ve3" path="res://src/enemy/enemy_types/04. sara/animations/ATTACK2/SIDE R/0019.png" id="160_r8ggx"]
[ext_resource type="Texture2D" uid="uid://dykb4rwua8iyw" path="res://src/enemy/enemy_types/04. sara/animations/ATTACK2/SIDE R/0022.png" id="161_xafpd"]
[ext_resource type="AudioStream" uid="uid://b4bseex34nu6c" path="res://src/audio/sfx/ENEMY_APSARA_STRIKE.ogg" id="162_veo2p"]
[ext_resource type="PackedScene" uid="uid://diaxvpmwgl65u" path="res://src/enemy/TwoAttacksEnemyAnimationTree.tscn" id="163_e6etm"]
[ext_resource type="AudioStream" uid="uid://dnnhfw6cgrca4" path="res://src/audio/sfx/enemy_sara_magic.ogg" id="163_xppqu"]
[ext_resource type="AnimationNodeStateMachine" uid="uid://co7lshemjrro8" path="res://src/enemy/animation_state_machines/IdleStateMachine.tres" id="164_fc7i0"]
[ext_resource type="Texture2D" uid="uid://cxibdrta6imfb" path="res://src/vfx/Enemy/nega.png" id="164_rrjme"]
[ext_resource type="AnimationNodeStateMachine" uid="uid://cbq8xog50cjjy" path="res://src/enemy/animation_state_machines/PrimaryAttackStateMachine.tres" id="165_veo2p"]
@@ -1035,6 +1037,21 @@ tracks/2/keys = {
"update": 1,
"values": [true, false, true]
}
tracks/3/type = "audio"
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/path = NodePath("Attacks")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/keys = {
"clips": [{
"end_offset": 0.0,
"start_offset": 0.0,
"stream": ExtResource("162_veo2p")
}],
"times": PackedFloat32Array(0)
}
tracks/3/use_blend = true
[sub_resource type="Animation" id="Animation_xppqu"]
resource_name = "primary_attack_back"
@@ -1076,6 +1093,21 @@ tracks/2/keys = {
"update": 1,
"values": [true, false, true]
}
tracks/3/type = "audio"
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/path = NodePath("Attacks")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/keys = {
"clips": [{
"end_offset": 0.0,
"start_offset": 0.0,
"stream": ExtResource("162_veo2p")
}],
"times": PackedFloat32Array(0)
}
tracks/3/use_blend = true
[sub_resource type="Animation" id="Animation_fc7i0"]
resource_name = "primary_attack_left"
@@ -1117,6 +1149,21 @@ tracks/2/keys = {
"update": 1,
"values": [true, false, true]
}
tracks/3/type = "audio"
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/path = NodePath("Attacks")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/keys = {
"clips": [{
"end_offset": 0.0,
"start_offset": 0.0,
"stream": ExtResource("162_veo2p")
}],
"times": PackedFloat32Array(0)
}
tracks/3/use_blend = true
[sub_resource type="Animation" id="Animation_veo2p"]
resource_name = "primary_attack_right"
@@ -1158,6 +1205,21 @@ tracks/2/keys = {
"update": 1,
"values": [true, false, true]
}
tracks/3/type = "audio"
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/path = NodePath("Attacks")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/keys = {
"clips": [{
"end_offset": 0.0,
"start_offset": 0.0,
"stream": ExtResource("162_veo2p")
}],
"times": PackedFloat32Array(0)
}
tracks/3/use_blend = true
[sub_resource type="Animation" id="Animation_wtyys"]
resource_name = "secondary_attack"
@@ -1209,6 +1271,21 @@ tracks/3/keys = {
"clips": PackedStringArray("Attack VFX"),
"times": PackedFloat32Array(0)
}
tracks/4/type = "audio"
tracks/4/imported = false
tracks/4/enabled = true
tracks/4/path = NodePath("Attacks")
tracks/4/interp = 1
tracks/4/loop_wrap = true
tracks/4/keys = {
"clips": [{
"end_offset": 0.0,
"start_offset": 0.0,
"stream": ExtResource("163_xppqu")
}],
"times": PackedFloat32Array(0)
}
tracks/4/use_blend = true
[sub_resource type="Animation" id="Animation_gv7gi"]
resource_name = "secondary_attack_back"
@@ -1260,6 +1337,21 @@ tracks/3/keys = {
"clips": PackedStringArray("Attack VFX"),
"times": PackedFloat32Array(0)
}
tracks/4/type = "audio"
tracks/4/imported = false
tracks/4/enabled = true
tracks/4/path = NodePath("Attacks")
tracks/4/interp = 1
tracks/4/loop_wrap = true
tracks/4/keys = {
"clips": [{
"end_offset": 0.0,
"start_offset": 0.0,
"stream": ExtResource("163_xppqu")
}],
"times": PackedFloat32Array(0)
}
tracks/4/use_blend = true
[sub_resource type="Animation" id="Animation_qbkgi"]
resource_name = "secondary_attack_left"
@@ -1311,6 +1403,21 @@ tracks/3/keys = {
"clips": PackedStringArray("Attack VFX"),
"times": PackedFloat32Array(0)
}
tracks/4/type = "audio"
tracks/4/imported = false
tracks/4/enabled = true
tracks/4/path = NodePath("Attacks")
tracks/4/interp = 1
tracks/4/loop_wrap = true
tracks/4/keys = {
"clips": [{
"end_offset": 0.0,
"start_offset": 0.0,
"stream": ExtResource("163_xppqu")
}],
"times": PackedFloat32Array(0)
}
tracks/4/use_blend = true
[sub_resource type="Animation" id="Animation_k1pc0"]
resource_name = "secondary_attack_right"
@@ -1362,6 +1469,21 @@ tracks/3/keys = {
"clips": PackedStringArray("Attack VFX"),
"times": PackedFloat32Array(0)
}
tracks/4/type = "audio"
tracks/4/imported = false
tracks/4/enabled = true
tracks/4/path = NodePath("Attacks")
tracks/4/interp = 1
tracks/4/loop_wrap = true
tracks/4/keys = {
"clips": [{
"end_offset": 0.0,
"start_offset": 0.0,
"stream": ExtResource("163_xppqu")
}],
"times": PackedFloat32Array(0)
}
tracks/4/use_blend = true
[sub_resource type="AnimationLibrary" id="AnimationLibrary_pkiq5"]
_data = {
@@ -1766,3 +1888,7 @@ sprite_frames = SubResource("SpriteFrames_4o5f2")
libraries = {
&"": SubResource("AnimationLibrary_8wlnr")
}
[node name="Attacks" type="AudioStreamPlayer3D" parent="."]
process_mode = 3
bus = &"SFX"