r116 - trunk/progsqc
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sun Jun 15 19:38:41 EDT 2008
Author: vermeulen
Date: 2008-06-15 19:38:40 -0400 (Sun, 15 Jun 2008)
New Revision: 116
Modified:
trunk/progsqc/bots.qc
trunk/progsqc/damage.qc
trunk/progsqc/dpextensions.qc
trunk/progsqc/inventory.qc
trunk/progsqc/player.qc
trunk/progsqc/server.qc
trunk/progsqc/structures.qc
Log:
not much has changed in two months
Modified: trunk/progsqc/bots.qc
===================================================================
--- trunk/progsqc/bots.qc 2008-03-26 18:01:59 UTC (rev 115)
+++ trunk/progsqc/bots.qc 2008-06-15 23:38:40 UTC (rev 116)
@@ -57,7 +57,9 @@
local vector vec, en, diff, dir;
vec = self.origin;
+ self.goalentity = self.enemy;
movetogoal(20);
+
en = self.origin;
self.origin = vec;
@@ -117,7 +119,7 @@
while (e)
{
if (e.team != self.team)
- if (e.classname == "playerclass")
+ if (e.classname == "player")
if (e.takedamage)
if (!e.deadflag)
if (!(e.flags & FL_NOTARGET))
@@ -146,6 +148,15 @@
}
else
{
+ Inventory_GetItemInfo(self, self.itemselected);
+ if (iteminfo_ammo1fireflags & FIREFLAG_JETPACK)
+ {
+ self.button7 = 1;
+ }
+ else
+ self.button7 = 0;
+ // if it has jetpack proj flag, use
+
//ai_strafe();
if (self.enemy.deadflag || !self.enemy.takedamage)
{
@@ -202,7 +213,7 @@
// keep spawning new bots
}
-void() enemy_class2
+void() enemy_soldier
{
if (cvar("g_gametype") == 1)
{
@@ -216,7 +227,7 @@
}
};
-void() enemy_class3
+void() enemy_spy
{
if (cvar("g_gametype") == 1)
{
@@ -230,7 +241,7 @@
}
};
-void() enemy_class4
+void() enemy_minesoldier
{
if (cvar("g_gametype") == 1)
{
@@ -245,7 +256,7 @@
};
-void() enemy_class5
+void() enemy_heavy
{
if (cvar("g_gametype") == 1)
{
@@ -260,7 +271,7 @@
};
-void() enemy_class6
+void() enemy_turret
{
if (cvar("g_gametype") == 1)
{
@@ -274,7 +285,7 @@
}
};
-void() enemy_class7
+void() enemy_largeturret
{
if (cvar("g_gametype") == 1)
{
Modified: trunk/progsqc/damage.qc
===================================================================
--- trunk/progsqc/damage.qc 2008-03-26 18:01:59 UTC (rev 115)
+++ trunk/progsqc/damage.qc 2008-06-15 23:38:40 UTC (rev 116)
@@ -351,6 +351,20 @@
self.th_die();
return;
}
+ /*
+ if (self.projflag & PROJFLAG_PROXIMITY)
+ {
+ entity e;
+ e = findradius(self.origin, self.damageinfo_z);
+ while (e)
+ {
+ if ((e.classname == "playerclass") && (e.team != self.team))
+ {
+ self.th_die();
+ }
+ e = e.chain;
+ }
+ } */
if (self.projflag & PROJFLAG_LASERGUIDED)
{
float velspeed,turnrate;
Modified: trunk/progsqc/dpextensions.qc
===================================================================
--- trunk/progsqc/dpextensions.qc 2008-03-26 18:01:59 UTC (rev 115)
+++ trunk/progsqc/dpextensions.qc 2008-06-15 23:38:40 UTC (rev 116)
@@ -1657,3 +1657,5 @@
//A function that gets called just before progs exit. To save persistent data from.
//It is not called on a crash or error.
//void SV_Shutdown();
+
+void(float index, float type, ...) addstat = #232;
\ No newline at end of file
Modified: trunk/progsqc/inventory.qc
===================================================================
--- trunk/progsqc/inventory.qc 2008-03-26 18:01:59 UTC (rev 115)
+++ trunk/progsqc/inventory.qc 2008-06-15 23:38:40 UTC (rev 116)
@@ -689,7 +689,7 @@
Item_Spawn(ITEMTYPE_WEAP10,1,50,self.origin,'0 0 0',10,1.5,world);
}
-/*
+
void() weapon_weap1 =
{
Item_Spawn(ITEMTYPE_WEAP1,1,100,self.origin,'0 0 0',10,1.5,world);
@@ -724,8 +724,17 @@
{
Item_Spawn(ITEMTYPE_WEAP7,1,100,self.origin,'0 0 0',10,1.5,world);
}
-*/
+void() weapon_weap8 =
+{
+ Item_Spawn(ITEMTYPE_WEAP8,1,100,self.origin,'0 0 0',10,1.5,world);
+}
+
+void() weapon_weap9 =
+{
+ Item_Spawn(ITEMTYPE_WEAP9,1,100,self.origin,'0 0 0',10,1.5,world);
+}
+
void() item_ammo1 =
{
Item_Spawn(ITEMTYPE_AMMO1,50,0,self.origin,'0 0 0',10,1,world);
Modified: trunk/progsqc/player.qc
===================================================================
--- trunk/progsqc/player.qc 2008-03-26 18:01:59 UTC (rev 115)
+++ trunk/progsqc/player.qc 2008-06-15 23:38:40 UTC (rev 116)
@@ -56,7 +56,7 @@
local float newweapon;
local float classnumber;
local float i;
- for (classnumber = 1;classnumber < ACTORTYPE_TOTAL;classnumber++)
+ for (classnumber = 0;classnumber < ACTORTYPE_TOTAL;classnumber++)
{
cname = strcat("g_class",ftos(classnumber));
@@ -398,18 +398,30 @@
//self.classnum = cvar("g_startclass");
spot = SelectSpawnPoint ();
+ setorigin (self, spot.origin + '0 0 1');
self.angles = spot.angles;
- setorigin (self, spot.origin + '0 0 1');
self.fixangle = TRUE;
self.v_angle = self.angles_x * '-1 0 0' + self.angles_y * '0 1 0';
self.nextthink = 0;
-
+
+ if (cvar("g_gametype") == 1)
+ {
+ self.team = 5;
+ self.classnum = 0;
+ stuffcmd(self,"cmd join\n");
+ }
+ else
+ {
+ if (!self.spawned)
+ {
+ stuffcmd(self,"menu_showteamselect\n");
+ }
+ }
+
if (!self.spawned)
{
self.health = 1;
-
- stuffcmd(self,"menu_showteamselect\n");
}
else
{
@@ -557,10 +569,10 @@
{
if (self.oldvelocity_z < -500)
{
- sound(self, CHAN_BODY, strcat(self.playerclass.sounddir, "/hardlanding.wav"), 1, ATTN_NORM);
- T_Damage(self, world, world, DAMAGETYPE_FALL, PLAYER_FALLDAMAGE, self.origin + self.mins_z * '0 0 1', '0 0 0');
+ //sound(self, CHAN_BODY, strcat(self.playerclass.sounddir, "/hardlanding.wav"), 1, ATTN_NORM);
+ //T_Damage(self, world, world, DAMAGETYPE_FALL, PLAYER_FALLDAMAGE, self.origin + self.mins_z * '0 0 1', '0 0 0');
// this code made the player bounce on hard landings... why?
- //self.velocity_z = self.velocity_z + self.oldvelocity_z * -1;
+ self.velocity_z = self.velocity_z + self.oldvelocity_z * -0.2;
}
else
sound(self, CHAN_BODY, strcat(self.playerclass.sounddir, "/landing.wav"), 1, ATTN_NORM);
@@ -724,7 +736,38 @@
self.oldbutton3 = self.button3;
};
+
/*
+void() CheckClimb =
+{
+ local vector start, end;
+
+ makevectors (self.angles);
+ start = self.origin;
+ start_z = start_z + self.maxs_z - 8;
+ v_forward_z = 0;
+ normalize(v_forward);
+ end = start + v_forward*24;
+ traceline (start, end, TRUE, self);
+ if (trace_fraction < 1)
+ { // solid at head
+ start_z = start_z + self.maxs_z + 10;
+ end = start + v_forward*100;
+ self.movedir = trace_plane_normal * -50;
+ traceline (start, end, TRUE, self);
+ if (trace_fraction == 1)
+ { // open above
+ self.flags = self.flags | FL_WATERJUMP;
+ self.velocity = self.velocity * 0;
+ self.flags = self.flags - (self.flags & FL_JUMPRELEASED);
+ self.teleport_time = time + 1; // safety net
+ return;
+ }
+ }
+};
+*/
+
+/*
=============
SV_PlayerPhysics
@@ -815,8 +858,21 @@
self.angles_z = 0;
}
- if (self.movetype == MOVETYPE_NOCLIP)
+ // climbing
+ if (self.flags & FL_WATERJUMP )
{
+ self.velocity_x = self.movedir_x;
+ self.velocity_y = self.movedir_y;
+
+ self.origin_z = self.origin_z + 1;
+ if (time > self.teleport_time)
+ {
+ self.flags = self.flags - (self.flags & FL_WATERJUMP);
+ self.teleport_time = 0;
+ }
+ }
+ else if (self.movetype == MOVETYPE_NOCLIP)
+ {
// noclipping or flying
self.velocity = self.velocity * (1 - frametime * sv_friction);
makevectors(self.v_angle);
Modified: trunk/progsqc/server.qc
===================================================================
--- trunk/progsqc/server.qc 2008-03-26 18:01:59 UTC (rev 115)
+++ trunk/progsqc/server.qc 2008-06-15 23:38:40 UTC (rev 116)
@@ -120,7 +120,7 @@
{
self.classnum = stof(argv(1));
if ((self.classnum > ACTORTYPE_TOTAL) || (self.classnum <= ACTORTYPE_INVALID))
- self.classnum = 1;
+ self.classnum = 0;
}
else if( c == "selectteam" )
{
Modified: trunk/progsqc/structures.qc
===================================================================
--- trunk/progsqc/structures.qc 2008-03-26 18:01:59 UTC (rev 115)
+++ trunk/progsqc/structures.qc 2008-06-15 23:38:40 UTC (rev 116)
@@ -68,6 +68,9 @@
self.unlimitedinventory = 1;
self.solid = SOLID_BBOX;
self.movetype = MOVETYPE_TOSS;
+ self.scale = 0.5;
+ self.glow_size = 500;
+ self.colormod = '3 3 3';
setmodel(self, "models/structures/reactor/reactor.md3");
self.takedamage = DAMAGE_YES;
More information about the zymotic-commits
mailing list