Skip to content

Commit

Permalink
Updating to latest trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew Spiering committed Aug 15, 2011
1 parent 5faa1ea commit 74734ed
Show file tree
Hide file tree
Showing 21 changed files with 718 additions and 294 deletions.
36 changes: 25 additions & 11 deletions ns2/lua/AlienWeaponEffects.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ kAlienWeaponEffects =
// Brian TODO: Change to something cooler
{player_cinematic = "cinematics/alien/gorge/bilebomb_impact.cinematic", doer = "Bomb", done = true},

//{player_cinematic = "cinematics/alien/lerk/spike_impact.cinematic", doer = "Spike", done = true},
{cinematic = "cinematics/alien/lerk/spike_impact.cinematic", doer = "Spikes", done = true},
//{player_cinematic = "cinematics/alien/hydra/spike_impact.cinematic", doer = "HydraSpike", done = true},

{player_cinematic = "cinematics/materials/%s/scrape.cinematic", doer = "SwipeBlink", done = true},
{player_cinematic = "cinematics/materials/%s/scrape.cinematic", doer = "StabBlink", done = true},

Expand Down Expand Up @@ -313,15 +314,17 @@ kAlienWeaponEffects =
{sound = "sound/ns2.fev/alien/lerk/spikes", upgraded = false, done = true},
{sound = "sound/ns2.fev/alien/lerk/spikes_pierce", upgraded = true, done = true},
},

},

spikes_alt_attack =
{

spikeZoomEffect =
spikeSpray =
{
{sound = "sound/ns2.fev/alien/lerk/spikes_zoom", upgraded = false, done = true},
{sound = "sound/ns2.fev/alien/lerk/spikes_zoomed_pierce", upgraded = true, done = true},
{overlay_animation = "spike"},
{viewmodel_animation = "spikes_snipe"},
{sound = "sound/ns2.fev/alien/lerk/spikes_zoom"},
/*{sound = "sound/ns2.fev/alien/lerk/spikes_zoomed_pierce", upgraded = true, done = true},*/
},
},

Expand Down Expand Up @@ -351,21 +354,32 @@ kAlienWeaponEffects =
{
sporesAttackEffects =
{
{sound = "sound/ns2.fev/alien/lerk/spores_shoot"},
{viewmodel_animation = "spores_attack"},
{looping_sound = "sound/ns2.fev/alien/lerk/spore_spray"},
{overlay_animation = "spore"},

//{viewmodel_cinematic = "cinematics/alien/lerk/spore_view_fire.cinematic", attach_point = "?"},
//{weapon_cinematic = "cinematics/alien/lerk/spores.cinematic", attach_point = "?"},
},
},

spores =
spores_attack_end =
{
sporesAttackEndEffects =
{
{stop_sound = "sound/ns2.fev/alien/lerk/spore_spray"},
},
},

spores_alt_attack =
{
sporesCreateEffects =
sporesAttackEffects =
{
{sound = "sound/ns2.fev/alien/lerk/spores_hit"},
{cinematic = "cinematics/alien/lerk/spore_impact.cinematic"},
{sound = "sound/ns2.fev/alien/lerk/spores_shoot"},
{viewmodel_animation = "spores_attack"},
{overlay_animation = "spore"},

//{viewmodel_cinematic = "cinematics/alien/lerk/spore_view_fire.cinematic", attach_point = "?"},
//{weapon_cinematic = "cinematics/alien/lerk/spores.cinematic", attach_point = "?"},
},
},

Expand Down
26 changes: 14 additions & 12 deletions ns2/lua/Balance.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,22 +316,27 @@ kBileBombDamageType = kDamageType.StructuresOnly
kBileBombFireDelay = 1
kBileBombEnergyCost = 15

kSpikeMaxDamage = 30
kSpikeMinDamage = 8
kSpikeMaxDamage = 24
kSpikeMinDamage = 20
kSpikeDamageType = kDamageType.Light
kSpikeFireDelay = 0.1
kSpikeFireDelay = 0.08
kSpikeEnergyCost = 1.5
kSpikeMinDamageRange = 16
kSpikeMaxDamageRange = 2
kPiercingDamageScalar = 1.4

kSpikesAltDamage = 90
kSpikesAltDamageType = kDamageType.Normal
kSpikesAltFireDelay = 1
kSpikesAltEnergyCost = 30
kSpikesAltDamageType = kDamageType.Heavy
kSpikesAltFireDelay = 0.5
kSpikesAltEnergyCost = 25

kSporesDamagePerSecond = 7
kSporesDamageType = kDamageType.Gas
kSporesFireDelay = 0.8
kSporesEnergyCost = 20
kSporesDustDamagePerSecond = 18
kSporesDustFireDelay = 0.18
kSporesCloudFireDelay = 0.8
kSporesDustEnergyCost = 7
kSporesCloudEnergyCost = 20

kSwipeDamage = 70
kSwipeDamageType = kDamageType.Puncture
Expand Down Expand Up @@ -372,9 +377,6 @@ kMelee3DamageScalar = 1.3






// SPAWN TIMES
kMarineRespawnTime = 10
kAlienRespawnTime = 13
Expand Down Expand Up @@ -537,7 +539,7 @@ kMetabolizeCost = 25

kObservatoryInitialEnergy = 25 kObservatoryMaxEnergy = 100
kObservatoryScanCost = 20
kObservatoryDistressBeaconCost = 50
kObservatoryDistressBeaconCost = 50

kDrifterCost = 30

Expand Down
248 changes: 124 additions & 124 deletions ns2/lua/BalanceHealth.lua
View file
Original file line number Diff line number Diff line change
@@ -1,124 +1,124 @@
// ======= Copyright © 2003-2011, Unknown Worlds Entertainment, Inc. All rights reserved. =======
//
// lua\BalanceHealth.lua
//
// Created by: Charlie Cleveland (charlie@unknownworlds.com)
//
// Auto-generated. Copy and paste from balance spreadsheet.
//
// ========= For more information, visit us at http://www.unknownworlds.com =====================
// HEALTH AND ARMOR
kMarineHealth = 100 kMarineArmor = 30 kMarinePointValue = 5
kExosuitHealth = 100 kExosuitArmor = 200 kExosuitPointValue = 10
kSkulkHealth = 70 kSkulkArmor = 5 kSkulkPointValue = 5
kGorgeHealth = 150 kGorgeArmor = 50 kGorgePointValue = 7
kLerkHealth = 125 kLerkArmor = 30 kLerkPointValue = 15
kFadeHealth = 200 kFadeArmor = 50 kFadePointValue = 20
kOnosHealth = 700 kOnosArmor = 600 kOnosPointValue = 30
kEggHealth = 250 kEggArmor = 0 kEggPointValue = 2
kArmorPerUpgradeLevel = 20
kExosuitArmorPerUpgradeLevel = 30
kBaseArmorAbsorption = 0.7
kHealthPointsPerArmor = 2
kBuildPointValue = 5
kRecyclePaybackScalar = 0.75
kRepairMarineArmorPointValue = 1
kSkulkArmorFullyUpgradedAmount = 20
kGorgeArmorFullyUpgradedAmount = 50
kLerkArmorFullyUpgradedAmount = 30
kFadeArmorFullyUpgradedAmount = 100
kOnosArmorFullyUpgradedAmount = 350
kAlienArmorAbsorption1 = 1
kAlienArmorAbsorption2 = 1.1
kAlienArmorAbsorption3 = 1.2
// Damage types
kHealthPointsPerArmorLight = 4
kHealthPointsPerArmorHeavy = 1
kPuncturePlayerDamageScalar = 1.5
kStructuralDamageScalar = 2
kExosuitAbsorption = 0.95
kBalanceAutoHealMaxPercentPerSecond = 0.5
kBalanceInfestationHurtPercentPerSecond = 2
kStartHealthScalar = 0.3
kCarapaceHealthPerArmor = 3
kArmoryHealth = 1800 kArmoryArmor = 300 kArmoryPointValue = 10
kAdvancedArmoryHealth = 3000 kAdvancedArmoryArmor = 500 kAdvancedArmoryPointValue = 40
kCommandStationHealth = 5000 kCommandStationArmor = 2500 kCommandStationPointValue = 25
kObservatoryHealth = 1700 kObservatoryArmor = 0 kObservatoryPointValue = 15
kPhaseGateHealth = 2700 kPhaseGateArmor = 150 kPhaseGatePointValue = 15
kRoboticsFactoryHealth = 2400 kRoboticsFactoryArmor = 800 kRoboticsFactoryPointValue = 20
kPrototypeLabHealth = 3200 kPrototypeLabArmor = 400 kPrototypeLabPointValue = 20
kInfantryPortalHealth = 2250 kInfantryPortalArmor = 125 kInfantryPortalPointValue = 15
kInfantryPortalTransponderHealth = 3000 kInfantryPortalTransponderArmor = 0 kInfantryPortalTransponderPointValue = 20
kPowerPackHealth = 1200 kPowerPackArmor = 400 kPowerPackPointValue = 15
kArmsLabHealth = 1870 kArmsLabArmor = 165 kArmsLabPointValue = 20
kHiveHealth = 6300 kHiveArmor = 350 kHivePointValue = 30
kDrifterHealth = 150 kDrifterArmor = 0 kDrifterPointValue = 2
kMACHealth = 300 kMACArmor = 50 kMACPointValue = 5
kExtractorHealth = 4200 kExtractorArmor = 900 kExtractorPointValue = 15
kHarvesterHealth = 1750 kHarvesterArmor = 375 kHarvesterPointValue = 15
kSentryHealth = 1440 kSentryArmor = 180 kSentryPointValue = 10
kARCHealth = 1600 kARCArmor = 200 kARCPointValue = 20
kCragHealth = 600 kCragArmor = 200 kCragPointValue = 10
kMatureCragHealth = 600 kMatureCragArmor = 300 kMatureCragPointValue = 15
kWhipHealth = 640 kWhipArmor = 80 kWhipPointValue = 10
kMatureWhipHealth = 750 kMatureWhipArmor = 125 kMatureWhipPointValue = 15
kShiftHealth = 560 kShiftArmor = 70 kShiftPointValue = 10
kMatureShiftHealth = 720 kMatureShiftArmor = 90 kMatureShiftPointValue = 15
kShadeHealth = 700 kShadeArmor = 0 kShadePointValue = 10
kMatureShadeHealth = 900 kMatureShadeArmor = 0 kMatureShadePointValue = 15
kHydraHealth = 500 kHydraArmor = 0 kHydraPointValue = 5
kCystHealth = 600 kCystArmor = 0 kCystPointValue = 5
kMiniCystHealth = 400 kMiniCystArmor = 0 kMiniCystPointValue = 3
kPowerPointHealth = 2500 kPowerPointArmor = 1250 kPowerPointPointValue = 15
// ======= Copyright © 2003-2011, Unknown Worlds Entertainment, Inc. All rights reserved. =======
//
// lua\BalanceHealth.lua
//
// Created by: Charlie Cleveland (charlie@unknownworlds.com)
//
// Auto-generated. Copy and paste from balance spreadsheet.
//
// ========= For more information, visit us at http://www.unknownworlds.com =====================
// HEALTH AND ARMOR
kMarineHealth = 100 kMarineArmor = 30 kMarinePointValue = 5
kExosuitHealth = 100 kExosuitArmor = 200 kExosuitPointValue = 10
kSkulkHealth = 70 kSkulkArmor = 5 kSkulkPointValue = 5
kGorgeHealth = 150 kGorgeArmor = 50 kGorgePointValue = 7
kLerkHealth = 200 kLerkArmor = 25 kLerkPointValue = 15
kFadeHealth = 200 kFadeArmor = 50 kFadePointValue = 20
kOnosHealth = 700 kOnosArmor = 600 kOnosPointValue = 30
kEggHealth = 250 kEggArmor = 0 kEggPointValue = 2
kArmorPerUpgradeLevel = 20
kExosuitArmorPerUpgradeLevel = 30
kBaseArmorAbsorption = 0.7
kHealthPointsPerArmor = 2
kBuildPointValue = 5
kRecyclePaybackScalar = 0.75
kRepairMarineArmorPointValue = 1
kSkulkArmorFullyUpgradedAmount = 20
kGorgeArmorFullyUpgradedAmount = 50
kLerkArmorFullyUpgradedAmount = 30
kFadeArmorFullyUpgradedAmount = 100
kOnosArmorFullyUpgradedAmount = 350
kAlienArmorAbsorption1 = 1
kAlienArmorAbsorption2 = 1.1
kAlienArmorAbsorption3 = 1.2
// Damage types
kHealthPointsPerArmorLight = 4
kHealthPointsPerArmorHeavy = 1
kPuncturePlayerDamageScalar = 1.5
kStructuralDamageScalar = 2
kExosuitAbsorption = 0.95
kBalanceAutoHealMaxPercentPerSecond = 0.5
kBalanceInfestationHurtPercentPerSecond = 2
kStartHealthScalar = 0.3
kCarapaceHealthPerArmor = 3
kArmoryHealth = 1800 kArmoryArmor = 300 kArmoryPointValue = 10
kAdvancedArmoryHealth = 3000 kAdvancedArmoryArmor = 500 kAdvancedArmoryPointValue = 40
kCommandStationHealth = 5000 kCommandStationArmor = 2500 kCommandStationPointValue = 25
kObservatoryHealth = 1700 kObservatoryArmor = 0 kObservatoryPointValue = 15
kPhaseGateHealth = 2700 kPhaseGateArmor = 150 kPhaseGatePointValue = 15
kRoboticsFactoryHealth = 2400 kRoboticsFactoryArmor = 800 kRoboticsFactoryPointValue = 20
kPrototypeLabHealth = 3200 kPrototypeLabArmor = 400 kPrototypeLabPointValue = 20
kInfantryPortalHealth = 2250 kInfantryPortalArmor = 125 kInfantryPortalPointValue = 15
kInfantryPortalTransponderHealth = 3000 kInfantryPortalTransponderArmor = 0 kInfantryPortalTransponderPointValue = 20
kPowerPackHealth = 1200 kPowerPackArmor = 400 kPowerPackPointValue = 15
kArmsLabHealth = 1870 kArmsLabArmor = 165 kArmsLabPointValue = 20
kHiveHealth = 6300 kHiveArmor = 350 kHivePointValue = 30
kDrifterHealth = 150 kDrifterArmor = 0 kDrifterPointValue = 2
kMACHealth = 300 kMACArmor = 50 kMACPointValue = 5
kExtractorHealth = 4200 kExtractorArmor = 900 kExtractorPointValue = 15
kHarvesterHealth = 1750 kHarvesterArmor = 375 kHarvesterPointValue = 15
kSentryHealth = 1440 kSentryArmor = 180 kSentryPointValue = 10
kARCHealth = 1600 kARCArmor = 200 kARCPointValue = 20
kCragHealth = 600 kCragArmor = 200 kCragPointValue = 10
kMatureCragHealth = 600 kMatureCragArmor = 300 kMatureCragPointValue = 15
kWhipHealth = 640 kWhipArmor = 80 kWhipPointValue = 10
kMatureWhipHealth = 750 kMatureWhipArmor = 125 kMatureWhipPointValue = 15
kShiftHealth = 560 kShiftArmor = 70 kShiftPointValue = 10
kMatureShiftHealth = 720 kMatureShiftArmor = 90 kMatureShiftPointValue = 15
kShadeHealth = 700 kShadeArmor = 0 kShadePointValue = 10
kMatureShadeHealth = 900 kMatureShadeArmor = 0 kMatureShadePointValue = 15
kHydraHealth = 500 kHydraArmor = 0 kHydraPointValue = 5
kCystHealth = 600 kCystArmor = 0 kCystPointValue = 5
kMiniCystHealth = 400 kMiniCystArmor = 0 kMiniCystPointValue = 3
kPowerPointHealth = 2500 kPowerPointArmor = 1250 kPowerPointPointValue = 15
Loading

0 comments on commit 74734ed

Please sign in to comment.