Skip to content

Commit

Permalink
Merge pull request #113 from snjo/DEVELOP
Browse files Browse the repository at this point in the history
Multiple wing fixes, now with 99% less Kraken!
  • Loading branch information
BobPalmer committed May 16, 2015
2 parents c289008 + e4a8187 commit 019386a
Show file tree
Hide file tree
Showing 12 changed files with 127 additions and 78 deletions.
8 changes: 4 additions & 4 deletions Firespitter/Firespitter.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
<ItemGroup>
<Reference Include="Assembly-CSharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Spill\ksp_win\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
<HintPath>..\..\..\..\..\..\KSP_DEV\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
</Reference>
<Reference Include="Assembly-CSharp-firstpass, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Spill\ksp_win\KSP_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
<HintPath>..\..\..\..\..\..\KSP_DEV\KSP_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand All @@ -49,7 +49,7 @@
<Reference Include="System.Xml" />
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Spill\ksp_win\KSP_Data\Managed\UnityEngine.dll</HintPath>
<HintPath>..\..\..\..\..\..\KSP_DEV\KSP_Data\Managed\UnityEngine.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -151,7 +151,7 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>copy Firespitter.dll D:\Spill\KSP_win\GameData\Firespitter\Plugins</PostBuildEvent>
<PostBuildEvent>copy Firespitter.dll D:\KSP_DEV\GameData\Firespitter\Plugins</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
2 changes: 1 addition & 1 deletion Firespitter/aero/FSliftSurface.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Linq;
using UnityEngine;

class FSliftSurface : PartModule
class FSliftSurface : PartModule, ILiftProvider
{
[KSPField]
public string liftTransformName = "lift";
Expand Down
33 changes: 22 additions & 11 deletions For release/Firespitter/Parts/Aero/FS_bomberWing/part.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ PART

// --- general parameters ---
name = FSbomberWing
module = ControlSurface
module = Part //ControlSurface
author = Snjo

// --- asset parameters ---
Expand Down Expand Up @@ -43,17 +43,28 @@ breakingTorque = 200
// --- winglet parameters ---
// dragCoeff will override the maximum_drag value
dragCoeff = 0.6
deflectionLiftCoeff = 2.1 // WAS 1.9
ctrlSurfaceRange = 15 //was 10
ctrlSurfaceArea = 0.4 //was 0.5
//dragCoeff = 0.6
//deflectionLiftCoeff = 2.1 // WAS 1.9
//ctrlSurfaceRange = 15 //was 10
//ctrlSurfaceArea = 0.4 //was 0.5
MODULE
{
name = FSwingletRangeAdjustment
stepAngle = 5
maxRange = 60
}
MODULE
{
name = ModuleControlSurface
useInternalDragModel = True
dragCoeff = 0.6
deflectionLiftCoeff = 2.1
ctrlSurfaceRange = 15
ctrlSurfaceArea = 0.4
}
//MODULE
//{
// name = FSwingletRangeAdjustment
// stepAngle = 5
// maxRange = 60
//}
//RESOURCE
//{
Expand Down
14 changes: 10 additions & 4 deletions For release/Firespitter/Parts/Aero/FS_bomberWingExtender/part.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ PART

// --- general parameters ---
name = FSbomberWingExtender
module = Winglet
module = Part //Winglet
author = Snjo

// --- asset parameters ---
Expand Down Expand Up @@ -40,14 +40,20 @@ explosionPotential = 0.1
fuelCrossFeed = True
// --- winglet parameters ---
// dragCoeff will override the maximum_drag value
dragCoeff = 0.6
deflectionLiftCoeff = 1.5 // WAS 1.3
//dragCoeff = 0.6
//deflectionLiftCoeff = 1.5 // WAS 1.3
breakingForce = 200
breakingTorque = 200
// --- tweakables (coming soon...) ---
MODULE
{
name = ModuleControlSurface
useInternalDragModel = True
dragCoeff = 0.6
deflectionLiftCoeff = 1.5
}
// ----- FAR values, enable the lines below if you use Ferram Aeorpace Research mod. By IvanTehFennec -----
Expand Down
48 changes: 24 additions & 24 deletions For release/Firespitter/Parts/Aero/FS_fighterWing/part.cfg
Original file line number Diff line number Diff line change
@@ -1,20 +1,8 @@
PART
{

// this is a sample config file, for determining a good file format for defining part parameters
// comment line - ignored by cfg parser
// empty lines, or lines without a '=' sign are also ignored
// all other lines are split at the '=' sign, and the left operand is used to know what parameter we are setting
// diferent parameters require data in different formats (see docs), and each module has it's own parameters (again, see docs)
// each assignment must be in a single line. Lines without assignments will be ignored. (You CAN turn on word wrap, though)
// each keyword here relates to an existing variable in the assigned module. If the keyword isn't found, it is ignored.
// conversely, if a keyword is left unassigned (as in not in the file), it will be initialized with it's default value
// This is done automatically, so any public variable defined in the loaded module can be accessed this way (provided it's value can be parsed)


// --- general parameters ---
name = FSfighterWing
module = ControlSurface
module = Part //ControlSurface
author = Snjo

// --- asset parameters ---
Expand Down Expand Up @@ -42,7 +30,7 @@ node_attach = -1.5, 0.0, 0.0, -1.0, 0.0, 0.0
// --- standard part parameters ---
mass = 0.05
dragModelType = override
dragModelType = none //override
maximum_drag = 0.02
minimum_drag = 0.02
angularDrag = 2
Expand All @@ -52,13 +40,25 @@ breakingTorque = 200
maxTemp = 3400
explosionPotential = 0.1
fuelCrossFeed = True
bulkheadProfiles = srf
// --- winglet parameters ---
// dragCoeff will override the maximum_drag value
dragCoeff = 0.5
deflectionLiftCoeff = 1.0 //was 0.8
ctrlSurfaceRange = 20
ctrlSurfaceArea = 0.2
//dragCoeff = 0.5
//deflectionLiftCoeff = 1.0 //was 0.8
//ctrlSurfaceRange = 20
//ctrlSurfaceArea = 0.2
MODULE
{
name = ModuleControlSurface
useInternalDragModel = True
dragCoeff = 0.5
deflectionLiftCoeff = 1.0
ctrlSurfaceRange = 20
ctrlSurfaceArea = 0.2
}
RESOURCE
{
Expand All @@ -67,12 +67,12 @@ RESOURCE
maxAmount = 30
}
MODULE
{
name = FSwingletRangeAdjustment
stepAngle = 5
maxRange = 60
}
//MODULE
//{
// name = FSwingletRangeAdjustment
// stepAngle = 5
// maxRange = 60
//}
// ----- FAR values, enable the lines below if you use Ferram Aeorpace Research mod. By IvanTehFennec and BubbaWilkins-----
Expand Down
33 changes: 22 additions & 11 deletions For release/Firespitter/Parts/Aero/FS_tailWing/part.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ PART

// --- general parameters ---
name = FStailWing
module = ControlSurface
module = Part //ControlSurface
author = Snjo

// --- asset parameters ---
Expand Down Expand Up @@ -42,17 +42,28 @@ explosionPotential = 0.1

// --- winglet parameters ---
// dragCoeff will override the maximum_drag value
dragCoeff = 0.6
deflectionLiftCoeff = 0.2
ctrlSurfaceRange = 15
ctrlSurfaceArea = 0.4
//dragCoeff = 0.6
//deflectionLiftCoeff = 0.2
//ctrlSurfaceRange = 15
//ctrlSurfaceArea = 0.4

MODULE
{
name = FSwingletRangeAdjustment
stepAngle = 5
maxRange = 60
}
MODULE
{
name = ModuleControlSurface
useInternalDragModel = True
dragCoeff = 0.6
deflectionLiftCoeff = 0.2
ctrlSurfaceRange = 15
ctrlSurfaceArea = 0.4
}


//MODULE
//{
// name = FSwingletRangeAdjustment
// stepAngle = 5
// maxRange = 60
//}

// ----- FAR values, enable the lines below if you use Ferram Aeorpace Research mod. By IvanTehFennec and BubbaWilkins-----

Expand Down
32 changes: 21 additions & 11 deletions For release/Firespitter/Parts/Aero/FS_tailWingLarge/part.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ PART

// --- general parameters ---
name = FStailWingLarge
module = ControlSurface
module = Part //ControlSurface
author = Snjo

// --- asset parameters ---
Expand Down Expand Up @@ -42,17 +42,27 @@ explosionPotential = 0.1

// --- winglet parameters ---
// dragCoeff will override the maximum_drag value
dragCoeff = 0.6
deflectionLiftCoeff = 0.3
ctrlSurfaceRange = 15
ctrlSurfaceArea = 0.7
//dragCoeff = 0.6
//deflectionLiftCoeff = 0.3
//ctrlSurfaceRange = 15
//ctrlSurfaceArea = 0.7

MODULE
{
name = FSwingletRangeAdjustment
stepAngle = 5
maxRange = 60
}
MODULE
{
name = ModuleControlSurface
useInternalDragModel = True
dragCoeff = 0.6
deflectionLiftCoeff = 0.3
ctrlSurfaceRange = 15
ctrlSurfaceArea = 0.7
}

//MODULE
//{
// name = FSwingletRangeAdjustment
// stepAngle = 5
// maxRange = 60
//}

// ----- FAR values, enable the lines below if you use Ferram Aeorpace Research mod. By IvanTehFennec and BubbaWilkins-----

Expand Down
33 changes: 22 additions & 11 deletions For release/Firespitter/Parts/Aero/FS_winglet/part.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ PART

// --- general parameters ---
name = FSwinglet
module = ControlSurface
module = Part //ControlSurface
author = Snjo

// --- asset parameters ---
Expand Down Expand Up @@ -40,17 +40,28 @@ explosionPotential = 0.1
// --- winglet parameters ---
// dragCoeff will override the maximum_drag value
dragCoeff = 0.6
deflectionLiftCoeff = 0.2
ctrlSurfaceRange = 10
ctrlSurfaceArea = 0.4
//dragCoeff = 0.6
//deflectionLiftCoeff = 0.2
//ctrlSurfaceRange = 10
//ctrlSurfaceArea = 0.4
MODULE
{
name = FSwingletRangeAdjustment
stepAngle = 5
maxRange = 60
}
MODULE
{
name = ModuleControlSurface
useInternalDragModel = True
dragCoeff = 0.6
deflectionLiftCoeff = 0.2
ctrlSurfaceRange = 10
ctrlSurfaceArea = 0.4
}
//MODULE
//{
// name = FSwingletRangeAdjustment
// stepAngle = 5
// maxRange = 60
//}
// ----- FAR values, enable the lines below if you use Ferram Aeorpace Research mod. By IvanTehFennec and BubbaWilkins-----
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ scale = 1.0

// --- node definitions ---

node_attach = 0.00, 0.00, 0.00, 0.0, 1.0, 0.0, 1
node_attach = 0.00, 0.00, 0.00, 1.0, 0.0, 0.0, 1

// --- FX definitions ---

Expand Down
Binary file modified For release/Firespitter/Plugins/Firespitter.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 019386a

Please sign in to comment.