diff --git a/baseq3r/icons/medkit.tga b/baseq3r/icons/medkit.tga index d04dd6ca..2bc13bb4 100644 Binary files a/baseq3r/icons/medkit.tga and b/baseq3r/icons/medkit.tga differ diff --git a/baseq3r/icons/teleporter.tga b/baseq3r/icons/teleporter.tga index c44cb3bb..c3eda2ae 100644 Binary files a/baseq3r/icons/teleporter.tga and b/baseq3r/icons/teleporter.tga differ diff --git a/baseq3r/models/powerups/holdable/envmapmedkit.jpg b/baseq3r/models/powerups/holdable/envmapmedkit.jpg new file mode 100644 index 00000000..9fd00e3b Binary files /dev/null and b/baseq3r/models/powerups/holdable/envmapmedkit.jpg differ diff --git a/baseq3r/models/powerups/holdable/envmapteleporter.jpg b/baseq3r/models/powerups/holdable/envmapteleporter.jpg new file mode 100644 index 00000000..baaef895 Binary files /dev/null and b/baseq3r/models/powerups/holdable/envmapteleporter.jpg differ diff --git a/baseq3r/models/powerups/holdable/medkit-glow.jpg b/baseq3r/models/powerups/holdable/medkit-glow.jpg new file mode 100644 index 00000000..f3823ef1 Binary files /dev/null and b/baseq3r/models/powerups/holdable/medkit-glow.jpg differ diff --git a/baseq3r/models/powerups/holdable/medkit.md3 b/baseq3r/models/powerups/holdable/medkit.md3 index 9de7f006..f2e119f6 100644 Binary files a/baseq3r/models/powerups/holdable/medkit.md3 and b/baseq3r/models/powerups/holdable/medkit.md3 differ diff --git a/baseq3r/models/powerups/holdable/medkit.tga b/baseq3r/models/powerups/holdable/medkit.tga new file mode 100644 index 00000000..7659b19a Binary files /dev/null and b/baseq3r/models/powerups/holdable/medkit.tga differ diff --git a/baseq3r/models/powerups/holdable/medkit_1.md3 b/baseq3r/models/powerups/holdable/medkit_1.md3 deleted file mode 100644 index 34488630..00000000 Binary files a/baseq3r/models/powerups/holdable/medkit_1.md3 and /dev/null differ diff --git a/baseq3r/models/powerups/holdable/medkit_box.tga b/baseq3r/models/powerups/holdable/medkit_box.tga new file mode 100644 index 00000000..bdb97ce3 Binary files /dev/null and b/baseq3r/models/powerups/holdable/medkit_box.tga differ diff --git a/baseq3r/models/powerups/holdable/medkitfluid.jpg b/baseq3r/models/powerups/holdable/medkitfluid.jpg new file mode 100644 index 00000000..0ee5360b Binary files /dev/null and b/baseq3r/models/powerups/holdable/medkitfluid.jpg differ diff --git a/baseq3r/models/powerups/holdable/teleporter-glow.jpg b/baseq3r/models/powerups/holdable/teleporter-glow.jpg new file mode 100644 index 00000000..d67c0399 Binary files /dev/null and b/baseq3r/models/powerups/holdable/teleporter-glow.jpg differ diff --git a/baseq3r/models/powerups/holdable/teleporter.md3 b/baseq3r/models/powerups/holdable/teleporter.md3 index 8e10da3c..22042f96 100644 Binary files a/baseq3r/models/powerups/holdable/teleporter.md3 and b/baseq3r/models/powerups/holdable/teleporter.md3 differ diff --git a/baseq3r/models/powerups/holdable/teleporter.tga b/baseq3r/models/powerups/holdable/teleporter.tga new file mode 100644 index 00000000..73267c08 Binary files /dev/null and b/baseq3r/models/powerups/holdable/teleporter.tga differ diff --git a/baseq3r/models/powerups/holdable/teleporter_box.tga b/baseq3r/models/powerups/holdable/teleporter_box.tga new file mode 100644 index 00000000..bdb97ce3 Binary files /dev/null and b/baseq3r/models/powerups/holdable/teleporter_box.tga differ diff --git a/baseq3r/models/powerups/holdable/teleporterfluid.jpg b/baseq3r/models/powerups/holdable/teleporterfluid.jpg new file mode 100644 index 00000000..b92047ca Binary files /dev/null and b/baseq3r/models/powerups/holdable/teleporterfluid.jpg differ diff --git a/baseq3r/scripts/ammo.shader b/baseq3r/scripts/ammo.shader index 72e547af..12c8aa87 100644 --- 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 } -} \ No newline at end of file +} diff --git a/engine/code/game/bg_misc.c b/engine/code/game/bg_misc.c index f1a2027c..cfcb82cd 100644 --- 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 index 9bbbe08b..a22151be 100644 --- 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).