Skip to content

Commit

Permalink
Merge pull request #696 from PapaJoesSoup/dev
Browse files Browse the repository at this point in the history
Release 1.3.1
  • Loading branch information
Gedas-S authored May 12, 2019
2 parents 24504c2 + 1557e72 commit 6364402
Show file tree
Hide file tree
Showing 71 changed files with 677 additions and 607 deletions.
4 changes: 2 additions & 2 deletions BDArmory.Core/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.3.0.0")]
[assembly: AssemblyFileVersion("1.3.0.0")]
[assembly: AssemblyVersion("1.3.1.0")]
[assembly: AssemblyFileVersion("1.3.1.0")]
[assembly: KSPAssembly("BDArmory.Core", 1, 0)]
2 changes: 1 addition & 1 deletion BDArmory/Distribution/GameData/BDArmory/BDArmory.version
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{
"MAJOR":1,
"MINOR":3,
"PATCH":0,
"PATCH":1,
"BUILD":0
},
"KSP_VERSION":
Expand Down
7 changes: 6 additions & 1 deletion BDArmory/Distribution/GameData/BDArmory/ChangeLog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
v1.3.0
v1.3.1
* FIXES
* All parts have bulkheadProfiles - should stop bulkhead filter NREs.
* Rocket pods no longer fire StackOverflows.

v1.3.0
* NEW FEATURES:
* Multiple teams are now supported by BDA.
* Probably breaks ALL the existing addons.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
PART
{
// Kerbal Space Program - Part Config
//
//
//
//

// --- general parameters ---
name = bahaGatlingGun
Expand All @@ -25,13 +25,14 @@ PART
category = none
bdacategory = Gun turrets
subcategory = 0
bulkheadProfiles = srf
//title = Vulcan Turret
///manufacturer = Bahamuto Dynamics
////description = A 6 barrel 20x102mm rotary cannon.
title = #loc_BDArmory_part_20mmVulcan_title
manufacturer = #loc_BDArmory_part_manufacturer
description = #loc_BDArmory_part_20mmVulcan_description

// attachment rules: stack, srfAttach, allowStack, allowSrfAttach, allowCollision
attachRules = 0,1,0,0,1

Expand All @@ -50,55 +51,55 @@ PART
MODULE
{
name = ModuleTurret

pitchTransformName = pitchTransform
yawTransformName = yawTransform

pitchSpeedDPS = 90
yawSpeedDPS = 90

minPitch = -8
maxPitch = 65
yawRange = 90

smoothRotation = true
smoothMultiplier = 10
}

MODULE
{
name = ModuleWeapon

fireTransformName = fireTransform

hasDeployAnim = true
deployAnimName = deployAnimation
hasFireAnimation = true
fireAnimName = fireAnimation
spinDownAnimation = true

roundsPerMinute = 5500
maxDeviation = 0.175
maxEffectiveDistance = 2500
maxTargetingRange = 5000

ammoName = 20x102Ammo
bulletType = 20x102mmHEBullet
requestResourceAmount = 1

hasRecoil = true
onlyFireInRange = true
bulletDrop = true
useRippleFire = false

weaponType = ballistic
projectileColor = 255, 15, 0, 128//RGBA 0-255

projectileColor = 255, 15, 0, 128//RGBA 0-255
startColor = 255, 90, 0, 32
fadeColor = false

shellScale = 0.66

tracerStartWidth = 0.18
tracerEndWidth = 0.18
tracerLength = 0
Expand All @@ -107,11 +108,11 @@ PART
tracerDeltaFactor = 2.75
tracerInterval = 3
nonTracerWidth = 0.035

maxHeat = 3600
heatPerShot = 36
heatLoss = 820
heatLoss = 820

fireSoundPath = BDArmory/Parts/20mmVulcan/sounds/VulcanCannon
overheatSoundPath = BDArmory/Parts/20mmVulcan/sounds/VulcanEnd
oneShotSound = false
Expand Down
41 changes: 21 additions & 20 deletions BDArmory/Distribution/GameData/BDArmory/Parts/50CalTurret/50cal.cfg
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
PART
{
// Kerbal Space Program - Part Config
//
//
//
//

// --- general parameters ---
name = bahaTurret
Expand All @@ -25,6 +25,7 @@ PART
category = none
bdacategory = Gun turrets
subcategory = 0
bulkheadProfiles = srf
title = .50cal Turret
manufacturer = Bahamuto Dynamics
description = A dual barrel .50 cal machine gun.
Expand All @@ -46,62 +47,62 @@ PART
MODULE
{
name = ModuleTurret

pitchTransformName = pitchTransform
yawTransformName = yawTransform

pitchSpeedDPS = 120
yawSpeedDPS = 120

maxPitch = 85
minPitch = -8

yawRange = 360

smoothRotation = true
smoothMultiplier = 10
}

MODULE
{
name = ModuleWeapon

fireTransformName = fireTransform

hasDeployAnim = true
deployAnimName = deployAnimation
hasFireAnimation = true
fireAnimName = fireAnimation

roundsPerMinute = 450
maxDeviation = 0.65
maxEffectiveDistance = 2500
maxEffectiveDistance = 2500

weaponType = ballistic
ammoName = 50CalAmmo
bulletType = 12.7mmBullet
requestResourceAmount = 1
shellScale = 0.463
bulletDmgMult = 1.3

hasRecoil = true
onlyFireInRange = true
bulletDrop = true
projectileColor = 255, 90, 0, 128 //RGBA 0-255
bulletDrop = true

projectileColor = 255, 90, 0, 128 //RGBA 0-255
startColor = 255, 105, 0, 70
tracerStartWidth = 0.15
tracerEndWidth = 0.05
tracerLength = 0

maxHeat = 3600
heatPerShot = 100
heatLoss = 1000
heatLoss = 1000

fireSoundPath = BDArmory/Parts/50CalTurret/sounds/shot
overheatSoundPath = BDArmory/Parts/50CalTurret/sounds/turretOverheat


}

}
33 changes: 17 additions & 16 deletions BDArmory/Distribution/GameData/BDArmory/Parts/ABL/ABL.cfg
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
PART
{
// Kerbal Space Program - Part Config
//
//
//
//

// --- general parameters ---
name = bahaABL
Expand All @@ -25,6 +25,7 @@ cost = 7600
category = none
bdacategory = Laser turrets
subcategory = 0
bulkheadProfiles = srf
title = USAF Airborne Laser
manufacturer = Bahamuto Dynamics
description = A high powered laser for setting things on fire. Uses 350 electric charge per second.
Expand All @@ -47,50 +48,50 @@ stagingIcon = SOLID_BOOSTER
MODULE
{
name = ModuleTurret

pitchTransformName = aimPitch
yawTransformName = aimRotate

pitchSpeedDPS = 220
yawSpeedDPS = 220

maxPitch = 90
minPitch = -15

yawRange = 360

smoothRotation = true
smoothMultiplier = 20
}

MODULE
{
name = ModuleWeapon

fireTransformName = fireTransform

hasDeployAnim = true
deployAnimName = deployAnimation
hasFireAnimation = false

maxEffectiveDistance = 5000
maxDeviation = 0.0125

ammoName = ElectricCharge
requestResourceAmount = 350

weaponType = laser
laserDamage = 1600
tanAngle = 0.0001 //controls how quickly damage scales down with distance
projectileColor = 255, 20, 0, 128 //RGBA 0-255

projectileColor = 255, 20, 0, 128 //RGBA 0-255
tracerStartWidth = 0.3
tracerEndWidth = 0.3

maxHeat = 3600
heatPerShot = 40
heatLoss = 740

fireSoundPath = BDArmory/Parts/ABL/sounds/laser
chargeSoundPath = BDArmory/Parts/ABL/sounds/charge
overheatSoundPath = BDArmory/Parts/50CalTurret/sounds/turretOverheat
Expand Down
Loading

0 comments on commit 6364402

Please sign in to comment.