r92 - trunk/basezym/progsqc
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri Dec 21 18:17:10 EST 2007
Author: Vermeulen
Date: 2007-12-21 18:17:10 -0500 (Fri, 21 Dec 2007)
New Revision: 92
Modified:
trunk/basezym/progsqc/actor.qc
trunk/basezym/progsqc/bots.qc
trunk/basezym/progsqc/inventory.qc
trunk/basezym/progsqc/player.qc
Log:
Reverted angvelo for now
Fixed problems with AI
Modified: trunk/basezym/progsqc/actor.qc
===================================================================
--- trunk/basezym/progsqc/actor.qc 2007-12-14 05:13:28 UTC (rev 91)
+++ trunk/basezym/progsqc/actor.qc 2007-12-21 23:17:10 UTC (rev 92)
@@ -17,7 +17,10 @@
float ACTORTYPE_CLASS5 = 5;
float ACTORTYPE_CLASS6 = 6;
float ACTORTYPE_CLASS7 = 7;
-float ACTORTYPE_TOTAL = 8;
+float ACTORTYPE_CLASS8 = 8;
+float ACTORTYPE_CLASS9 = 9;
+float ACTORTYPE_CLASS10 = 10;
+float ACTORTYPE_TOTAL = 11;
.float actortype;
@@ -424,7 +427,6 @@
local vector shotorg;
local vector shotdir;
local vector shotdamage;
- local vector anglespeed;
local float shotdamagetype;
local float shotlifetime;
local float shotprojflags;
@@ -451,7 +453,6 @@
shotorg = muzzle2tagorigin; // overridden on hagar
shotdir = iteminfo_ammo2speeds;
shotdamage = iteminfo_ammo2damage;
- anglespeed = iteminfo_ammo2angspeeds;
shotdamagetype = iteminfo_ammo2damagetype;
shotlifetime = iteminfo_ammo2lifetime;
shotprojflags = iteminfo_ammo2projflags;
@@ -476,7 +477,6 @@
shotorg = muzzle1tagorigin;
shotdir = iteminfo_ammo1speeds;
shotdamage = iteminfo_ammo1damage;
- anglespeed = iteminfo_ammo1angspeeds;
shotdamagetype = iteminfo_ammo1damagetype;
shotlifetime = iteminfo_ammo1lifetime;
shotprojflags = iteminfo_ammo1projflags;
@@ -510,7 +510,7 @@
while (numberof != 0)
{
- weapon_fireprojectile(shotmodel, shotorg, shotdir, anglespeed, shotdamage, shotdamagetype, shotlifetime, shotprojflags, shotfireflags, shotexplflags, shotfiresound, shotexplodesound, shotbouncesound, tracer, tracermodel, modelscale, projhealth, projmass, projcolormod);
+ weapon_fireprojectile(shotmodel, shotorg, shotdir, shotdamage, shotdamagetype, shotlifetime, shotprojflags, shotfireflags, shotexplflags, shotfiresound, shotexplodesound, shotbouncesound, tracer, tracermodel, modelscale, projhealth, projmass, projcolormod);
numberof = numberof - 1;
}
};
Modified: trunk/basezym/progsqc/bots.qc
===================================================================
--- trunk/basezym/progsqc/bots.qc 2007-12-14 05:13:28 UTC (rev 91)
+++ trunk/basezym/progsqc/bots.qc 2007-12-21 23:17:10 UTC (rev 92)
@@ -210,8 +210,8 @@
self.nextthink = time;
self.team = cvar("g_defaultenemyteam");
self.unlimitedinventory = 1;
- player_spawn(ACTORTYPE_CLASS2);
- total_monsters = total_monsters + 1;
+ self.spawned = 1;
+ player_spawn(ACTORTYPE_CLASS5);
}
};
@@ -224,8 +224,8 @@
self.nextthink = time;
self.team = cvar("g_defaultenemyteam");
self.unlimitedinventory = 1;
- player_spawn(ACTORTYPE_CLASS3);
- total_monsters = total_monsters + 1;
+ self.spawned = 1;
+ player_spawn(ACTORTYPE_CLASS6);
}
};
@@ -238,11 +238,12 @@
self.nextthink = time;
self.team = cvar("g_defaultenemyteam");
self.unlimitedinventory = 1;
- player_spawn(ACTORTYPE_CLASS4);
- total_monsters = total_monsters + 1;
+ self.spawned = 1;
+ player_spawn(ACTORTYPE_CLASS7);
}
};
+
void() enemy_class5
{
if (cvar("g_gametype") == 1)
@@ -252,7 +253,8 @@
self.nextthink = time;
self.team = cvar("g_defaultenemyteam");
self.unlimitedinventory = 1;
- player_spawn(ACTORTYPE_CLASS5);
+ self.spawned = 1;
+ player_spawn(ACTORTYPE_CLASS8);
}
};
@@ -266,7 +268,8 @@
self.nextthink = time;
self.team = cvar("g_defaultenemyteam");
self.unlimitedinventory = 1;
- player_spawn(ACTORTYPE_CLASS6);
+ self.spawned = 1;
+ player_spawn(ACTORTYPE_CLASS9);
}
};
@@ -279,6 +282,7 @@
self.nextthink = time;
self.team = cvar("g_defaultenemyteam");
self.unlimitedinventory = 1;
- player_spawn(ACTORTYPE_CLASS7);
+ self.spawned = 1;
+ player_spawn(ACTORTYPE_CLASS10);
}
};
\ No newline at end of file
Modified: trunk/basezym/progsqc/inventory.qc
===================================================================
--- trunk/basezym/progsqc/inventory.qc 2007-12-14 05:13:28 UTC (rev 91)
+++ trunk/basezym/progsqc/inventory.qc 2007-12-21 23:17:10 UTC (rev 92)
@@ -113,8 +113,6 @@
vector iteminfo_ammo2colormod;
vector iteminfo_ammo1viewmodelpush;
vector iteminfo_ammo2viewmodelpush;
-vector iteminfo_ammo1angspeeds;
-vector iteminfo_ammo2angspeeds;
float iteminfo_ammo1noprojectile;
float iteminfo_ammo2noprojectile;
@@ -180,7 +178,6 @@
iteminfo_ammo1minimumtofire = 0;
iteminfo_ammo1damagetype = DAMAGETYPE_UNKNOWN;
iteminfo_ammo1damage = '0 0 0';
- iteminfo_ammo1angspeeds = '0 0 0';
iteminfo_ammo1speeds = '0 0 0';
iteminfo_ammo1lifetime = 10;
iteminfo_ammo1projflags = PROJFLAG_ANYIMPACT;
@@ -203,7 +200,6 @@
iteminfo_ammo2minimumtofire = 0;
iteminfo_ammo2damagetype = DAMAGETYPE_UNKNOWN;
iteminfo_ammo2damage = '0 0 0';
- iteminfo_ammo2angspeeds = '0 0 0';
iteminfo_ammo2speeds = '0 0 0';
iteminfo_ammo2lifetime = 10;
iteminfo_ammo2projflags = PROJFLAG_ANYIMPACT;
@@ -282,7 +278,6 @@
iteminfo_ammo1damage = stov(cvar_string(wname,"_ammo1damage"));
iteminfo_ammo1speeds = stov(cvar_string(wname,"_ammo1speeds"));
- iteminfo_ammo1angspeeds = stov(cvar_string(wname,"_ammo1angspeeds"));
iteminfo_ammo1model = cvar_string(wname,"_ammo1model");
iteminfo_ammo1firesound = cvar_string(wname,"_ammo1firesound");
//iteminfo_ammo1explodesound = strzone(cvar_string(wname,"_ammo1explodesound"));
@@ -308,7 +303,6 @@
iteminfo_ammo2damage = stov(cvar_string(wname,"_ammo2damage"));
iteminfo_ammo2speeds = stov(cvar_string(wname,"_ammo2speeds"));
- iteminfo_ammo2angspeeds = stov(cvar_string(wname,"_ammo2angspeeds"));
iteminfo_ammo2model = cvar_string(wname,"_ammo2model");
iteminfo_ammo2firesound = cvar_string(wname,"_ammo2firesound");
//iteminfo_ammo2explodesound = strzone(cvar_string(wname,"_ammo2explodesound"));
Modified: trunk/basezym/progsqc/player.qc
===================================================================
--- trunk/basezym/progsqc/player.qc 2007-12-14 05:13:28 UTC (rev 91)
+++ trunk/basezym/progsqc/player.qc 2007-12-21 23:17:10 UTC (rev 92)
@@ -56,16 +56,6 @@
pc.bloodtype = cvar(cname,"_bloodtype");
pc.gibtype = cvar(cname,"_gibtype");
-
- pc.jetpack_fuelmax = cvar(cname,"_jetpack_fuelmax");
- pc.jetpack_acc = cvar(cname,"_jetpack_acc");
- pc.jetpack_accadd = cvar(cname,"_jetpack_accadd");
- pc.jetpack_accbase = cvar(cname,"_jetpack_accbase");
- pc.jetpack_maxupspeed = cvar(cname,"_jetpack_maxupspeed");
- pc.jetpack_maxmovespeed = cvar(cname,"_jetpack_maxmovespeed");
- pc.jetpack_fuelregenair = cvar(cname,"_jetpack_fuelregenair");
- pc.jetpack_fuelregenground = cvar(cname,"_jetpack_fuelregenground");
- pc.jetpack_use = cvar(cname,"_jetpack_use");
pc.animationtype = cvar(cname,"_animationtype");
@@ -196,6 +186,16 @@
Inventory_ModifyItem(pc, newweapon + ITEMTYPE_ITEM1, iteminfo_quantitymax, 0);
}
}
+
+ for (i=1; i < ITEMTYPE_ITEM1 - ITEMTYPE_AI_WEAP1; i++)
+ {
+ if (cvar(cname,"_aiweapon",ftos(i)) != 0)
+ {
+ newweapon = cvar(cname,"_aiweapon",ftos(i)) - 1 + ITEMTYPE_AI_WEAP1;
+ Inventory_GetItemInfo(pc, newweapon);
+ Inventory_ModifyItem(pc, newweapon, 1, iteminfo_ammomax);
+ }
+ }
}
};
@@ -253,17 +253,6 @@
self.bloodtype = pc.bloodtype;
self.gibtype = pc.gibtype;
- self.jetpack_fuel = pc.jetpack_fuelmax;
- self.jetpack_fuelmax = pc.jetpack_fuelmax;
- self.jetpack_acc = pc.jetpack_acc;
- self.jetpack_accadd = pc.jetpack_accadd;
- self.jetpack_accbase = pc.jetpack_accbase;
- self.jetpack_maxupspeed = pc.jetpack_maxupspeed;
- self.jetpack_maxmovespeed = pc.jetpack_maxmovespeed;
- self.jetpack_fuelregenair = pc.jetpack_fuelregenair;
- self.jetpack_fuelregenground = pc.jetpack_fuelregenground;
- self.jetpack_use = pc.jetpack_use;
-
self.animationtype = pc.animationtype;
self.scaleratio = pc.scaleratio;
@@ -578,7 +567,7 @@
{
if (self.jetpackactive)
{
- self.jetpackacc = self.jetpack_accbase;
+ self.jetpackacc = cvar("g_jetpack_accbase");
sound(self, CHAN_BODY, strcat(self.playerclass.sounddir, "/jetpackstop.wav"), 1, ATTN_NORM);
self.jetpackactive = FALSE;
self.actorpart_jetpacktrail.effects = self.actorpart_jetpacktrail.effects | EF_NODRAW;
@@ -875,13 +864,12 @@
{
self.movetype = MOVETYPE_FLY;
- if (self.velocity_z < self.jetpack_maxupspeed)
+ if (self.velocity_z < cvar("g_jetpack_maxupspeed"))
{
- self.jetpack_acc = self.jetpack_acc + self.jetpack_acc;
self.velocity_z = self.velocity_z + self.jetpackacc;
}
- if (wishspeed > self.jetpack_maxmovespeed)
- wishspeed = self.jetpack_maxmovespeed;
+ if (wishspeed > cvar("g_jetpack_maxmovespeed"))
+ wishspeed = cvar("g_jetpack_maxmovespeed");
}
else
{
@@ -1139,6 +1127,7 @@
self = newmis;
self.team = cvar("g_defaultenemyteam");
self.unlimitedinventory = 1;
+ self.spawned = 1;
player_spawn(impuls - 30);
self = oldself;
}
@@ -1175,17 +1164,6 @@
}
self.switchweaponitem = Inventory_GetBestWeapon(self);
}
- if (impuls == 20)
- {
- c = ITEMTYPE_ITEM1;
- while (c < ITEMTYPE_AMMO1)
- {
- Inventory_GetItemInfo(self, c);
- Inventory_ModifyItem(self, c, iteminfo_quantitymax, iteminfo_ammomax);
- c = c + 1;
- }
- self.switchweaponitem = Inventory_GetBestWeapon(self);
- }
}
if (impuls >= 1 && impuls <= 9)
{
@@ -1202,7 +1180,7 @@
if (select == 0)
{
self.switchweaponitem = w;
- bprint(iteminfo_name,"\n");
+ //bprint(iteminfo_name,"\n");
break;
}
}
@@ -1223,7 +1201,7 @@
if (iteminfo_weapon_canraise)
{
self.switchweaponitem = w;
- bprint(iteminfo_name,"\n");
+ //bprint(iteminfo_name,"\n");
break;
}
}
@@ -1242,7 +1220,7 @@
if (iteminfo_weapon_canraise)
{
self.switchweaponitem = w;
- bprint(iteminfo_name,"\n");
+ //bprint(iteminfo_name,"\n");
break;
}
}
@@ -1260,7 +1238,7 @@
Inventory_GetItemInfo(self, w);
if (iteminfo_weapon_canraise)
{
- bprint(iteminfo_name,"\n");
+ //bprint(iteminfo_name,"\n");
self.itemselected = w;
break;
}
More information about the zymotic-commits
mailing list