New boxes for Repair Kit & teleporter

modified entities.def
Q3Rally-Team · Aug 27, 2024 · a6261c2 · a6261c2
1 parent 4a34cec
commit a6261c2
Show file tree

Hide file tree

Showing 18 changed files with 65 additions and 4 deletions.
diff --git a/baseq3r/icons/medkit.tga b/baseq3r/icons/medkit.tga
diff --git a/baseq3r/icons/teleporter.tga b/baseq3r/icons/teleporter.tga
diff --git a/baseq3r/models/powerups/holdable/envmapmedkit.jpg b/baseq3r/models/powerups/holdable/envmapmedkit.jpg
diff --git a/baseq3r/models/powerups/holdable/envmapteleporter.jpg b/baseq3r/models/powerups/holdable/envmapteleporter.jpg
diff --git a/baseq3r/models/powerups/holdable/medkit-glow.jpg b/baseq3r/models/powerups/holdable/medkit-glow.jpg
diff --git a/baseq3r/models/powerups/holdable/medkit.md3 b/baseq3r/models/powerups/holdable/medkit.md3
diff --git a/baseq3r/models/powerups/holdable/medkit.tga b/baseq3r/models/powerups/holdable/medkit.tga
diff --git a/baseq3r/models/powerups/holdable/medkit_1.md3 b/baseq3r/models/powerups/holdable/medkit_1.md3
diff --git a/baseq3r/models/powerups/holdable/medkit_box.tga b/baseq3r/models/powerups/holdable/medkit_box.tga
diff --git a/baseq3r/models/powerups/holdable/medkitfluid.jpg b/baseq3r/models/powerups/holdable/medkitfluid.jpg
diff --git a/baseq3r/models/powerups/holdable/teleporter-glow.jpg b/baseq3r/models/powerups/holdable/teleporter-glow.jpg
diff --git a/baseq3r/models/powerups/holdable/teleporter.md3 b/baseq3r/models/powerups/holdable/teleporter.md3
diff --git a/baseq3r/models/powerups/holdable/teleporter.tga b/baseq3r/models/powerups/holdable/teleporter.tga
diff --git a/baseq3r/models/powerups/holdable/teleporter_box.tga b/baseq3r/models/powerups/holdable/teleporter_box.tga
diff --git a/baseq3r/models/powerups/holdable/teleporterfluid.jpg b/baseq3r/models/powerups/holdable/teleporterfluid.jpg
diff --git a/baseq3r/scripts/ammo.shader b/baseq3r/scripts/ammo.shader
@@ -1,8 +1,69 @@
 // powerups
+
 //
+// holdable
+//
+
+models/powerups/holdable/medkit_box
+{
+	{
+		map models/powerups/holdable/envmapmedkit.tga
+		rgbGen identity
+		tcMod rotate 12
+		tcMod turb 0 0.5 0 0.5
+		tcMod scroll 1 0.5
+	}
+	{
+		map models/powerups/holdable/medkitfluid.tga
+		blendfunc add
+		rgbGen identity
+		tcMod scroll 0.5 0
+		tcGen environment 
+	}
+	{
+		map models/powerups/holdable/medkit_box.tga
+		blendfunc blend
+		rgbGen lightingDiffuse
+	}
+	{
+		map models/powerups/holdable/medkit-glow.tga
+		blendfunc gl_one_minus_dst_color gl_src_alpha
+		rgbGen wave noise 0 1 0 5 
+	}
+}
+
+models/powerups/holdable/teleporter_box
+{
+	{
+		map models/powerups/holdable/envmapteleporter.tga
+		rgbGen identity
+		tcMod rotate 12
+		tcMod turb 0 0.5 0 0.5
+		tcMod scroll 1 0.5
+	}
+	{
+		map models/powerups/holdable/teleporterfluid.tga
+		blendfunc add
+		rgbGen identity
+		tcMod scroll 0.5 0
+		tcGen environment 
+	}
+	{
+		map models/powerups/holdable/teleporter_box.tga
+		blendfunc blend
+		rgbGen lightingDiffuse
+	}
+	{
+		map models/powerups/holdable/teleporter-glow.tga
+		blendfunc gl_one_minus_dst_color gl_src_alpha
+		rgbGen wave noise 0 1 0 5 
+	}
+}
+
 //
 // ammo
 //
+
 models/powerups/ammo/bfgammo_new
 {
 	{
@@ -356,4 +417,4 @@ models/powerups/ammo/flameammo2
 		rgbGen identity
 	}
 
-}
+}
diff --git a/engine/code/game/bg_misc.c b/engine/code/game/bg_misc.c
@@ -653,7 +653,7 @@ gitem_t	bg_itemlist[] =
 		"models/powerups/holdable/medkit_sphere.md3",
 		NULL, NULL},
 /* icon */		"icons/medkit",
-/* pickup */	"Medkit",
+/* pickup */	"Repair Kit",
 		60,
 		IT_HOLDABLE,
 		HI_MEDKIT,

diff --git a/tools/radiant-config/radiant15-netradiant/q3rally.game/baseq3r/entities.def b/tools/radiant-config/radiant15-netradiant/q3rally.game/baseq3r/entities.def
@@ -611,8 +611,8 @@ HOLDABLE_* ENTITIES
 
 //=============================================================================
 
-/*QUAKED holdable_medkit (.7 0 1) (-16 -16 -16) (16 16 16) SUSPENDED
-Medkit that can be picked up and used later. Brings the player's health back to 100 when used. Player can only carry one holdable item at a time.
+/*QUAKED repair_kit (.7 0 1) (-16 -16 -16) (16 16 16) SUSPENDED
+Repair Kit that can be picked up and used later. Brings the player's health up to 125 when used. Player can only carry one holdable item at a time.
 -------- KEYS --------
 wait : time in seconds before item respawns after being picked up (default 60, -1 = never respawn).
 random : random time variance in seconds added or subtracted from "wait" delay (default 0 - see Notes).