r105 - trunk/progsqc

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sat Mar 8 04:50:15 EST 2008


Author: vermeulen
Date: 2008-03-08 04:50:15 -0500 (Sat, 08 Mar 2008)
New Revision: 105

Modified:
   trunk/progsqc/actor.qc
   trunk/progsqc/damage.qc
   trunk/progsqc/inventory.qc
   trunk/progsqc/player.qc
   trunk/progsqc/server.qc
Log:
Small changes to armor regen
Scaled the third person weird to 0.8, will be put into a per weapon cvar later

Modified: trunk/progsqc/actor.qc
===================================================================
--- trunk/progsqc/actor.qc	2008-03-08 05:28:58 UTC (rev 104)
+++ trunk/progsqc/actor.qc	2008-03-08 09:50:15 UTC (rev 105)
@@ -144,6 +144,8 @@
 	setmodel(self.actorpart_head, strcat(self.playerclass.modeldir, "/head", self.playerclass.modelext));
 	//setmodel(self.actorpart_hand,"models/weapons/hand.md3");
 	self.actorpart_weapon.model = ""; // will be changed by weapon code as needed
+	self.actorpart_weapon.scale = 0.8;
+
 	self.actorpart_viewweapon.model = ""; // will be changed by weapon code as needed
 	
 	self.scale = self.scaleratio;
@@ -544,6 +546,7 @@
 	actor_setweaponmodel(iteminfo_model, iteminfo_weapon_viewmodel);
 	actor_setviewmodeloffset(iteminfo_viewmodeloffset);
 	self.viewmodelchange = iteminfo_viewmodeloffset;
+	//self.actorpart_weapon.scale = iteminfo_modelscale;
 	
 	weapon_state(WS_IDLE);
 };

Modified: trunk/progsqc/damage.qc
===================================================================
--- trunk/progsqc/damage.qc	2008-03-08 05:28:58 UTC (rev 104)
+++ trunk/progsqc/damage.qc	2008-03-08 09:50:15 UTC (rev 105)
@@ -4,6 +4,7 @@
 .float armorregenplaysound;
 .float armorregenrate;
 .float armorregenmax;
+.float armormax;
 .float gibhealth;
 .float paintake;
 .void() th_gib;

Modified: trunk/progsqc/inventory.qc
===================================================================
--- trunk/progsqc/inventory.qc	2008-03-08 05:28:58 UTC (rev 104)
+++ trunk/progsqc/inventory.qc	2008-03-08 09:50:15 UTC (rev 105)
@@ -72,6 +72,7 @@
 float iteminfo_ammomax;
 float iteminfo_ammoinventorymax;
 float iteminfo_ammotype;
+float iteminfo_modelscale;
 
 float iteminfo_ammo1minimumtofire;
 float iteminfo_ammo2minimumtofire;
@@ -274,6 +275,8 @@
 		iteminfo_viewmodeloffset = stov(cvar_string(wname,"_viewmodeloffset"));
 		
 		iteminfo_rechargerate = cvar(wname,"_rechargerate");
+
+		iteminfo_modelscale = cvar(wname,"_modelscale");
 		
 		iteminfo_ammomax = cvar(wname,"_ammomax");
 		iteminfo_ammoinventorymax = cvar(wname,"_ammoinventorymax");
@@ -603,7 +606,9 @@
 	if (self.health)
 	   other.health = other.health + self.health;
 	else if (self.armorvalue)
-	   other.armorvalue = other.armorvalue + self.armorvalue;
+	{
+		other.armorvalue = other.armorvalue + self.armorvalue;
+	}
 	else
 	{
 		Inventory_AddFromInventory(other, self);

Modified: trunk/progsqc/player.qc
===================================================================
--- trunk/progsqc/player.qc	2008-03-08 05:28:58 UTC (rev 104)
+++ trunk/progsqc/player.qc	2008-03-08 09:50:15 UTC (rev 105)
@@ -66,9 +66,10 @@
 		  pc.health = cvar(cname,"_healthstart");
 		  pc.max_health = cvar(cname,"_healthmax");
 		  pc.armorvalue = cvar(cname,"_shieldstart");
+		  pc.armormax = cvar(cname,"_shieldmax");
 		  pc.armortype = 1;
 		  pc.armorregenrate = cvar(cname,"_regenrate");
-		  pc.armorregenmax = cvar(cname,"_shieldmax");
+		  pc.armorregenmax = cvar(cname,"_regenmax");
 		  pc.gibhealth = cvar(cname,"_gibhealth");
 		  pc.paintake = 20;
 		  pc.unlimitedinventory = FALSE;
@@ -261,6 +262,7 @@
 	self.health = pc.health;
 	self.max_health = pc.max_health;
 	self.armorvalue = pc.armorvalue;
+	self.armormax = pc.armormax;
 	self.armortype = pc.armortype;
 	self.armorregenrate = pc.armorregenrate;
 	self.armorregenmax = pc.armorregenmax;
@@ -414,6 +416,7 @@
 	if (!self.spawned)
 	{
 	   self.health = 1;
+			
 	   stuffcmd(self,"menu_showteamselect\n");
 	}
 	else

Modified: trunk/progsqc/server.qc
===================================================================
--- trunk/progsqc/server.qc	2008-03-08 05:28:58 UTC (rev 104)
+++ trunk/progsqc/server.qc	2008-03-08 09:50:15 UTC (rev 105)
@@ -108,9 +108,9 @@
 	c = argv(0);
 	if(c == "join")
 	{
-		bprint ("^4", self.netname, "^4 is playing now\n");
 	 	if (!self.spawned)
 		{
+			bprint ("^4", self.netname, "^4 is playing now\n");
 			self.spawned = TRUE;
 			self.frags = 0;
 			PutClientInServer();




More information about the zymotic-commits mailing list