fn/dmc
fn/dmc
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

item_artifact: tweak colors and don't allow players to pick up an artifact if they already have it.

Browse source
This commit is contained in:
Marco Cawthorne 2023-04-16 11:18:33 -07:00
parent 6d4272ef87
commit 5b0d88840c
Signed by: eukara
GPG key ID: CE2032F0A2882A22
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/server/item_artifact.qc
View file

@ -35,6 +35,11 @@ item_artifact::Touch(entity eToucher)
} }
player pl = (player)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); Sound_Play(eToucher, CHAN_ITEM, noise);
Logging_Pickup(eToucher, this, __NULL__); Logging_Pickup(eToucher, this, __NULL__);
@ -166,7 +171,7 @@ item_artifact_invisibility::Spawned(void)
SetRenderMode(RM_DONTRENDER); SetRenderMode(RM_DONTRENDER);
SetRenderFX(RFX_GLOWSHELL); SetRenderFX(RFX_GLOWSHELL);
SetRenderColor([0.5, 0.5, 0.5]); SetRenderColor([0.5, 0.5, 0.5]);
SetRenderAmt(0.25f); SetRenderAmt(1.0f);
} }
void void
@ -214,7 +219,7 @@ item_artifact_invulnerability::Spawned(void)
super::Spawned(); super::Spawned();
SetRenderFX(RFX_GLOWSHELL); SetRenderFX(RFX_GLOWSHELL);
SetRenderColor([1.0, 0.5, 0.0]); SetRenderColor([1.0, 0.5, 0.0]);
SetRenderAmt(0.5f); SetRenderAmt(1.0f);
} }
void void
@ -263,7 +268,7 @@ item_artifact_super_damage::Spawned(void)
Sound_Precache("item_artifact_super_damage.attack"); Sound_Precache("item_artifact_super_damage.attack");
SetRenderFX(RFX_GLOWSHELL); SetRenderFX(RFX_GLOWSHELL);
SetRenderColor([0.5, 0.5, 1.0]); SetRenderColor([0.5, 0.5, 1.0]);
SetRenderAmt(0.45f); SetRenderAmt(1.0f);
} }
void void

8
src/shared/player.qc
View file

@ -342,19 +342,19 @@ player::ReceiveEntity(float new, float flChanged)
SetRenderMode(RM_DONTRENDER); SetRenderMode(RM_DONTRENDER);
SetRenderFX(RFX_GLOWSHELL); SetRenderFX(RFX_GLOWSHELL);
SetRenderColor([0.5, 0.5, 0.5]); SetRenderColor([0.5, 0.5, 0.5]);
SetRenderAmt(0.1f); SetRenderAmt(0.25f);
} else if (HasQuadDamage()) { } else if (HasQuadDamage()) {
SetRenderFX(RFX_GLOWSHELL); SetRenderFX(RFX_GLOWSHELL);
SetRenderColor([0.5, 0.5, 1.0]); SetRenderColor([0.5, 0.5, 1.0]);
SetRenderAmt(0.45f); SetRenderAmt(1.0f);
} else if (HasInvulnerability()) { } else if (HasInvulnerability()) {
SetRenderFX(RFX_GLOWSHELL); SetRenderFX(RFX_GLOWSHELL);
SetRenderColor([1.0, 0.5, 0.0]); SetRenderColor([1.0, 0.5, 0.0]);
SetRenderAmt(0.5f); SetRenderAmt(1.0f);
} else if (HasEnviroSuit()) { } else if (HasEnviroSuit()) {
SetRenderFX(RFX_GLOWSHELL); SetRenderFX(RFX_GLOWSHELL);
SetRenderColor([0.5, 1.0, 0.5]); SetRenderColor([0.5, 1.0, 0.5]);
SetRenderAmt(0.45f); SetRenderAmt(1.0f);
} else { } else {
SetRenderMode(RM_NORMAL); SetRenderMode(RM_NORMAL);
SetRenderFX(RM_NORMAL); SetRenderFX(RM_NORMAL);