Skip to content

Commit

Permalink
Revert "Add SSTUVolumeContainer to fuel tank checks"
Browse files Browse the repository at this point in the history
This reverts commit 2256889.
  • Loading branch information
leatherneck6017 committed Mar 29, 2020
1 parent 2256889 commit a1be209
Show file tree
Hide file tree
Showing 9 changed files with 281 additions and 31 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ SUBCATEGORY
CHECK
{
type = moduleName
value = ModuleControlSurface, FARControllableSurface, ModuleAeroSurface, ModuleCommand
value = ModuleControlSurface, FARControllableSurface, ModuleAeroSurface
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
SUBCATEGORY
{
name = Ablative Heat Shields
icon = Ablative_Shield
FILTER
{
CHECK
{
type = moduleName
value = ModuleHeatShield, ModuleAblator
}
}
}
SUBCATEGORY
{
name = Air Intake
icon = AirIntake
FILTER
{
CHECK
{
type = moduleName
value = ModuleResourceIntake
}
}
}

SUBCATEGORY
{
name = Control Surface
icon = ControlSurface
FILTER
{
CHECK
{
type = moduleName
value = ModuleControlSurface, FARControllableSurface, ModuleAeroSurface
}
}
}

SUBCATEGORY
{
name = Fairings
icon = Fairing
FILTER
{
CHECK
{
type = title
value = fairing
}
}
FILTER
{
CHECK
{
type = moduleName
value = ModuleProceduralFairing, ProceduralFairingBase, ProceduralFairingSide
}
}
}
SUBCATEGORY
{
name = Nose Cones
icon = NoseCone
FILTER
{
CHECK
{
type = title
value = nose cone, nosecone, nanocone, tail connector
}
}
}

SUBCATEGORY
{
name = Wings
icon = Wings
FILTER
{
CHECK
{
type = moduleName
value = ModuleLiftingSurface, FARWingAerodynamicModel
}
CHECK
{
type = check
invert = true
CHECK
{
type = moduleName
value = ModuleControlSurface, FARControllableSurface, ModuleAeroSurface
}
}
}
}
22 changes: 11 additions & 11 deletions GameData/000_FilterExtensions_Configs/SubCategories_Fuel.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ SUBCATEGORY
CHECK
{
type = moduleName
value = ModuleB9PartSwitch, SSTUVolumeContainer
value = ModuleB9PartSwitch
}
}
}
Expand Down Expand Up @@ -93,7 +93,7 @@ SUBCATEGORY
CHECK
{
type = moduleName
value = ModuleB9PartSwitch, SSTUVolumeContainer
value = ModuleB9PartSwitch
}
}
}
Expand Down Expand Up @@ -144,7 +144,7 @@ SUBCATEGORY
CHECK
{
type = moduleName
value = ModuleB9PartSwitch, SSTUVolumeContainer
value = ModuleB9PartSwitch
}
}
}
Expand Down Expand Up @@ -193,7 +193,7 @@ SUBCATEGORY
CHECK
{
type = moduleName
value = ModuleB9PartSwitch, SSTUVolumeContainer
value = ModuleB9PartSwitch
}
}
}
Expand Down Expand Up @@ -243,7 +243,7 @@ SUBCATEGORY
CHECK
{
type = moduleName
value = ModuleB9PartSwitch, SSTUVolumeContainer
value = ModuleB9PartSwitch
}
}
}
Expand Down Expand Up @@ -293,7 +293,7 @@ SUBCATEGORY
CHECK
{
type = moduleName
value = ModuleB9PartSwitch, SSTUVolumeContainer
value = ModuleB9PartSwitch
}
}
}
Expand Down Expand Up @@ -342,7 +342,7 @@ SUBCATEGORY
CHECK
{
type = moduleName
value = ModuleB9PartSwitch, SSTUVolumeContainer
value = ModuleB9PartSwitch
}
}
}
Expand Down Expand Up @@ -392,7 +392,7 @@ SUBCATEGORY
CHECK
{
type = moduleName
value = ModuleB9PartSwitch, SSTUVolumeContainer
value = ModuleB9PartSwitch
}
}
}
Expand Down Expand Up @@ -442,7 +442,7 @@ SUBCATEGORY
CHECK
{
type = moduleName
value = ModuleB9PartSwitch, SSTUVolumeContainer
value = ModuleB9PartSwitch
}
}
}
Expand Down Expand Up @@ -491,7 +491,7 @@ SUBCATEGORY
CHECK
{
type = moduleName
value = ModuleB9PartSwitch, SSTUVolumeContainer
value = ModuleB9PartSwitch
}
}
}
Expand Down Expand Up @@ -539,7 +539,7 @@ SUBCATEGORY
CHECK
{
type = moduleName
value = ModuleB9PartSwitch, SSTUVolumeContainer
value = ModuleB9PartSwitch
}
}
}
Expand Down
19 changes: 0 additions & 19 deletions GameData/000_FilterExtensions_Configs/SubCategories_ISRU.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,3 @@ SUBCATEGORY
}
}
}
SUBCATEGORY
{
name = Radiators
icon = stockIcon_thermal
FILTER
{
CHECK
{
type = moduleName
value = ModuleActiveRadiator
}
CHECK
{
type = category
value = Engines
invert = true
}
}
}
54 changes: 54 additions & 0 deletions buildRelease.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@

@echo off

rem Set variables here
set GAMEDIR=000_FilterExtensions
set GAMEDIR2="000_FilterExtensions_Configs"
set LICENSE=License.txt
set README=ReadMe.txt

set RELEASEDIR=d:\Users\jbb\release
set ZIP="c:\Program Files\7-zip\7z.exe"

rem Copy files to GameData locations


copy /Y "%1%2" "GameData\%GAMEDIR%\Plugins"

copy /Y FilterExtension.version GameData\%GAMEDIR%
copy /Y ..\MiniAVC.dll GameData\%GAMEDIR%

if "%LICENSE%" NEQ "" copy /y %LICENSE% GameData\%GAMEDIR%
if "%README%" NEQ "" copy /Y %README% GameData\%GAMEDIR%

rem Get Version info



set VERSIONFILE=FilterExtension.version
rem The following requires the JQ program, available here: https://stedolan.github.io/jq/download/
c:\local\jq-win64 ".VERSION.MAJOR" %VERSIONFILE% >tmpfile
set /P major=<tmpfile

c:\local\jq-win64 ".VERSION.MINOR" %VERSIONFILE% >tmpfile
set /P minor=<tmpfile

c:\local\jq-win64 ".VERSION.PATCH" %VERSIONFILE% >tmpfile
set /P patch=<tmpfile

c:\local\jq-win64 ".VERSION.BUILD" %VERSIONFILE% >tmpfile
set /P build=<tmpfile
del tmpfile
set VERSION=%major%.%minor%.%patch%
if "%build%" NEQ "0" set VERSION=%VERSION%.%build%

echo Version: %VERSION%


rem Build the zip FILE

set FILE="%RELEASEDIR%\%GAMEDIR%-%VERSION%.zip"
IF EXIST %FILE% del /F %FILE%
%ZIP% a -tzip %FILE% GameData

pause
34 changes: 34 additions & 0 deletions buildRelease.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#!/bin/bash

[ "$3" != "Release" ] || exit

DEV="/home/cameron/src/FilterExtension"

GAMEDIR="000_FilterExtensions"
GAMEDIR2="000_FilterExtensions_Configs"
LICENSE="License.txt"
README="ReadMe.txt"

RELEASEDIR="$DEV/release"
mkdir -p "$RELEASEDIR"

cp "$1$2" "$DEV/GameData/$GAMEDIR/Plugins/"

cp "$DEV/FilterExtension.version" "$DEV/GameData/$GAMEDIR/"
# cp "$DEV/../MiniAVC.dll" "$DEV/GameData/$GAMEDIR" # ??

cp "$DEV/$LICENSE" "$DEV/GameData/$GAMEDIR"
cp "$DEV/$README" "$DEV/GameData/$GAMEDIR"

VERSIONFILE="$DEV/FilterExtension.version"
VMA=`jq ".VERSION.MAJOR" $VERSIONFILE`
VMI=`jq ".VERSION.MINOR" $VERSIONFILE`
PA=`jq ".VERSION.PATCH" $VERSIONFILE`
BU=`jq ".VERSION.BUILD" $VERSIONFILE`
VERSION="$VMA.$VMI.$PA.$BU"

echo "Version: $VERSION"

cd "$DEV"
rm "$RELEASEDIR/$GAMEDIR-$VERSION.zip"
zip -r "$RELEASEDIR/$GAMEDIR-$VERSION.zip" "GameData"
20 changes: 20 additions & 0 deletions deploy.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@

@echo off

set H=%KSPDIR%
set GAMEDIR=000_FilterExtensions
set GAMEDIR2="000_FilterExtensions_Configs"
set GAMEDIR3="zFinal_FilterExtensions"
set GAMEDATA="GameData\"
set VERSIONFILE=FilterExtension.version

echo %H%

copy /Y "%1%2" "GameData\%GAMEDIR%\Plugins"
copy /Y %VERSIONFILE% %GAMEDATA%\%GAMEDIR%


xcopy /y /s /I %GAMEDATA%\%GAMEDIR% "%H%\GameData\%GAMEDIR%"

xcopy /y /s /I %GAMEDATA%\%GAMEDIR2% "%H%\GameData\%GAMEDIR2%"
xcopy /y /s /I %GAMEDATA%\%GAMEDIR3% "%H%\GameData\%GAMEDIR3%"
14 changes: 14 additions & 0 deletions deploy.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/bash

DEV="/home/cameron/src/FilterExtension"
KSP="/mnt/games/KSPDev"

GAMEDIR="000_FilterExtensions"
GAMEDIR2="000_FilterExtensions_Configs"
GAMEDATA="GameData/"

cp "$1$2" "$DEV/GameData/$GAMEDIR/Plugins"
cp "$DEV/FilterExtension.version" "$DEV/GameData/$GAMEDIR/"

cp -r "$DEV/$GAMEDATA/$GAMEDIR" "$KSP/GameData/"
cp -r "$DEV/$GAMEDATA/$GAMEDIR2" "$KSP/GameData/"
Loading

0 comments on commit a1be209

Please sign in to comment.