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

stage adjustments, damage VFX adjustments

Browse Source
This commit is contained in:
Pal
2026-05-02 03:47:34 -07:00
parent 4460fd28f5
commit 88e7c04e2d
12 changed files with 760 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/SproingyModelView.tscn
View File

@@ -3887,14 +3887,14 @@ animation = &"Flame Damage"
frame = 40
[node name="Water Hit Layer 1 Effect" type="AnimatedSprite2D" parent="Sprite3D/SubViewportContainer/SubViewport/VFXSprites"]
position = Vector2(400, 400)
position = Vector2(400, 389.89)
scale = Vector2(2.215, 2.215)
sprite_frames = SubResource("SpriteFrames_afod7")
animation = &"WATER DAMAGE"
frame = 29
[node name="Water Hit Layer 2Effect" type="AnimatedSprite2D" parent="Sprite3D/SubViewportContainer/SubViewport/VFXSprites"]
position = Vector2(400, 400)
position = Vector2(385, 440)
scale = Vector2(1.105, 0.895)
sprite_frames = SubResource("SpriteFrames_dwhw7")
animation = &"WATER"
@@ -3902,13 +3902,13 @@ frame = 51
[node name="Curse Hit Effect" type="AnimatedSprite2D" parent="Sprite3D/SubViewportContainer/SubViewport/VFXSprites"]
texture_filter = 1
position = Vector2(400, 400)
position = Vector2(410, 375)
scale = Vector2(2.78, 2.78)
sprite_frames = SubResource("SpriteFrames_qjloj")
frame = 47
[node name="Earth Hit Effect" type="AnimatedSprite2D" parent="Sprite3D/SubViewportContainer/SubViewport/VFXSprites"]
position = Vector2(400, 400)
position = Vector2(395.285, 395.86)
scale = Vector2(2.005, 2.005)
sprite_frames = SubResource("SpriteFrames_afod7")
animation = &"WATER DAMAGE"

14
Zennysoft.Game.Ma/src/enemy/enemy_types/02. michael/MichaelModelView.tscn
View File

@@ -4373,7 +4373,7 @@ render_target_update_mode = 4
[node name="AnimatedSprite" type="AnimatedSprite2D" parent="Sprite3D/SubViewportContainer/SubViewport"]
unique_name_in_owner = true
texture_filter = 1
texture_filter = 2
texture_repeat = 1
material = SubResource("ShaderMaterial_wey7h")
sprite_frames = SubResource("SpriteFrames_v4v5p")
@@ -4401,29 +4401,29 @@ sprite_frames = SubResource("SpriteFrames_qe6vs")
frame = 50
[node name="Flame Hit Effect" type="AnimatedSprite2D" parent="Sprite3D/SubViewportContainer/SubViewport/VFXSprites"]
position = Vector2(400, 400)
scale = Vector2(3.445, 3.445)
position = Vector2(400, 395.145)
scale = Vector2(2.47, 2.47)
sprite_frames = SubResource("SpriteFrames_k0kt8")
animation = &"Flame Damage"
frame = 40
[node name="Water Hit Layer 1 Effect" type="AnimatedSprite2D" parent="Sprite3D/SubViewportContainer/SubViewport/VFXSprites"]
position = Vector2(400, 400)
position = Vector2(403.59, 391.5)
scale = Vector2(2.215, 2.215)
sprite_frames = SubResource("SpriteFrames_kp6q4")
animation = &"WATER DAMAGE"
frame = 29
[node name="Water Hit Layer 2Effect" type="AnimatedSprite2D" parent="Sprite3D/SubViewportContainer/SubViewport/VFXSprites"]
position = Vector2(400, 400)
scale = Vector2(1.105, 0.895)
texture_filter = 1
position = Vector2(389.79, 434.625)
sprite_frames = SubResource("SpriteFrames_3to5j")
animation = &"WATER"
frame = 51
[node name="Curse Hit Effect" type="AnimatedSprite2D" parent="Sprite3D/SubViewportContainer/SubViewport/VFXSprites"]
texture_filter = 1
position = Vector2(400, 400)
position = Vector2(408.13, 380.23)
scale = Vector2(2.78, 2.78)
sprite_frames = SubResource("SpriteFrames_7x07v")
frame = 47

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

@@ -5024,7 +5024,7 @@ animation = &"idle_front"
[node name="Rust Activation Effect" type="AnimatedSprite2D" parent="Sprite3D/SubViewportContainer/SubViewport/VFXSprites"]
position = Vector2(400, 400)
scale = Vector2(1.54, 1.54)
scale = Vector2(2.74, 2.74)
sprite_frames = SubResource("SpriteFrames_s0t7i")
frame = 88
@@ -5036,7 +5036,7 @@ animation = &"HOLY"
[node name="Wind Hit Layer Effect" type="AnimatedSprite2D" parent="Sprite3D/SubViewportContainer/SubViewport/VFXSprites"]
position = Vector2(400, 400)
scale = Vector2(1.445, 1.445)
scale = Vector2(1.8, 1.8)
sprite_frames = SubResource("SpriteFrames_olmld")
frame = 50
@@ -5048,29 +5048,29 @@ animation = &"Flame Damage"
frame = 40
[node name="Water Hit Layer 1 Effect" type="AnimatedSprite2D" parent="Sprite3D/SubViewportContainer/SubViewport/VFXSprites"]
position = Vector2(400, 400)
scale = Vector2(2.215, 2.215)
position = Vector2(404.795, 390.395)
scale = Vector2(2.66, 2.66)
sprite_frames = SubResource("SpriteFrames_bsjfy")
animation = &"WATER DAMAGE"
frame = 29
[node name="Water Hit Layer 2Effect" type="AnimatedSprite2D" parent="Sprite3D/SubViewportContainer/SubViewport/VFXSprites"]
position = Vector2(400, 400)
scale = Vector2(1.105, 0.895)
position = Vector2(400, 457.01)
scale = Vector2(1.38, 1.38)
sprite_frames = SubResource("SpriteFrames_cht2c")
animation = &"WATER"
frame = 51
[node name="Curse Hit Effect" type="AnimatedSprite2D" parent="Sprite3D/SubViewportContainer/SubViewport/VFXSprites"]
texture_filter = 1
position = Vector2(400, 400)
scale = Vector2(2.78, 2.78)
position = Vector2(415.125, 384.07)
scale = Vector2(2.945, 2.945)
sprite_frames = SubResource("SpriteFrames_v3crq")
frame = 47
[node name="Earth Hit Effect" type="AnimatedSprite2D" parent="Sprite3D/SubViewportContainer/SubViewport/VFXSprites"]
position = Vector2(400, 400)
scale = Vector2(2.005, 2.005)
scale = Vector2(2.605, 2.605)
sprite_frames = SubResource("SpriteFrames_bsjfy")
animation = &"WATER DAMAGE"

169
Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Platform.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=47 format=4 uid="uid://cj0o4t20jdk02"]
[gd_scene load_steps=50 format=4 uid="uid://cj0o4t20jdk02"]
[ext_resource type="Script" uid="uid://dd8dyuud0f74g" path="res://src/map/dungeon/floors/Special Floors/Platform.cs" id="1_mkwqq"]
[ext_resource type="Texture2D" uid="uid://h4hyjwy3q1h3" path="res://src/map/assets/EX Assetts/1.png" id="2_tstta"]
@@ -9,7 +9,7 @@
resource_name = "Material.004"
cull_mode = 2
albedo_color = Color(0.177556, 1, 0, 1)
roughness = 0.5
roughness = 0.0
emission_enabled = true
emission = Color(0.470821, 1, 0, 1)
emission_energy_multiplier = 3.3
@@ -679,7 +679,7 @@ ambient_light_sky_contribution = 0.0
ambient_light_energy = 0.0
reflected_light_source = 1
glow_enabled = true
glow_intensity = 0.04
glow_intensity = 0.09
glow_bloom = 1.0
glow_blend_mode = 0
volumetric_fog_density = 0.01
@@ -709,6 +709,164 @@ size = Vector2(3.785, 6.145)
subdivide_width = 2
subdivide_depth = 2
[sub_resource type="Animation" id="Animation_tstta"]
resource_name = "material animation"
length = 4.0
loop_mode = 1
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Model/space platform/WALKWAY:mesh:surface_0/material:emission_energy_multiplier")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 2, 4),
"transitions": PackedFloat32Array(1, 1, 1),
"update": 0,
"values": [3.3, 2.42, 3.3]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("Model/space platform/WALKWAY:mesh:surface_0/material:albedo_color")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0, 2, 4),
"transitions": PackedFloat32Array(1, 1, 1),
"update": 0,
"values": [Color(0.177556, 1, 0, 1), Color(0.183333, 1, 0, 0.505882), Color(0.177556, 1, 0, 1)]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("Model/space platform/WALKWAY:mesh:surface_1/material:emission_energy_multiplier")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0, 2, 4),
"transitions": PackedFloat32Array(1, 1, 1),
"update": 0,
"values": [3.3, 2.35, 3.3]
}
tracks/3/type = "value"
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/path = NodePath("Model/space platform/WALKWAY:mesh:surface_1/material:albedo_color")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/keys = {
"times": PackedFloat32Array(0, 2, 4),
"transitions": PackedFloat32Array(1, 1, 1),
"update": 0,
"values": [Color(0.177556, 1, 0, 1), Color(0.183333, 1, 0, 0.411765), Color(0.177556, 1, 0, 1)]
}
tracks/4/type = "value"
tracks/4/imported = false
tracks/4/enabled = true
tracks/4/path = NodePath("Model/space platform/WALKWAY:mesh:surface_2/material:albedo_color")
tracks/4/interp = 1
tracks/4/loop_wrap = true
tracks/4/keys = {
"times": PackedFloat32Array(0, 2, 4),
"transitions": PackedFloat32Array(1, 1, 1),
"update": 0,
"values": [Color(0.177556, 1, 0, 1), Color(0.183333, 1, 0, 0.509804), Color(0.177556, 1, 0, 1)]
}
tracks/5/type = "value"
tracks/5/imported = false
tracks/5/enabled = true
tracks/5/path = NodePath("Model/space platform/WALKWAY:mesh:surface_2/material:emission_energy_multiplier")
tracks/5/interp = 1
tracks/5/loop_wrap = true
tracks/5/keys = {
"times": PackedFloat32Array(0, 2, 4),
"transitions": PackedFloat32Array(1, 1, 1),
"update": 0,
"values": [3.3, 1.96, 3.3]
}
[sub_resource type="Animation" id="Animation_x55gx"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Model/space platform/WALKWAY:mesh:surface_0/material:emission_energy_multiplier")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [3.3]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("Model/space platform/WALKWAY:mesh:surface_0/material:albedo_color")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Color(0.177556, 1, 0, 1)]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("Model/space platform/WALKWAY:mesh:surface_1/material:emission_energy_multiplier")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [3.3]
}
tracks/3/type = "value"
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/path = NodePath("Model/space platform/WALKWAY:mesh:surface_1/material:albedo_color")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Color(0.177556, 1, 0, 1)]
}
tracks/4/type = "value"
tracks/4/imported = false
tracks/4/enabled = true
tracks/4/path = NodePath("Model/space platform/WALKWAY:mesh:surface_2/material:albedo_color")
tracks/4/interp = 1
tracks/4/loop_wrap = true
tracks/4/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Color(0.177556, 1, 0, 1)]
}
tracks/5/type = "value"
tracks/5/imported = false
tracks/5/enabled = true
tracks/5/path = NodePath("Model/space platform/WALKWAY:mesh:surface_2/material:emission_energy_multiplier")
tracks/5/interp = 1
tracks/5/loop_wrap = true
tracks/5/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [3.3]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_voxte"]
_data = {
&"RESET": SubResource("Animation_x55gx"),
&"material animation": SubResource("Animation_tstta")
}
[node name="Platform" type="Node3D"]
script = ExtResource("1_mkwqq")
@@ -878,3 +1036,8 @@ transform = Transform3D(0.765, 0, 0, 0, 0.765, 0, 0, 0, 0.765, -0.364896, 2.9044
material_override = SubResource("ShaderMaterial_x55gx")
mesh = SubResource("QuadMesh_voxte")
skeleton = NodePath("../..")
[node name="material animation" type="AnimationPlayer" parent="."]
libraries = {
&"": SubResource("AnimationLibrary_voxte")
}

469
Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/River.tscn
View File

File diff suppressed because one or more lines are too long

BIN
Zennysoft.Game.Ma/src/map/dungeon/models/Special Floors & Rooms/EX-River/Dock.glb Normal file
View File

Binary file not shown.

37
Zennysoft.Game.Ma/src/map/dungeon/models/Special Floors & Rooms/EX-River/Dock.glb.import Normal file
View File

@@ -0,0 +1,37 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://djw02d6aod8wi"
path="res://.godot/imported/Dock.glb-f2493245c095eed15f5234fff5d02662.scn"
[deps]
source_file="res://src/map/dungeon/models/Special Floors & Rooms/EX-River/Dock.glb"
dest_files=["res://.godot/imported/Dock.glb-f2493245c095eed15f5234fff5d02662.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
nodes/use_node_type_suffixes=true
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
_subresources={}
gltf/naming_version=1
gltf/embedded_image_handling=1

BIN
Zennysoft.Game.Ma/src/map/dungeon/models/Special Floors & Rooms/EX-River/impalers.glb Normal file
View File

Binary file not shown.

37
Zennysoft.Game.Ma/src/map/dungeon/models/Special Floors & Rooms/EX-River/impalers.glb.import Normal file
View File

@@ -0,0 +1,37 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://bq5klt6otnowv"
path="res://.godot/imported/impalers.glb-a4c3f6e49335f4aa098579a3b7fdff4e.scn"
[deps]
source_file="res://src/map/dungeon/models/Special Floors & Rooms/EX-River/impalers.glb"
dest_files=["res://.godot/imported/impalers.glb-a4c3f6e49335f4aa098579a3b7fdff4e.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
nodes/use_node_type_suffixes=true
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
_subresources={}
gltf/naming_version=1
gltf/embedded_image_handling=1

BIN
Zennysoft.Game.Ma/src/map/dungeon/models/Special Floors & Rooms/EX-River/impalers_impalers.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 107 KiB

38
Zennysoft.Game.Ma/src/map/dungeon/models/Special Floors & Rooms/EX-River/impalers_impalers.png.import Normal file
View File

@@ -0,0 +1,38 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://4acpnr07pmlg"
path.bptc="res://.godot/imported/impalers_impalers.png-e04f7bc968b82d8e3a4538887e012744.bptc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
generator_parameters={
"md5": "6c8d2b4b45fbc062971b845c248098cc"
}
[deps]
source_file="res://src/map/dungeon/models/Special Floors & Rooms/EX-River/impalers_impalers.png"
dest_files=["res://.godot/imported/impalers_impalers.png-e04f7bc968b82d8e3a4538887e012744.bptc.ctex"]
[params]
compress/mode=2
compress/high_quality=true
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
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=0

18
Zennysoft.Game.Ma/src/player/Player.cs
View File

@@ -170,7 +170,7 @@ public partial class Player : CharacterBody3D, IPlayer, IProvide<IPlayer>
LuckComponent = new LuckComponent(InitialLuck);
EquipmentComponent = new EquipmentComponent();
StatusEffectComponent = new StatusEffectComponent(RustDuration);
SigilComponent = new SigilComponent();
SigilComponent = new SigilComponent();
_itemReroller = new ItemReroller(ItemDatabase.Instance);
_playerEffectService = new PlayerEffectService(this);
@@ -204,7 +204,7 @@ public partial class Player : CharacterBody3D, IPlayer, IProvide<IPlayer>
ExperiencePointsComponent.Reset();
LuckComponent.Reset();
EquipmentComponent.Reset();
SigilComponent.Reset();
SigilComponent.Reset();
HealthTimer.Timeout += OnHealthTimerTimeout;
}
@@ -297,7 +297,7 @@ public partial class Player : CharacterBody3D, IPlayer, IProvide<IPlayer>
_camera3D.AddShake(1.0f);
TakeDamageAnimationPlayer.Play("take_damage");
var defense = TotalDefense * SigilComponent.Sigil.DefenseModifier;
var defense = TotalDefense * SigilComponent.Sigil.DefenseModifier;
var damageReceived = DamageCalculator.CalculateDamage(damage, defense, EquipmentComponent.ElementalResistance);
HealthComponent.Damage(damageReceived, damage.ElementType);
SfxDatabase.Instance.Play(SoundEffect.TakeDamage);
@@ -311,7 +311,7 @@ public partial class Player : CharacterBody3D, IPlayer, IProvide<IPlayer>
public void SetSigil(ISigil sigil)
{
SigilComponent.Sigil = sigil;
SigilComponent.Sigil = sigil;
}
public void Knockback(float impulse)
@@ -910,12 +910,12 @@ public partial class Player : CharacterBody3D, IPlayer, IProvide<IPlayer>
var isCriticalHit = BattleExtensions.IsCriticalHit(TotalLuck);
var totalDamage = TotalAttack;
if (SigilComponent.Sigil.ElementType == weapon.WeaponElement)
totalDamage = Mathf.RoundToInt(totalDamage * 1.15f);
if (SigilComponent.Sigil.ElementType == weapon.WeaponElement)
totalDamage = Mathf.RoundToInt(totalDamage * 1.15f);
totalDamage = Mathf.RoundToInt(totalDamage * SigilComponent.Sigil.AttackModifier);
totalDamage = Mathf.RoundToInt(totalDamage * SigilComponent.Sigil.AttackModifier);
if (isCriticalHit)
if (isCriticalHit)
{
totalDamage += (int)(totalDamage * 0.5f);
SfxDatabase.Instance.Play(SoundEffect.Crit);
@@ -923,7 +923,7 @@ public partial class Player : CharacterBody3D, IPlayer, IProvide<IPlayer>
var baseAttack = new AttackData(totalDamage, weapon.WeaponElement, weapon.WeaponTag == WeaponTag.IgnoreDefense, weapon.WeaponTag == WeaponTag.IgnoreAffinity);
var damageDealt = DamageCalculator.CalculateDamage(baseAttack, enemy.DefenseComponent.CurrentDefense.Value, enemy.ElementalResistanceSet);
var damageDealt = DamageCalculator.CalculateDamage(baseAttack, enemy.DefenseComponent.CurrentDefense.Value, enemy.ElementalResistanceSet);
enemy.HealthComponent.Damage(damageDealt, weapon.WeaponElement);
if (weapon.WeaponTag == WeaponTag.Knockback && enemy is IKnockbackable knockbackable)