reworked shaders and ammo boxes

baseq3r/scripts/ammo.shader

@@ -1,6 +1,13 @@
-// // // // SHADERS FOR OPEN ARENA AMMOBOX POWERUPS 
-// // // //  jzero --> johnzero@verizon.net
-// 1.machinegun
+// ------------------------------------------------------------
+// Shaders for Q3Rally Ammo Boxes - rewritten by P3rlE
+// based on the ammo.shader from jzero --> johnzero@verizon.net
+// ------------------------------------------------------------
+
+
+// ------------------------------------------------------------
+// 1.Machinegun
+// ------------------------------------------------------------
+
 models/powerups/ammo/machammo
 {
 	{
@@ -23,7 +30,10 @@ models/powerups/ammo/machammo2
 	}
 }
 
-// 2.shotgun
+// ------------------------------------------------------------
+// 2.Shotgun
+// ------------------------------------------------------------
+
 models/powerups/ammo/shotammo
 {
 	{
@@ -46,7 +56,10 @@ models/powerups/ammo/shotammo2
 	}
 }
 
-// 3.grenade launcher
+// ------------------------------------------------------------
+// 3.Grenadelauncher
+// ------------------------------------------------------------
+
 models/powerups/ammo/grenammo
 {
 	{
@@ -69,7 +82,10 @@ models/powerups/ammo/grenammo2
 	}
 }
 
-// 4.lightning gun
+// ------------------------------------------------------------
+// 4.Lightninggun
+// ------------------------------------------------------------
+
 models/powerups/ammo/lighammo
 {
 	{
@@ -79,7 +95,7 @@ models/powerups/ammo/lighammo
 	{
 		map models/powerups/ammo/ammolights.tga
 		blendfunc blend
-		rgbGen const ( 1 1 0.69 )
+		rgbGen const ( 0.50 1 1 )
 		alphaGen wave sawtooth 0 1 0 1 
 	}
 }
@@ -92,7 +108,10 @@ models/powerups/ammo/lighammo2
 	}
 }
 
-// 5.plasma gun
+// ------------------------------------------------------------
+// 5.Plasmagun
+// ------------------------------------------------------------
+
 models/powerups/ammo/plasammo
 {
 	{
@@ -102,7 +121,7 @@ models/powerups/ammo/plasammo
 	{
 		map models/powerups/ammo/ammolights.tga
 		blendfunc blend
-		rgbGen const ( 0.8 0 1 )
+		rgbGen const ( 0 0 1 )
 		alphaGen wave sawtooth 0 1 0 1 
 	}
 }
@@ -115,7 +134,10 @@ models/powerups/ammo/plasammo2
 	}
 }
 
-//6.rocket launcher
+// ------------------------------------------------------------
+// 6.Rocketlauncher
+// ------------------------------------------------------------
+
 models/powerups/ammo/rockammo
 {
 	{
@@ -138,7 +160,10 @@ models/powerups/ammo/rockammo2
 	}
 }
 
-//7. railgun
+// ------------------------------------------------------------
+// 7.Railgun
+// ------------------------------------------------------------
+
 models/powerups/ammo/railammo
 {
 	{
@@ -161,7 +186,10 @@ models/powerups/ammo/railammo2
 	}
 }
 
-//8. BFG
+// ------------------------------------------------------------
+// 8.BigFuckingGun
+// ------------------------------------------------------------
+
 models/powerups/ammo/bfgammo
 {
 	{
@@ -171,7 +199,7 @@ models/powerups/ammo/bfgammo
 	{
 		map models/powerups/ammo/ammolights.tga
 		blendfunc blend
-		rgbGen const ( 0 0.4 1 )
+		rgbGen const ( 0 1 0 )
 		alphaGen wave sawtooth 0 1 0 1 
 	}
 }
@@ -184,7 +212,10 @@ models/powerups/ammo/bfgammo2
 	}
 }
 
-//8. Flamethrower
+// ------------------------------------------------------------
+// 9.Flamethrower
+// ------------------------------------------------------------
+
 models/powerups/ammo/flameammo
 {
 	{
@@ -194,7 +225,7 @@ models/powerups/ammo/flameammo
 	{
 		map models/powerups/ammo/ammolights.tga
 		blendfunc blend
-		rgbGen const ( 0 0.4 1 )
+		rgbGen const ( 1 0.5 0 )
 		alphaGen wave sawtooth 0 1 0 1 
 	}
 }

engine/code/game/g_rally_rearweapon.c

@@ -212,11 +212,18 @@ void FireRearWeapon( gentity_t *ent ) {
 	vec3_t		angles;
 	int			weapon, i;
 /*
+==============================================
+Quadfactor-Test 16/03/2020
+==============================================
 	if (ent->client->ps.powerups[PW_QUAD] ) {
+		G_AddEvent( ent, EV_POWERUP_QUAD, 0 );
 		s_quadFactor = g_quadfactor.value;
 	} else {
 		s_quadFactor = 1;
 	}
+==============================================
+Quadfactor-Test 16/03/2020   End
+==============================================
 */
 
 	// set aiming directions

engine/code/game/g_weapon.c

@@ -609,7 +609,7 @@ void weapon_railgun_fire (gentity_t *ent) {
 	int			passent;
 	gentity_t	*unlinkedEntities[MAX_RAIL_HITS];
 
-	damage = 75 * s_quadFactor;
+	damage = 50 * s_quadFactor;
 
 	VectorMA (muzzle, 8192, forward, end);
 

engine/code/q3_ui/ui_menu.c

@@ -518,14 +518,14 @@ void UI_MainMenu( void ) {
         s_main.banner.generic.flags                     = QMF_INACTIVE;
         s_main.banner.generic.x                         = 320;
         s_main.banner.generic.y                         = 17;
-        s_main.banner.string                            = "Q 3 R a l l y";
+        s_main.banner.string                            = "Q 3 R A L L Y";
         s_main.banner.color                             = text_color_normal;
-        s_main.banner.style                             = UI_CENTER;
+        s_main.banner.style                             = UI_CENTER|UI_DROPSHADOW;
 
-        x = 240;
+        x = 175;
         y = 100;
 
-
+        
         s_main.singleplayer.generic.type                = MTYPE_PTEXT;
         s_main.singleplayer.generic.id                  = ID_SINGLEPLAYER;
         s_main.singleplayer.generic.callback            = Main_MenuEvent;

engine/code/qcommon/q_shared.h

@@ -67,7 +67,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define BASETA				"missionpack"
 
 #ifndef PRODUCT_VERSION
-#define PRODUCT_VERSION "v0.0.2.3_r264"
+#define PRODUCT_VERSION "v0.0.2.5_r265"
 #endif
 
 

q3rallycode.ppr

@@ -427,7 +427,7 @@ q3rallycode
 				engine\code\null\null_main.c
 				engine\code\null\null_net.c
 				engine\code\null\null_snddma.c
-			-q3_ui
+			+q3_ui
 				engine\code\q3_ui\ui.def
 				engine\code\q3_ui\ui_addbots.c
 				engine\code\q3_ui\ui_atoms.c
@@ -836,7 +836,7 @@ q3rallycode
 			engine\misc\quake3-tango.png
 			engine\misc\quake3-tango.xcf
 			engine\misc\ReadMe-OSX.rtf
-		-ui
+		+ui
 			engine\ui\hud.txt
 			engine\ui\hud2.txt
 			engine\ui\ingame.txt
@@ -867,15 +867,20 @@ q3rallycode
 6=engine\code\client\snd_dma.c
 7=engine\code\game\g_spawn.c
 8=engine\code\q3_ui\ui_menu.c
+9=engine\code\q3_ui\ui_credits.c
+10=engine\code\q3_ui\ui_rally_controls.c
+11=engine\code\q3_ui\ui_rally_options.c
+12=engine\code\game\g_weapon.c
+13=engine\code\game\g_rally_rearweapon.c
 [Selected Project Files]
 Main=
-Selected=engine\code\q3_ui\ui_menu.c
+Selected=engine\code\qcommon\q_shared.h
 [engine\code\qcommon\files.c]
 TopLine=183
 Caret=129,192
 [engine\code\qcommon\q_shared.h]
-TopLine=53
-Caret=39,70
+TopLine=47
+Caret=40,70
 [engine\Makefile]
 TopLine=114
 Caret=17,114
@@ -895,5 +900,20 @@ Caret=1,724
 TopLine=655
 Caret=1,670
 [engine\code\q3_ui\ui_menu.c]
-TopLine=479
-Caret=33,74
+TopLine=103
+Caret=22,121
+[engine\code\q3_ui\ui_credits.c]
+TopLine=49
+Caret=1,64
+[engine\code\q3_ui\ui_rally_controls.c]
+TopLine=544
+Caret=80,574
+[engine\code\q3_ui\ui_rally_options.c]
+TopLine=147
+Caret=27,147
+[engine\code\game\g_weapon.c]
+TopLine=582
+Caret=13,612
+[engine\code\game\g_rally_rearweapon.c]
+TopLine=201
+Caret=3,223