Mantis: 1060

o Balance changes from 3.0.x
- Jetpack Research Time 50->60
- HA Upgrade Time 100->110
- Alien upgrade evolution time 2->3
- AA Research Time 180->160
- Obs Cost 20->15
- Marine Starting LMG Ammo 50->100
- Marine Starting Pistol Ammo 10->20
- Armslab cost 25->20
- Siege Damage 380->400
- Phasegate Delay 0.8->0.5



git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@173 67975925-1194-0748-b3d5-c16f83f1a3a1

main/Balance.txt

@@ -27,9 +27,9 @@
 #define kArmoryCost 10
 #define kArmoryHealth 2400
 #define kArmoryUpgradeCost 30
-#define kArmoryUpgradeTime 180
+#define kArmoryUpgradeTime 160
 #define kArmsLabBuildTime 19
-#define kArmsLabCost 25
+#define kArmsLabCost 20
 #define kArmsLabHealth 2200
 #define kBalanceAverageTeamSize 6
 #define kBalanceFuncResourceTime 15
@@ -98,7 +98,7 @@
 #define kElectricalUpgradeResearchTime 30
 #define kEnsnareTime 2
 #define kEvolutionCost 0
-#define kEvolutionGestateTime 2
+#define kEvolutionGestateTime 3
 #define kFadeArmorUpgrade 100
 #define kFadeBaseArmor 150
 #define kFadeBaseSpeed 240
@@ -154,7 +154,7 @@
 #define kHeavyArmorAbsorbPercent 95
 #define kHeavyArmorCost 15
 #define kHeavyArmorResearchCost 40
-#define kHeavyArmorResearchTime 100
+#define kHeavyArmorResearchTime 110
 #define kHiveBuildTime 180
 #define kHiveCost 40
 #define kHiveHealRadius 500
@@ -166,7 +166,7 @@
 #define kInfantryPortalHealth 2500
 #define kJetpackCost 15
 #define kJetpacksResearchCost 35
-#define kJetpacksResearchTime 50
+#define kJetpacksResearchTime 60
 #define kKNDamage 30
 #define kKillRewardMax 3
 #define kKillRewardMin 1
@@ -210,7 +210,7 @@
 #define kNumSameAlienStructuresAllowedInRadius 8
 #define kNumWebsAllowedInRadius 8
 #define kObservatoryBuildTime 15
-#define kObservatoryCost 20
+#define kObservatoryCost 15
 #define kObservatoryHealth 1700
 #define kObservatoryXYDetectionRadius 900
 #define kOffenseChamberBuildTime 11
@@ -277,7 +277,7 @@
 #define kShotgunCost 10
 #define kSiegeBuildTime 10
 #define kSiegeCost 15
-#define kSiegeDamage 380
+#define kSiegeDamage 400
 #define kSiegeHealth 2000
 #define kSiegeROF 4
 #define kSiegeTurretRange 1100
@@ -415,7 +415,7 @@
 #define kParasiteEnergyCost 0.30
 #define kParasiteROF 0.50
 #define kPhaseGateDelay 2.00
-#define kPhaseGateDepartureInterval 0.80
+#define kPhaseGateDepartureInterval 0.50
 #define kPrimalScreamDamageModifier 0.30
 #define kPrimalScreamDuration 4.00
 #define kPrimalScreamEnergyCost 0.45

main/source/mod/AvHMachineGun.cpp

@@ -5,7 +5,7 @@
 // Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
 // the agreement/contract under which the contents have been supplied.
 //
-// Purpose: 
+// Purpose:
 //
 // $Workfile: AvHMachineGun.cpp $
 // $Date: 2002/11/22 21:28:16 $
@@ -147,24 +147,24 @@ void AvHMachineGun::Precache()
 	AvHMarineWeapon::Precache();
 
 	PRECACHE_UNMODIFIED_MODEL(kMGEjectModel);
-	
+
 	PRECACHE_UNMODIFIED_SOUND(kMGFireSound1);
 	PRECACHE_UNMODIFIED_SOUND(kMGReloadSound);
-	
+
 	PRECACHE_UNMODIFIED_MODEL(kGenericWallpuff);
-	
+
 	this->mEvent = PRECACHE_EVENT(1, kMGEventName);
 }
 
 
-void AvHMachineGun::Spawn() 
-{ 
-    AvHMarineWeapon::Spawn(); 
+void AvHMachineGun::Spawn()
+{
+    AvHMarineWeapon::Spawn();
 
 	Precache();
 
 	this->m_iId = AVH_WEAPON_MG;
-	this->m_iDefaultAmmo = BALANCE_VAR(kMGMaxClip)*BALANCE_VAR(kMarineSpawnClips);
+	this->m_iDefaultAmmo = BALANCE_VAR(kMGMaxClip)*(BALANCE_VAR(kMarineSpawnClips) + 1);
 
     // Set our class name
 	this->pev->classname = MAKE_STRING(kwsMachineGun);
@@ -172,4 +172,4 @@ void AvHMachineGun::Spawn()
 	SET_MODEL(ENT(this->pev), kMGWModel);
 
 	FallInit();// get ready to fall down.
-} 
+}

main/source/mod/AvHPistol.cpp

@@ -5,7 +5,7 @@
 // Charles G. Cleveland, or in accordance with the terms and conditions stipulated in
 // the agreement/contract under which the contents have been supplied.
 //
-// Purpose: 
+// Purpose:
 //
 // $Workfile: AvHPistol.cpp $
 // $Date: 2002/11/22 21:28:17 $
@@ -153,7 +153,7 @@ bool AvHPistol::GetHasMuzzleFlash() const
 }
 
 bool AvHPistol::GetMustPressTriggerForEachShot() const
-{ 
+{
 	return true;
 }
 
@@ -170,19 +170,19 @@ void AvHPistol::Precache()
 	PRECACHE_UNMODIFIED_SOUND(kHGFireSound1);
 	PRECACHE_UNMODIFIED_SOUND(kHGReloadSound);
 	PRECACHE_UNMODIFIED_MODEL(kGenericWallpuff);
-	
+
 	this->mEvent = PRECACHE_EVENT(1, kHGEventName);
 }
 
 
-void AvHPistol::Spawn() 
-{ 
-    AvHMarineWeapon::Spawn(); 
+void AvHPistol::Spawn()
+{
+    AvHMarineWeapon::Spawn();
 
 	Precache();
 
 	this->m_iId = AVH_WEAPON_PISTOL;
-	this->m_iDefaultAmmo = BALANCE_VAR(kHGMaxClip)*BALANCE_VAR(kMarineSpawnClips);
+	this->m_iDefaultAmmo = BALANCE_VAR(kHGMaxClip)*(BALANCE_VAR(kMarineSpawnClips) + 1);
 
     // Set our class name
 	this->pev->classname = MAKE_STRING(kwsPistol);
@@ -190,5 +190,5 @@ void AvHPistol::Spawn()
 	SET_MODEL(ENT(this->pev), kHGWModel);
 
 	FallInit();// get ready to fall down.
-} 
+}