From b8185765588549cc36abacd70b1905cdb5878818 Mon Sep 17 00:00:00 2001 From: Rendo Date: Wed, 23 Jul 2025 18:25:34 +0500 Subject: [PATCH] additive mix --- assets/shaders/canvas_group_flash.gdshader | 5 +-- assets/shaders/generic_flash.gdshader | 5 +-- scenes/entities/Zombies/cone_zombie.tscn | 44 +++++++++++----------- 3 files changed, 24 insertions(+), 30 deletions(-) diff --git a/assets/shaders/canvas_group_flash.gdshader b/assets/shaders/canvas_group_flash.gdshader index df21cff..8655e46 100644 --- a/assets/shaders/canvas_group_flash.gdshader +++ b/assets/shaders/canvas_group_flash.gdshader @@ -18,8 +18,5 @@ void fragment() { { COLOR = vec4(mix(text.rgb,HIGHLIGHT_COLOR.rgb,HIGHLIGHT_COLOR.a),text.a); } - else - { - COLOR = vec4(mix(text.rgb,FLASH_COLOR.rgb,FLASH_COLOR.a*blend),text.a); - } + COLOR = vec4(mix(text.rgb,FLASH_COLOR.rgb,FLASH_COLOR.a*blend),text.a); } \ No newline at end of file diff --git a/assets/shaders/generic_flash.gdshader b/assets/shaders/generic_flash.gdshader index 736bcb1..5686f5f 100644 --- a/assets/shaders/generic_flash.gdshader +++ b/assets/shaders/generic_flash.gdshader @@ -10,9 +10,6 @@ void fragment() { { COLOR = vec4(mix(COLOR.rgb,HIGHLIGHT_COLOR.rgb,HIGHLIGHT_COLOR.a),COLOR.a); } - else - { - COLOR = vec4(mix(COLOR.rgb,FLASH_COLOR.rgb,FLASH_COLOR.a*blend),COLOR.a); - } + COLOR = vec4(mix(COLOR.rgb,FLASH_COLOR.rgb,FLASH_COLOR.a*blend),COLOR.a); } \ No newline at end of file diff --git a/scenes/entities/Zombies/cone_zombie.tscn b/scenes/entities/Zombies/cone_zombie.tscn index 0cd5843..12146f3 100644 --- a/scenes/entities/Zombies/cone_zombie.tscn +++ b/scenes/entities/Zombies/cone_zombie.tscn @@ -48,38 +48,38 @@ material = SubResource("ShaderMaterial_b8kja") scale = Vector2(0.999834, 0.999834) [node name="RightLowerLeg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg" index="1"] -scale = Vector2(0.999832, 0.999832) +scale = Vector2(0.999835, 0.999835) [node name="RightFoot" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/RightUpperLeg/RightLowerLeg" index="0"] -scale = Vector2(0.999834, 0.999834) +scale = Vector2(0.999835, 0.999835) [node name="LeftUpperLeg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt" index="2"] -scale = Vector2(0.99983, 0.99983) +scale = Vector2(0.999833, 0.999833) [node name="LeftLowerLeg" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg" index="1"] scale = Vector2(0.999832, 0.999832) [node name="LeftFoot" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/LeftUpperLeg/LeftLowerLeg" index="1"] -scale = Vector2(0.99983, 0.99983) +scale = Vector2(0.999831, 0.999831) [node name="Body" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt" index="3"] -scale = Vector2(0.999829, 0.999829) - -[node name="RightUpperArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="0"] scale = Vector2(0.99983, 0.99983) +[node name="RightUpperArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="0"] +scale = Vector2(0.999828, 0.999828) + [node name="RightLowerArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm" index="1"] -scale = Vector2(0.999829, 0.999829) +scale = Vector2(0.999828, 0.999828) [node name="RightHand" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm/RightLowerArm" index="0"] -scale = Vector2(0.999829, 0.999829) +scale = Vector2(0.999828, 0.999828) [node name="Tie" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="2"] -rotation = 0.116288 -skew = -0.000152588 +rotation = 0.164533 +skew = -0.000153184 [node name="Head" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="3"] -scale = Vector2(0.999826, 0.999826) +scale = Vector2(0.999828, 0.999828) [node name="Right_Eye" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" index="0"] position = Vector2(-16, -8) @@ -90,12 +90,12 @@ position = Vector2(-4, -9) scale = Vector2(1, 1) [node name="Jaw" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head/HeadParticle/Head" index="2"] -position = Vector2(-3.00143, 2.99759) -rotation = 0.0112854 -scale = Vector2(0.999829, 0.999829) +position = Vector2(-3.00202, 2.99657) +rotation = 0.0159674 +scale = Vector2(0.99983, 0.99983) [node name="Jaw" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head" index="1"] -scale = Vector2(0.999829, 0.999829) +scale = Vector2(0.99983, 0.99983) [node name="Hat" type="RigidBody2D" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/Head" index="4" node_paths=PackedStringArray("data")] position = Vector2(-2.5, -13.5) @@ -125,19 +125,19 @@ position = Vector2(1, -6) shape = SubResource("CircleShape2D_67t4t") [node name="LeftUpperArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body" index="4"] -scale = Vector2(0.99983, 0.99983) +scale = Vector2(0.999832, 0.999832) [node name="Left_Lower_Arm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/HandProjectile" index="0"] -rotation = 0.109337 -scale = Vector2(0.999999, 0.999999) +rotation = 0.154698 +scale = Vector2(1, 1) [node name="Left_Hand" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/HandProjectile/Left_Lower_Arm" index="0"] position = Vector2(-0.99983, 12.9978) -rotation = -0.0482545 +rotation = -0.068274 scale = Vector2(0.999658, 0.999658) [node name="LeftLowerArm" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm" index="2"] -scale = Vector2(0.999829, 0.999829) +scale = Vector2(0.999831, 0.999831) [node name="LeftHand" parent="CanvasGroup/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm/LeftLowerArm" index="0"] scale = Vector2(0.999828, 0.999828) @@ -147,7 +147,7 @@ _damage = SubResource("Resource_011r0") [node name="Mover" parent="." index="4"] _speed = SubResource("Resource_b6mal") -_speedControlMult = 0.665961 +_speedControlMult = 1.31979 [node name="HitPlayer" parent="." index="5"] playlist = Array[AudioStream]([ExtResource("7_0amn8"), ExtResource("7_67t4t")])