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

Mess with enemy lighting, time bad end better

Browse Source
This commit is contained in:
Zenny
2026-06-16 02:03:36 -07:00
parent d4a27f6d4d
commit bbadf9ccec
17 changed files with 174 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Zennysoft.Game.Ma/src/audio/amb/AMB_BAD_END_EARTHQUAKE.ogg.import
+3 -3
View File
@@ -12,8 +12,8 @@ dest_files=["res://.godot/imported/AMB_BAD_END_EARTHQUAKE.ogg-03e817303decd8b8e4
[params]
loop=false
loop_offset=0
bpm=0
loop=true
loop_offset=0.0
bpm=0.0
beat_count=0
bar_beats=4
Zennysoft.Game.Ma/src/audio/bgm/21 - Evil End.ogg
BIN
View File
Binary file not shown.
Zennysoft.Game.Ma/src/audio/sfx/item_persuader.ogg
BIN
View File
Binary file not shown.
Zennysoft.Game.Ma/src/audio/sfx/item_persuader.ogg.import
-19
View File
@@ -1,19 +0,0 @@
[remap]
importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://yjm1usonqxpw"
path="res://.godot/imported/item_persuader.ogg-c3c3292adcec7bbf7eb5289059116cde.oggvorbisstr"
[deps]
source_file="res://src/audio/sfx/item_persuader.ogg"
dest_files=["res://.godot/imported/item_persuader.ogg-c3c3292adcec7bbf7eb5289059116cde.oggvorbisstr"]
[params]
loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4
Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/SproingyModelView.tscn
+4 -4
View File
@@ -4026,7 +4026,7 @@ bus = &"SFX"
[node name="SpotLight3D" type="SpotLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 0.366956, 0.930238, 0, -0.930238, 0.366956, 0.00325984, 2.75088, 0.773075)
light_energy = 0.5
light_energy = 0.05
light_indirect_energy = 0.0
light_bake_mode = 0
light_cull_mask = 4293918724
@@ -4034,7 +4034,7 @@ spot_range = 2.0
[node name="SpotLight3D2" type="SpotLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, -0.534057, 0.845448, 0, -0.845448, -0.534057, -0.1912, 2.95882, -1.04038)
light_energy = 0.5
light_energy = 0.05
light_indirect_energy = 0.0
light_bake_mode = 0
light_cull_mask = 4293918724
@@ -4042,7 +4042,7 @@ spot_range = 2.0
[node name="SpotLight3D3" type="SpotLight3D" parent="."]
transform = Transform3D(0.619848, -0.663442, -0.419086, 0, -0.534057, 0.845448, -0.784722, -0.524049, -0.331034, -0.901541, 2.75088, -0.392173)
light_energy = 0.5
light_energy = 0.05
light_indirect_energy = 0.0
light_bake_mode = 0
light_cull_mask = 4293918724
@@ -4050,7 +4050,7 @@ spot_range = 2.0
[node name="SpotLight3D4" type="SpotLight3D" parent="."]
transform = Transform3D(-0.0257408, 0.845168, 0.53388, 1.84729e-08, -0.534057, 0.845448, 0.999669, 0.0217625, 0.013747, 0.89876, 2.87897, -0.00373673)
light_energy = 0.5
light_energy = 0.05
light_indirect_energy = 0.0
light_bake_mode = 0
light_cull_mask = 4293918724
Zennysoft.Game.Ma/src/enemy/enemy_types/02. michael/MichaelModelView.tscn
+20 -8
View File
@@ -4445,35 +4445,47 @@ animation = &"WATER DAMAGE"
[node name="SpotLight3D" type="SpotLight3D" parent="Sprite3D"]
transform = Transform3D(1, 0, 0, 0, 0.366956, 0.930238, 0, -0.930238, 0.366956, 0, 0.895226, 0.771256)
light_energy = 0.25
light_energy = 0.1
light_indirect_energy = 0.0
light_bake_mode = 0
light_cull_mask = 4293918724
spot_range = 2.0
distance_fade_enabled = true
distance_fade_begin = 10.0
distance_fade_length = 40.0
spot_range = 4.0
[node name="SpotLight3D2" type="SpotLight3D" parent="Sprite3D"]
transform = Transform3D(1, 0, 0, 0, -0.534057, 0.845448, 0, -0.845448, -0.534057, -0.19446, 1.10317, -1.0422)
light_energy = 0.25
light_energy = 0.1
light_indirect_energy = 0.0
light_bake_mode = 0
light_cull_mask = 4293918724
spot_range = 2.0
distance_fade_enabled = true
distance_fade_begin = 10.0
distance_fade_length = 40.0
spot_range = 4.0
[node name="SpotLight3D3" type="SpotLight3D" parent="Sprite3D"]
transform = Transform3D(0.619848, -0.663442, -0.419087, 0, -0.534057, 0.845448, -0.784722, -0.524049, -0.331034, -0.904801, 0.895226, -0.393992)
light_energy = 0.25
light_energy = 0.1
light_indirect_energy = 0.0
light_bake_mode = 0
light_cull_mask = 4293918724
spot_range = 2.0
distance_fade_enabled = true
distance_fade_begin = 10.0
distance_fade_length = 40.0
spot_range = 4.0
[node name="SpotLight3D4" type="SpotLight3D" parent="Sprite3D"]
transform = Transform3D(-0.0257408, 0.845168, 0.53388, 1.84729e-08, -0.534057, 0.845448, 0.999669, 0.0217625, 0.0137471, 0.8955, 1.02332, -0.00555617)
light_energy = 0.25
light_energy = 0.1
light_indirect_energy = 0.0
light_bake_mode = 0
light_cull_mask = 4293918724
spot_range = 2.0
distance_fade_enabled = true
distance_fade_begin = 10.0
distance_fade_length = 40.0
spot_range = 4.0
[node name="Hitbox" type="Area3D" parent="."]
unique_name_in_owner = true
Zennysoft.Game.Ma/src/enemy/enemy_types/03. filth_eater/FilthEaterModelView.tscn
+1
View File
@@ -6038,6 +6038,7 @@ unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0509949, 1.00697, 0.684851)
script = ExtResource("200_4h5gj")
ProjectileScene = ExtResource("200_mno7m")
_projectileForce = 20.0
[node name="Marker3D" type="Marker3D" parent="ProjectileSystem"]
Zennysoft.Game.Ma/src/enemy/enemy_types/03. filth_eater/FilthEaterProjectile.tscn
+2
View File
@@ -831,6 +831,7 @@ collision_mask = 64
shape = SubResource("SphereShape3D_kct8n")
[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="Bullet"]
process_mode = 1
[node name="AnimationPlayer" type="AnimationPlayer" parent="Bullet"]
unique_name_in_owner = true
@@ -844,6 +845,7 @@ autoplay = "Fire"
shape = SubResource("SphereShape3D_ka3x7")
[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="."]
process_mode = 1
stream = ExtResource("5_m4i4a")
autoplay = true
bus = &"SFX"
Zennysoft.Game.Ma/src/enemy/enemy_types/04. sara/Sara.tscn
+2 -1
View File
@@ -128,9 +128,10 @@ stream = ExtResource("10_ddchx")
bus = &"SFX"
[node name="Shadow" type="Sprite3D" parent="."]
transform = Transform3D(0.925, 0, 0, 0, -4.0433e-08, 0.925, 0, -0.925, -4.0433e-08, 0.00393164, 0.101466, 0.0077811)
transform = Transform3D(0.925, 0, 0, 0, -4.0433e-08, 0.925, 0, -0.925, -4.0433e-08, 0.00393164, 0.110065, 0.0077811)
transparency = 0.1
cast_shadow = 0
modulate = Color(1, 1, 1, 0.591)
texture_filter = 0
render_priority = 100
texture = ExtResource("10_746fv")
Zennysoft.Game.Ma/src/enemy/enemy_types/04. sara/SaraModelView.tscn
+4 -4
View File
@@ -5084,28 +5084,28 @@ animation = &"WATER DAMAGE"
[node name="SpotLight3D" type="SpotLight3D" parent="Sprite3D"]
transform = Transform3D(0.666667, 0, 0, 0, 0.540614, 0.390104, 0, -0.390104, 0.540614, 0, 0.895226, 1.17112)
light_energy = 0.5
light_energy = 0.1
light_indirect_energy = 0.0
light_bake_mode = 0
light_cull_mask = 4293918724
[node name="SpotLight3D2" type="SpotLight3D" parent="Sprite3D"]
transform = Transform3D(1, 0, 0, 0, -0.534057, 0.845448, 0, -0.845448, -0.534057, -0.19446, 1.10317, -1.0422)
light_energy = 0.5
light_energy = 0.1
light_indirect_energy = 0.0
light_bake_mode = 0
light_cull_mask = 4293918724
[node name="SpotLight3D3" type="SpotLight3D" parent="Sprite3D"]
transform = Transform3D(0.619848, -0.663442, -0.419087, 0, -0.534057, 0.845448, -0.784722, -0.524049, -0.331034, -0.904801, 0.895226, -0.393992)
light_energy = 0.5
light_energy = 0.1
light_indirect_energy = 0.0
light_bake_mode = 0
light_cull_mask = 4293918724
[node name="SpotLight3D4" type="SpotLight3D" parent="Sprite3D"]
transform = Transform3D(-0.188919, 0.423463, 0.478992, 0.052598, -0.487478, 0.451711, 0.637171, 0.165797, 0.104731, 1.08038, 1.13857, 0.101536)
light_energy = 0.5
light_energy = 0.1
light_indirect_energy = 0.0
light_bake_mode = 0
light_cull_mask = 4293918724
Zennysoft.Game.Ma/src/items/armor/Armor.tscn
+1 -1
View File
@@ -18,7 +18,7 @@ axis_lock_angular_z = true
script = ExtResource("1_cmjpq")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.00908482, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.323599, 0)
shape = SubResource("CylinderShape3D_e2a3b")
[node name="Pickup" type="Area3D" parent="."]
Zennysoft.Game.Ma/src/items/consumable/ConsumableItem.tscn
+9 -8
View File
@@ -29,6 +29,7 @@ collision_mask = 0
[node name="Sprite" type="Sprite3D" parent="Pickup"]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.0322805, 0)
layers = 5
pixel_size = 0.005
billboard = 2
shaded = true
@@ -43,37 +44,37 @@ shape = SubResource("BoxShape3D_7mh0f")
[node name="SpotLight3D" type="SpotLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 0.366956, 0.930238, 0, -0.930238, 0.366956, 0, 1.28212, 0.771256)
light_energy = 0.25
light_indirect_energy = 0.0
light_cull_mask = 4293918721
light_cull_mask = 4293918724
distance_fade_enabled = true
distance_fade_begin = 10.0
distance_fade_length = 40.0
spot_range = 4.0
[node name="SpotLight3D2" type="SpotLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, -0.534057, 0.845448, 0, -0.845448, -0.534057, -0.19446, 1.49007, -1.0422)
light_energy = 0.25
light_indirect_energy = 0.0
light_bake_mode = 0
light_cull_mask = 4293918721
light_cull_mask = 4293918724
distance_fade_enabled = true
distance_fade_begin = 10.0
distance_fade_length = 40.0
spot_range = 4.0
[node name="SpotLight3D3" type="SpotLight3D" parent="."]
transform = Transform3D(0.619848, -0.663442, -0.419086, 0, -0.534057, 0.845448, -0.784722, -0.524049, -0.331034, -0.904801, 1.28212, -0.393992)
light_energy = 0.25
light_indirect_energy = 0.0
light_cull_mask = 4293918721
light_cull_mask = 4293918724
distance_fade_enabled = true
distance_fade_begin = 10.0
distance_fade_length = 40.0
spot_range = 4.0
[node name="SpotLight3D4" type="SpotLight3D" parent="."]
transform = Transform3D(-0.0257408, 0.845168, 0.53388, 1.84729e-08, -0.534057, 0.845448, 0.999669, 0.0217625, 0.013747, 0.8955, 1.41022, -0.00555617)
light_energy = 0.25
light_indirect_energy = 0.0
light_cull_mask = 4293918721
light_cull_mask = 4293918724
distance_fade_enabled = true
distance_fade_begin = 10.0
distance_fade_length = 40.0
spot_range = 4.0
Zennysoft.Game.Ma/src/items/weapons/PersuaderProjectile.tscn
+1 -1
View File
@@ -721,4 +721,4 @@ shape = SubResource("SphereShape3D_bp1ct")
unique_name_in_owner = true
sprite_frames = SubResource("SpriteFrames_bp1ct")
autoplay = "default"
frame_progress = 0.701144
frame_progress = 0.194951
Zennysoft.Game.Ma/src/map/dungeon/floors/Floor13/Floor 13B.tscn
-3
View File
@@ -354,9 +354,6 @@ transform = Transform3D(-1, -8.74228e-08, 0, 8.74228e-08, -1, 0, 0, 0, 1, 0, 40.
mesh = SubResource("ArrayMesh_8t8c7")
skeleton = NodePath("")
[node name="Eden Pillar9" parent="." instance=ExtResource("14_vk64w")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 30.4301, -0.114054, 1.87484)
[node name="Eden Pillar Rest9" type="Node3D" parent="."]
transform = Transform3D(0.365, 0, 0, 0, 0.365, 0, 0, 0, 0.365, 30.44, -0.552997, 1.86223)
Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/BAD END.tscn
+55 -43
View File
File diff suppressed because one or more lines are too long
Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/BadEnd.cs
+1 -1
View File
@@ -35,7 +35,7 @@ public partial class BadEnd : SpecialFloor
AddChild(_spawnTimer);
_spawnTimer.Start();
var tweener = GetTree().CreateTween();
tweener.TweenMethod(Callable.From((float x) => SetShakeValue(x)), ShakeAmount, 1f, 700f).SetDelay(30);
tweener.TweenMethod(Callable.From((float x) => SetShakeValue(x)), ShakeAmount, 1f, 300f).SetDelay(15);
}
public async void StartEndGameCutscene()
Zennysoft.Game.Ma/src/player/Player.tscn
+71 -70
View File
@@ -3181,6 +3181,73 @@ tracks/4/keys = {
}
tracks/4/use_blend = true
[sub_resource type="Animation" id="Animation_r1e0i"]
resource_name = "Tepotztli"
length = 0.46667
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("../Collision/Hitbox/HitboxCollision:disabled")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 0.166667, 0.233333),
"transitions": PackedFloat32Array(1, 1, 1),
"update": 1,
"values": [true, false, true]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("Control/Weapon Animations 1080p:animation")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"Regular Slash B"]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("Control/Weapon Animations 1080p:frame")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0, 0.433333),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [0, 22]
}
tracks/3/type = "audio"
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/path = NodePath("../Weapon Slashes")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/keys = {
"clips": [{
"end_offset": 0.0,
"start_offset": 0.0503,
"stream": ExtResource("11_m024w")
}],
"times": PackedFloat32Array(0)
}
tracks/3/use_blend = true
tracks/4/type = "value"
tracks/4/imported = false
tracks/4/enabled = true
tracks/4/path = NodePath("../Weapon Slashes:bus")
tracks/4/interp = 1
tracks/4/loop_wrap = true
tracks/4/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"SFX"]
}
[sub_resource type="Animation" id="Animation_fsw4h"]
resource_name = "Unarmed"
length = 1.23334
@@ -3369,73 +3436,6 @@ tracks/4/keys = {
"values": [&"DELAY SFX"]
}
[sub_resource type="Animation" id="Animation_r1e0i"]
resource_name = "Tepotztli"
length = 0.46667
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("../Collision/Hitbox/HitboxCollision:disabled")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 0.166667, 0.233333),
"transitions": PackedFloat32Array(1, 1, 1),
"update": 1,
"values": [true, false, true]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("Control/Weapon Animations 1080p:animation")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"Regular Slash B"]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("Control/Weapon Animations 1080p:frame")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0, 0.433333),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [0, 22]
}
tracks/3/type = "audio"
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/path = NodePath("../Weapon Slashes")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/keys = {
"clips": [{
"end_offset": 0.0,
"start_offset": 0.0503,
"stream": ExtResource("11_m024w")
}],
"times": PackedFloat32Array(0)
}
tracks/3/use_blend = true
tracks/4/type = "value"
tracks/4/imported = false
tracks/4/enabled = true
tracks/4/path = NodePath("../Weapon Slashes:bus")
tracks/4/interp = 1
tracks/4/loop_wrap = true
tracks/4/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"SFX"]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_ickvi"]
_data = {
&"Cello": SubResource("Animation_mtb23"),
@@ -13063,10 +13063,10 @@ visible = false
transform = Transform3D(1.355, 0, 2.84217e-14, 0, 1.355, 0, -2.84217e-14, 0, 1.355, 3.57499e-06, 0, -23.676)
[node name="Lights" type="Node3D" parent="Camera"]
visible = false
[node name="OmniLight3D" type="OmniLight3D" parent="Camera/Lights"]
transform = Transform3D(0.999997, 0, 0.00260054, 0, 1, 0, -0.00260054, 0, 0.999997, -0.109951, 1.37487, -0.0100155)
visible = false
light_color = Color(0.839909, 0.829039, 0.76409, 1)
light_energy = 0.2
light_bake_mode = 1
@@ -13202,8 +13202,8 @@ texture_filter = 2
position = Vector2(-215, -11)
scale = Vector2(3.02734, 3.02734)
sprite_frames = SubResource("SpriteFrames_v0s2u")
animation = &"DivinityRecall"
frame = 107
animation = &"KeyStaff"
frame = 31
frame_progress = 1.0
speed_scale = 2.0
@@ -13282,6 +13282,7 @@ process_mode = 3
bus = &"SFX"
[node name="Misc" type="AudioStreamPlayer" parent="."]
bus = &"SFX"
[node name="Weapon Slashes" type="AudioStreamPlayer" parent="."]
max_polyphony = 4