Skip to content

Commit

Permalink
Merge branch 'test'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rodg88
Rodg88 committed May 19, 2020
2 parents 18f1b2e + 4cf2078 commit eb2220e
Show file tree
Hide file tree
Showing 10 changed files with 331 additions and 9 deletions.
Binary file modified GameData/Bumblebee/Assets/bb_Aeroshell.mu
View file
Binary file not shown.
Binary file modified GameData/Bumblebee/Assets/bb_Core.mu
View file
Binary file not shown.
Binary file modified GameData/Bumblebee/Assets/bb_HGA.mu
View file
Binary file not shown.
Binary file added GameData/Bumblebee/Assets/glow.dds
View file
Binary file not shown.
72 changes: 71 additions & 1 deletion GameData/Bumblebee/Parts/bb_Core.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,38 @@ PART {
SASServiceLevel = 3
}
MODULE
{
name = ModuleColorChanger
moduleID = lightColor
useMaterialsList = true
materialsNames = glow2
animRate = 1
useRate = False
shaderProperty = _TintColor
toggleInEditor = false
toggleInFlight = false
redCurve
{
key = 0 0
key = 1 0
}
greenCurve
{
key = 0 0.05
key = 1 .5
}
blueCurve
{
key = 0 .2
key = 1 1
}
alphaCurve
{
key = 0 0
key = 1 1
}
}
MODULE
{
name = ModuleB9PartSwitch
moduleID = meshSwitchCover
Expand All @@ -170,13 +202,51 @@ PART {
primaryColor = #c7c7c7
secondaryColor = #707070
transform = meshWhite
MATERIAL
{
baseTransform = LED1
baseTransform = LED3
COLOR
{
shaderProperty = _TintColor
color = #00ff00
}
}
MATERIAL
{
baseTransform = LED2
COLOR
{
shaderProperty = _TintColor
color = #0066ff
}
}
}
SUBTYPE
{
name = Black
primaryColor = #2d2d2d
secondaryColor = #d9b358
transform = meshBlack
MATERIAL
{
baseTransform = LED1
baseTransform = LED3
COLOR
{
shaderProperty = _TintColor
color = #00ff00
}
}
MATERIAL
{
baseTransform = LED2
COLOR
{
shaderProperty = _TintColor
color = #0066ff
}
}
}
}
MODULE
Expand Down Expand Up @@ -209,6 +279,6 @@ PART {
uiGroupName = CoreData
uiGroupDisplayName = Internal Antenna
}

}

}
95 changes: 92 additions & 3 deletions GameData/Bumblebee/Parts/bb_Prop.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,21 @@ PART {
}
unitScalar = .1
}
MODULE
{
name = MultiModeEngine
primaryEngineID = BBProp
primaryEngineModeDisplayName = Full Power
secondaryEngineID = LowPower
secondaryEngineModeDisplayName = Low Power
}
MODULE
{
name = ModuleEnginesFX
engineID = BBProp
thrustVectorTransformName = thrustTransform
exhaustDamage = False
ignitionThreshold = 0.1
ignitionThreshold = 0
minThrust = 0
maxThrust = 2
heatProduction = 0
Expand Down Expand Up @@ -92,7 +100,6 @@ PART {
key = 0 1000 0 0
}

// Jet params
atmChangeFlow = True
useVelCurve = True
useAtmCurve = True
Expand All @@ -111,7 +118,71 @@ PART {
}
atmCurve
{
key = 0 0 0.33 0
key = 0 0 0.33 .6
key = 0.4 0.2 1 1.166
key = 1 1 1.4 1.4
key = 2 1.8 0.6 0.6
key = 10 5 0.2 0
}
}
MODULE
{
name = ModuleEnginesFX
engineID = LowPower
thrustVectorTransformName = thrustTransform
exhaustDamage = False
ignitionThreshold = 0
minThrust = 0
maxThrust = .5
heatProduction = 0
useEngineResponseTime = true
engineAccelerationSpeed = 15
engineDecelerationSpeed = 10
fxOffset = 0, 0, 0
engageEffectName = null
disengageEffectName = null
spoolEffectName = power
runningEffectName = speed
powerEffectName = null
engineSpoolIdle = 0.0
engineSpoolTime = 6
EngineType = Electric
PROPELLANT
{
name = ElectricCharge
ratio = 10
DrawGauge = True
}
PROPELLANT
{
name = IntakeAir
ratio = 1
DrawGauge = False
}
atmosphereCurve
{
key = 0 1000 0 0
}

atmChangeFlow = True
useVelCurve = True
useAtmCurve = True
flameoutBar = 0.02
flowCapMult = 1.0
machLimit = 0.85
machHeatMult = 25
velCurve
{
key = 0 0.95 0 1
key = 0.1 1 -0.25 -0.25
key = 0.2 0.9 -1.66 -1.66
key = 0.5 0.25 -1.5 -1.3
key = 0.9 0.05 -0.5 -0.5
key = 1 0 0 0
}
atmCurve
{
key = 0 0 0.33 .6
key = 0.4 0.2 1 1.166
key = 1 1 1.4 1.4
key = 2 1.8 0.6 0.6
Expand Down Expand Up @@ -250,6 +321,24 @@ PART {
uiGroupDisplayName = Control
}
}
MODULE
{
name = ModuleSurfaceFX
thrustProviderModuleIndex = 2
fxMax = 0.05
maxDistance = 3
falloff = 8
thrustTransformName = thrustTransform
}
MODULE
{
name = ModuleSurfaceFX
thrustProviderModuleIndex = 3
fxMax = 0.02
maxDistance = 2
falloff = 10
thrustTransformName = thrustTransform
}
EFFECTS
{
power
Expand Down
98 changes: 94 additions & 4 deletions GameData/Bumblebee/Parts/bb_PropSingle.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ PART {
manufacturer = Hummingbird RC Models and Drones
tags = Bumblebee Dragonfly bee impossible prop rotor wing propeller fly buzz cck-rovers
description = A single propeller version of the Bumblebee propeller, for when you only need about half as much power.
attachRules = 1,0,1,1,0
attachRules = 1,1,1,1,0
mass = 0.004
dragModelType = default
maximum_drag = 0.2
Expand All @@ -23,6 +23,7 @@ PART {
breakingForce = 200
breakingTorque = 200
maxTemp = 1700
node_attach = 0, 0.11, 0, 0, -1, 0, 1, 0, 1, 0
MODEL {
model = Bumblebee/Assets/bb_Prop
position = 0, 0, 0
Expand Down Expand Up @@ -53,13 +54,21 @@ PART {
}
unitScalar = .1
}
MODULE
{
name = MultiModeEngine
primaryEngineID = BBProp
primaryEngineModeDisplayName = Full Power
secondaryEngineID = LowPower
secondaryEngineModeDisplayName = Low Power
}
MODULE
{
name = ModuleEnginesFX
engineID = BBProp
thrustVectorTransformName = thrustTransform
exhaustDamage = False
ignitionThreshold = 0.1
ignitionThreshold = 0
minThrust = 0
maxThrust = .8
heatProduction = 0
Expand Down Expand Up @@ -92,7 +101,6 @@ PART {
key = 0 1000 0 0
}

// Jet params
atmChangeFlow = True
useVelCurve = True
useAtmCurve = True
Expand All @@ -111,7 +119,71 @@ PART {
}
atmCurve
{
key = 0 0 0.33 0
key = 0 0 0.33 0.6
key = 0.4 0.2 1 1.166
key = 1 1 1.4 1.4
key = 2 1.8 0.6 0.6
key = 10 5 0.2 0
}
}
MODULE
{
name = ModuleEnginesFX
engineID = LowPower
thrustVectorTransformName = thrustTransform
exhaustDamage = False
ignitionThreshold = 0
minThrust = 0
maxThrust = .2
heatProduction = 0
useEngineResponseTime = true
engineAccelerationSpeed = 15
engineDecelerationSpeed = 10
fxOffset = 0, 0, 0
engageEffectName = null
disengageEffectName = null
spoolEffectName = power
runningEffectName = speed
powerEffectName = null
engineSpoolIdle = 0.0
engineSpoolTime = 6
EngineType = Electric
PROPELLANT
{
name = ElectricCharge
ratio = 10
DrawGauge = True
}
PROPELLANT
{
name = IntakeAir
ratio = 1
DrawGauge = False
}
atmosphereCurve
{
key = 0 1000 0 0
}

atmChangeFlow = True
useVelCurve = True
useAtmCurve = True
flameoutBar = 0.02
flowCapMult = 1.0
machLimit = 0.85
machHeatMult = 25
velCurve
{
key = 0 0.95 0 1
key = 0.1 1 -0.25 -0.25
key = 0.2 0.9 -1.66 -1.66
key = 0.5 0.25 -1.5 -1.3
key = 0.9 0.05 -0.5 -0.5
key = 1 0 0 0
}
atmCurve
{
key = 0 0 0.33 0.6
key = 0.4 0.2 1 1.166
key = 1 1 1.4 1.4
key = 2 1.8 0.6 0.6
Expand Down Expand Up @@ -229,6 +301,24 @@ PART {
uiGroupDisplayName = Control
}
}
MODULE
{
name = ModuleSurfaceFX
thrustProviderModuleIndex = 2
fxMax = 0.03
maxDistance = 3
falloff = 8
thrustTransformName = thrustTransform
}
MODULE
{
name = ModuleSurfaceFX
thrustProviderModuleIndex = 3
fxMax = 0.01
maxDistance = 2
falloff = 10
thrustTransformName = thrustTransform
}
EFFECTS
{
power
Expand Down
13 changes: 13 additions & 0 deletions GameData/Bumblebee/Patches/Hullcam.cfg
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
@PART[bb_Core]:NEEDS[HullCameraVDS]
{
MODULE
{
name = MuMechModuleHullCameraZoom
cameraName = FrontCam
cameraForward = 0, 0, 1
cameraUp = 0, 1, 0
cameraPosition = 0.0, 1.08, 0.0
cameraFoVMax = 60
cameraFoVMin = 20
}
}
Loading

0 comments on commit eb2220e

Please sign in to comment.