From 78cb99523f422673e0b85c19c4add60f13af0993 Mon Sep 17 00:00:00 2001
From: Samual Lenks <samual@xonotic.org>
Date: Sun, 2 Sep 2012 22:14:40 -0400
Subject: [PATCH] New WIP passing effect for the flags

---
 effectinfo.txt                        | 63 +++++++++++++++++++++++++++
 qcsrc/server/mutators/gamemode_ctf.qc |  3 +-
 qcsrc/server/mutators/gamemode_ctf.qh |  1 +
 3 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/effectinfo.txt b/effectinfo.txt
index 9258efaa3..fe7601322 100644
--- a/effectinfo.txt
+++ b/effectinfo.txt
@@ -7669,3 +7669,66 @@ originjitter 1 1 1
 velocityjitter 300 300 300
 velocitymultiplier 0.5
 airfriction 3
+
+// red_pass
+// used nowhere in code
+effect red_pass
+trailspacing 64
+color 0xFF0000 0x970000
+size 2 2
+tex 32 32
+alpha 64 128 64
+airfriction 5
+sizeincrease 2
+type static
+// ============== DRIFTING SMOKE
+effect red_pass
+trailspacing 12
+color 0xFF0000 0x970000
+size 1 1
+tex 0 8
+alpha 32 64 32
+airfriction 9
+sizeincrease 8
+velocityjitter 64 64 64
+type static
+// ============== BRIGHT CORE
+effect red_pass
+trailspacing 12
+color 0xFF0000 0x970000
+size 4 4
+//tex 48 55
+alpha 256 256 1280
+type static
+
+// blue_pass
+// used nowhere in code
+effect blue_pass
+trailspacing 64
+color 0x0000FF 0x000097
+size 2 2
+tex 32 32
+alpha 64 128 64
+airfriction 5
+sizeincrease 2
+type static
+// ============== DRIFTING SMOKE
+effect blue_pass
+trailspacing 12
+color 0x0000FF 0x000097
+size 1 1
+tex 0 8
+alpha 32 64 32
+airfriction 9
+sizeincrease 8
+velocityjitter 64 64 64
+type static
+// ============== BRIGHT CORE
+effect blue_pass
+trailspacing 12
+color 0x0000FF 0x000097
+size 4 4
+//tex 48 55
+alpha 256 256 1280
+type static
+
diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 8e5b71586..342f52983 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -311,8 +311,8 @@ void ctf_Handle_Throw(entity player, entity reciever, float droptype)
 			
 			// other
 			sound(player, CH_TRIGGER, flag.snd_flag_touch, VOL_BASE, ATTN_NORM);
+			WarpZone_TrailParticles(world, particleeffectnum(flag.passeffect), reciever.origin, player.origin);
 			ctf_EventLog("pass", flag.team, player);
-			te_lightning2(world, reciever.origin, player.origin);
 			break;
 		}
 
@@ -949,6 +949,7 @@ void ctf_FlagSetup(float teamnumber, entity flag) // called when spawning a flag
 	if(!flag.scale) { flag.scale = FLAG_SCALE; }
 	if(!flag.skin) { flag.skin = ((teamnumber) ? autocvar_g_ctf_flag_red_skin : autocvar_g_ctf_flag_blue_skin); }
 	if(!flag.toucheffect) { flag.toucheffect = ((teamnumber) ? "redflag_touch" : "blueflag_touch"); }
+	if(!flag.passeffect) { flag.passeffect = ((!teamnumber) ? "red_pass" : "blue_pass"); } // invert the team number of the flag to pass as enemy team color
 	
 	// sound 
 	if(!flag.snd_flag_taken) { flag.snd_flag_taken  = ((teamnumber) ? "ctf/red_taken.wav" : "ctf/blue_taken.wav"); }
diff --git a/qcsrc/server/mutators/gamemode_ctf.qh b/qcsrc/server/mutators/gamemode_ctf.qh
index fc91e94a4..a5b8b24f0 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qh
+++ b/qcsrc/server/mutators/gamemode_ctf.qh
@@ -47,6 +47,7 @@ void spawnfunc_ctf_team();
 
 // effects
 .string toucheffect;
+.string passeffect;
 
 // list of flags on the map
 entity ctf_worldflaglist;
-- 
2.39.2