From 632643a1304ccaf59fc538de24f5fb21ce9a2855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torjus=20H=C3=A5kestad?= <torjus@usit.uio.no>
Date: Thu, 21 Aug 2025 00:58:58 +0200
Subject: [PATCH] game: use shader for enemy on-hit visual

---
 animation/generic_anims.res           | Bin 617 -> 658 bytes
 assets/shaders/hit_flash.gdshader     |   8 ++++++++
 assets/shaders/hit_flash.gdshader.uid |   1 +
 scenes/enemies/enemy_base.gd          |   2 ++
 scenes/enemies/enemy_base.tscn        |  20 +++++++++++++++++++-
 5 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 assets/shaders/hit_flash.gdshader
 create mode 100644 assets/shaders/hit_flash.gdshader.uid

diff --git a/animation/generic_anims.res b/animation/generic_anims.res
index 8734ec295b97af144f39c79b3955ee5ccdcfad72..b990b81870ecbfbdf3e90cc36f0e2d086c891e68 100644
GIT binary patch
literal 658
zcmV;D0&V?LQ$s@n000005C8y-1^@th0ssIgwJ-f(j0J@g0Ja)gJwR=f4y<E?eQ~lH
z@cE6CPP}9Xm&p5w5jh$6-n-T=R?FR`JqKXZ{(@gY&&P7=KPjGs8J)3+fzG3~Z7D<m
zK>$bq@u`xgIt>wT?^9N(c$rG`|AIShysg{nCKg|tQDT^|-B^PB$M}!n8#-i|gh+ux
z#Q(}YtQ^ubFt*m$poRaJ{}+}&ZR0CF9Yu&{XDRpO?XbT80nV09Zo#IOr<S_pw#Apl
zr(}%KrQX1G{{eiTLX9unHC1fobVa9j@f7Fse~vet0=z3N3jv4zV|*?{m})g%xSL3$
zsH1`9#Np&TP6fmztYr!mkvB#%M@3PGwldYS@tV`K9jPp0;F7mtflIBDtqW1OY@4He
z0T(_%J}4882bU4ARM1o?BqSa-`jn~dX#XCc10J70GlEf}p=31M7&KvWBJqKs`N4sS
z%m`)$RL)@Vxv#Z?{~MPl_)p;fL}S2ra>^kiQ&LhQd8m=KLNr1&B?T!p2XF$J86x!(
zz%?Praz;8cfrvzrq7;==a17>125@*DfLJ>uf;OX<;H1fK<rss(;&buK9><OCu_Zla
zPG$T(gCfAqF-UF5gvH8S`yv`+)-oX_J?`{Jkv(H!?<H8cI`CHXfTkar_~jqDk;E8i
zf+oVqKY|OF6%;d*kRXwX8?7hB>pwjcHdX|}<A9T)?y9%+$fFy9xM|TaIJ?KAv2D0U
z#a#$P!4g!u7rH|rpLsU3WXuxlL2d9hacCk_;gnB_s2K{{kwxmP``STzAp^scTc?(L
sF95c`2xEkv<x{Y!1en9-sj*YXPsLG(u1R2sV%iUtzO|Ff1X5E&LmIO-QUCw|

literal 617
zcmV-v0+#(!Q$s@n000005C8yu1^@t20ssIgwJ-f(eFZ%d0G1a~JU~yA4iI-0VFf_m
z7y!Nd>f-zmD1fg1L{6f;_a@TY7P)t6&w;sB0_j*^m<IL2Pd?gmWDO;Av2D^w3OxWi
z07C%F=8C;2WszFTxQcW6zvbIXRV_X@qugL&+p*O6Kj6QDdjQelA)z8giT}_!ti0hc
zFuK;~V21yc{{SL?OKm9Jw#`vKSNTd#M--wtG3B1T6YKjg;B8w)G3eHE)l!+<p8qA^
z7T=OFPOj+;T<U*-?^Af-3j>sLNFN_3cvr&+T*BgWdBR-G@xskS8bucnA|npx=4~L3
zS76H*AROKo$(t2L7uwoZOUG<Z&Q4PKgXC?P;F?z10va+jG9ZsdLWP3i5CnO6gvjXA
zwsz7Vqq6{`^Gh9<6&Q$wS=S~{la-0iCk{SEL_i^RTv|Zoe(<@^bpr%v@ZZ4yr@&SL
zbEv^FLNqe8sGy||V1gk;Rp$W`V09S=V@fJBA|inVLW){m#ljc{nS*ec=!M)HtZjS9
zQ;dmI221jkXb?8NbXYF5;Btkw7A3Z!{LTMyhmy^MWOF-h_p$U$X%7cJQT60##{n%r
z5)v<HL>NKEJai>cMhvShhg>OxOC~;YM0@_g;_1*y#8m#mV}L>#TdauzzSXmh!zi+B
zd;kU>MmFAuyte!vXG8o*2dXgsDjTpBGcFa_?+<WJp?e#0Te$+1Lvxl0gGwV5+#&2s
zEA)7`)cpg&$qD|0fE>u)27WCb8E{e=KA2Lc<J7^a|Hq694L(kRm_qqiJrLjlQd2`i
D2_+P%

diff --git a/assets/shaders/hit_flash.gdshader b/assets/shaders/hit_flash.gdshader
new file mode 100644
index 0000000..e08a6b0
--- /dev/null
+++ b/assets/shaders/hit_flash.gdshader
@@ -0,0 +1,8 @@
+shader_type canvas_item;
+
+uniform float flash_amount : hint_range(0.0, 1.0) = 0.0; // 0 = normal, 1 = full white
+
+void fragment() {
+    vec4 tex_color = texture(TEXTURE, UV);
+    COLOR = mix(tex_color, vec4(1.0, 1.0, 1.0, tex_color.a), flash_amount);
+}
diff --git a/assets/shaders/hit_flash.gdshader.uid b/assets/shaders/hit_flash.gdshader.uid
new file mode 100644
index 0000000..66582f8
--- /dev/null
+++ b/assets/shaders/hit_flash.gdshader.uid
@@ -0,0 +1 @@
+uid://p7evv1wldgsa
diff --git a/scenes/enemies/enemy_base.gd b/scenes/enemies/enemy_base.gd
index f4ecb1b..69a2e60 100644
--- a/scenes/enemies/enemy_base.gd
+++ b/scenes/enemies/enemy_base.gd
@@ -13,6 +13,7 @@ extends CharacterBody2D
 @onready var nav_agent: NavigationAgent2D = $NavigationAgent2D
 @onready var collision_shape_2d: CollisionShape2D = $CollisionShape2D
 @onready var shape_cast_2d: ShapeCast2D = $ShapeCast2D
+@onready var sprite_2d: Sprite2D = $Sprite2D
 
 var player: Player
 var target: Node2D
@@ -27,6 +28,7 @@ func _ready() -> void:
 	health = max_health
 	shape_cast_2d.shape.radius = collision_shape_2d.shape.radius
 	shape_cast_2d.enabled = false
+	sprite_2d.material = sprite_2d.material.duplicate()
 	_find_player()
 
 
diff --git a/scenes/enemies/enemy_base.tscn b/scenes/enemies/enemy_base.tscn
index e0552d3..077c6e1 100644
--- a/scenes/enemies/enemy_base.tscn
+++ b/scenes/enemies/enemy_base.tscn
@@ -1,7 +1,12 @@
-[gd_scene load_steps=8 format=3 uid="uid://b7vq8xspnlyeu"]
+[gd_scene load_steps=10 format=3 uid="uid://b7vq8xspnlyeu"]
 
 [ext_resource type="Script" uid="uid://dxn17u7ltuibw" path="res://scenes/enemies/enemy_base.gd" id="1_qty17"]
 [ext_resource type="AnimationLibrary" uid="uid://dos4y853hq1gu" path="res://animation/generic_anims.res" id="2_pkqou"]
+[ext_resource type="Shader" uid="uid://p7evv1wldgsa" path="res://assets/shaders/hit_flash.gdshader" id="2_satqt"]
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_qa0nx"]
+shader = ExtResource("2_satqt")
+shader_parameter/flash_amount = 0.0
 
 [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_pkqou"]
 size = Vector2(32, 32)
@@ -35,6 +40,18 @@ tracks/1/keys = {
 "update": 0,
 "values": [Color(1, 1, 1, 1)]
 }
+tracks/2/type = "value"
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/path = NodePath("Sprite2D:material:shader_parameter/flash_amount")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [0.0]
+}
 
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_qa0nx"]
 _data = {
@@ -49,6 +66,7 @@ collision_mask = 3
 script = ExtResource("1_qty17")
 
 [node name="Sprite2D" type="Sprite2D" parent="."]
+material = SubResource("ShaderMaterial_qa0nx")
 texture = SubResource("PlaceholderTexture2D_pkqou")
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]