r64 - trunk/basezym/progsqc
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri Oct 27 11:07:38 EDT 2006
Author: vermeulen
Date: 2006-10-27 11:07:38 -0400 (Fri, 27 Oct 2006)
New Revision: 64
Modified:
trunk/basezym/progsqc/damage.qc
trunk/basezym/progsqc/inventory.qc
trunk/basezym/progsqc/player.qc
Log:
Made the AI use the electro for now, changed weapons
Modified: trunk/basezym/progsqc/damage.qc
===================================================================
--- trunk/basezym/progsqc/damage.qc 2006-10-01 03:32:20 UTC (rev 63)
+++ trunk/basezym/progsqc/damage.qc 2006-10-27 15:07:38 UTC (rev 64)
@@ -1,5 +1,5 @@
-float ACTOR_SHIELD_REGENDELAY = 5;
+float ACTOR_SHIELD_REGENDELAY = 1;
.float armorregentime;
.float armorregenplaysound;
.float armorregenrate;
@@ -402,22 +402,25 @@
}
else if (self.lefty & PROJECTILEFLAG_EXPLODE)
{
- // TODO: become a rocket/grenade explosion sprite
te_explosion(self.origin);
remove(self);
}
else if (self.lefty & PROJECTILEFLAG_PLASMALARGE)
{
- // TODO: become a plasma explosion sprite
- // TODO: add a plasma effect
te_plasmaburn(self.origin);
remove(self);
}
else if (self.lefty & PROJECTILEFLAG_PLASMA)
{
- // TODO: become a plasma explosion sprite
- // TODO: add a plasma effect
- te_gunshotquad(self.origin);
+ WriteByte (MSG_BROADCAST, SVC_TEMPENTITY);
+ WriteByte (MSG_BROADCAST, 79);
+ WriteCoord (MSG_BROADCAST, self.origin_x);
+ WriteCoord (MSG_BROADCAST, self.origin_y);
+ WriteCoord (MSG_BROADCAST, self.origin_z);
+ WriteCoord (MSG_BROADCAST, 0);
+ WriteCoord (MSG_BROADCAST, 0);
+ WriteCoord (MSG_BROADCAST, 0);
+ WriteByte (MSG_BROADCAST, 155);
remove(self);
}
else // metal projectile of some sort (bullet, shrapnel, railgun bolt, etc)
@@ -585,7 +588,7 @@
if (projectileflags & PROJECTILEFLAG_ROCKET)
newmis.movetype = MOVETYPE_BOUNCEMISSILE;
if (projectileflags & PROJECTILEFLAG_GLOW)
- newmis.effects = newmis.effects | EF_FULLBRIGHT | EF_ADDITIVE;
+ newmis.effects = newmis.effects | EF_ADDITIVE | EF_FULLBRIGHT | EF_NOSHADOW; // | EF_BRIGHTFIELD; Add once Zymotic gamemode has support for this
};
Modified: trunk/basezym/progsqc/inventory.qc
===================================================================
--- trunk/basezym/progsqc/inventory.qc 2006-10-01 03:32:20 UTC (rev 63)
+++ trunk/basezym/progsqc/inventory.qc 2006-10-27 15:07:38 UTC (rev 64)
@@ -214,7 +214,7 @@
iteminfo_ammo1minimumtofire = 1;
iteminfo_ammo1damage = '10 10 0';
iteminfo_ammo1speeds = '20000 0 300';
- iteminfo_ammo1model = "models/weapons/assaultrailgun_bullet.mdl";
+ iteminfo_ammo1model = "models/weapons/bullet.mdl";
iteminfo_ammo1firesound = "weapons/assaultrailgun_bulletfire1.wav"; // templeofnoise
// iteminfo_ammo1explodesound = "weapons/assaultrailgun_bulletimpact.wav"; // templeofnoise: using minigun ones
iteminfo_ammo1inventorymax = 80;
@@ -237,14 +237,14 @@
iteminfo_ammo1flags = PROJECTILEFLAG_ANYIMPACT | PROJECTILEFLAG_PLASMA | PROJECTILEFLAG_MUZZLEFLASH | PROJECTILEFLAG_GLOW | PROJECTILEFLAG_ROCKET;
iteminfo_ammo1minimumtofire = 1;
iteminfo_ammo1damage = '60 20000 100';
- iteminfo_ammo1speeds = '2000 0 30';
+ iteminfo_ammo1speeds = '1500 0 30';
iteminfo_ammo1inventorymax = 90;
iteminfo_ammo1model = "models/weapons/crylink_bullet.mdl";
iteminfo_ammo1firesound = "weapons/crylink_shot.wav";
iteminfo_ammo1explodesound = "weapons/crylink_shotexplode.wav";
iteminfo_weapon_viewmodel = "models/items/crylink.md3";
iteminfo_weapon_viewmodelanim_idle = '0 0 30';
- iteminfo_weapon_viewmodelanim_fire1 = '0 0 3';
+ iteminfo_weapon_viewmodelanim_fire1 = '0 0 2';
iteminfo_weapon_viewmodelanim_fire2 = '0 0 3';
iteminfo_weapon_viewmodelanim_reload = '0 0 1';
iteminfo_weapon_viewmodelanim_lower = '0 0 2';
@@ -264,7 +264,7 @@
iteminfo_ammo1damage = '30 20 5';
iteminfo_ammo1speeds = '20000 0 600';
iteminfo_ammo1inventorymax = 600;
- iteminfo_ammo1model = "models/weapons/assaultrailgun_bullet.mdl";
+ iteminfo_ammo1model = "models/weapons/bullet.mdl";
iteminfo_ammo1firesound = "weapons/minigun_bulletfire1.wav"; // templeofnoise
iteminfo_ammo1explodesound = "weapons/bullet_ric1.wav"; // templeofnoise
iteminfo_weapon_viewmodel = "models/items/minigun.md3";
@@ -292,6 +292,17 @@
iteminfo_ammo1model = "models/weapons/hagar_rocket.md3";
iteminfo_ammo1firesound = "weapons/hagar_rocketfire.wav";
iteminfo_ammo1explodesound = "weapons/hagar_rocketexplode.wav";
+ iteminfo_ammo2max = 60;
+ iteminfo_ammo2itemtype = ITEMTYPE_HAGAR_AMMO;
+ iteminfo_ammo2damagetype = DAMAGETYPE_HAGAR_ROCKET;
+ iteminfo_ammo2flags = PROJECTILEFLAG_ANYIMPACT | PROJECTILEFLAG_EXPLODE | PROJECTILEFLAG_ROCKET | PROJECTILEFLAG_MUZZLEFLASH;// | PROJECTILEFLAG_RICOCHET;
+ iteminfo_ammo2minimumtofire = 1;
+ iteminfo_ammo2damage = '120 20000 30';
+ iteminfo_ammo2speeds = '500 0 2';
+ iteminfo_ammo2inventorymax = 60;
+ iteminfo_ammo2model = "models/weapons/hagar_rocket.md3";
+ iteminfo_ammo2firesound = "weapons/hagar_rocketfire.wav";
+ iteminfo_ammo2explodesound = "weapons/hagar_rocketexplode.wav";
iteminfo_weapon_viewmodel = "models/items/hagar.md3";
iteminfo_weapon_viewmodelanim_idle = '0 0 30';
iteminfo_weapon_viewmodelanim_fire1 = '0 0 3';
@@ -341,7 +352,7 @@
iteminfo_ammo1damage = '250 1500 5';
iteminfo_ammo1speeds = '200000 0 200';
iteminfo_ammo1inventorymax = 40;
- iteminfo_ammo1model = "models/weapons/sniperrailgun_bullet.dpm";
+ iteminfo_ammo1model = "models/weapons/bullet.mdl";
iteminfo_ammo1firesound = "weapons/sniperrailgun_bulletfire.wav";
iteminfo_ammo1explodesound = "weapons/sniperrailgun_bulletimpact.wav";
iteminfo_weapon_viewmodel = "models/items/sniperrailgun.md3";
Modified: trunk/basezym/progsqc/player.qc
===================================================================
--- trunk/basezym/progsqc/player.qc 2006-10-01 03:32:20 UTC (rev 63)
+++ trunk/basezym/progsqc/player.qc 2006-10-27 15:07:38 UTC (rev 64)
@@ -9,7 +9,7 @@
float PLAYER_HEALTH_MAX = 200;
float PLAYER_SHIELD_START = 200;
float PLAYER_SHIELD_MAX = 600;
-float PLAYER_SHIELD_REGENRATE = 200;
+float PLAYER_SHIELD_REGENRATE = 20;
float PLAYER_SHIELD_REGENMAX = 200;
float PLAYER_FALLDAMAGE = 30;
@@ -205,9 +205,9 @@
pc.actoranim_LEGS_IDLECR = '236 5 15' + legsframesoffset;
pc.actoranim_LEGS_TURN = '245 7 15' + legsframesoffset;
Inventory_Clear(pc);
- Inventory_GetItemInfo(pc, ITEMTYPE_ASSAULTRAILGUN);
- Inventory_ModifyItem(pc, ITEMTYPE_ASSAULTRAILGUN, 1, iteminfo_ammo1max, iteminfo_ammo2max);
- Inventory_ModifyItem(pc, ITEMTYPE_ASSAULTRAILGUN_AMMO, iteminfo_ammo1max * 1, 0, 0);
+ Inventory_GetItemInfo(pc, ITEMTYPE_CRYLINK);
+ Inventory_ModifyItem(pc, ITEMTYPE_CRYLINK, 1, iteminfo_ammo1max, iteminfo_ammo2max);
+ Inventory_ModifyItem(pc, ITEMTYPE_CRYLINK_AMMO, iteminfo_ammo1inventorymax * 2, 0, 0);
pc = playerclass_spawn(ACTORTYPE_HEAVYGUARD, AITYPE_SMARTFELLOW, "models/players/soldier", ".md3", "player");
pc.health = PLAYER_HEALTH_START;
@@ -250,9 +250,9 @@
pc.actoranim_LEGS_IDLECR = '236 5 15' + legsframesoffset;
pc.actoranim_LEGS_TURN = '245 7 15' + legsframesoffset;
Inventory_Clear(pc);
- Inventory_GetItemInfo(pc, ITEMTYPE_ASSAULTRAILGUN);
- Inventory_ModifyItem(pc, ITEMTYPE_ASSAULTRAILGUN, 1, iteminfo_ammo1max, iteminfo_ammo2max);
- Inventory_ModifyItem(pc, ITEMTYPE_ASSAULTRAILGUN_AMMO, iteminfo_ammo1max * 2, 0, 0);
+ Inventory_GetItemInfo(pc, ITEMTYPE_CRYLINK);
+ Inventory_ModifyItem(pc, ITEMTYPE_CRYLINK, 1, iteminfo_ammo1max, iteminfo_ammo2max);
+ Inventory_ModifyItem(pc, ITEMTYPE_CRYLINK_AMMO, iteminfo_ammo1inventorymax * 2, 0, 0);
};
entity(float type) playerclass_find =
@@ -549,9 +549,9 @@
{
if (self.button5)
{
- self.armorvalue = max(0, self.armorvalue - 20 * frametime);
- self.armorregentime = max(self.armorregentime, time + ACTOR_SHIELD_REGENDELAY);
- self.armorregenplaysound = TRUE;
+ //self.armorvalue = max(0, self.armorvalue - 20 * frametime);
+ //self.armorregentime = max(self.armorregentime, time + ACTOR_SHIELD_REGENDELAY);
+ //self.armorregenplaysound = TRUE;
if (!self.jetpackactive)
{
sound(self, CHAN_BODY, strcat(self.playerclass.sounddir, "/jetpack.wav"), 1, ATTN_NORM);
More information about the zymotic-commits
mailing list