More and more changes against Develop Nuclide.

src/client/hud.qc

@@ -488,8 +488,9 @@ HUD_Draw(void)
 #endif
 
 	/* little point in not drawing these, even if you don't have a suit */
-	if (pl.m_activeWeapon)
+	if (pl.m_activeWeapon) {
 		pl.m_activeWeapon.UpdateGUI();
+	}
 
 	HUD_DrawDamageIndicator();
 	HUD_DrawWeaponSelect();

src/shared/HLWeapon.qc

@@ -34,34 +34,44 @@ For example, `ammoIcon` being set to `weapon_foobar.ammo` will look up `ammo` in
 class
 HLWeapon:NSWeapon
 {
+public:
 	void HLWeapon(void);
 
-	bool m_bAltModeSwitch;
 	virtual void AddedToInventory(void);
-	virtual void PrimaryAttack(void);
-	virtual void SecondaryAttack(void);
 
 #ifdef SERVER
 	virtual void SpawnKey(string, string);
 #endif
 
+#ifdef CLIENT
+	virtual void UpdateGUI(void);
+	nonvirtual void DrawLaser(void);
+#endif
+
+private:
 #ifdef CLIENT
 	int m_iHudSlot;
 	int m_iHudSlotPos;
-
 	string m_ammoIcon;
 	string m_ammo2Icon;
 	string m_crossHair;
 	NSWeapon m_nextWeapon;
-	virtual void UpdateGUI(void);
-	nonvirtual void DrawLaser(void);
 #endif
+	bool m_bAltModeLaser;
 };
 
 void
 HLWeapon::HLWeapon(void)
 {
-
+#ifdef CLIENT
+	m_iHudSlot = 0i;
+	m_iHudSlotPos = 0i;
+	m_ammoIcon = __NULL__;
+	m_ammo2Icon = __NULL__;
+	m_crossHair = __NULL__;
+	m_nextWeapon = __NULL__;
+#endif
+	m_bAltModeLaser = false;
 }
 
 #ifdef SERVER
@@ -69,55 +79,12 @@ void
 HLWeapon::SpawnKey(string keyName, string setValue)
 {
 	switch (keyName) {
-	case "altLaser":
-	case "ammoIcon":
-	case "crosshair":
-	case "hudSlot":
-	case "hudSlotPos":
-		break;
 	default:
 		super::SpawnKey(keyName, setValue);
 	}
 }
 #endif
 
-void
-HLWeapon::PrimaryAttack(void)
-{
-	if (m_bAltModeSwitch == true) {
-		if (CanFire() == false) {
-			return;
-		}
-
-		//m_iMode = 1 - m_iMode;
-	}
-
-	if (m_iMode) {
-		super::SecondaryAttack();
-		return;
-	}
-
-	super::PrimaryAttack();
-}
-
-void
-HLWeapon::SecondaryAttack(void)
-{
-	if (m_bAltModeSwitch == true) {
-		if (CanFire() == false) {
-			return;
-		}
-
-		m_iMode = 1 - m_iMode;
-		SetAttackNext(1.0);
-		SetIdleNext(1.0f);
-		return;
-	}
-
-	super::SecondaryAttack();
-}
-
-
 void
 HLWeapon::AddedToInventory(void)
 {
@@ -158,7 +125,7 @@ HLWeapon::AddedToInventory(void)
 	m_iHudSlotPos = GetDefInt("hudSlotPos");
 #endif
 
-	m_bAltModeSwitch = GetDefBool("altLaser");
+	m_bAltModeLaser = GetDefBool("altLaser");
 }
 
 #ifdef CLIENT
@@ -176,10 +143,37 @@ HLWeapon::UpdateGUI(void)
 		HLSprite_Draw_RGBA(m_ammoIcon, ammoPos, g_hud_color, pSeatLocal->m_flAmmo2Alpha, true);
 	}
 
-	if (m_iMode) {
+	if (m_iMode && m_bAltModeLaser) {
 		DrawLaser();
 	}
 
+#if 1
+	vector vSize = [540,16];
+	vector vMainPos;
+	float progress;
+
+	progress = (m_flOverheating / m_fiOverheatLength);
+
+	if (progress > 1.0) {
+		progress = 1.0f;
+	}
+
+	if (m_fiOverheatLength && progress > 0) {
+		vMainPos = g_hudmins;
+		vMainPos[0] += (g_hudres[0] / 2) - (vSize[0] / 2);
+		vMainPos[1] += (g_hudres[1] / 2) - (vSize[1] / 2);
+
+		vector vBar = vSize;
+		vBar[0] = 538 * progress;
+		vBar[1] = 14;
+		drawfill(vMainPos + [1,1], vBar, g_hud_color, 1.0, DRAWFLAG_ADDITIVE);
+		drawfill(vMainPos, [vSize[0], 1], g_hud_color, 1.0f); // Top
+		drawfill([vMainPos[0], vMainPos[1] + vSize[1]], [vSize[0], 1], g_hud_color, 1.0f); // Bottom
+		drawfill(vMainPos, [1, vSize[1]], g_hud_color, 1.0f); // Left
+		drawfill([vMainPos[0] + vSize[0], vMainPos[1]], [1, vSize[1] + 1], g_hud_color, 1.0f); // Right
+	}
+#endif
+
 	if (m_bAmmoRequired == false)
 		return;
 

zpak001.pk3dir/cvar_defaults.cfg

@@ -4,41 +4,40 @@ set ai_debugNav "0" // Show prints when AI makes decisions regarding navigation.
 set ai_debugScripts "0" // Show prints when AI interacts with scripted sequences.
 set ai_runSpeed "320" // Default run speed chosen by AI characters, in units per second.
 set ai_walkSpeed "150" // Default walk speed chosen by AI characters, in units per second.
+set ai_enable "1" // Disable AI behaviour when set.
 
-set bot_aimless
-set bot_backspeed
-set bot_crouch
-set bot_debug
-set bot_developer
-set bot_dont_shoot
-set bot_enable
-set bot_fastChat
-set bot_forwardspeed
-set bot_minClients
-set bot_noChat
-set bot_pause
-set bot_prefix
-set bot_prone
-set bot_sidespeed
-set bot_skill
-set bot_walk
+set bot_aimless			"0"		// Bots will not set goals for themselves when set.
+set bot_backspeed		"133"	// Bots desired maximum backwards speed.
+set bot_crouch			"0"		// Bots are all forced to move crouched.
+set bot_debug			"0"		// TODO: needs to be logLevel?
+set bot_developer		"0"		// TODO: remove?
+set bot_dont_shoot		"0"		// Bots never actually shoot.
+set bot_enable			"1"		// Bot support enabled when set.
+set bot_fastChat		"0"		// Bots will chat instantly instead of 'typing'.
+set bot_forwardspeed	"190"	// Bots desired maximum forward speed.
+set bot_minClients		"-1"	// How many player slots are to be filled, -1 is 'untouched'. 
+set bot_noChat			"0"		// Bots will no longer communicate when set.
+set bot_pause			"0"		// Bots logic will be paused.
+set bot_prefix			""		// Bot nickname prefix for newly added bots.
+set bot_prone			"0"		// Bots are all forced to move prone.
+set bot_sidespeed		"152"	// Bots desired maximum strafe speed.
+set bot_skill			"2"		// Bot version of cvar "skill".
+set bot_walk			"0"		// Bots are forced to walk slowly.
 
-set cg_chatEnabled
-set cg_damageShake
-set cg_hudAspect
-set cg_muzzleDLight
-set cg_muzzleDLightColor
-set cg_viewZSmoothingMax
-set cg_viewZSmoothingMin
-set cg_viewZSmoothingTime
-set cg_viewmodelFlip
-set cg_viewmodelFov
-set cg_viewmodelLag
-set cg_viewmodelOffset
-set cg_viewmodelPass
-set cg_viewmodelScale
-
-set chatplug_filter
+set cg_chatEnabled				"1"					// Enable the display of chat messages.
+set cg_damageShake				"0"					// Shake the display upon taking damage.
+set cg_hudAspect				"0"					// Aspect ratio override for the HUD. 1.0 is 1:1 square, 0 is auto.
+set cg_muzzleDLight				"1"					// Enable dlights being spawned from muzzleflashes. 
+set cg_muzzleDLightColor		"1.0 0.45 0.0"	// Color of muzzleflash dlights.
+set cg_viewZSmoothingMax		"16"				// Camera vertical-axis smoothing max delta threshold.
+set cg_viewZSmoothingMin		"1"					// Camera vertical-axis smoothing delta threshold.
+set cg_viewZSmoothingTime		"0.1"			// Camera vertical-axis smoothing steps.
+set cg_viewmodelFlip			"0"					// Flip the viewmodel.
+set cg_viewmodelFov				"90"				// Viewmodel field of view.
+set cg_viewmodelLag				"0"					// Viewmodel lag when camera looks around.
+set cg_viewmodelOffset			"0 0 0"			// Viewmodel offset in relative units (forward, right, up)
+set cg_viewmodelPass			"1"					// Renders viewmodel in separate drawpass (no lighting)
+set cg_viewmodelScale			"1.0"			// Viewmodel scale multiplier, affects bob as well.
 
 set cl_backspeed "400" // Client's desired backwards speed.
 set cl_decals "128"
@@ -48,10 +47,9 @@ set cl_sidespeed "400" // Client's desired side-step speed.
 
 set con_color "255 150 0"
 // HUD color value, R G B, 0-255 for each channel.
 
-set dev_cornerspeed
-set dev_loddistance
-set dev_rotspeed
-set dev_skyscale
+set dev_cornerspeed			"0"	// Override speed set by path_corner entities.
+set dev_loddistance			"0"	// Override distance at which func_lod entities disappear.
+set dev_skyscale			""	// Override for the sky_camera room scale.
 
 set dsp_soundscapes "1" // Enable the use of sound scapes.
 

zpak001.pk3dir/decls/def/weapons/9mmAR.def

@@ -43,7 +43,7 @@ entityDef projectile_9mmAR
 
 entityDef fireInfo_9mmAR
 {
-	"def_onFire"	"projectile_9mmAR"
+	"def_onFire"		"projectile_9mmAR"
 	"ammoType"			"ammo_9mm"
 	"ammoRequired"		"1"
 	"ammoPerShot"		"1"

zpak001.pk3dir/decls/def/weapons/egon.def

@@ -19,13 +19,14 @@ entityDef weapon_egon
 	"ammoRequired"		"1"
 	"actIdle"			"0,1"
 	"actDraw"			"9"
-	"actFire"			"7,8"
-	"actFireLoop"		"7,8"
+	"actLoop"			"7,8"
+	"actFireEnd"		"1"
 	"actHolster"		"10"
 	"fireRate"			"0.2"
 
-	"snd_fire"			"weapon_egon.fire"
-	"snd_fire_loop"		"weapon_egon.fire_loop"
+	"snd_fireStart"		"weapon_egon.fire"
+	"snd_fireLoop"		"weapon_egon.fire_loop"
+	"snd_fireEnd"		"weapon_egon.fire_stop"
 	"fx_trail"			"weapon_egon.trail"
 	"fx_trail_world"	"weapon_egon.trail_world"
 

zpak001.pk3dir/decls/def/weapons/gauss.def

@@ -21,7 +21,6 @@ entityDef weapon_gauss
 	"actIdle"			"0,1,2"
 	"actDraw"			"8"
 	"actHolster"		"7"
-	"actLoop"			"4"
 	"powerAmmo"			"1"
 	"snd_fire"			"weapon_gauss.fire"
 
@@ -45,7 +44,7 @@ entityDef projectile_gausscharge
 
 entityDef fireInfo_gauss
 {
-	"def_onFire"	"projectile_gauss"
+	"def_onFire"		"projectile_gauss"
 	"ammoPerShot" 		"2"
 	"fireRate" 			".2"
 	"punchAngle"		"-2 0 0"
@@ -55,12 +54,18 @@ entityDef fireInfo_gauss
 
 entityDef fireInfo_gausscharge
 {
+	"def_onFire"		"projectile_gausscharge"
 	"def_onRelease"		"projectile_gausscharge"
 	"ammoPerShot" 		"5"
 	"fireRate" 			"2"
 	"punchAngle"		"-2 0 0"
 	"model_flash"		"sprites/muzzleflash2.spr"
-	"primed_fuse"		"5"
+	"snd_fireStart"		"weapon_gauss.revving"
+	"snd_fire"			"weapon_gauss.overcharge"
+	"snd_release"		"weapon_gauss.fire"
+	"chargeTime"		"5"
 	"actRelease"		"5,6"
-	"actFire"			"3"
+	"actDelay"			"3"
+	"actLoop"			"4"
+	"knockbackRelease"	"1024"
 }

zpak001.pk3dir/decls/efx/default.efx

@@ -0,0 +1,23 @@
+density "1.000000"
+diffusion "1.000000"
+gain "0.000000"
+gain_hf "1.000000"
+gain_lf "1.000000"
+decay_time "1.000000"
+decay_hf_ratio "1.000000"
+decay_lf_ratio "1.000000"
+reflections_gain "0.000000"
+reflections_delay "0.000000"
+reflections_pan "0 0 0"
+late_reverb_gain "1.000000"
+late_reverb_delay "0.000000"
+late_reverb_pan "0 0 0"
+echo_time "0.250000"
+echo_depth "0.000000"
+modulation_time "0.250000"
+modulation_depth "0.000000"
+air_absorbtion_hf "1.000000"
+hf_reference "5000.000000"
+lf_reference "250.000000"
+room_rolloff_factor "0.000000"
+decay_limit "1"