From 5b0d88840cc5f8bc20fbdb78fb83709ea0a52203 Mon Sep 17 00:00:00 2001
From: Marco Cawthorne <marco@vera-visions.com>
Date: Sun, 16 Apr 2023 11:18:33 -0700
Subject: [PATCH] item_artifact: tweak colors and don't allow players to pick
 up an artifact if they already have it.

---
 src/server/item_artifact.qc | 11 ++++++++---
 src/shared/player.qc        |  8 ++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/server/item_artifact.qc b/src/server/item_artifact.qc
index 27af593..7c4f4d9 100644
--- a/src/server/item_artifact.qc
+++ b/src/server/item_artifact.qc
@@ -35,6 +35,11 @@ item_artifact::Touch(entity eToucher)
 	}
 
 	player pl = (player)eToucher;
+
+	/* don't allow us to pick it up _again_ */
+	if (pl.g_items & m_itemID)
+		return;
+
 	Sound_Play(eToucher, CHAN_ITEM, noise);
 	Logging_Pickup(eToucher, this, __NULL__);
 
@@ -166,7 +171,7 @@ item_artifact_invisibility::Spawned(void)
 	SetRenderMode(RM_DONTRENDER);
 	SetRenderFX(RFX_GLOWSHELL);
 	SetRenderColor([0.5, 0.5, 0.5]);
-	SetRenderAmt(0.25f);
+	SetRenderAmt(1.0f);
 }
 
 void
@@ -214,7 +219,7 @@ item_artifact_invulnerability::Spawned(void)
 	super::Spawned();
 	SetRenderFX(RFX_GLOWSHELL);
 	SetRenderColor([1.0, 0.5, 0.0]);
-	SetRenderAmt(0.5f);
+	SetRenderAmt(1.0f);
 }
 
 void
@@ -263,7 +268,7 @@ item_artifact_super_damage::Spawned(void)
 	Sound_Precache("item_artifact_super_damage.attack");
 	SetRenderFX(RFX_GLOWSHELL);
 	SetRenderColor([0.5, 0.5, 1.0]);
-	SetRenderAmt(0.45f);
+	SetRenderAmt(1.0f);
 }
 
 void
diff --git a/src/shared/player.qc b/src/shared/player.qc
index 6f484df..b9b0a56 100644
--- a/src/shared/player.qc
+++ b/src/shared/player.qc
@@ -342,19 +342,19 @@ player::ReceiveEntity(float new, float flChanged)
 			SetRenderMode(RM_DONTRENDER);
 			SetRenderFX(RFX_GLOWSHELL);
 			SetRenderColor([0.5, 0.5, 0.5]);
-			SetRenderAmt(0.1f);
+			SetRenderAmt(0.25f);
 		} else if (HasQuadDamage()) {
 			SetRenderFX(RFX_GLOWSHELL);
 			SetRenderColor([0.5, 0.5, 1.0]);
-			SetRenderAmt(0.45f);
+			SetRenderAmt(1.0f);
 		} else if (HasInvulnerability()) {
 			SetRenderFX(RFX_GLOWSHELL);
 			SetRenderColor([1.0, 0.5, 0.0]);
-			SetRenderAmt(0.5f);
+			SetRenderAmt(1.0f);
 		} else if (HasEnviroSuit()) {
 			SetRenderFX(RFX_GLOWSHELL);
 			SetRenderColor([0.5, 1.0, 0.5]);
-			SetRenderAmt(0.45f);
+			SetRenderAmt(1.0f);
 		} else {
 			SetRenderMode(RM_NORMAL);
 			SetRenderFX(RM_NORMAL);