CLIENT/SERVER: Add Xmas Content Drop

Author: MotoLegacy

progs/ssqc.src

@@ -59,6 +59,7 @@ entities/wall_weapon.qc
 weapons/frames_core.qc
 weapons/rocket_launcher.qc
 weapons/ray_gun.qc
+weapons/ray_gun_mk2.qc
 weapons/ballistic_knife.qc
 weapons/tesla.qc
 weapons/flamethrower.qc

source/client/hud.qc

@@ -1374,7 +1374,7 @@ void() HUD_WeaponString =
 			break;
 	}
 
-	if (EqualNonPapWeapon(getstatf(STAT_ACTIVEWEAPON)) == W_RAY || EqualNonPapWeapon(getstatf(STAT_ACTIVEWEAPON)) == W_TESLA)
+	if (EqualNonPapWeapon(getstatf(STAT_ACTIVEWEAPON)) == W_RAY || EqualNonPapWeapon(getstatf(STAT_ACTIVEWEAPON)) == W_TESLA || EqualNonPapWeapon(getstatf(STAT_ACTIVEWEAPON)) == W_RAYMK2)
 		weapon_name_color = TEXT_YELLOW;
 
 	// If the string matches our last store, bail out.

source/server/ai/zoning_core.qc

@@ -23,8 +23,6 @@
 		59 Temple Place - Suite 330
 		Boston, MA  02111-1307, USA
 */
-
-string zone_version;
 float zone_timer;
 
 float num_zones;
@@ -570,19 +568,23 @@ void(float force_update) Zoning_UpdateAllZones =
 void(float zone_file) Zoning_ParseZoneFile =
 {
     string h;
+    string zone_firstline;
     string zone_header;
+    string zone_version;
     float parsing = 1;
 
     while (parsing) {
         // read the header to validate that
         // this is a zone file
         h = fgets(zone_file);
-        zone_header = substring(h, 0, 17);
+        zone_firstline = strzone(h);
+        zone_header = strzone(substring(zone_firstline, 0, 17));
         if (zone_header != "zone_file_version") {
             parsing = 0;
         }
+
         // version of the zone file
-        zone_version = substring(h, 19, 23);
+        zone_version = strzone(substring(zone_firstline, 19, 24));
         // number of zones in map
         h = fgets(zone_file);
         num_zones = stof(substring(h, 17, 20));
@@ -610,11 +612,9 @@ void(float zone_file) Zoning_ParseZoneFile =
             }
             // number of brushes in this zone
             h = fgets(zone_file);
-            float num_zone_brushes = stof(strzone(strtrim(h)));
-            stored_zones[i].num_brushes = num_zone_brushes;
-
+            stored_zones[i].num_brushes = stof(strzone(strtrim(h)));
             // all brush mins/maxs
-            for (float k = 0; k < num_zone_brushes; k++) {
+            for (float k = 0; k < stored_zones[i].num_brushes; k++) {
                 h = fgets(zone_file);
                 string brush_mins = strzone(strtrim(h));
                 vector brush_mins_vec = stov(brush_mins);
@@ -632,12 +632,16 @@ void(float zone_file) Zoning_ParseZoneFile =
             if (zone_version != "1.0.0") {
                 // number of wayTargets
                 h = fgets(zone_file);
-                stored_zones[i].num_way_targets = stof(strzone(strtrim(h)));
+                string num_way_targets = strzone(strtrim(h));
+                stored_zones[i].num_way_targets = stof(num_way_targets);
                 // wayTargets in this zone
                 for (float l = 0; l < stored_zones[i].num_way_targets; l++) {
                     h = fgets(zone_file);
                     stored_zones[i].way_target[l] = strzone(strtrim(h));
                 }
+            } else {
+                stored_zones[i].num_way_targets = 0;
+                stored_zones[i].way_target[0] = "";
             }
         }
         parsing = 0;

source/server/clientfuncs.qc

@@ -611,6 +611,9 @@ void(entity ent) Ent_FakeRemove =
 	ent.bbmins = ent.mins;
 	ent.bbmaxs = ent.maxs;
 	ent.sprintflag = ent.solid;
+	ent.use = SUB_Null;
+	ent.think = SUB_Null;
+	ent.nextthink = 0;
 
 	ent.solid = SOLID_NOT;
 	setsize(ent, '0 0 0', '0 0 0');

source/server/defs/custom.qc

@@ -64,6 +64,7 @@ float 	framecount;
 
 float music_override;
 
+.float 	round_delay;
 .float	recoil_delay;
 .float 	cur_spread;
 
@@ -190,6 +191,10 @@ void (float shotcount, float sprd, float Damage, float side) FireTrace;
 .float hitcount;
 .float viewmodel_effects;
 .float viewmodel2_effects;
+.float weapon_burst_count;
+.float weapon_burst_override;
+.float weapon_autoreload_pending;
+.float weapon2_autoreload_pending;
 
 #ifdef FTE
 
@@ -470,6 +475,8 @@ float crandom();
 #define PERK_MULEKICK_DEFAULT_MODEL		"models/machines/quake_scale/mulekick.mdl"
 
 float isPowerOn;
+float num_power_switches;
+float activated_power_switches;
 .float isBuying; // naievil -- used for checking if a perk is being consumed, limits glitching
 .float perks;
 .float perk_delay;

source/server/dummies.qc

@@ -51,6 +51,7 @@ void() info_player_6_spawn 		= {};
 void() info_player_7_spawn 		= {};
 void() info_player_8_spawn 		= {};
 void() info_null = {remove(self);};
+void() info_texlights = {remove(self);};
 
 void() zombie_horde_point 		= {};
 

source/server/entities/func.qc

@@ -29,13 +29,32 @@
 // func_illusionary
 // =================================
 
+#define SPAWNFLAG_FUNCILLUSIONARY_STARTHIDDEN 	1
+
+void() func_illusionary_show =
+{
+	setmodel(self, self.oldmodel);
+#ifdef FTE
+
+	HalfLife_DoRender();
+	
+#endif // FTE
+};
+
 void() func_illusionary =
 {
 	self.angles = '0 0 0';
 	self.movetype = MOVETYPE_NONE;
 	self.solid = SOLID_NOT;
 	setmodel (self, self.model);
 
+	if (self.spawnflags & SPAWNFLAG_FUNCILLUSIONARY_STARTHIDDEN) {
+		self.use = func_illusionary_show;
+		self.oldmodel = self.model;
+		setmodel(self, "");
+		return;
+	}
+
 #ifdef FTE
 
 	HalfLife_DoRender();
@@ -276,6 +295,8 @@ void() func_train =
 // func_button
 // =================================
 
+#define SPAWNFLAG_FUNCBUTTON_FIREDAMAGE		1
+
 void() button_wait;
 void() button_return;
 
@@ -376,6 +397,7 @@ void() func_button =
 
 	self.blocked = button_blocked;
 	self.use = button_use;
+	self.classname = "func_button";
 
 	if (self.health) {
 		self.max_health = self.health;

source/server/entities/lights.qc

@@ -26,10 +26,10 @@
 */
 
 #define LIGHT_SPAWNFLAG_STARTOFF        1               // Light starts turned off but can be triggered
-                                                        // On via Power Switch.
+                                                        // targetted.
 
 #define LIGHT_SPAWNFLAG_STARTON         2               // Opposite of STARTOFF, light turns Off when
-                                                        // Power is On.
+                                                        // targetted.
 
 //
 // LS_Setup()
@@ -54,25 +54,43 @@ void() LS_Setup =
     lightstyle(11, "abcdefghijklmnopqrrqponmlkjihgfedcba");                 // 11: Slow Pulse (no black)                                                  // 64: Off.
 }
 
+//
+// L_Toggle()
+// Sets OFF lights to ON and vice versa.
+//
+void() L_Toggle =
+{
+    // Turn the light ON if it was set to start OFF
+    if (self.spawnflags & LIGHT_SPAWNFLAG_STARTOFF)
+		lightstyle(self.style, self.aistatus);
+    // Turn the light OFF if it was set to start ON
+	else
+		lightstyle(self.style, "a");
+};
+
 //
 // L_Setup()
 // Initialization for Lights.
 //
 void() L_Setup =
 {
-    // If it's not vanilla ZHLT, cut it off.
-    if (self.style > 12 || !self.targetname) {
-        remove(self);
-        return;
-    }
+    if (!self.targetname) {
+		remove(self);
+		return;
+	}
+	
+    // Reserved internally for toggled lights.
+	if (self.style >= 32)
+	{
+		self.use = L_Toggle;
 
-    // Set the Light to be Off if the spawnflag is set.
-    /*if ((self.spawnflags & LIGHT_SPAWNFLAG_STARTOFF)) {
-        // Store the other value for later.
-        //self.score = self.style;
-        lightstyle(self.style, "a");
-    }*/
-}
+        // Set the Light to be Off if the spawnflag is set.
+		if (self.spawnflags & LIGHT_SPAWNFLAG_STARTOFF)
+			lightstyle(self.style, "a");
+		else
+			lightstyle(self.style, self.aistatus);
+ 	}
+};
 
 //
 // --------------------
@@ -85,7 +103,7 @@ void()  light               =           // Basic Light
 void()  light_fluoro        =           // Light with hum ambient
 {   L_Setup();                                                              }
 void()  light_environment   =           // Sun cast from Sky
-{   makestatic(self);                                                       }
+{   L_Setup();                                                              }
 void()  light_fluorospark   =           // Light with buzz ambient
 {   L_Setup();                                                              }
 void()  light_globe         =           // Light with visible globe

source/server/entities/map_entities.qc

@@ -429,3 +429,82 @@ void() game_counter =
 	// Every time its triggered, increment.
 	self.use = game_counter_increment;
 }
+
+#define SCREENFLASH_SPAWNFLAG_ENDROUND	1
+
+void() removeZombie;
+void() game_screenflash_fire =
+{
+	if (self.noise != "")
+		Sound_PlaySound(world, self.noise, SOUND_TYPE_MUSIC_ROUND, SOUND_PRIORITY_PLAYALWAYS);
+
+	// End the round if requested
+	if (self.spawnflags & SCREENFLASH_SPAWNFLAG_ENDROUND) {
+		entity old_self = self;
+		entity monsters = find(world, classname, "ai_zombie");
+		while(monsters != world) {
+			self = monsters;
+			self.th_die();
+			monsters = find(monsters, classname, "ai_zombie");
+		}
+		monsters = find(world, classname, "ai_dog");
+		while(monsters != world) {
+			self = monsters;
+			self.th_die();
+			monsters = find(monsters, classname, "ai_dog");
+		}
+		self = old_self;
+		Remaining_Zombies = Current_Zombies = Total_Zombies = 0;
+		EndRound();
+		round_changetime = time + self.currentammo;
+	}
+
+	nzp_screenflash(world, self.weapon, self.ltime, SCREENFLASH_FADE_INANDOUT);
+};
+
+void() game_screenflash =
+{
+	// Trigger Sound
+	if (self.noise != "")
+		precache_sound(self.noise);
+
+	self.use = game_screenflash_fire;
+};
+
+#define SPAWNFLAG_SPAWNPU_SPAWN_ON_PLAYER	1
+
+void() spawn_pu_use =
+{
+	if (self.spawnflags & SPAWNFLAG_SPAWNPU_SPAWN_ON_PLAYER) {
+		// We can just spawn on any active player, it's fine.
+		entity random_player = find(world, classname, "player");
+
+		if (random_player != world)
+			Spawn_Powerup(random_player.origin, self.spawn_id);
+	} else {
+		Spawn_Powerup(self.origin, self.spawn_id);
+	}
+};
+
+void() spawn_pu =
+{
+	self.classname = "spawn_pu";
+	self.use = spawn_pu_use;
+};
+
+void() info_changesky_use =
+{
+	// Evil..
+	string command = "sky ";
+	command = strcat(command, self.name);
+	localcmd(strcat(command, "\n"));
+};
+
+void() info_changesky =
+{
+	if (!self.name)
+		objerror("[ERROR]: info_changesky entity with no skybox definition!\n");
+
+	self.classname = "info_changesky";
+	self.use = info_changesky_use;
+};