]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Multiple improvements to onslaught code, including CSQC generators/control points...
authorMario <mario.mario@y7mail.com>
Thu, 20 Mar 2014 04:45:11 +0000 (15:45 +1100)
committerMario <mario.mario@y7mail.com>
Thu, 20 Mar 2014 04:45:11 +0000 (15:45 +1100)
21 files changed:
gamemodes.cfg
qcsrc/client/Main.qc
qcsrc/client/controlpoint.qc [new file with mode: 0644]
qcsrc/client/controlpoint.qh [new file with mode: 0644]
qcsrc/client/generator.qc [new file with mode: 0644]
qcsrc/client/generator.qh [new file with mode: 0644]
qcsrc/client/progs.src
qcsrc/common/constants.qh
qcsrc/common/notifications.qh
qcsrc/server/autocvars.qh
qcsrc/server/bot/havocbot/havocbot.qc
qcsrc/server/bot/havocbot/roles.qc
qcsrc/server/controlpoint.qc [new file with mode: 0644]
qcsrc/server/controlpoint.qh [new file with mode: 0644]
qcsrc/server/g_damage.qc
qcsrc/server/generator.qc [new file with mode: 0644]
qcsrc/server/generator.qh [new file with mode: 0644]
qcsrc/server/mutators/gamemode_onslaught.qc
qcsrc/server/mutators/gamemode_onslaught.qh [new file with mode: 0644]
qcsrc/server/progs.src
qcsrc/server/teamplay.qc

index 30352bba7be4bbeef4a341674f5151d4dfb030da..7e3b401a8f36ef663aa5dece389aca2d4b9540d5 100644 (file)
@@ -448,6 +448,7 @@ seta g_nexball_tackling 1 "Allow ball theft?"
 // ===========
 set g_onslaught 0 "Onslaught: take control points towards the enemy generator and then destroy it"
 set g_onslaught_gen_health 2500
+set g_onslaught_allow_vehicle_touch 0
 set g_onslaught_cp_health 1000
 set g_onslaught_cp_buildhealth 100
 set g_onslaught_cp_buildtime 5
@@ -455,8 +456,13 @@ set g_onslaught_cp_regen 20
 set g_onslaught_cp_proxydecap 0 "de-capture controlpoints by standing close to them"
 set g_onslaught_cp_proxydecap_distance 512
 set g_onslaught_cp_proxydecap_dps 100
+set g_onslaught_shield_force 100
 set g_onslaught_spawn_at_controlpoints 0
+set g_onslaught_spawn_at_controlpoints_chance 0.5
+set g_onslaught_spawn_at_controlpoints_random 0
 set g_onslaught_spawn_at_generator 0
+set g_onslaught_spawn_at_generator_chance 0
+set g_onslaught_spawn_at_generator_random 0
 
 
 // ======
index db99e507ff7b68d86586799ca7942ac99088e360..6c4f2d7f309ec1a7270aecdeaf2b70e0772c2e69 100644 (file)
@@ -117,6 +117,7 @@ void CSQC_Init(void)
        precache_sound("misc/hit.wav");
        precache_sound("misc/typehit.wav");
 
+       generator_precache();
        Projectile_Precache();
        Hook_Precache();
        GibSplash_Precache();
@@ -824,6 +825,8 @@ void CSQC_Ent_Update(float bIsNewEntity)
                case ENT_CLIENT_ACCURACY: Ent_ReadAccuracy(); break;
                case ENT_CLIENT_AUXILIARYXHAIR: Net_AuXair2(bIsNewEntity); break;
                case ENT_CLIENT_TURRET: ent_turret(); break;
+               case ENT_CLIENT_GENERATOR: ent_generator(); break;
+               case ENT_CLIENT_CONTROLPOINT_ICON: ent_cpicon(); break;
                case ENT_CLIENT_MODEL: CSQCModel_Read(bIsNewEntity); break;
                case ENT_CLIENT_ITEM: ItemRead(bIsNewEntity); break;
                case ENT_CLIENT_BUMBLE_RAYGUN: bumble_raygun_read(bIsNewEntity); break;
diff --git a/qcsrc/client/controlpoint.qc b/qcsrc/client/controlpoint.qc
new file mode 100644 (file)
index 0000000..c01835c
--- /dev/null
@@ -0,0 +1,210 @@
+float cpicon_precached;
+.float count;
+.float pain_finished;
+
+.float iscaptured;
+
+.vector cp_origin, cp_bob_origin;
+.float cp_bob_spd;
+
+.vector cp_bob_dmg;
+
+.vector punchangle;
+
+.float max_health;
+
+.entity icon_realmodel;
+
+void cpicon_precache()
+{
+       if(cpicon_precached)
+               return; // already precached
+
+       precache_model("models/onslaught/controlpoint_icon_dmg3.md3");
+       precache_model("models/onslaught/controlpoint_icon_dmg2.md3");
+       precache_model("models/onslaught/controlpoint_icon_dmg1.md3");
+       precache_model("models/onslaught/controlpoint_icon.md3");
+
+       cpicon_precached = TRUE;
+}
+
+void cpicon_draw()
+{
+       if(time < self.move_time) { return; }
+
+       if(self.cp_bob_dmg_z > 0)
+               self.cp_bob_dmg_z = self.cp_bob_dmg_z - 3 * frametime;
+       else
+               self.cp_bob_dmg_z = 0;
+       self.cp_bob_origin_z = 4 * PI * (1 - cos(self.cp_bob_spd));
+       self.cp_bob_spd = self.cp_bob_spd + 1.875 * frametime;
+       self.colormod = '1 1 1' * (2 - bound(0, (self.pain_finished - time) / 10, 1));
+       
+       if(!self.iscaptured) self.alpha = self.health / self.max_health;
+       
+       if(self.iscaptured)
+       {
+               if (self.punchangle_x > 0)
+               {
+                       self.punchangle_x = self.punchangle_x - 60 * frametime;
+                       if (self.punchangle_x < 0)
+                               self.punchangle_x = 0;
+               }
+               else if (self.punchangle_x < 0)
+               {
+                       self.punchangle_x = self.punchangle_x + 60 * frametime;
+                       if (self.punchangle_x > 0)
+                               self.punchangle_x = 0;
+               }
+
+               if (self.punchangle_y > 0)
+               {
+                       self.punchangle_y = self.punchangle_y - 60 * frametime;
+                       if (self.punchangle_y < 0)
+                               self.punchangle_y = 0;
+               }
+               else if (self.punchangle_y < 0)
+               {
+                       self.punchangle_y = self.punchangle_y + 60 * frametime;
+                       if (self.punchangle_y > 0)
+                               self.punchangle_y = 0;
+               }
+
+               if (self.punchangle_z > 0)
+               {
+                       self.punchangle_z = self.punchangle_z - 60 * frametime;
+                       if (self.punchangle_z < 0)
+                               self.punchangle_z = 0;
+               }
+               else if (self.punchangle_z < 0)
+               {
+                       self.punchangle_z = self.punchangle_z + 60 * frametime;
+                       if (self.punchangle_z > 0)
+                               self.punchangle_z = 0;
+               }
+
+               self.angles_x = self.punchangle_x;
+               self.angles_y = self.punchangle_y + self.move_angles_y;
+               self.angles_z = self.punchangle_z;
+               self.move_angles_y = self.move_angles_y + 45 * frametime;
+       }
+       
+       setorigin(self, self.cp_origin + self.cp_bob_origin + self.cp_bob_dmg);
+}
+
+void cpicon_damage(float hp)
+{
+       if(!self.iscaptured) { return; }
+
+       if(hp < self.max_health * 0.25)
+               setmodel(self, "models/onslaught/controlpoint_icon_dmg3.md3");
+       else if(hp < self.max_health * 0.50)
+               setmodel(self, "models/onslaught/controlpoint_icon_dmg2.md3");
+       else if(hp < self.max_health * 0.75)
+               setmodel(self, "models/onslaught/controlpoint_icon_dmg1.md3");
+       else if(hp <= self.max_health || hp >= self.max_health)
+               setmodel(self, "models/onslaught/controlpoint_icon.md3");
+               
+       self.punchangle = (2 * randomvec() - '1 1 1') * 45;
+
+       self.cp_bob_dmg_z = (2 * random() - 1) * 15;
+       self.pain_finished = time + 1;
+       self.colormod = '2 2 2';
+
+       setsize(self, CPICON_MIN, CPICON_MAX);
+}
+
+void cpicon_construct()
+{
+       self.netname = "Control Point Icon";
+
+       setmodel(self, "models/onslaught/controlpoint_icon.md3");
+       setsize(self, CPICON_MIN, CPICON_MAX);
+       
+       if(self.icon_realmodel == world)
+       {
+               self.icon_realmodel = spawn();
+               setmodel(self.icon_realmodel, "null");
+               setorigin(self.icon_realmodel, self.origin);
+               setsize(self.icon_realmodel, CPICON_MIN, CPICON_MAX);
+               self.icon_realmodel.movetype = MOVETYPE_NOCLIP;
+               self.icon_realmodel.solid = SOLID_NOT;
+               self.icon_realmodel.move_origin = self.icon_realmodel.origin;
+       }
+       
+       if(self.iscaptured) { self.icon_realmodel.solid = SOLID_BBOX; }
+
+       self.move_movetype      = MOVETYPE_NOCLIP;
+       self.solid                      = SOLID_NOT;
+       self.movetype           = MOVETYPE_NOCLIP;
+       self.move_origin        = self.origin;
+       self.move_time          = time;
+       self.drawmask           = MASK_NORMAL;
+       self.alpha                      = 1;
+       self.draw                       = cpicon_draw;
+       self.cp_origin          = self.origin;
+       self.cp_bob_origin      = '0 0 0.1';
+       self.cp_bob_spd         = 0;
+}
+
+.vector glowmod;
+void cpicon_changeteam()
+{
+       if(self.team)
+       {
+               self.glowmod = Team_ColorRGB(self.team - 1);
+               self.teamradar_color = Team_ColorRGB(self.team - 1);
+               self.colormap = 1024 + (self.team - 1) * 17;
+       }
+       else
+       {
+               self.colormap = 1024;
+               self.glowmod = '1 1 0';
+               self.teamradar_color = '1 1 0';
+       }
+}
+
+void ent_cpicon()
+{
+       float sf;
+       sf = ReadByte();
+
+       if(sf & CPSF_SETUP)
+       {
+               self.origin_x = ReadCoord();
+               self.origin_y = ReadCoord();
+               self.origin_z = ReadCoord();
+               setorigin(self, self.origin);
+
+               self.health = ReadByte();
+               self.max_health = ReadByte();
+               self.count = ReadByte();
+               self.team = ReadByte();
+               self.iscaptured = ReadByte();
+
+               if(!self.count)
+                       self.count = (self.health - self.max_health) * frametime;
+
+               cpicon_changeteam();
+               cpicon_precache();
+               cpicon_construct();
+       }
+
+       if(sf & CPSF_STATUS)
+       {
+               float _tmp;
+               _tmp = ReadByte();
+               if(_tmp != self.team)
+               {
+                       self.team = _tmp;
+                       cpicon_changeteam();
+               }
+
+               _tmp = ReadByte();
+
+               if(_tmp != self.health)
+                       cpicon_damage(_tmp);
+
+               self.health = _tmp;
+       }
+}
diff --git a/qcsrc/client/controlpoint.qh b/qcsrc/client/controlpoint.qh
new file mode 100644 (file)
index 0000000..eef4bd4
--- /dev/null
@@ -0,0 +1,8 @@
+const vector CPICON_MIN = '-32 -32 -9';
+const vector CPICON_MAX = '32 32 25';
+
+float CPSF_STATUS = 4;
+float CPSF_SETUP = 8;
+
+void ent_cpicon();
+void cpicon_precache();
\ No newline at end of file
diff --git a/qcsrc/client/generator.qc b/qcsrc/client/generator.qc
new file mode 100644 (file)
index 0000000..474890c
--- /dev/null
@@ -0,0 +1,315 @@
+float generator_precached;
+.float count;
+
+vector randompos(vector m1, vector m2)
+{
+       vector v;
+       m2 = m2 - m1;
+       v_x = m2_x * random() + m1_x;
+       v_y = m2_y * random() + m1_y;
+       v_z = m2_z * random() + m1_z;
+       return  v;
+}
+
+void generator_precache()
+{
+       if(generator_precached)
+               return; // already precached
+
+       precache_model("models/onslaught/generator.md3");
+       precache_model("models/onslaught/generator_dead.md3");
+       precache_model("models/onslaught/generator_dmg1.md3");
+       precache_model("models/onslaught/generator_dmg2.md3");
+       precache_model("models/onslaught/generator_dmg3.md3");
+       precache_model("models/onslaught/generator_dmg4.md3");
+       precache_model("models/onslaught/generator_dmg5.md3");
+       precache_model("models/onslaught/generator_dmg6.md3");
+       precache_model("models/onslaught/generator_dmg7.md3");
+       precache_model("models/onslaught/generator_dmg8.md3");
+       precache_model("models/onslaught/generator_dmg9.md3");
+       precache_model("models/onslaught/generator_dead.md3");
+
+       precache_model("models/onslaught/ons_ray.md3");
+       precache_sound("onslaught/shockwave.wav");
+       precache_sound("weapons/grenade_impact.wav");
+       precache_sound("weapons/rocket_impact.wav");
+
+       precache_model("models/onslaught/gen_gib1.md3");
+       precache_model("models/onslaught/gen_gib2.md3");
+       precache_model("models/onslaught/gen_gib3.md3");
+
+       generator_precached = TRUE;
+}
+
+void ons_gib_damage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector vforce)
+{
+       self.velocity = self.velocity + vforce;
+}
+
+.float giblifetime;
+
+void gib_draw_noburn()
+{
+       if(time >= self.giblifetime)
+               remove(self);
+}
+
+void gib_draw()
+{
+       if(time >= self.move_time)
+               return;
+
+       self.move_time = time + 0.05;
+
+       if(time > self.giblifetime)
+       {
+               remove(self);
+               return;
+       }
+
+       self.alpha -= 0.05;
+
+       if(self.alpha < 0.1)
+       {
+               remove(self);
+               return;
+       }
+
+       if(random()<0.6)
+               pointparticles(particleeffectnum("onslaught_generator_gib_flame"), self.origin, '0 0 0', 1);
+}
+
+void ons_throwgib(vector v_from, vector v_to, string smodel, float f_lifetime, float b_burn)
+{
+       entity gib;
+
+       gib = spawn();
+
+       setmodel(gib, smodel);
+       setorigin(gib, v_from);
+       gib.solid = SOLID_CORPSE;
+       gib.move_movetype = MOVETYPE_BOUNCE;
+       gib.movetype = MOVETYPE_BOUNCE;
+       gib.health = 255;
+       gib.move_velocity = v_to;
+       gib.move_origin = v_from;
+       gib.velocity = v_to;
+       gib.alpha = 1;
+       gib.move_time = time;
+       gib.drawmask = MASK_NORMAL;
+       gib.giblifetime = time + f_lifetime;
+
+       if(b_burn)
+               gib.draw = gib_draw;
+       else
+               gib.draw = gib_draw_noburn;
+}
+
+void onslaught_generator_ray_think()
+{
+       self.nextthink = time + 0.05;
+       if(self.count > 10)
+       {
+               self.think = SUB_Remove;
+               return;
+       }
+
+       if(self.count > 5)
+               self.alpha -= 0.1;
+       else
+               self.alpha += 0.1;
+
+       self.scale += 0.2;
+       self.count +=1;
+}
+
+void onslaught_generator_ray_spawn(vector org)
+{
+       entity e;
+       e = spawn();
+       setmodel(e, "models/onslaught/ons_ray.md3");
+       setorigin(e, org);
+       e.angles = randomvec() * 360;
+       e.alpha = 0;
+       e.scale = random() * 5 + 8;
+       e.think = onslaught_generator_ray_think;
+       e.nextthink = time + 0.05;
+}
+
+void generator_draw()
+{
+       if(self.health > 0)
+               return;
+
+       if(time < self.move_time)
+               return;
+       if(self.count <= 0)
+               return;
+
+       vector org;
+       float i;
+
+       // White shockwave
+       if(self.count==40||self.count==20)
+       {
+               sound(self, CH_TRIGGER, "onslaught/shockwave.wav", VOL_BASE, ATTEN_NORM);
+               pointparticles(particleeffectnum("electro_combo"), self.origin, '0 0 0', 6);
+       }
+
+       // Throw some gibs
+       if(random() < 0.3)
+       {
+               i = random();
+               if(i < 0.3)
+                       ons_throwgib(self.origin + '0 0 40', (100 * randomvec() - '1 1 1') * 11 + '0 0 20', "models/onslaught/gen_gib1.md3", 6, TRUE);
+               else if(i > 0.7)
+                       ons_throwgib(self.origin + '0 0 40', (100 * randomvec() - '1 1 1') * 12 + '0 0 20', "models/onslaught/gen_gib2.md3", 6, TRUE);
+               else
+                       ons_throwgib(self.origin + '0 0 40', (100 * randomvec() - '1 1 1') * 13 + '0 0 20', "models/onslaught/gen_gib3.md3", 6, TRUE);
+       }
+
+       // Spawn fire balls
+       for(i=0;i < 10;++i)
+       {
+               org = self.origin + randompos('-30 -30 -30' * i + '0 0 -20', '30 30 30' * i + '0 0 20');
+               pointparticles(particleeffectnum("onslaught_generator_gib_explode"), org, '0 0 0', 1);
+       }
+
+       // Short explosion sound + small explosion
+       if(random() < 0.25)
+       {
+               te_explosion(self.origin);
+               sound(self, CH_TRIGGER, "weapons/grenade_impact.wav", VOL_BASE, ATTEN_NORM);
+       }
+
+       // Particles
+       org = self.origin + randompos(self.mins + '8 8 8', self.maxs + '-8 -8 -8');
+       pointparticles(particleeffectnum("onslaught_generator_smallexplosion"), org, '0 0 0', 1);
+
+       // rays
+       if(random() > 0.25 )
+       {
+               onslaught_generator_ray_spawn(self.origin);
+       }
+
+       // Final explosion
+       if(self.count==1)
+       {
+               org = self.origin;
+               te_explosion(org);
+               pointparticles(particleeffectnum("onslaught_generator_finalexplosion"), org, '0 0 0', 1);
+               sound(self, CH_TRIGGER, "weapons/rocket_impact.wav", VOL_BASE, ATTEN_NORM);
+       }
+
+       self.move_time = time + 0.05;
+
+       self.count -= 1;
+}
+
+.float max_health;
+void generator_damage(float hp)
+{
+       if(hp <= 0)
+               setmodel(self, "models/onslaught/generator_dead.md3");
+       else if(hp < self.max_health * 0.10)
+               setmodel(self, "models/onslaught/generator_dmg9.md3");
+       else if(hp < self.max_health * 0.20)
+               setmodel(self, "models/onslaught/generator_dmg8.md3");
+       else if(hp < self.max_health * 0.30)
+               setmodel(self, "models/onslaught/generator_dmg7.md3");
+       else if(hp < self.max_health * 0.40)
+               setmodel(self, "models/onslaught/generator_dmg6.md3");
+       else if(hp < self.max_health * 0.50)
+               setmodel(self, "models/onslaught/generator_dmg5.md3");
+       else if(hp < self.max_health * 0.60)
+               setmodel(self, "models/onslaught/generator_dmg4.md3");
+       else if(hp < self.max_health * 0.70)
+               setmodel(self, "models/onslaught/generator_dmg3.md3");
+       else if(hp < self.max_health * 0.80)
+               setmodel(self, "models/onslaught/generator_dmg2.md3");
+       else if(hp < self.max_health * 0.90)
+               setmodel(self, "models/onslaught/generator_dmg1.md3");
+       else if(hp <= self.max_health || hp >= self.max_health)
+               setmodel(self, "models/onslaught/generator.md3");
+
+       setsize(self, GENERATOR_MIN, GENERATOR_MAX);
+}
+
+void generator_construct()
+{
+       self.netname = "Generator";
+
+       setorigin(self, self.origin);
+       setmodel(self, "models/onslaught/generator.md3");
+       setsize(self, GENERATOR_MIN, GENERATOR_MAX);
+
+       self.move_movetype      = MOVETYPE_NOCLIP;
+       self.solid                      = SOLID_BBOX;
+       self.movetype           = MOVETYPE_NOCLIP;
+       self.move_origin        = self.origin;
+       self.move_time          = time;
+       self.drawmask           = MASK_NORMAL;
+       self.alpha                      = 1;
+       self.draw                       = generator_draw;
+}
+
+.vector glowmod;
+void generator_changeteam()
+{
+       if(self.team)
+       {
+               self.glowmod = Team_ColorRGB(self.team - 1);
+               self.teamradar_color = Team_ColorRGB(self.team - 1);
+               self.colormap = 1024 + (self.team - 1) * 17;
+       }
+       else
+       {
+               self.colormap = 1024;
+               self.glowmod = '1 1 0';
+               self.teamradar_color = '1 1 0';
+       }
+}
+
+void ent_generator()
+{
+       float sf;
+       sf = ReadByte();
+
+       if(sf & GSF_SETUP)
+       {
+               self.origin_x = ReadCoord();
+               self.origin_y = ReadCoord();
+               self.origin_z = ReadCoord();
+               setorigin(self, self.origin);
+
+               self.health = ReadByte();
+               self.max_health = ReadByte();
+               self.count = ReadByte();
+               self.team = ReadByte();
+
+               if(!self.count)
+                       self.count = 40;
+
+               generator_changeteam();
+               generator_precache();
+               generator_construct();
+       }
+
+       if(sf & GSF_STATUS)
+       {
+               float _tmp;
+               _tmp = ReadByte();
+               if(_tmp != self.team)
+               {
+                       self.team = _tmp;
+                       generator_changeteam();
+               }
+
+               _tmp = ReadByte();
+
+               if(_tmp != self.health)
+                       generator_damage(_tmp);
+
+               self.health = _tmp;
+       }
+}
diff --git a/qcsrc/client/generator.qh b/qcsrc/client/generator.qh
new file mode 100644 (file)
index 0000000..6ba1ce8
--- /dev/null
@@ -0,0 +1,8 @@
+const vector GENERATOR_MIN = '-52 -52 -14';
+const vector GENERATOR_MAX = '52 52 75';
+
+float GSF_STATUS = 4;
+float GSF_SETUP = 8;
+
+void ent_generator();
+void generator_precache();
\ No newline at end of file
index 1a518c5a697f9079977a896ae21cf841cdedeb17..82af9b202a7cce089e38a95231d5cfeade8d269d 100644 (file)
@@ -50,6 +50,8 @@ noise.qh
 tturrets.qh
 ../server/tturrets/include/turrets_early.qh
 ../server/movelib.qc
+generator.qh
+controlpoint.qh
 main.qh
 vehicles/vehicles.qh
 ../common/csqcmodel_settings.qh
@@ -121,6 +123,10 @@ command/cl_cmd.qc
 ../warpzonelib/mathlib.qc
 ../warpzonelib/common.qc
 ../warpzonelib/client.qc
+
+generator.qc
+controlpoint.qc
+
 tturrets.qc
 
 player_skeleton.qc
index e02fad45f06090b6b3d8e24bfed12f7ade651548..c7c43bff23b9f37496d8036bd35c4b6f24323622 100644 (file)
@@ -100,6 +100,8 @@ const float ENT_CLIENT_NOTIFICATION = 38;
 const float ENT_CLIENT_TURRET = 40;
 const float ENT_CLIENT_AUXILIARYXHAIR = 50;
 const float ENT_CLIENT_VEHICLE = 60;
+const float ENT_CLIENT_GENERATOR = 70;
+const float ENT_CLIENT_CONTROLPOINT_ICON = 71;
 
 const float SPRITERULE_DEFAULT = 0;
 const float SPRITERULE_TEAMPLAY = 1;
index 003c0fcc1d64fc4fa0e112576e4342f5933b5d36..4051ccedefda68b169d8348bf3beadb2b111c075 100644 (file)
@@ -457,6 +457,10 @@ void Send_Notification_WOCOVA(
        MSG_INFO_NOTIF(1, INFO_LMS_FORFEIT,                    1, 0, "s1", "",                          "",                     _("^BG%s^F3 forfeited"), "") \
        MSG_INFO_NOTIF(1, INFO_LMS_NOLIVES,                    1, 0, "s1", "",                          "",                     _("^BG%s^F3 has no more lives left"), "") \
        MSG_INFO_NOTIF(1, INFO_MONSTERS_DISABLED,              0, 0, "", "",                            "",                     _("^BGMonsters are currently disabled"), "") \
+       MSG_INFO_NOTIF(1, INFO_ONSLAUGHT_CAPTURE,              2, 0, "s1 s2", "",                       "",                     _("^BG%s^BG captured %s^BG control point"), "") \
+       MULTITEAM_INFO(1, INFO_ONSLAUGHT_CPDESTROYED_, 4,      2, 0, "s1 s2", "",                       "",                     _("^TC^TT^BG team %s^BG control point has been destroyed by %s"), "") \
+       MULTITEAM_INFO(1, INFO_ONSLAUGHT_GENDESTROYED_, 4,     0, 0, "", "",                            "",                     _("^TC^TT^BG generator has been destroyed"), "") \
+       MULTITEAM_INFO(1, INFO_ONSLAUGHT_GENDESTROYED_OVERTIME_, 4,  0, 0, "", "",                      "",                     _("^TC^TT^BG generator spontaneously combusted due to overtime!"), "") \
        MSG_INFO_NOTIF(1, INFO_POWERUP_INVISIBILITY,           1, 0, "s1", "s1",                        "strength",             _("^BG%s^K1 picked up Invisibility"), "") \
        MSG_INFO_NOTIF(1, INFO_POWERUP_SHIELD,                 1, 0, "s1", "s1",                        "shield",               _("^BG%s^K1 picked up Shield"), "") \
        MSG_INFO_NOTIF(1, INFO_POWERUP_SPEED,                  1, 0, "s1", "s1",                        "shield",               _("^BG%s^K1 picked up Speed"), "") \
@@ -622,6 +626,7 @@ void Send_Notification_WOCOVA(
        MSG_CENTER_NOTIF(1, CENTER_FREEZETAG_REVIVE_FALL,       0, 0, "",             NO_CPID,             "0 0", _("^K3You revived yourself"), "") \
        MSG_CENTER_NOTIF(1, CENTER_FREEZETAG_REVIVED,           1, 0, "s1",           NO_CPID,             "0 0", _("^K3You were revived by ^BG%s"), "") \
        MSG_CENTER_NOTIF(1, CENTER_FREEZETAG_AUTO_REVIVED,      0, 1, "f1",           NO_CPID,             "0 0", _("^K3You were automatically revived after %s second(s)"), "") \
+       MSG_CENTER_NOTIF(1, CENTER_GENERATOR_UNDERATTACK,       0, 0, "",             NO_CPID,             "0 0", _("^BGThe generator is under attack!"), "") \
        MULTITEAM_CENTER(1, CENTER_ROUND_TEAM_WIN_, 4,          0, 0, "",             CPID_ROUND,          "0 0", _("^TC^TT^BG team wins the round"), "") \
        MSG_CENTER_NOTIF(1, CENTER_ROUND_PLAYER_WIN,            1, 0, "s1",           CPID_ROUND,          "0 0", _("^BG%s^BG wins the round"), "") \
        MSG_CENTER_NOTIF(1, CENTER_FREEZETAG_SELF,              0, 0, "",             NO_CPID,             "0 0", _("^K1You froze yourself"), "") \
@@ -655,7 +660,14 @@ void Send_Notification_WOCOVA(
        MSG_CENTER_NOTIF(1, CENTER_NIX_COUNTDOWN,               0, 2, "item_wepname",  CPID_NIX,              "1 f2", _("^F2^COUNT^BG until weapon change...\nNext weapon: ^F1%s"), "") \
        MSG_CENTER_NOTIF(1, CENTER_NIX_NEWWEAPON,               0, 1, "item_wepname",  CPID_NIX,              "0 0", _("^F2Active weapon: ^F1%s"), "") \
        MSG_CENTER_NOTIF(1, CENTER_NADE,                                0, 0, "",              NO_CPID,                   "0 0", _("^BGPress ^F2DROPWEAPON^BG again to toss the grenade!"), "") \
+       MSG_CENTER_NOTIF(1, CENTER_ONS_CAPTURE,                 1, 0, "s1",            CPID_ONSLAUGHT,        "0 0", _("^BGYou captured %s^BG control point"), "") \
+       MULTITEAM_CENTER(1, CENTER_ONS_CAPTURE_, 4,             1, 0, "s1",            CPID_ONSLAUGHT,        "0 0", _("^TC^TT^BG team captured %s^BG control point"), "") \
+       MSG_CENTER_NOTIF(1, CENTER_ONS_CONTROLPOINT_SHIELDED,   0, 0, "",              CPID_ONS_CAPSHIELD,    "0 0", _("^BGThis control point currently cannot be captured"), "") \
+       MSG_CENTER_NOTIF(1, CENTER_ONS_GENERATOR_SHIELDED,      0, 0, "",              CPID_ONS_CAPSHIELD,    "0 0", _("^BGThe enemy generator cannot be destroyed yet\n^F2Capture some control points to unshield it"), "") \
+       MULTITEAM_CENTER(1, CENTER_ONS_NOTSHIELDED_, 4,         0, 0, "",              CPID_ONSLAUGHT,        "0 0", _("^BGThe ^TCenemy^BG generator is no longer shielded!"), "") \
+       MSG_CENTER_NOTIF(1, CENTER_ONS_NOTSHIELDED_TEAM,        0, 0, "",              CPID_ONSLAUGHT,        "0 0", _("^K1Your generator is NOT shielded!\n^BGRe-capture control points to shield it!"), "") \
        MSG_CENTER_NOTIF(1, CENTER_OVERTIME_FRAG,               0, 0, "",              CPID_OVERTIME,         "0 0", _("^F2Now playing ^F4OVERTIME^F2!\nKeep fragging until we have a winner!"), _("^F2Now playing ^F4OVERTIME^F2!\nKeep scoring until we have a winner!")) \
+       MSG_CENTER_NOTIF(1, CENTER_OVERTIME_CONTROLPOINT,       0, 0, "",              CPID_OVERTIME,         "3 0", _("^F2Now playing ^F4OVERTIME^F2!\n\nGenerators start now to decay.\nThe more control points your team holds,\nthe faster the enemy generator decays"), "") \
        MSG_CENTER_NOTIF(1, CENTER_OVERTIME_TIME,               0, 1, "f1time",        CPID_OVERTIME,         "0 0", _("^F2Now playing ^F4OVERTIME^F2!\n^BGAdded ^F4%s^BG to the game!"), "") \
        MSG_CENTER_NOTIF(1, CENTER_POWERDOWN_INVISIBILITY,      0, 0, "",              CPID_POWERUP,          "0 0", _("^F2Invisibility has worn off"), "") \
        MSG_CENTER_NOTIF(1, CENTER_POWERDOWN_SHIELD,            0, 0, "",              CPID_POWERUP,          "0 0", _("^F2Shield has worn off"), "") \
index 674c95b14ea735e2b67e0cb063f21702e2a1c754..d6f571b38b78008ad4ae5d476abe66e080139bb2 100644 (file)
@@ -917,11 +917,6 @@ float autocvar_g_nix_with_powerups;
 float autocvar_g_nodepthtestitems;
 float autocvar_g_nodepthtestplayers;
 float autocvar_g_norecoil;
-float autocvar_g_onslaught_cp_buildhealth;
-float autocvar_g_onslaught_cp_buildtime;
-float autocvar_g_onslaught_cp_health;
-float autocvar_g_onslaught_cp_regen;
-float autocvar_g_onslaught_gen_health;
 float autocvar_g_pickup_cells_max;
 float autocvar_g_pickup_fuel_max;
 float autocvar_g_pickup_items;
@@ -1278,3 +1273,19 @@ float autocvar_g_spawn_near_teammate_ignore_spawnpoint_delay;
 float autocvar_g_spawn_near_teammate_ignore_spawnpoint_delay_death;
 float autocvar_g_spawn_near_teammate_ignore_spawnpoint_check_health;
 float autocvar_g_spawn_near_teammate_ignore_spawnpoint_closetodeath;
+float autocvar_g_onslaught_spawn_at_controlpoints;
+var float autocvar_g_onslaught_spawn_at_controlpoints_chance = 0.5;
+float autocvar_g_onslaught_spawn_at_controlpoints_random;
+float autocvar_g_onslaught_spawn_at_generator;
+float autocvar_g_onslaught_spawn_at_generator_chance;
+float autocvar_g_onslaught_spawn_at_generator_random;
+float autocvar_g_onslaught_cp_proxydecap;
+var float autocvar_g_onslaught_cp_proxydecap_distance = 512;
+var float autocvar_g_onslaught_cp_proxydecap_dps = 100;
+float autocvar_g_onslaught_cp_buildhealth;
+float autocvar_g_onslaught_cp_buildtime;
+float autocvar_g_onslaught_cp_health;
+float autocvar_g_onslaught_cp_regen;
+float autocvar_g_onslaught_gen_health;
+var float autocvar_g_onslaught_shield_force = 100;
+float autocvar_g_onslaught_allow_vehicle_touch;
index a0e6bfffd42926004503c8e9f63b8e9eaaa07836..cf97821bba5ff6f99921d8e0b2441f0bf1b9c3b4 100644 (file)
@@ -1,5 +1,4 @@
 #include "havocbot.qh"
-#include "role_onslaught.qc"
 #include "role_keyhunt.qc"
 #include "roles.qc"
 
index 3e0e60fcc09995c25dd8525b050bc8f6f3f93561..3d3ee3f7d6bd757d9a5499dcc605ea51fcb4a315 100644 (file)
@@ -275,8 +275,6 @@ void havocbot_chooserole()
                havocbot_chooserole_kh();
        else if (g_race || g_cts)
                havocbot_chooserole_race();
-       else if (g_onslaught)
-               havocbot_chooserole_ons();
        else // assume anything else is deathmatch
                havocbot_chooserole_dm();
 }
diff --git a/qcsrc/server/controlpoint.qc b/qcsrc/server/controlpoint.qc
new file mode 100644 (file)
index 0000000..d088e2e
--- /dev/null
@@ -0,0 +1,36 @@
+float cpicon_send(entity to, float sf)
+{
+       WriteByte(MSG_ENTITY, ENT_CLIENT_CONTROLPOINT_ICON);
+       WriteByte(MSG_ENTITY, sf);
+       if(sf & CPSF_SETUP)
+       {
+               WriteCoord(MSG_ENTITY, self.origin_x);
+               WriteCoord(MSG_ENTITY, self.origin_y);
+               WriteCoord(MSG_ENTITY, self.origin_z);
+
+               WriteByte(MSG_ENTITY, self.health);
+               WriteByte(MSG_ENTITY, self.max_health);
+               WriteByte(MSG_ENTITY, self.count);
+               WriteByte(MSG_ENTITY, self.team);
+               WriteByte(MSG_ENTITY, self.owner.iscaptured);
+       }
+
+       if(sf & CPSF_STATUS)
+       {
+               WriteByte(MSG_ENTITY, self.team);
+
+               if(self.health <= 0)
+                       WriteByte(MSG_ENTITY, 0);
+               else
+                       WriteByte(MSG_ENTITY, ceil((self.health / self.max_health) * 255));
+       }
+
+       return TRUE;
+}
+
+void onslaught_controlpoint_icon_link(entity e, void() spawnproc)
+{
+       Net_LinkEntity(e, TRUE, 0, cpicon_send);
+       e.think         = spawnproc;
+       e.nextthink     = time * sys_frametime;
+}
diff --git a/qcsrc/server/controlpoint.qh b/qcsrc/server/controlpoint.qh
new file mode 100644 (file)
index 0000000..e489f90
--- /dev/null
@@ -0,0 +1,5 @@
+const vector CPICON_MIN = '-32 -32 -9';
+const vector CPICON_MAX = '32 32 25';
+
+float CPSF_STATUS = 4;
+float CPSF_SETUP = 8;
index 45319ca0748e6f19a6ae95722967249421ea724f..9e61ac6fa80c6e8d9916e1221e91471b13c63971 100644 (file)
@@ -732,7 +732,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
                        else
                                victim = targ;
 
-                       if(IS_PLAYER(victim) || victim.turrcaps_flags & TFL_TURRCAPS_ISTURRET || victim.flags & FL_MONSTER)
+                       if(IS_PLAYER(victim) || victim.turrcaps_flags & TFL_TURRCAPS_ISTURRET || victim.flags & FL_MONSTER || victim.classname == "func_assault_destructible" || (victim.classname == "onslaught_generator" && !victim.isshielded) || (victim.classname == "onslaught_controlpoint_icon" && !victim.owner.isshielded))
                        {
                                if(DIFF_TEAM(victim, attacker))
                                {
diff --git a/qcsrc/server/generator.qc b/qcsrc/server/generator.qc
new file mode 100644 (file)
index 0000000..13aa35a
--- /dev/null
@@ -0,0 +1,35 @@
+float generator_send(entity to, float sf)
+{
+       WriteByte(MSG_ENTITY, ENT_CLIENT_GENERATOR);
+       WriteByte(MSG_ENTITY, sf);
+       if(sf & GSF_SETUP)
+       {
+               WriteCoord(MSG_ENTITY, self.origin_x);
+               WriteCoord(MSG_ENTITY, self.origin_y);
+               WriteCoord(MSG_ENTITY, self.origin_z);
+
+               WriteByte(MSG_ENTITY, self.health);
+               WriteByte(MSG_ENTITY, self.max_health);
+               WriteByte(MSG_ENTITY, self.count);
+               WriteByte(MSG_ENTITY, self.team);
+       }
+
+       if(sf & GSF_STATUS)
+       {
+               WriteByte(MSG_ENTITY, self.team);
+
+               if(self.health <= 0)
+                       WriteByte(MSG_ENTITY, 0);
+               else
+                       WriteByte(MSG_ENTITY, ceil((self.health / self.max_health) * 255));
+       }
+
+       return TRUE;
+}
+
+void generator_link(void() spawnproc)
+{
+       Net_LinkEntity(self, TRUE, 0, generator_send);
+       self.think              = spawnproc;
+       self.nextthink  = time;
+}
diff --git a/qcsrc/server/generator.qh b/qcsrc/server/generator.qh
new file mode 100644 (file)
index 0000000..a991874
--- /dev/null
@@ -0,0 +1,5 @@
+const vector GENERATOR_MIN = '-52 -52 -14';
+const vector GENERATOR_MAX = '52 52 75';
+
+float GSF_STATUS = 4;
+float GSF_SETUP = 8;
index dc2398609f1d08e821514e7bd6b51ceaf813a871..e275850cf52119c3cc168bfc094c629897a50f73 100644 (file)
@@ -1,29 +1,61 @@
-float autocvar_g_onslaught_spawn_at_controlpoints;
-float autocvar_g_onslaught_spawn_at_generator;
-float autocvar_g_onslaught_cp_proxydecap;
-var float autocvar_g_onslaught_cp_proxydecap_distance = 512;
-var float autocvar_g_onslaught_cp_proxydecap_dps = 100;
-
-void onslaught_generator_updatesprite(entity e);
-void onslaught_controlpoint_updatesprite(entity e);
-void onslaught_link_checkupdate();
-
-.entity sprite;
-.string target2;
-.float iscaptured;
-.float islinked;
-.float isgenneighbor_red;
-.float isgenneighbor_blue;
-.float iscpneighbor_red;
-.float iscpneighbor_blue;
-.float isshielded;
-.float lasthealth;
-.float lastteam;
-.float lastshielded;
-.float lastcaptured;
-
-entity ons_red_generator;
-entity ons_blue_generator;
+// =======================
+// CaptureShield Functions
+// =======================
+
+float ons_CaptureShield_Customize()
+{
+       if(!self.enemy.isshielded && (onslaught_controlpoint_attackable(self.enemy, other.team) > 0 || self.enemy.classname != "onslaught_controlpoint")) { return FALSE; }
+       if(SAME_TEAM(self, other)) { return FALSE; }
+
+       return TRUE;
+}
+
+void ons_CaptureShield_Touch()
+{
+       if(!self.enemy.isshielded && (onslaught_controlpoint_attackable(self.enemy, other.team) > 0 || self.enemy.classname != "onslaught_controlpoint")) { return; }
+       if(!IS_PLAYER(other)) { return; }
+       if(SAME_TEAM(other, self)) { return; }
+
+       vector mymid = (self.absmin + self.absmax) * 0.5;
+       vector othermid = (other.absmin + other.absmax) * 0.5;
+
+       Damage(other, self, self, 0, DEATH_HURTTRIGGER, mymid, normalize(othermid - mymid) * ons_captureshield_force);
+
+       play2(other, "onslaught/damageblockedbyshield.wav");
+       
+       if(self.enemy.classname == "onslaught_generator")
+               Send_Notification(NOTIF_ONE, other, MSG_CENTER, CENTER_ONS_GENERATOR_SHIELDED);
+       else
+               Send_Notification(NOTIF_ONE, other, MSG_CENTER, CENTER_ONS_CONTROLPOINT_SHIELDED);
+}
+
+void ons_CaptureShield_Reset()
+{
+       self.colormap = self.enemy.colormap;
+       self.team = self.enemy.team;
+}
+
+void ons_CaptureShield_Spawn(entity generator, string themodel)
+{
+       entity shield = spawn();
+
+       shield.enemy = generator;
+       shield.team = generator.team;
+       shield.colormap = generator.colormap;
+       shield.reset = ons_CaptureShield_Reset;
+       shield.touch = ons_CaptureShield_Touch;
+       shield.customizeentityforclient = ons_CaptureShield_Customize;
+       shield.classname = "ons_captureshield";
+       shield.effects = EF_ADDITIVE;
+       shield.movetype = MOVETYPE_NOCLIP;
+       shield.solid = SOLID_TRIGGER;
+       shield.avelocity = '7 0 11';
+       shield.scale = 1;
+
+       setorigin(shield, generator.origin);
+       setmodel(shield, themodel);
+       setsize(shield, shield.scale * shield.mins, shield.scale * shield.maxs);
+}
 
 void ons_gib_damage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector vforce)
 {
@@ -60,7 +92,7 @@ void ons_throwgib(vector v_from, vector v_to, string smodel, float f_lifetime, f
 
        setmodel(gib, smodel);
        setorigin(gib, v_from);
-       gib.solid = SOLID_BBOX;
+       gib.solid = SOLID_CORPSE;
        gib.movetype = MOVETYPE_BOUNCE;
        gib.takedamage = DAMAGE_YES;
        gib.event_damage = ons_gib_damage;
@@ -79,10 +111,26 @@ void ons_throwgib(vector v_from, vector v_to, string smodel, float f_lifetime, f
                SUB_SetFade(gib, gib.giblifetime, 2);
 }
 
+void FixSize(entity e)
+{
+       e.mins_x = rint(e.mins_x);
+       e.mins_y = rint(e.mins_y);
+       e.mins_z = rint(e.mins_z);
+       
+       e.maxs_x = rint(e.maxs_x);
+       e.maxs_y = rint(e.maxs_y);
+       e.maxs_z = rint(e.maxs_z);
+}
+
+void setmodel_fixsize(entity e, string m)
+{
+       setmodel(e, m);
+       FixSize(e);
+}
+
 void onslaught_updatelinks()
 {
        entity l, links;
-       float stop, t1, t2, t3, t4;
        // first check if the game has ended
        dprint("--- updatelinks ---\n");
        links = findchain(classname, "onslaught_link");
@@ -104,10 +152,8 @@ void onslaught_updatelinks()
        {
                l.islinked = FALSE;
                l.isshielded = TRUE;
-               l.isgenneighbor_red = FALSE;
-               l.isgenneighbor_blue = FALSE;
-               l.iscpneighbor_red = FALSE;
-               l.iscpneighbor_blue = FALSE;
+               float i;
+               for(i = 0; i < 17; ++i) { l.isgenneighbor[i] = FALSE; l.iscpneighbor[i] = FALSE; }
                dprint(etos(l), " (point) belongs to team ", ftos(l.team), "\n");
                l = l.chain;
        }
@@ -118,7 +164,7 @@ void onslaught_updatelinks()
                dprint(etos(l), " (link) connects ", etos(l.goalentity), " with ", etos(l.enemy), "\n");
                l = l.chain;
        }
-       stop = FALSE;
+       float stop = FALSE;
        while (!stop)
        {
                stop = TRUE;
@@ -154,47 +200,27 @@ void onslaught_updatelinks()
        {
                if (l.goalentity.islinked)
                {
-                       if (l.goalentity.team != l.enemy.team)
+                       if(DIFF_TEAM(l.goalentity, l.enemy))
                        {
                                dprint(etos(l), " (link) is unshielding ", etos(l.enemy), " (point) because its team does not match ", etos(l.goalentity), " (point)\n");
                                l.enemy.isshielded = FALSE;
                        }
                        if(l.goalentity.classname == "onslaught_generator")
-                       {
-                               if(l.goalentity.team == NUM_TEAM_1)
-                                       l.enemy.isgenneighbor_red = TRUE;
-                               else if(l.goalentity.team == NUM_TEAM_2)
-                                       l.enemy.isgenneighbor_blue = TRUE;
-                       }
+                               l.enemy.isgenneighbor[l.goalentity.team] = TRUE;
                        else
-                       {
-                               if(l.goalentity.team == NUM_TEAM_1)
-                                       l.enemy.iscpneighbor_red = TRUE;
-                               else if(l.goalentity.team == NUM_TEAM_2)
-                                       l.enemy.iscpneighbor_blue = TRUE;
-                       }
+                               l.enemy.iscpneighbor[l.goalentity.team] = TRUE;
                }
                if (l.enemy.islinked)
                {
-                       if (l.goalentity.team != l.enemy.team)
+                       if(DIFF_TEAM(l.goalentity, l.enemy))
                        {
                                dprint(etos(l), " (link) is unshielding ", etos(l.goalentity), " (point) because its team does not match ", etos(l.enemy), " (point)\n");
                                l.goalentity.isshielded = FALSE;
                        }
                        if(l.enemy.classname == "onslaught_generator")
-                       {
-                               if(l.enemy.team == NUM_TEAM_1)
-                                       l.goalentity.isgenneighbor_red = TRUE;
-                               else if(l.enemy.team == NUM_TEAM_2)
-                                       l.goalentity.isgenneighbor_blue = TRUE;
-                       }
+                               l.goalentity.isgenneighbor[l.enemy.team] = TRUE;
                        else
-                       {
-                               if(l.enemy.team == NUM_TEAM_1)
-                                       l.goalentity.iscpneighbor_red = TRUE;
-                               else if(l.enemy.team == NUM_TEAM_2)
-                                       l.goalentity.iscpneighbor_blue = TRUE;
-                       }
+                               l.goalentity.iscpneighbor[l.enemy.team] = TRUE;
                }
                l = l.chain;
        }
@@ -205,14 +231,12 @@ void onslaught_updatelinks()
                if (l.isshielded)
                {
                        dprint(etos(l), " (generator) is shielded\n");
-                       l.enemy.alpha = 1;
                        l.takedamage = DAMAGE_NO;
                        l.bot_attack = FALSE;
                }
                else
                {
                        dprint(etos(l), " (generator) is not shielded\n");
-                       l.enemy.alpha = -1;
                        l.takedamage = DAMAGE_AIM;
                        l.bot_attack = TRUE;
                }
@@ -225,7 +249,6 @@ void onslaught_updatelinks()
                if (l.isshielded)
                {
                        dprint(etos(l), " (point) is shielded\n");
-                       l.enemy.alpha = 1;
                        if (l.goalentity)
                        {
                                l.goalentity.takedamage = DAMAGE_NO;
@@ -235,7 +258,6 @@ void onslaught_updatelinks()
                else
                {
                        dprint(etos(l), " (point) is not shielded\n");
-                       l.enemy.alpha = -1;
                        if (l.goalentity)
                        {
                                l.goalentity.takedamage = DAMAGE_AIM;
@@ -246,20 +268,30 @@ void onslaught_updatelinks()
                l = l.chain;
        }
        // count generators owned by each team
-       t1 = t2 = t3 = t4 = 0;
+       float t1 = 0, t2 = 0, t3 = 0, t4 = 0;
        l = findchain(classname, "onslaught_generator");
        while (l)
        {
                if (l.iscaptured)
                {
-                       if (l.team == NUM_TEAM_1) t1 = 1;
-                       if (l.team == NUM_TEAM_2) t2 = 1;
-                       if (l.team == NUM_TEAM_3) t3 = 1;
-                       if (l.team == NUM_TEAM_4) t4 = 1;
+                       switch(l.team)
+                       {
+                               case NUM_TEAM_1: t1 = 1; break;
+                               case NUM_TEAM_2: t2 = 1; break;
+                               case NUM_TEAM_3: t3 = 1; break;
+                               case NUM_TEAM_4: t4 = 1; break;
+                       }
                }
                onslaught_generator_updatesprite(l);
                l = l.chain;
        }
+       l = findchain(classname, "ons_captureshield");
+       while(l)
+       {
+               l.team = l.enemy.team;
+               l.colormap = l.enemy.colormap;
+               l = l.chain;
+       }
        // see if multiple teams remain (if not, it's game over)
        if (t1 + t2 + t3 + t4 < 2)
                dprint("--- game over ---\n");
@@ -269,67 +301,10 @@ void onslaught_updatelinks()
 
 float onslaught_controlpoint_can_be_linked(entity cp, float t)
 {
-       if(t == NUM_TEAM_1)
-       {
-               if(cp.isgenneighbor_red)
-                       return 2;
-               if(cp.iscpneighbor_red)
-                       return 1;
-       }
-       else if(t == NUM_TEAM_2)
-       {
-               if(cp.isgenneighbor_blue)
-                       return 2;
-               if(cp.iscpneighbor_blue)
-                       return 1;
-       }
-       return 0;
-       /*
-          entity e;
-       // check to see if this player has a legitimate claim to capture this
-       // control point - more specifically that there is a captured path of
-       // points leading back to the team generator
-       e = findchain(classname, "onslaught_link");
-       while (e)
-       {
-       if (e.goalentity == cp)
-       {
-       dprint(etos(e), " (link) connects to ", etos(e.enemy), " (point)");
-       if (e.enemy.islinked)
-       {
-       dprint(" which is linked");
-       if (e.enemy.team == t)
-       {
-       dprint(" and has the correct team!\n");
-       return 1;
-       }
-       else
-       dprint(" but has the wrong team\n");
-       }
-       else
-       dprint("\n");
-       }
-       else if (e.enemy == cp)
-       {
-       dprint(etos(e), " (link) connects to ", etos(e.goalentity), " (point)");
-       if (e.goalentity.islinked)
-       {
-       dprint(" which is linked");
-       if (e.goalentity.team == t)
-       {
-       dprint(" and has a team!\n");
-       return 1;
-       }
-       else
-       dprint(" but has the wrong team\n");
-       }
-       else
-       dprint("\n");
-       }
-       e = e.chain;
-       }
+       if(cp.isgenneighbor[t]) { return 2; }
+       if(cp.iscpneighbor[t]) { return 1; }
+
        return 0;
-        */
 }
 
 float onslaught_controlpoint_attackable(entity cp, float t)
@@ -352,7 +327,7 @@ float onslaught_controlpoint_attackable(entity cp, float t)
                // if there's already an icon built, nothing happens
                if(cp.team == t)
                {
-                       a = onslaught_controlpoint_can_be_linked(cp, NUM_TEAM_1 + NUM_TEAM_2 - t);
+                       a = onslaught_controlpoint_can_be_linked(cp, t);
                        if(a) // attackable by enemy?
                                return -2; // EMERGENCY!
                        return -1;
@@ -369,7 +344,7 @@ float onslaught_controlpoint_attackable(entity cp, float t)
                // free point
                if(onslaught_controlpoint_can_be_linked(cp, t))
                {
-                       a = onslaught_controlpoint_can_be_linked(cp, NUM_TEAM_1 + NUM_TEAM_2 - t);
+                       a = onslaught_controlpoint_can_be_linked(cp, t); // why was this here NUM_TEAM_1 + NUM_TEAM_2 - t
                        if(a == 2)
                                return 4; // GET THIS ONE NOW!
                        else
@@ -391,8 +366,7 @@ void onslaught_generator_think()
                {
                        if (!overtime_msg_time)
                        {
-                               FOR_EACH_PLAYER(e)
-                                       centerprint(e, "^3Now playing ^1OVERTIME^3!\n^3Generators start now to decay.\n^3The more control points your team holds,\n^3the faster the enemy generator decays.");
+                               Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_OVERTIME_CONTROLPOINT);
                                overtime_msg_time = time;
                        }
                        // self.max_health / 300 gives 5 minutes of overtime.
@@ -423,11 +397,13 @@ void onslaught_generator_think()
             self.wait = time + 5;
             FOR_EACH_REALPLAYER(e)
             {
-                if(e.team == self.team)
-                {
-                    centerprint(e, "^1Your generator is NOT shielded!\n^7Re-capture controlpoints to shield it!");
-                    soundto(MSG_ONE, e, CHAN_AUTO, "kh/alarm.wav", VOL_BASE, ATTEN_NONE);    // FIXME: Uniqe sound?
+                               if(SAME_TEAM(e, self))
+                               {
+                                       Send_Notification(NOTIF_ONE, e, MSG_CENTER, CENTER_ONS_NOTSHIELDED_TEAM);
+                    soundto(MSG_ONE, e, CHAN_AUTO, "kh/alarm.wav", VOL_BASE, ATTEN_NONE);    // FIXME: unique sound?
                 }
+                               else
+                                       Send_Notification(NOTIF_ONE, e, MSG_CENTER, APP_TEAM_NUM_4(self.team, CENTER_ONS_NOTSHIELDED_));
             }
         }
        }
@@ -594,7 +570,8 @@ void onslaught_generator_damage(entity inflictor, entity attacker, float damage,
                if (time > self.pain_finished)
                {
                        self.pain_finished = time + 10;
-                       bprint(Team_ColoredFullName(self.team), " generator under attack!\n");
+                       entity head;
+                       FOR_EACH_REALPLAYER(head) if(SAME_TEAM(head, self)) { Send_Notification(NOTIF_ONE, head, MSG_CENTER, CENTER_GENERATOR_UNDERATTACK); }
                        play2team(self.team, "onslaught/generator_underattack.wav");
                }
        }
@@ -605,24 +582,16 @@ void onslaught_generator_damage(entity inflictor, entity attacker, float damage,
        // see if the generator is still functional, or dying
        if (self.health > 0)
        {
-#ifdef ONSLAUGHT_SPAM
-               float h, lh;
-               lh = ceil(self.lasthealth / 100) * 100;
-               h = ceil(self.health / 100) * 100;
-               if(lh != h)
-                       bprint(Team_ColoredFullName(self.team), " generator has less than ", ftos(h), " health remaining\n");
-#endif
                self.lasthealth = self.health;
        }
        else if (!warmup_stage)
        {
                if (attacker == self)
-                       bprint(Team_ColoredFullName(self.team), " generator spontaneously exploded due to overtime!\n");
+                       Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_NUM_4(self.team, INFO_ONSLAUGHT_GENDESTROYED_OVERTIME_));
                else
                {
-                       string t;
-                       t = Team_ColoredFullName(attacker.team);
-                       bprint(Team_ColoredFullName(self.team), " generator destroyed by ", t, "!\n");
+                       Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_NUM_4(self.team, INFO_ONSLAUGHT_GENDESTROYED_));
+                       PlayerScore_Add(attacker, SP_SCORE, 100);
                }
                self.iscaptured = FALSE;
                self.islinked = FALSE;
@@ -639,28 +608,6 @@ void onslaught_generator_damage(entity inflictor, entity attacker, float damage,
                onslaught_updatelinks();
        }
 
-       if(self.health <= 0)
-               setmodel(self, "models/onslaught/generator_dead.md3");
-       else if(self.health < self.max_health * 0.10)
-               setmodel(self, "models/onslaught/generator_dmg9.md3");
-       else if(self.health < self.max_health * 0.20)
-               setmodel(self, "models/onslaught/generator_dmg8.md3");
-       else if(self.health < self.max_health * 0.30)
-               setmodel(self, "models/onslaught/generator_dmg7.md3");
-       else if(self.health < self.max_health * 0.40)
-               setmodel(self, "models/onslaught/generator_dmg6.md3");
-       else if(self.health < self.max_health * 0.50)
-               setmodel(self, "models/onslaught/generator_dmg5.md3");
-       else if(self.health < self.max_health * 0.60)
-               setmodel(self, "models/onslaught/generator_dmg4.md3");
-       else if(self.health < self.max_health * 0.70)
-               setmodel(self, "models/onslaught/generator_dmg3.md3");
-       else if(self.health < self.max_health * 0.80)
-               setmodel(self, "models/onslaught/generator_dmg2.md3");
-       else if(self.health < self.max_health * 0.90)
-               setmodel(self, "models/onslaught/generator_dmg1.md3");
-       setsize(self, '-52 -52 -14', '52 52 75');
-
        // Throw some flaming gibs on damage, more damage = more chance for gib
        if(random() < damage/220)
        {
@@ -689,6 +636,8 @@ void onslaught_generator_damage(entity inflictor, entity attacker, float damage,
        if(random() < damage/200+0.2)
                if(random() < 0.5)
                        ons_throwgib(hitloc + '0 0 20', randomvec()*360, "models/onslaught/gen_gib1.md3", 5, FALSE);
+
+       self.SendFlags |= GSF_STATUS;
 }
 
 // update links after a delay
@@ -696,25 +645,23 @@ void onslaught_generator_delayed()
 {
        onslaught_updatelinks();
        // now begin normal thinking
-       self.think = onslaught_generator_think;
-       self.nextthink = time;
+       generator_link(onslaught_generator_think);
+
+       self.SendFlags = GSF_SETUP;
 }
 
 string onslaught_generator_waypointsprite_for_team(entity e, float t)
 {
-       if(t == e.team)
-       {
-               if(e.team == NUM_TEAM_1)
-                       return "ons-gen-red";
-               else if(e.team == NUM_TEAM_2)
-                       return "ons-gen-blue";
-       }
+       if(t != e.team)
        if(e.isshielded)
                return "ons-gen-shielded";
-       if(e.team == NUM_TEAM_1)
-               return "ons-gen-red";
-       else if(e.team == NUM_TEAM_2)
-               return "ons-gen-blue";
+       switch(e.team)
+       {
+               case NUM_TEAM_1: return "ons-gen-red";
+               case NUM_TEAM_2: return "ons-gen-blue";
+               case NUM_TEAM_3: return "ons-gen-yellow";
+               case NUM_TEAM_4: return "ons-gen-pink";
+       }
        return "";
 }
 
@@ -732,14 +679,14 @@ void onslaught_generator_updatesprite(entity e)
                e.lastshielded = e.isshielded;
                if(e.lastshielded)
                {
-                       if(e.team == NUM_TEAM_1 || e.team == NUM_TEAM_2)
+                       if(e.team == NUM_TEAM_1 || e.team == NUM_TEAM_2 || e.team == NUM_TEAM_3 || e.team == NUM_TEAM_4)
                                WaypointSprite_UpdateTeamRadar(e.sprite, RADARICON_GENERATOR, 0.5 * colormapPaletteColor(e.team - 1, FALSE));
                        else
                                WaypointSprite_UpdateTeamRadar(e.sprite, RADARICON_GENERATOR, '0.5 0.5 0.5');
                }
                else
                {
-                       if(e.team == NUM_TEAM_1 || e.team == NUM_TEAM_2)
+                       if(e.team == NUM_TEAM_1 || e.team == NUM_TEAM_2 || e.team == NUM_TEAM_3 || e.team == NUM_TEAM_4)
                                WaypointSprite_UpdateTeamRadar(e.sprite, RADARICON_GENERATOR, colormapPaletteColor(e.team - 1, FALSE));
                        else
                                WaypointSprite_UpdateTeamRadar(e.sprite, RADARICON_GENERATOR, '0.75 0.75 0.75');
@@ -756,38 +703,48 @@ string onslaught_controlpoint_waypointsprite_for_team(entity e, float t)
                a = onslaught_controlpoint_attackable(e, t);
                if(a == 3 || a == 4) // ATTACK/TOUCH THIS ONE NOW
                {
-                       if(e.team == NUM_TEAM_1)
-                               return "ons-cp-atck-red";
-                       else if(e.team == NUM_TEAM_2)
-                               return "ons-cp-atck-blue";
-                       else
-                               return "ons-cp-atck-neut";
+                       switch(e.team)
+                       {
+                               case NUM_TEAM_1: return "ons-cp-atck-red";
+                               case NUM_TEAM_2: return "ons-cp-atck-blue";
+                               case NUM_TEAM_3: return "ons-cp-atck-yellow";
+                               case NUM_TEAM_4: return "ons-cp-atck-pink";
+                               default: return "ons-cp-atck-neut";
+                       }
                }
                else if(a == -2) // DEFEND THIS ONE NOW
                {
-                       if(e.team == NUM_TEAM_1)
-                               return "ons-cp-dfnd-red";
-                       else if(e.team == NUM_TEAM_2)
-                               return "ons-cp-dfnd-blue";
+                       switch(e.team)
+                       {
+                               case NUM_TEAM_1: return "ons-cp-dfnd-red";
+                               case NUM_TEAM_2: return "ons-cp-dfnd-blue";
+                               case NUM_TEAM_3: return "ons-cp-dfnd-yellow";
+                               case NUM_TEAM_4: return "ons-cp-dfnd-pink";
+                       }
                }
                else if(e.team == t || a == -1 || a == 1) // own point, or fire at it
                {
-                       if(e.team == NUM_TEAM_1)
-                               return "ons-cp-red";
-                       else if(e.team == NUM_TEAM_2)
-                               return "ons-cp-blue";
+                       switch(e.team)
+                       {
+                               case NUM_TEAM_1: return "ons-cp-red";
+                               case NUM_TEAM_2: return "ons-cp-blue";
+                               case NUM_TEAM_3: return "ons-cp-yellow";
+                               case NUM_TEAM_4: return "ons-cp-pink";
+                       }
                }
                else if(a == 2) // touch it
                        return "ons-cp-neut";
        }
        else
        {
-               if(e.team == NUM_TEAM_1)
-                       return "ons-cp-red";
-               else if(e.team == NUM_TEAM_2)
-                       return "ons-cp-blue";
-               else
-                       return "ons-cp-neut";
+               switch(e.team)
+               {
+                       case NUM_TEAM_1: return "ons-cp-red";
+                       case NUM_TEAM_2: return "ons-cp-blue";
+                       case NUM_TEAM_3: return "ons-cp-yellow";
+                       case NUM_TEAM_4: return "ons-cp-pink";
+                       default: return "ons-cp-neut";
+               }
        }
        return "";
 }
@@ -819,14 +776,14 @@ void onslaught_controlpoint_updatesprite(entity e)
                }
                if(e.lastshielded)
                {
-                       if(e.team == NUM_TEAM_1 || e.team == NUM_TEAM_2)
+                       if(e.team == NUM_TEAM_1 || e.team == NUM_TEAM_2 || e.team == NUM_TEAM_3 || e.team == NUM_TEAM_4)
                                WaypointSprite_UpdateTeamRadar(e.sprite, RADARICON_CONTROLPOINT, 0.5 * colormapPaletteColor(e.team - 1, FALSE));
                        else
                                WaypointSprite_UpdateTeamRadar(e.sprite, RADARICON_CONTROLPOINT, '0.5 0.5 0.5');
                }
                else
                {
-                       if(e.team == NUM_TEAM_1 || e.team == NUM_TEAM_2)
+                       if(e.team == NUM_TEAM_1 || e.team == NUM_TEAM_2 || e.team == NUM_TEAM_3 || e.team == NUM_TEAM_4)
                                WaypointSprite_UpdateTeamRadar(e.sprite, RADARICON_CONTROLPOINT, colormapPaletteColor(e.team - 1, FALSE));
                        else
                                WaypointSprite_UpdateTeamRadar(e.sprite, RADARICON_CONTROLPOINT, '0.75 0.75 0.75');
@@ -848,11 +805,12 @@ void onslaught_generator_reset()
        self.iscaptured = TRUE;
        self.islinked = TRUE;
        self.isshielded = TRUE;
-       self.enemy.solid = SOLID_NOT;
        self.think = onslaught_generator_delayed;
        self.nextthink = time + 0.2;
        setmodel(self, "models/onslaught/generator.md3");
-       setsize(self, '-52 -52 -14', '52 52 75');
+       setsize(self, GENERATOR_MIN, GENERATOR_MAX);
+
+       self.SendFlags |= GSF_STATUS;
 
        if(!self.noalign)
        {
@@ -875,25 +833,11 @@ keys:
  */
 void spawnfunc_onslaught_generator()
 {
-       if (!g_onslaught)
-       {
-               remove(self);
-               return;
-       }
+       if(!g_onslaught) { remove(self); return; }
 
        //entity e;
        precache_model("models/onslaught/generator.md3");
        precache_model("models/onslaught/generator_shield.md3");
-       precache_model("models/onslaught/generator_dmg1.md3");
-       precache_model("models/onslaught/generator_dmg2.md3");
-       precache_model("models/onslaught/generator_dmg3.md3");
-       precache_model("models/onslaught/generator_dmg4.md3");
-       precache_model("models/onslaught/generator_dmg5.md3");
-       precache_model("models/onslaught/generator_dmg6.md3");
-       precache_model("models/onslaught/generator_dmg7.md3");
-       precache_model("models/onslaught/generator_dmg8.md3");
-       precache_model("models/onslaught/generator_dmg9.md3");
-       precache_model("models/onslaught/generator_dead.md3");
        precache_model("models/onslaught/shockwave.md3");
        precache_model("models/onslaught/shockwavetransring.md3");
        precache_model("models/onslaught/gen_gib1.md3");
@@ -908,22 +852,18 @@ void spawnfunc_onslaught_generator()
        precache_sound("onslaught/ons_hit1.wav");
        precache_sound("onslaught/ons_hit2.wav");
        precache_sound("onslaught/electricity_explode.wav");
+       precache_sound("onslaught/generator_underattack.wav");
        if (!self.team)
                objerror("team must be set");
 
-       if(self.team == NUM_TEAM_1)
-        ons_red_generator = self;
-
-       if(self.team == NUM_TEAM_2)
-        ons_blue_generator = self;
-
+       ons_generator[self.team] = self;
        self.team_saved = self.team;
        self.colormap = 1024 + (self.team - 1) * 17;
        self.solid = SOLID_BBOX;
        self.movetype = MOVETYPE_NONE;
        self.lasthealth = self.max_health = self.health = autocvar_g_onslaught_gen_health;
        setmodel(self, "models/onslaught/generator.md3");
-       setsize(self, '-52 -52 -14', '52 52 75');
+       setsize(self, GENERATOR_MIN, GENERATOR_MAX);
        setorigin(self, self.origin);
        self.takedamage = DAMAGE_AIM;
        self.bot_attack = TRUE;
@@ -933,19 +873,9 @@ void spawnfunc_onslaught_generator()
        self.isshielded = TRUE;
        // helper entity that create fx when generator is damaged
        onslaught_generator_damage_spawn(self);
-       // spawn shield model which indicates whether this can be damaged
-       self.enemy = spawn();
-       setattachment(self.enemy , self, "");
-       self.enemy.classname = "onslaught_generator_shield";
-       self.enemy.solid = SOLID_NOT;
-       self.enemy.movetype = MOVETYPE_NONE;
-       self.enemy.effects = EF_ADDITIVE;
-       setmodel(self.enemy, "models/onslaught/generator_shield.md3");
-       //setorigin(e, self.origin);
-       self.enemy.colormap = self.colormap;
-       self.enemy.team = self.team;
-       //self.think = onslaught_generator_delayed;
-       //self.nextthink = time + 0.2;
+
+       ons_CaptureShield_Spawn(self, "models/onslaught/generator_shield.md3");
+       
        InitializeEntity(self, onslaught_generator_delayed, INITPRIO_LAST);
 
        WaypointSprite_SpawnFixed(string_null, self.origin + '0 0 128', self, sprite, RADARICON_NONE, '0 0 0');
@@ -961,16 +891,10 @@ void spawnfunc_onslaught_generator()
 }
 
 .float waslinked;
-.float cp_bob_spd;
-.vector cp_origin, cp_bob_origin, cp_bob_dmg;
-
-float ons_notification_time_team1;
-float ons_notification_time_team2;
 
 void onslaught_controlpoint_icon_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
 {
        entity oself;
-       float nag;
 
        if (damage <= 0)
                return;
@@ -986,42 +910,19 @@ void onslaught_controlpoint_icon_damage(entity inflictor, entity attacker, float
                return;
        }
 
-       if (IS_PLAYER(attacker))
+       if(IS_PLAYER(attacker))
+       if(time - ons_notification_time[self.team] > 10)
        {
-               nag = FALSE;
-               if(self.team == NUM_TEAM_1)
-               {
-                       if(time - ons_notification_time_team1 > 10)
-                       {
-                               nag = TRUE;
-                               ons_notification_time_team1 = time;
-                       }
-               }
-               else if(self.team == NUM_TEAM_2)
-               {
-                       if(time - ons_notification_time_team2 > 10)
-                       {
-                               nag = TRUE;
-                               ons_notification_time_team2 = time;
-                       }
-               }
-               else
-                       nag = TRUE;
-
-               if(nag)
-                       play2team(self.team, "onslaught/controlpoint_underattack.wav");
+               play2team(self.team, "onslaught/controlpoint_underattack.wav");
+               ons_notification_time[self.team] = time;
        }
 
        self.health = self.health - damage;
        if(self.owner.iscaptured)
                WaypointSprite_UpdateHealth(self.owner.sprite, self.health);
        else
-               WaypointSprite_UpdateBuildFinished(self.owner.sprite, time + (self.max_health - self.health) / (self.count / sys_frametime));
+               WaypointSprite_UpdateBuildFinished(self.owner.sprite, time + (self.max_health - self.health) / (self.count / CP_THINKRATE));
        self.pain_finished = time + 1;
-       self.punchangle = (2 * randomvec() - '1 1 1') * 45;
-       self.cp_bob_dmg_z = (2 * random() - 1) * 15;
-       // colormod flash when shot
-       self.colormod = '2 2 2';
        // particles on every hit
        pointparticles(particleeffectnum("sparks"), hitloc, force*-1, 1);
        //sound on every hit
@@ -1035,9 +936,7 @@ void onslaught_controlpoint_icon_damage(entity inflictor, entity attacker, float
                sound(self, CH_TRIGGER, "weapons/grenade_impact.wav", VOL_BASE, ATTEN_NORM);
                pointparticles(particleeffectnum("rocket_explode"), self.origin, '0 0 0', 1);
                {
-                       string t;
-                       t = Team_ColoredFullName(attacker.team);
-                       bprint(Team_ColoredFullName(self.team), " ", self.message, " control point destroyed by ", t, "\n");
+                       Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_NUM_4(self.team, INFO_ONSLAUGHT_CPDESTROYED_), self.owner.message, attacker.netname);
                        ons_throwgib(self.origin, (2 * randomvec() - '1 1 1') * 25, "models/onslaught/controlpoint_icon_gib1.md3", 3, FALSE);
                        ons_throwgib(self.origin, (2 * randomvec() - '1 1 1') * 45, "models/onslaught/controlpoint_icon_gib2.md3", 3, FALSE);
                        ons_throwgib(self.origin, (2 * randomvec() - '1 1 1') * 45, "models/onslaught/controlpoint_icon_gib2.md3", 3, FALSE);
@@ -1046,6 +945,10 @@ void onslaught_controlpoint_icon_damage(entity inflictor, entity attacker, float
                        ons_throwgib(self.origin, (2 * randomvec() - '1 1 1') * 75, "models/onslaught/controlpoint_icon_gib4.md3", 3, FALSE);
                        ons_throwgib(self.origin, (2 * randomvec() - '1 1 1') * 75, "models/onslaught/controlpoint_icon_gib4.md3", 3, FALSE);
                }
+
+               PlayerScore_Add(attacker, SP_ONS_TAKES, 1);
+               PlayerScore_Add(attacker, SP_SCORE, 10);
+
                self.owner.goalentity = world;
                self.owner.islinked = FALSE;
                self.owner.iscaptured = FALSE;
@@ -1063,20 +966,20 @@ void onslaught_controlpoint_icon_damage(entity inflictor, entity attacker, float
                SUB_UseTargets ();
                self = oself;
 
-
                self.owner.waslinked = self.owner.islinked;
                if(self.owner.model != "models/onslaught/controlpoint_pad.md3")
-                       setmodel(self.owner, "models/onslaught/controlpoint_pad.md3");
-               //setsize(self, '-32 -32 0', '32 32 8');
+                       setmodel_fixsize(self.owner, "models/onslaught/controlpoint_pad.md3");
 
                remove(self);
        }
+
+       self.SendFlags |= CPSF_STATUS;
 }
 
 void onslaught_controlpoint_icon_think()
 {
        entity oself;
-       self.nextthink = time + sys_frametime;
+       self.nextthink = time + CP_THINKRATE;
 
        if(autocvar_g_onslaught_cp_proxydecap)
        {
@@ -1092,7 +995,7 @@ void onslaught_controlpoint_icon_think()
                 _dist = vlen(_player.origin - self.origin);
                 if(_dist < autocvar_g_onslaught_cp_proxydecap_distance)
                 {
-                    if(_player.team == self.team)
+                                       if(SAME_TEAM(_player, self))
                         ++_friendly_count;
                     else
                         ++_enemy_count;
@@ -1100,10 +1003,11 @@ void onslaught_controlpoint_icon_think()
             }
         }
 
-        _friendly_count = _friendly_count * (autocvar_g_onslaught_cp_proxydecap_dps * sys_frametime);
-        _enemy_count = _enemy_count * (autocvar_g_onslaught_cp_proxydecap_dps * sys_frametime);
+        _friendly_count = _friendly_count * (autocvar_g_onslaught_cp_proxydecap_dps * CP_THINKRATE);
+        _enemy_count = _enemy_count * (autocvar_g_onslaught_cp_proxydecap_dps * CP_THINKRATE);
 
         self.health = bound(0, self.health + (_friendly_count - _enemy_count), self.max_health);
+               self.SendFlags |= CPSF_STATUS;
         if(self.health <= 0)
         {
             onslaught_controlpoint_icon_damage(self, self, 1, 0, self.origin, '0 0 0');
@@ -1121,16 +1025,6 @@ void onslaught_controlpoint_icon_think()
                        WaypointSprite_UpdateHealth(self.owner.sprite, self.health);
                }
        }
-       if (self.health < self.max_health * 0.25)
-               setmodel(self, "models/onslaught/controlpoint_icon_dmg3.md3");
-       else if (self.health < self.max_health * 0.50)
-               setmodel(self, "models/onslaught/controlpoint_icon_dmg2.md3");
-       else if (self.health < self.max_health * 0.75)
-               setmodel(self, "models/onslaught/controlpoint_icon_dmg1.md3");
-       else if (self.health < self.max_health * 0.90)
-               setmodel(self, "models/onslaught/controlpoint_icon.md3");
-       // colormod flash when shot
-       self.colormod = '1 1 1' * (2 - bound(0, (self.pain_finished - time) / 10, 1));
 
        if(self.owner.islinked != self.owner.waslinked)
        {
@@ -1151,58 +1045,6 @@ void onslaught_controlpoint_icon_think()
                self.owner.waslinked = self.owner.islinked;
        }
 
-       if (self.punchangle_x > 0)
-       {
-               self.punchangle_x = self.punchangle_x - 60 * sys_frametime;
-               if (self.punchangle_x < 0)
-                       self.punchangle_x = 0;
-       }
-       else if (self.punchangle_x < 0)
-       {
-               self.punchangle_x = self.punchangle_x + 60 * sys_frametime;
-               if (self.punchangle_x > 0)
-                       self.punchangle_x = 0;
-       }
-
-       if (self.punchangle_y > 0)
-       {
-               self.punchangle_y = self.punchangle_y - 60 * sys_frametime;
-               if (self.punchangle_y < 0)
-                       self.punchangle_y = 0;
-       }
-       else if (self.punchangle_y < 0)
-       {
-               self.punchangle_y = self.punchangle_y + 60 * sys_frametime;
-               if (self.punchangle_y > 0)
-                       self.punchangle_y = 0;
-       }
-
-       if (self.punchangle_z > 0)
-       {
-               self.punchangle_z = self.punchangle_z - 60 * sys_frametime;
-               if (self.punchangle_z < 0)
-                       self.punchangle_z = 0;
-       }
-       else if (self.punchangle_z < 0)
-       {
-               self.punchangle_z = self.punchangle_z + 60 * sys_frametime;
-               if (self.punchangle_z > 0)
-                       self.punchangle_z = 0;
-       }
-
-       self.angles_x = self.punchangle_x;
-       self.angles_y = self.punchangle_y + self.mangle_y;
-       self.angles_z = self.punchangle_z;
-       self.mangle_y = self.mangle_y + 45 * sys_frametime;
-
-       self.cp_bob_origin_z = 4 * PI * (1 - cos(self.cp_bob_spd));
-       self.cp_bob_spd = self.cp_bob_spd + 1.875 * sys_frametime;
-       if(self.cp_bob_dmg_z > 0)
-               self.cp_bob_dmg_z = self.cp_bob_dmg_z - 3 * sys_frametime;
-       else
-               self.cp_bob_dmg_z = 0;
-       setorigin(self,self.cp_origin + self.cp_bob_origin + self.cp_bob_dmg);
-
        // damaged fx
        if(random() < 0.6 - self.health / self.max_health)
        {
@@ -1220,7 +1062,7 @@ void onslaught_controlpoint_icon_buildthink()
        entity oself;
        float a;
 
-       self.nextthink = time + sys_frametime;
+       self.nextthink = time + CP_THINKRATE;
 
        // only do this if there is power
        a = onslaught_controlpoint_can_be_linked(self.owner, self.owner.team);
@@ -1229,18 +1071,28 @@ void onslaught_controlpoint_icon_buildthink()
 
        self.health = self.health + self.count;
 
+       self.SendFlags |= CPSF_STATUS;
+
        if (self.health >= self.max_health)
        {
                self.health = self.max_health;
-               self.count = autocvar_g_onslaught_cp_regen * sys_frametime; // slow repair rate from now on
+               self.count = autocvar_g_onslaught_cp_regen * CP_THINKRATE; // slow repair rate from now on
                self.think = onslaught_controlpoint_icon_think;
                sound(self, CH_TRIGGER, "onslaught/controlpoint_built.wav", VOL_BASE, ATTEN_NORM);
-               bprint(Team_ColoredFullName(self.team), " captured ", self.owner.message, " control point\n");
                self.owner.iscaptured = TRUE;
+               self.solid = SOLID_BBOX;
 
                WaypointSprite_UpdateMaxHealth(self.owner.sprite, self.max_health);
                WaypointSprite_UpdateHealth(self.owner.sprite, self.health);
 
+               Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_ONSLAUGHT_CAPTURE, self.owner.ons_toucher.netname, self.owner.message);
+               Send_Notification(NOTIF_ALL_EXCEPT, self.owner.ons_toucher, MSG_CENTER, APP_TEAM_ENT_4(self.owner.ons_toucher, CENTER_ONS_CAPTURE_), self.owner.message);
+               Send_Notification(NOTIF_ONE, self.owner.ons_toucher, MSG_CENTER, CENTER_ONS_CAPTURE, self.owner.message);
+               PlayerTeamScore_Add(self.owner.ons_toucher, SP_ONS_CAPS, ST_ONS_CAPS, 1);
+               PlayerTeamScore_AddScore(self.owner.ons_toucher, 10);
+               
+               self.owner.ons_toucher = world;
+
                onslaught_updatelinks();
 
                // Use targets now (somebody make sure this is in the right place..)
@@ -1249,30 +1101,29 @@ void onslaught_controlpoint_icon_buildthink()
                activator = self;
                SUB_UseTargets ();
                self = oself;
-               self.cp_origin = self.origin;
-               self.cp_bob_origin = '0 0 0.1';
-               self.cp_bob_spd = 0;
+
+               self.SendFlags |= CPSF_SETUP;
        }
-       self.alpha = self.health / self.max_health;
-       // colormod flash when shot
-       self.colormod = '1 1 1' * (2 - bound(0, (self.pain_finished - time) / 10, 1));
        if(self.owner.model != "models/onslaught/controlpoint_pad2.md3")
-               setmodel(self.owner, "models/onslaught/controlpoint_pad2.md3");
-       //setsize(self, '-32 -32 0', '32 32 8');
-
+               setmodel_fixsize(self.owner, "models/onslaught/controlpoint_pad2.md3");
+               
        if(random() < 0.9 - self.health / self.max_health)
                pointparticles(particleeffectnum("rage"), self.origin + 10 * randomvec(), '0 0 -1', 1);
 }
 
-
-
-
 void onslaught_controlpoint_touch()
 {
-       entity e;
+       entity e, toucher = other;
        float a;
-       if (!IS_PLAYER(other))
+
+       if((toucher.vehicle_flags & VHF_ISVEHICLE) && toucher.owner)
+       if(autocvar_g_onslaught_allow_vehicle_touch)
+               toucher = toucher.owner;
+       else
                return;
+
+       if(!IS_PLAYER(toucher)) { return; }
+
        a = onslaught_controlpoint_attackable(self, other.team);
        if(a != 2 && a != 4)
                return;
@@ -1284,29 +1135,30 @@ void onslaught_controlpoint_touch()
        e.owner = self;
        e.max_health = autocvar_g_onslaught_cp_health;
        e.health = autocvar_g_onslaught_cp_buildhealth;
-       e.solid = SOLID_BBOX;
+       e.solid = SOLID_NOT;
        e.movetype = MOVETYPE_NONE;
-       setmodel(e, "models/onslaught/controlpoint_icon.md3");
-       setsize(e, '-32 -32 -32', '32 32 32');
+       //setmodel(e, "models/onslaught/controlpoint_icon.md3");
+       setsize(e, CPICON_MIN, CPICON_MAX);
        setorigin(e, self.origin + '0 0 96');
        e.takedamage = DAMAGE_AIM;
        e.bot_attack = TRUE;
        e.event_damage = onslaught_controlpoint_icon_damage;
        e.team = other.team;
        e.colormap = 1024 + (e.team - 1) * 17;
-       e.think = onslaught_controlpoint_icon_buildthink;
-       e.nextthink = time + sys_frametime;
-       e.count = (e.max_health - e.health) * sys_frametime / autocvar_g_onslaught_cp_buildtime; // how long it takes to build
+       e.count = (e.max_health - e.health) * CP_THINKRATE / autocvar_g_onslaught_cp_buildtime; // how long it takes to build
        sound(e, CH_TRIGGER, "onslaught/controlpoint_build.wav", VOL_BASE, ATTEN_NORM);
        self.team = e.team;
        self.colormap = e.colormap;
-       WaypointSprite_UpdateBuildFinished(self.sprite, time + (e.max_health - e.health) / (e.count / sys_frametime));
+       WaypointSprite_UpdateBuildFinished(self.sprite, time + (e.max_health - e.health) / (e.count / CP_THINKRATE));
+       self.ons_toucher = other;
        onslaught_updatelinks();
+
+       onslaught_controlpoint_icon_link(e, onslaught_controlpoint_icon_buildthink);
 }
 
 void onslaught_controlpoint_think()
 {
-       self.nextthink = time;
+       self.nextthink = time + CP_THINKRATE;
        CSQCMODEL_AUTOUPDATE();
 }
 
@@ -1320,12 +1172,10 @@ void onslaught_controlpoint_reset()
        self.iscaptured = FALSE;
        self.islinked = FALSE;
        self.isshielded = TRUE;
-       self.enemy.solid = SOLID_NOT;
-       self.enemy.colormap = self.colormap;
        self.think = onslaught_controlpoint_think;
-       self.enemy.think = func_null;
-       self.nextthink = time; // don't like func_null :P
-       setmodel(self, "models/onslaught/controlpoint_pad.md3");
+       self.ons_toucher = world;
+       self.nextthink = time + CP_THINKRATE; // don't like func_null :P
+       setmodel_fixsize(self, "models/onslaught/controlpoint_pad.md3");
        //setsize(self, '-32 -32 0', '32 32 8');
 
        WaypointSprite_UpdateMaxHealth(self.sprite, 0);
@@ -1334,7 +1184,7 @@ void onslaught_controlpoint_reset()
 
        activator = self;
        SUB_UseTargets(); // to reset the structures, playerspawns etc.
-       
+
        CSQCMODEL_AUTOUPDATE();
 }
 
@@ -1351,12 +1201,8 @@ keys:
 
 void spawnfunc_onslaught_controlpoint()
 {
-       //entity e;
-       if (!g_onslaught)
-       {
-               remove(self);
-               return;
-       }
+       if(!g_onslaught) { remove(self); return; }
+
        precache_model("models/onslaught/controlpoint_pad.md3");
        precache_model("models/onslaught/controlpoint_pad2.md3");
        precache_model("models/onslaught/controlpoint_shield.md3");
@@ -1377,8 +1223,7 @@ void spawnfunc_onslaught_controlpoint()
 
        self.solid = SOLID_BBOX;
        self.movetype = MOVETYPE_NONE;
-       setmodel(self, "models/onslaught/controlpoint_pad.md3");
-       //setsize(self, '-32 -32 0', '32 32 8');
+       setmodel_fixsize(self, "models/onslaught/controlpoint_pad.md3");
        if(!self.noalign)
        {
                setorigin(self, self.origin + '0 0 20');
@@ -1391,32 +1236,22 @@ void spawnfunc_onslaught_controlpoint()
        self.islinked = FALSE;
        self.isshielded = TRUE;
 
-       // spawn shield model which indicates whether this can be damaged
-       self.enemy = spawn();
-       self.enemy.classname = "onslaught_controlpoint_shield";
-       self.enemy.solid = SOLID_NOT;
-       self.enemy.movetype = MOVETYPE_NONE;
-       self.enemy.effects = EF_ADDITIVE;
-       setmodel(self.enemy , "models/onslaught/controlpoint_shield.md3");
-
-       setattachment(self.enemy , self, "");
-       //setsize(e, '-32 -32 0', '32 32 128');
-
-       //setorigin(e, self.origin);
-       self.enemy.colormap = self.colormap;
+       if(self.message == "") { self.message = "a"; }
 
        waypoint_spawnforitem(self);
-       
+
        self.think = onslaught_controlpoint_think;
-       self.nextthink = time;
+       self.nextthink = time + CP_THINKRATE;
+
+       self.reset = onslaught_controlpoint_reset;
 
        WaypointSprite_SpawnFixed(string_null, self.origin + '0 0 128', self, sprite, RADARICON_NONE, '0 0 0');
        WaypointSprite_UpdateRule(self.sprite, NUM_TEAM_2, SPRITERULE_TEAMPLAY);
 
        onslaught_updatelinks();
-
-       self.reset = onslaught_controlpoint_reset;
        
+       ons_CaptureShield_Spawn(self, "models/onslaught/controlpoint_shield.md3");
+
        CSQCMODEL_AUTOINIT();
 }
 
@@ -1451,17 +1286,19 @@ void onslaught_link_checkupdate()
        redpower = bluepower = 0;
        if(self.goalentity.islinked)
        {
-               if(self.goalentity.team == NUM_TEAM_1)
-                       redpower = 1;
-               else if(self.goalentity.team == NUM_TEAM_2)
-                       bluepower = 1;
+               switch(self.goalentity.team)
+               {
+                       case NUM_TEAM_1: redpower = 1; break;
+                       case NUM_TEAM_2: bluepower = 1; break;
+               }
        }
        if(self.enemy.islinked)
        {
-               if(self.enemy.team == NUM_TEAM_1)
-                       redpower = 2;
-               else if(self.enemy.team == NUM_TEAM_2)
-                       bluepower = 2;
+               switch(self.enemy.team)
+               {
+                       case NUM_TEAM_1: redpower = 2; break;
+                       case NUM_TEAM_2: bluepower = 2; break;
+               }
        }
 
        float cc;
@@ -1524,138 +1361,495 @@ void spawnfunc_onslaught_link()
        Net_LinkEntity(self, FALSE, 0, onslaught_link_send);
 }
 
-MUTATOR_HOOKFUNCTION(ons_BuildMutatorsString)
+// bot junk
+#define HAVOCBOT_ONS_ROLE_NONE                 0
+#define HAVOCBOT_ONS_ROLE_DEFENSE      2
+#define HAVOCBOT_ONS_ROLE_ASSISTANT    4
+#define HAVOCBOT_ONS_ROLE_OFFENSE      8
+
+.float havocbot_role_flags;
+.float havocbot_attack_time;
+
+.void() havocbot_role;
+.void() havocbot_previous_role;
+
+void() havocbot_role_ons_defense;
+void() havocbot_role_ons_offense;
+void() havocbot_role_ons_assistant;
+
+void(entity bot) havocbot_ons_reset_role;
+void(float ratingscale, vector org, float sradius) havocbot_goalrating_items;
+void(float ratingscale, vector org, float sradius) havocbot_goalrating_enemyplayers;
+
+.entity havocbot_ons_target;
+
+void havocbot_goalrating_ons_offenseitems(float ratingscale, vector org, float sradius)
 {
-       ret_string = strcat(ret_string, ":ONS");
-       return 0;
+       entity head;
+       float t, i, c, needarmor = FALSE, needweapons = FALSE;
+
+       // Needs armor/health?
+       if(self.health<100)
+               needarmor = TRUE;
+
+       // Needs weapons?
+       c = 0;
+       for(i = WEP_FIRST; i <= WEP_LAST ; ++i)
+       {
+               // Find weapon
+               if(self.weapons & WepSet_FromWeapon(i))
+               if(++c>=4)
+                       break;
+       }
+
+       if(c<4)
+               needweapons = TRUE;
+
+       if(!needweapons && !needarmor)
+               return;
+
+//     dprint(self.netname, " needs weapons ", ftos(needweapons) , "\n");
+//     dprint(self.netname, " needs armor ", ftos(needarmor) , "\n");
+
+       // See what is around
+       head = findchainfloat(bot_pickup, TRUE);
+       while (head)
+       {
+               // gather health and armor only
+               if (head.solid)
+               if ( ((head.health || head.armorvalue) && needarmor) || (head.weapons && needweapons ) )
+               if (vlen(head.origin - org) < sradius)
+               {
+                       t = head.bot_pickupevalfunc(self, head);
+                       if (t > 0)
+                               navigation_routerating(head, t * ratingscale, 500);
+               }
+               head = head.chain;
+       }
 }
 
-MUTATOR_HOOKFUNCTION(ons_BuildMutatorsPrettyString)
+void havocbot_role_ons_setrole(entity bot, float role)
 {
-       ret_string = strcat(ret_string, ", Onslaught");
-       return 0;
+       dprint(strcat(bot.netname," switched to "));
+       switch(role)
+       {
+               case HAVOCBOT_ONS_ROLE_DEFENSE:
+                       dprint("defense");
+                       bot.havocbot_role = havocbot_role_ons_defense;
+                       bot.havocbot_role_flags = HAVOCBOT_ONS_ROLE_DEFENSE;
+                       bot.havocbot_role_timeout = 0;
+                       break;
+               case HAVOCBOT_ONS_ROLE_ASSISTANT:
+                       dprint("assistant");
+                       bot.havocbot_role = havocbot_role_ons_assistant;
+                       bot.havocbot_role_flags = HAVOCBOT_ONS_ROLE_ASSISTANT;
+                       bot.havocbot_role_timeout = 0;
+                       break;
+               case HAVOCBOT_ONS_ROLE_OFFENSE:
+                       dprint("offense");
+                       bot.havocbot_role = havocbot_role_ons_offense;
+                       bot.havocbot_role_flags = HAVOCBOT_ONS_ROLE_OFFENSE;
+                       bot.havocbot_role_timeout = 0;
+                       break;
+       }
+       dprint("\n");
 }
 
-MUTATOR_HOOKFUNCTION(ons_Spawn_Score)
+float havocbot_ons_teamcount(entity bot, float role)
 {
+       float c = 0;
+       entity head;
 
-    /*
-    float _neer_home = (random() > 0.5 ? TRUE : FALSE);
+       FOR_EACH_PLAYER(head)
+       if(head.team==self.team)
+       if(head.havocbot_role_flags & role)
+               ++c;
 
-       RandomSelection_Init();
+       return c;
+}
 
-       if(self.team == NUM_TEAM_1)
-        RandomSelection_Add(ons_red_generator, 0, string_null, 1, 1);
+void havocbot_goalrating_ons_controlpoints_attack(float ratingscale)
+{
+       entity cp, cp1, cp2, best, pl, wp;
+       float radius, found, bestvalue, c;
 
-       if(self.team == NUM_TEAM_2)
-        RandomSelection_Add(ons_blue_generator, 0, string_null, 1, 1);
+       cp1 = cp2 = findchain(classname, "onslaught_controlpoint");
 
-       entity _cp = findchain(classname, "onslaught_controlpoint"):
-       while _cp;
+       // Filter control points
+       for (; cp2; cp2 = cp2.chain)
        {
-           if(_cp.team == self.team)
-            RandomSelection_Add(_cp, 0, string_null, 1, 1);
+               cp2.wpcost = c = 0;
+               cp2.wpconsidered = FALSE;
+
+               if(cp2.isshielded)
+                       continue;
+
+               // Ignore owned controlpoints
+               if(self.team == NUM_TEAM_1)
+               {
+                       if( (cp2.isgenneighbor[NUM_TEAM_2] || cp2.iscpneighbor[NUM_TEAM_2]) && !(cp2.isgenneighbor[NUM_TEAM_1] || cp2.iscpneighbor[NUM_TEAM_1]) )
+                               continue;
+               }
+               else if(self.team == NUM_TEAM_2)
+               {
+                       if( (cp2.isgenneighbor[NUM_TEAM_1] || cp2.iscpneighbor[NUM_TEAM_1]) && !(cp2.isgenneighbor[NUM_TEAM_2] || cp2.iscpneighbor[NUM_TEAM_2]) )
+                               continue;
+               }
+
+               // Count team mates interested in this control point
+               // (easier and cleaner than keeping counters per cp and teams)
+               FOR_EACH_PLAYER(pl)
+               if(pl.team==self.team)
+               if(pl.havocbot_role_flags & HAVOCBOT_ONS_ROLE_OFFENSE)
+               if(pl.havocbot_ons_target==cp2)
+                       ++c;
 
-               _cp = _cp.chain;
+               // NOTE: probably decrease the cost of attackable control points
+               cp2.wpcost = c;
+               cp2.wpconsidered = TRUE;
        }
 
-       if(RandomSelection_chosen_ent)
+       // We'll consider only the best case
+       bestvalue = 99999999999;
+       cp = world;
+       for (; cp1; cp1 = cp1.chain)
        {
-               self.tur_head = RandomSelection_chosen_ent;
-               spawn_score_x += SPAWN_PRIO_NEAR_TEAMMATE_FOUND;
+               if (!cp1.wpconsidered)
+                       continue;
+
+               if(cp1.wpcost<bestvalue)
+               {
+                       bestvalue = cp1.wpcost;
+                       cp = cp1;
+                       self.havocbot_ons_target = cp1;
+               }
        }
-       else if(self.team == spawn_spot.team)
-               spawn_score_x += SPAWN_PRIO_NEAR_TEAMMATE_SAMETEAM; // prefer same team, if we can't find a spawn near teammate
 
-    */
+       if (!cp)
+               return;
+
+//     dprint(self.netname, " chose cp ranked ", ftos(bestvalue), "\n");
 
-       return 0;
+       if(cp.goalentity)
+       {
+               // Should be attacked
+               // Rate waypoints near it
+               found = FALSE;
+               best = world;
+               bestvalue = 99999999999;
+               for(radius=0; radius<1000 && !found; radius+=500)
+               {
+                       for(wp=findradius(cp.origin,radius); wp; wp=wp.chain)
+                       {
+                               if(!(wp.wpflags & WAYPOINTFLAG_GENERATED))
+                               if(wp.classname=="waypoint")
+                               if(checkpvs(wp.origin,cp))
+                               {
+                                       found = TRUE;
+                                       if(wp.cnt<bestvalue)
+                                       {
+                                               best = wp;
+                                               bestvalue = wp.cnt;
+                                       }
+                               }
+                       }
+               }
+
+               if(best)
+               {
+                       navigation_routerating(best, ratingscale, 10000);
+                       best.cnt += 1;
+
+                       self.havocbot_attack_time = 0;
+                       if(checkpvs(self.view_ofs,cp))
+                       if(checkpvs(self.view_ofs,best))
+                               self.havocbot_attack_time = time + 2;
+               }
+               else
+               {
+                       navigation_routerating(cp, ratingscale, 10000);
+               }
+       //      dprint(self.netname, " found an attackable controlpoint at ", vtos(cp.origin) ,"\n");
+       }
+       else
+       {
+               // Should be touched
+               // dprint(self.netname, " found a touchable controlpoint at ", vtos(cp.origin) ,"\n");
+               found = FALSE;
+
+               // Look for auto generated waypoint
+               if (!bot_waypoints_for_items)
+               for (wp = findradius(cp.origin,100); wp; wp = wp.chain)
+               {
+                       if(wp.classname=="waypoint")
+                       {
+                               navigation_routerating(wp, ratingscale, 10000);
+                               found = TRUE;
+                       }
+               }
+
+               // Nothing found, rate the controlpoint itself
+               if (!found)
+                       navigation_routerating(cp, ratingscale, 10000);
+       }
 }
 
-MUTATOR_HOOKFUNCTION(ons_PlayerSpawn)
+float havocbot_goalrating_ons_generator_attack(float ratingscale)
 {
-    if(!autocvar_g_onslaught_spawn_at_controlpoints)
-        return 0;
+       entity g, wp, bestwp;
+       float found, best;
+
+       for (g = findchain(classname, "onslaught_generator"); g; g = g.chain)
+       {
+               if(g.team == self.team || g.isshielded)
+                       continue;
+
+               // Should be attacked
+               // Rate waypoints near it
+               found = FALSE;
+               bestwp = world;
+               best = 99999999999;
+
+               for(wp=findradius(g.origin,400); wp; wp=wp.chain)
+               {
+                       if(wp.classname=="waypoint")
+                       if(checkpvs(wp.origin,g))
+                       {
+                               found = TRUE;
+                               if(wp.cnt<best)
+                               {
+                                       bestwp = wp;
+                                       best = wp.cnt;
+                               }
+                       }
+               }
 
-    if(random() < 0.5)  // 50/50 chane to use default spawnsystem.
-        return 0;
+               if(bestwp)
+               {
+               //      dprint("waypoints found around generator\n");
+                       navigation_routerating(bestwp, ratingscale, 10000);
+                       bestwp.cnt += 1;
 
-    float _close_to_home = ((random() > 0.5) ? TRUE : FALSE);
-    entity _best = world, _trg_gen = world;
-    float _score, _best_score = MAX_SHOT_DISTANCE;
+                       self.havocbot_attack_time = 0;
+                       if(checkpvs(self.view_ofs,g))
+                       if(checkpvs(self.view_ofs,bestwp))
+                               self.havocbot_attack_time = time + 5;
 
-       RandomSelection_Init();
+                       return TRUE;
+               }
+               else
+               {
+               //      dprint("generator found without waypoints around\n");
+                       // if there aren't waypoints near the generator go straight to it
+                       navigation_routerating(g, ratingscale, 10000);
+                       self.havocbot_attack_time = 0;
+                       return TRUE;
+               }
+       }
+       return FALSE;
+}
 
-       if(self.team == NUM_TEAM_1)
+void havocbot_role_ons_offense()
+{
+       if(self.deadflag != DEAD_NO)
        {
-           if(!_close_to_home)
-            _trg_gen = ons_blue_generator;
-        else
-            _trg_gen  = ons_red_generator;
+               self.havocbot_attack_time = 0;
+               havocbot_ons_reset_role(self);
+               return;
        }
 
-       if(self.team == NUM_TEAM_2)
+       // Set the role timeout if necessary
+       if (!self.havocbot_role_timeout)
+               self.havocbot_role_timeout = time + 120;
+
+       if (time > self.havocbot_role_timeout)
        {
-           if(_close_to_home)
-            _trg_gen = ons_blue_generator;
-        else
-            _trg_gen  = ons_red_generator;
+               havocbot_ons_reset_role(self);
+               return;
        }
 
-       entity _cp = findchain(classname, "onslaught_controlpoint");
-       while(_cp)
+       if(self.havocbot_attack_time>time)
+               return;
+
+       if (self.bot_strategytime < time)
        {
-           if(_cp.team == self.team)
-        {
-            _score = vlen(_trg_gen.origin - _cp.origin);
-            if(_score < _best_score)
-            {
-                _best = _cp;
-                _best_score = _score;
-            }
-        }
-               _cp = _cp.chain;
+               navigation_goalrating_start();
+               havocbot_goalrating_enemyplayers(20000, self.origin, 650);
+               if(!havocbot_goalrating_ons_generator_attack(20000))
+                       havocbot_goalrating_ons_controlpoints_attack(20000);
+               havocbot_goalrating_ons_offenseitems(10000, self.origin, 10000);
+               navigation_goalrating_end();
+
+               self.bot_strategytime = time + autocvar_bot_ai_strategyinterval;
        }
+}
 
-    vector _loc;
-    float i;
-    if(_best)
-    {
-        for(i = 0; i < 10; ++i)
-        {
-            _loc = _best.origin + '0 0 96';
-            _loc += ('0 1 0' * random()) * 128;
-            tracebox(_loc, PL_MIN, PL_MAX, _loc, MOVE_NORMAL, self);
-            if(trace_fraction == 1.0 && !trace_startsolid)
-            {
-                setorigin(self, _loc);
-                self.angles = normalize(_loc - _best.origin) * RAD2DEG;
-                return 0;
-            }
-        }
-    }
-    else
-    {
-        if(!autocvar_g_onslaught_spawn_at_generator)
-            return 0;
+void havocbot_role_ons_assistant()
+{
+       havocbot_ons_reset_role(self);
+}
 
-        _trg_gen = ((self.team == NUM_TEAM_1) ? ons_red_generator : ons_blue_generator);
+void havocbot_role_ons_defense()
+{
+       havocbot_ons_reset_role(self);
+}
 
-        for(i = 0; i < 10; ++i)
-        {
-            _loc = _trg_gen.origin + '0 0 96';
-            _loc += ('0 1 0' * random()) * 128;
-            tracebox(_loc, PL_MIN, PL_MAX, _loc, MOVE_NORMAL, self);
-            if(trace_fraction == 1.0 && !trace_startsolid)
-            {
-                setorigin(self, _loc);
-                self.angles = normalize(_loc - _trg_gen.origin) * RAD2DEG;
-                return 0;
-            }
-        }
-    }
+void havocbot_ons_reset_role(entity bot)
+{
+       entity head;
+       float c;
+
+       if(self.deadflag != DEAD_NO)
+               return;
+
+       bot.havocbot_ons_target = world;
+
+       // TODO: Defend control points or generator if necessary
 
-    return 0;
+       // if there is only me on the team switch to offense
+       c = 0;
+       FOR_EACH_PLAYER(head)
+       if(head.team==self.team)
+               ++c;
+
+       if(c==1)
+       {
+               havocbot_role_ons_setrole(bot, HAVOCBOT_ONS_ROLE_OFFENSE);
+               return;
+       }
+
+       havocbot_role_ons_setrole(bot, HAVOCBOT_ONS_ROLE_OFFENSE);
+}
+
+
+// ==============
+// Hook Functions
+// ==============
+
+MUTATOR_HOOKFUNCTION(ons_ResetMap)
+{
+       FOR_EACH_PLAYER(self) { self.ons_deathloc = '0 0 0'; }
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(ons_RemovePlayer)
+{
+       self.ons_deathloc = '0 0 0';
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(ons_PlayerSpawn)
+{
+       if(autocvar_g_onslaught_spawn_at_controlpoints)
+       if(random() <= autocvar_g_onslaught_spawn_at_controlpoints_chance)
+       {
+               float random_target = autocvar_g_onslaught_spawn_at_controlpoints_random;
+               entity tmp_entity, closest_target = world;
+               vector spawn_loc = self.ons_deathloc;
+               
+               // new joining player or round reset, don't bother checking
+               if(spawn_loc == '0 0 0') { return FALSE; }
+               
+               tmp_entity = findchain(classname, "onslaught_controlpoint");
+               
+               if(random_target) { RandomSelection_Init(); }
+
+               while(tmp_entity)
+               {
+                       if(SAME_TEAM(tmp_entity, self))
+                       if(random_target)
+                               RandomSelection_Add(tmp_entity, 0, string_null, 1, 1);
+                       else if(vlen(tmp_entity.origin - spawn_loc) <= vlen(closest_target.origin - spawn_loc) || closest_target == world)
+                               closest_target = tmp_entity;
+                       
+                       tmp_entity = tmp_entity.chain;
+               }
+               
+               if(random_target) { closest_target = RandomSelection_chosen_ent; }
+               
+               if(closest_target)
+               {
+                       float i;
+                       vector loc;
+                       for(i = 0; i < 10; ++i)
+                       {
+                               loc = closest_target.origin + '0 0 96';
+                               loc += ('0 1 0' * random()) * 128;
+                               tracebox(loc, PL_MIN, PL_MAX, loc, MOVE_NORMAL, self);
+                               if(trace_fraction == 1.0 && !trace_startsolid)
+                               {
+                                       traceline(closest_target.origin, loc, MOVE_NOMONSTERS, closest_target); // double check to make sure we're not spawning outside the world
+                                       if(trace_fraction == 1.0 && !trace_startsolid)
+                                       {
+                                               setorigin(self, loc);
+                                               self.angles = normalize(loc - closest_target.origin) * RAD2DEG;
+                                               return FALSE;
+                                       }
+                               }
+                       }
+               }
+       }
+       
+       if(autocvar_g_onslaught_spawn_at_generator)
+       if(random() <= autocvar_g_onslaught_spawn_at_generator_chance)
+       {
+               float random_target = autocvar_g_onslaught_spawn_at_generator_random;
+               entity tmp_entity, closest_target = world;
+               vector spawn_loc = self.ons_deathloc;
+               
+               // new joining player or round reset, don't bother checking
+               if(spawn_loc == '0 0 0') { return FALSE; }
+               
+               tmp_entity = findchain(classname, "onslaught_generator");
+               
+               if(random_target) { RandomSelection_Init(); }
+
+               while(tmp_entity)
+               {
+                       if(random_target)
+                               RandomSelection_Add(tmp_entity, 0, string_null, 1, 1);
+                       else
+                       {
+                               if(SAME_TEAM(tmp_entity, self))
+                               if(vlen(tmp_entity.origin - spawn_loc) <= vlen(closest_target.origin - spawn_loc) || closest_target == world)
+                                       closest_target = tmp_entity;
+                       }
+                       
+                       tmp_entity = tmp_entity.chain;
+               }
+               
+               if(random_target) { closest_target = RandomSelection_chosen_ent; }
+               
+               if(closest_target)
+               {
+                       float i;
+                       vector loc;
+                       for(i = 0; i < 10; ++i)
+                       {
+                               loc = closest_target.origin + '0 0 128';
+                               loc += ('0 1 0' * random()) * 256;
+                               tracebox(loc, PL_MIN, PL_MAX, loc, MOVE_NORMAL, self);
+                               if(trace_fraction == 1.0 && !trace_startsolid)
+                               {
+                                       traceline(closest_target.origin, loc, MOVE_NOMONSTERS, closest_target); // double check to make sure we're not spawning outside the world
+                                       if(trace_fraction == 1.0 && !trace_startsolid)
+                                       {
+                                               setorigin(self, loc);
+                                               self.angles = normalize(loc - closest_target.origin) * RAD2DEG;
+                                               return FALSE;
+                                       }
+                               }
+                       }
+               }
+       }
+
+    return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(ons_PlayerDies)
+{
+       frag_target.ons_deathloc = frag_target.origin;
+       return FALSE;
 }
 
 MUTATOR_HOOKFUNCTION(ons_MonsterThink)
@@ -1690,19 +1884,100 @@ MUTATOR_HOOKFUNCTION(ons_MonsterSpawn)
        return FALSE;
 }
 
+MUTATOR_HOOKFUNCTION(ons_TurretSpawn)
+{
+       entity e, ee = world;
+       if(self.targetname)
+       {
+               e = find(world, target, self.targetname);
+               if(e != world)
+               {
+                       self.team = e.team;
+                       ee = e;
+               }
+       }
+
+       if(ee)
+       {
+               activator = ee;
+               if(self.use)
+                       self.use();
+       }
+
+       return FALSE;
+}
+
+MUTATOR_HOOKFUNCTION(ons_BotRoles)
+{
+       havocbot_ons_reset_role(self);
+       return TRUE;
+}
+
+MUTATOR_HOOKFUNCTION(ons_GetTeamCount)
+{
+       // onslaught is special
+       entity head = findchain(classname, "onslaught_generator");
+       while (head)
+       {
+               switch(head.team)
+               {
+                       case NUM_TEAM_1: c1 = 0; break;
+                       case NUM_TEAM_2: c2 = 0; break;
+                       case NUM_TEAM_3: c3 = 0; break;
+                       case NUM_TEAM_4: c4 = 0; break;
+               }
+               head = head.chain;
+       }
+
+       return TRUE;
+}
+
+// scoreboard setup
+void ons_ScoreRules()
+{
+       CheckAllowedTeams(world);
+       ScoreRules_basics(((c4>=0) ? 4 : (c3>=0) ? 3 : 2), SFL_SORT_PRIO_PRIMARY, 0, TRUE);
+       ScoreInfo_SetLabel_TeamScore  (ST_ONS_CAPS,     "caps",      SFL_SORT_PRIO_PRIMARY);
+       ScoreInfo_SetLabel_PlayerScore(SP_ONS_CAPS,     "caps",      SFL_SORT_PRIO_SECONDARY);
+       ScoreInfo_SetLabel_PlayerScore(SP_ONS_TAKES,    "takes",     0);
+       ScoreRules_basics_end();
+}
+
+void ons_DelayedInit() // Do this check with a delay so we can wait for teams to be set up
+{
+       ons_ScoreRules();
+}
+
+void ons_Initialize()
+{
+       ons_captureshield_force = autocvar_g_onslaught_shield_force;
+       InitializeEntity(world, ons_DelayedInit, INITPRIO_GAMETYPE);
+}
+
 MUTATOR_DEFINITION(gamemode_onslaught)
 {
-       MUTATOR_HOOK(BuildMutatorsPrettyString, ons_BuildMutatorsPrettyString, CBC_ORDER_ANY);
-       MUTATOR_HOOK(BuildMutatorsString, ons_BuildMutatorsString, CBC_ORDER_ANY);
+       MUTATOR_HOOK(reset_map_global, ons_ResetMap, CBC_ORDER_ANY);
+       MUTATOR_HOOK(MakePlayerObserver, ons_RemovePlayer, CBC_ORDER_ANY);
+       MUTATOR_HOOK(ClientDisconnect, ons_RemovePlayer, CBC_ORDER_ANY);
        MUTATOR_HOOK(PlayerSpawn, ons_PlayerSpawn, CBC_ORDER_ANY);
+       MUTATOR_HOOK(PlayerDies, ons_PlayerDies, CBC_ORDER_ANY);
        MUTATOR_HOOK(MonsterMove, ons_MonsterThink, CBC_ORDER_ANY);
        MUTATOR_HOOK(MonsterSpawn, ons_MonsterSpawn, CBC_ORDER_ANY);
-       //MUTATOR_HOOK(Spawn_Score, ons_Spawn_Score, CBC_ORDER_ANY);
+       MUTATOR_HOOK(TurretSpawn, ons_TurretSpawn, CBC_ORDER_ANY);
+       MUTATOR_HOOK(HavocBot_ChooseRule, ons_BotRoles, CBC_ORDER_ANY);
 
        MUTATOR_ONADD
        {
                if(time > 1) // game loads at time 1
                        error("This is a game type and it cannot be added at runtime.");
+               ons_Initialize();
+       }
+
+       MUTATOR_ONROLLBACK_OR_REMOVE
+       {
+               // we actually cannot roll back ons_Initialize here
+               // BUT: we don't need to! If this gets called, adding always
+               // succeeds.
        }
 
        MUTATOR_ONREMOVE
@@ -1711,5 +1986,5 @@ MUTATOR_DEFINITION(gamemode_onslaught)
                return -1;
        }
 
-       return 0;
+       return FALSE;
 }
diff --git a/qcsrc/server/mutators/gamemode_onslaught.qh b/qcsrc/server/mutators/gamemode_onslaught.qh
new file mode 100644 (file)
index 0000000..7e318cc
--- /dev/null
@@ -0,0 +1,46 @@
+// these are needed since mutators are compiled last
+
+#ifdef SVQC
+
+.entity ons_toucher; // player who touched the control point
+
+// control point / generator constants
+#define CP_THINKRATE 0.2
+
+// definitions
+.entity sprite;
+.string target2;
+.float iscaptured;
+.float islinked;
+.float isgenneighbor_red;
+.float isgenneighbor_blue;
+.float iscpneighbor_red;
+.float iscpneighbor_blue;
+.float isshielded;
+.float lasthealth;
+.float lastteam;
+.float lastshielded;
+.float lastcaptured;
+
+entity ons_generator[17];
+.float isgenneighbor[17];
+.float iscpneighbor[17];
+float ons_notification_time[17];
+
+.vector ons_deathloc;
+
+// declarations for functions used outside gamemode_onslaught.qc
+void onslaught_generator_updatesprite(entity e);
+void onslaught_controlpoint_updatesprite(entity e);
+void onslaught_link_checkupdate();
+float onslaught_controlpoint_attackable(entity cp, float t);
+
+// CaptureShield: Prevent capturing or destroying control point/generator if it is not available yet
+float ons_captureshield_force; // push force of the shield
+
+// score rule declarations
+#define ST_ONS_CAPS 1
+#define SP_ONS_CAPS 4
+#define SP_ONS_TAKES 6
+
+#endif
index 1ae22e2029f7ff518aff3b21533a54a07163673d..62a35767d8152d9a814c0b4a6f4d1e4d624bb545 100644 (file)
@@ -48,6 +48,7 @@ mutators/gamemode_keepaway.qh
 mutators/gamemode_nexball.qh 
 mutators/gamemode_lms.qh
 mutators/gamemode_invasion.qh
+mutators/gamemode_onslaught.qh
 mutators/mutator_dodging.qh
 mutators/mutator_nades.qh
 
@@ -55,6 +56,9 @@ mutators/mutator_nades.qh
 tturrets/include/turrets_early.qh
 vehicles/vehicles_def.qh
 
+generator.qh
+controlpoint.qh
+
 campaign.qh
 ../common/campaign_common.qh
 ../common/mapinfo.qh
@@ -208,6 +212,9 @@ spawnpoints.qc
 
 portals.qc
 
+generator.qc
+controlpoint.qc
+
 target_spawn.qc
 func_breakable.qc
 target_music.qc
index e332e55ed80de06b3b4ce73e6fa2f063d1f4d8d0..bb2cc4cf02bf2f75d7144279cf94071a3b0c7fd9 100644 (file)
@@ -153,6 +153,8 @@ void InitGameplayMode()
        if(g_onslaught)
        {
                ActivateTeamplay();
+               fraglimit_override = 0;
+               leadlimit_override = 0;
                have_team_spawns = -1; // request team spawns
                MUTATOR_ADD(gamemode_onslaught);
        }