Skip to content

Update to 1.7.1 'Making History #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
The-Grim-Sleeper wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Update to 1.7.1 'Making History #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
946435a
Update globals.js with 'Making History' engines
The-Grim-Sleeper Jun 8, 2019
2b1bd62
'Making History' engines are now selectable
The-Grim-Sleeper Jun 8, 2019
e697ca5
As of 1.7.1
The-Grim-Sleeper Jun 8, 2019
580d785
Almost forgot.
The-Grim-Sleeper Jun 9, 2019
a59650c
copy-paste error
The-Grim-Sleeper Jun 9, 2019
0c7f506
Suggested by fjw
The-Grim-Sleeper Oct 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 32 additions & 24 deletions code/globals.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ var tic, toc;
//palette = [[77,77,77],[93,165,218],[250,164,58],[96,189,104],[241,124,176],[178,145,47],[178,118,178],[222,207,63],[241,88,84]];
//palette = [[136,189,230],[38,93,171],[251,178,88],[223,92,36],[144,205,151],[5,151,72],[229,18,111],[85,85,85],[157,114,42],[123,58,150],[199,180,46],[215,31,39],[237,221,70],[228,186,127]];
//palette = [[166,206,227],[31,120,180],[178,223,138],[51,160,44],[251,154,153],[227,26,28],[253,191,111],[255,127,0],[202,178,214],[106,61,154],[255,255,153],[177,89,40]];
palette = [[227, 196, 113], [114, 72, 153], [253, 160, 58], [211, 197, 153], [78, 150, 196], [231, 55, 42], [74, 150, 167], [227, 154, 140], [214, 166, 163], [103, 185, 82], [98, 158, 69], [248, 133, 25], [248, 161, 96], [162, 129, 189], [238, 86, 86], [169, 216, 140], [177, 89, 40], [166, 206, 227],[77,77,77],[250,164,58]];
palette = [[115,221,158], [116,69,208], [103,219,82], [208,69,199], [199,227,75], [79,42,127], [216,185,67], [101,121,205], [130,177,72], [210,72,139], [59,129,65], [190,120,202], [208,131,58], [63,51,86], [218,74,42], [134,212,207], [212,81,94], [84,129,113], [136,54,33], [117,159,196], [117,113,50], [123,51,83], [206,205,153], [41,56,49], [201,157,188], [94,64,48], [199,145,125]];

// Standard gravity
g0 = 9.80655;
Expand All @@ -48,26 +48,34 @@ surfgrav = {
}

// Load engine definitions
// Values updated for KSP 1.1.1
allEngines = [
new Engine("LV-909", "Terrier", 0.5, 60, [[0,345], [1,85], [3,0.001]], 8),
new Engine("LV-T30", "Reliant", 1.25, 215, [[0,300], [1,280], [7,0.001]], 8),
new Engine("LV-T45", "Swivel", 1.5, 200, [[0,320], [1,270], [6,0.001]], 8),
new Engine("T-1", "Aerospike", 1, 180, [[0,340], [1,290], [5,230], [10,170], [20,0.001]], 8),
new Engine("LV-N", "Nerv", 3, 60, [[0,800], [1,185], [2,0.001]], 7),
new Engine("Mk-55", "Thud", 0.9, 120, [[0,305], [1,275], [9,0.001]], 8),
new Engine("CR-7", "RAPIER", 2, 180, [[0,305], [1,275], [9,0.001]], 8),
new Engine("RE-L10", "Poodle", 1.75, 250, [[0,350], [1,90], [3,0.001]], 8),
new Engine("RE-I5", "Skipper", 3, 650, [[0,320], [1,280], [6,0.001]], 8),
new Engine("RE-M3", "Mainsail", 6, 1500, [[0,310], [1,285], [9,0.001]], 8),
new Engine("KR-2L", "Rhino", 9, 2000, [[0,340], [1,255], [5,0.001]], 8),
new Engine("KS-25x4", "Mammoth", 15, 4000, [[0,315], [1,295], [12,0.001]], 8),
new Engine("KR-1x2", "Twin Boar", 6.5, 2000, [[0,300], [1,280], [9,0.001]], 8),
new Engine("LV-1", "Ant", 0.02, 2, [[0,315], [1,80], [3,0.001]], 8),
new Engine("LV-1R", "Spider", 0.02, 2, [[0,290], [1,260], [8,0.001]], 8),
new Engine("24-77", "Twitch", 0.09, 16, [[0,290], [1,250], [7,0.001]], 8),
new Engine("48-7S", "Spark", 0.1, 18, [[0,300], [1,270], [7,0.001]], 8),
new Engine("O-10", "Puff", 0.09, 20, [[0,250], [1,120], [4,0.001]], 6),
new Engine("IX-6315", "Dawn", 0.25, 2, [[0,4200], [1,100], [1.2,0.001]], 8),
new Engine("KS-25", "Vector", 4, 1000, [[0,315], [1,295], [12,0.001]], 8)
];
// Values updated for KSP 1.7.1
allEngines = [
new Engine("LV-909", "Terrier", 0.5, 60, [[0,345], [1,85], [3,0.001]], 8),
new Engine("LV-T30", "Reliant", 1.25, 240, [[0,310], [1,265], [7,0.001]], 8),
new Engine("LV-T45", "Swivel", 1.5, 215, [[0,320], [1,250], [6,0.001]], 8),
new Engine("T-1", "Aerospike", 1, 180, [[0,340], [1,290], [5,230], [10,170], [20,0.001]], 8),
new Engine("LV-N", "Nerv", 3, 60, [[0,800], [1,185], [2,0.001]], 7),
new Engine("Mk-55", "Thud", 0.9, 120, [[0,305], [1,275], [9,0.001]], 8),
new Engine("CR-7", "RAPIER", 2, 180, [[0,305], [1,275], [9,0.001]], 8),
new Engine("RE-L10", "Poodle", 1.75, 250, [[0,350], [1,90], [3,0.001]], 8),
new Engine("RE-I5", "Skipper", 3, 650, [[0,320], [1,280], [6,0.001]], 8),
new Engine("RE-M3", "Mainsail", 6, 1500, [[0,310], [1,285], [9,0.001]], 8),
new Engine("KR-2L", "Rhino", 9, 2000, [[0,340], [1,205], [5,0.001]], 8),
new Engine("KS-25x4", "Mammoth", 15, 4000, [[0,315], [1,295], [12,0.001]], 8),
new Engine("KR-1x2", "Twin Boar", 10.5, 2000, [[0,300], [1,280], [9,0.001]], 8),
new Engine("LV-1", "Ant", 0.02, 2, [[0,315], [1,80], [3,0.001]], 8),
new Engine("LV-1R", "Spider", 0.02, 2, [[0,290], [1,260], [8,0.001]], 8),
new Engine("24-77", "Twitch", 0.09, 16, [[0,290], [1,250], [7,0.001]], 8),
new Engine("48-7S", "Spark", 0.1, 20, [[0,320], [1,270], [7,0.001]], 8),
new Engine("O-10", "Puff", 0.09, 20, [[0,250], [1,120], [4,0.001]], 6),
new Engine("IX-6315", "Dawn", 0.25, 2, [[0,4200], [1,100], [1.2,0.001]], 8),
new Engine("KS-25", "Vector", 4, 1000, [[0,315], [1,295], [12,0.001]], 8),
new Engine("KE-1", "Mastodon", 5, 1350, [[0,305], [1,290], [9,0.001]], 8),
new Engine("LV-T91", "Cheetah", 1, 125, [[0,355], [1,150], [9,0.001]], 8),
new Engine("LV-TX87", "Bobcat", 2, 400, [[0,310], [1,290], [9,0.001]], 8),
new Engine("RE-I2", "Skiff", 1.6, 300, [[0,330], [1,265], [9,0.001]], 8),
new Engine("RE-J10", "Wolfhound", 3.3, 375, [[0,380], [1,70], [3,0.001]], 8),
new Engine("RK-7", "Kodiak", 1.25, 260, [[0,300], [1,285], [9,0.001]], 8),
new Engine("RV-1", "Cub", 0.18, 32, [[0,310], [1,280], [7,0.001]], 8)
];

49 changes: 28 additions & 21 deletions data/parse_cfgs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,35 @@

# List of engine config tuples (name, nickname, cfg file) to process
if not KSP_dir.endswith("/"): KSP_dir += "/"
path = KSP_dir + "GameData/Squad/Parts/Engine/"
path = KSP_dir + "GameData/"
engines = [
("LV-909", "Terrier", "liquidEngineLV-909/liquidEngineLV-909.cfg"),
("LV-T30", "Reliant", "liquidEngineLV-T30/liquidEngineLV-T30.cfg"),
("LV-T45", "Swivel", "liquidEngineLV-T45/liquidEngineLV-T45.cfg"),
("T-1", "Aerospike", "liquidEngineAerospike/liquidEngineAerospike.cfg"),
("LV-N", "Nerv", "liquidEngineLV-N/liquidEngineLV-N.cfg"),
("Mk-55", "Thud", "liquidEngineMk55/liquidEngineMk55.cfg"),
("CR-7", "RAPIER", "rapierEngine/rapierEngine.cfg"),
("RE-L10", "Poodle", "liquidEnginePoodle/liquidEnginePoodle.cfg"),
("RE-I5", "Skipper", "liquidEngineSkipper/skipperLiquidEngine.cfg"),
("RE-M3", "Mainsail", "liquidEngineMainsail/liquidEngineMainsail.cfg"),
("KR-2L", "Rhino", "Size3AdvancedEngine/part.cfg"),
("KS-25x4", "Mammoth", "Size3EngineCluster/part.cfg"),
("KR-1x2", "Twin Boar", "Size2LFB/part.cfg"),
("LV-1", "Ant", "liquidEngineLV-1/liquidEngineLV-1.cfg"),
("LV-1R", "Spider", "liquidEngineLV-1R/liquidEngineLV-1R.cfg"),
("24-77", "Twitch", "liquidEngine24-77/liquidEngine24-77.cfg"),
("48-7S", "Spark", "liquidEngine48-7S/liquidEngine48-7S.cfg"),
("O-10", "Puff", "OMSEngine/omsEngine.cfg"),
("IX-6315", "Dawn", "ionEngine/ionEngine.cfg"),
("KS-25", "Vector", "liquidEngineSSME/SSME.cfg")
("LV-909", "Terrier", "Squad/Parts/Engine/liquidEngineLV-909/liquidEngineLV-909.cfg"),
("LV-T30", "Reliant", "Squad/Parts/Engine/liquidEngineLV-T30/liquidEngineLV-T30.cfg"),
("LV-T45", "Swivel", "Squad/Parts/Engine/liquidEngineLV-T45/liquidEngineLV-T45.cfg"),
("T-1", "Aerospike", "Squad/Parts/Engine/liquidEngineAerospike/liquidEngineAerospike.cfg"),
("LV-N", "Nerv", "Squad/Parts/Engine/liquidEngineLV-N/liquidEngineLV-N.cfg"),
("Mk-55", "Thud", "Squad/Parts/Engine/liquidEngineMk55/liquidEngineMk55.cfg"),
("CR-7", "RAPIER", "Squad/Parts/Engine/rapierEngine/rapierEngine.cfg"),
("RE-L10", "Poodle", "Squad/Parts/Engine/liquidEnginePoodle/liquidEnginePoodle.cfg"),
("RE-I5", "Skipper", "Squad/Parts/Engine/liquidEngineSkipper/skipperLiquidEngine.cfg"),
("RE-M3", "Mainsail", "Squad/Parts/Engine/liquidEngineMainsail/liquidEngineMainsail.cfg"),
("KR-2L", "Rhino", "Squad/Parts/Engine/Size3AdvancedEngine/part.cfg"),
("KS-25x4", "Mammoth", "Squad/Parts/Engine/Size3EngineCluster/part.cfg"),
("KR-1x2", "Twin Boar", "Squad/Parts/Engine/Size2LFB/part.cfg"),
("LV-1", "Ant", "Squad/Parts/Engine/liquidEngineLV-1/liquidEngineLV-1.cfg"),
("LV-1R", "Spider", "Squad/Parts/Engine/liquidEngineLV-1R/liquidEngineLV-1R.cfg"),
("24-77", "Twitch", "Squad/Parts/Engine/liquidEngine24-77/liquidEngine24-77.cfg"),
("48-7S", "Spark", "Squad/Parts/Engine/liquidEngine48-7S/liquidEngine48-7S.cfg"),
("O-10", "Puff", "Squad/Parts/Engine/OMSEngine/omsEngine.cfg"),
("IX-6315", "Dawn", "Squad/Parts/Engine/ionEngine/ionEngine.cfg"),
("KS-25", "Vector", "Squad/Parts/Engine/liquidEngineSSME/SSME.cfg"),
("KE-1", "Mastodon", "/SquadExpansion/MakingHistory/Parts/Engine/LiquidEngineKE-1.cfg"),
("LV-T91", "Cheetah", "/SquadExpansion/MakingHistory/Parts/Engine/LiquidEngineLV-T91.cfg"),
("LV-TX87", "Bobcat", "/SquadExpansion/MakingHistory/Parts/Engine/LiquidEngineLV-TX87.cfg"),
("RE-I2", "Skiff", "/SquadExpansion/MakingHistory/Parts/Engine/LiquidEngineRE-I2.cfg"),
("RE-J10", "Wolfhound", "/SquadExpansion/MakingHistory/Parts/Engine/LiquidEngineRE-J10.cfg"),
("RK-7", "Kodiak", "/SquadExpansion/MakingHistory/Parts/Engine/LiquidEngineRK-7.cfg"),
("RV-1", "Cub", "/SquadExpansion/MakingHistory/Parts/Engine/LiquidEngineRV-1.cfg")
]

# ================================
Expand Down
29 changes: 29 additions & 0 deletions data/stats_1.7.1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
allEngines = [
new Engine("LV-909", "Terrier", 0.5, 60, [[0,345], [1,85], [3,0.001]], 8),
new Engine("LV-T30", "Reliant", 1.25, 240, [[0,310], [1,265], [7,0.001]], 8),
new Engine("LV-T45", "Swivel", 1.5, 215, [[0,320], [1,250], [6,0.001]], 8),
new Engine("T-1", "Aerospike", 1, 180, [[0,340], [1,290], [5,230], [10,170], [20,0.001]], 8),
new Engine("LV-N", "Nerv", 3, 60, [[0,800], [1,185], [2,0.001]], 7),
new Engine("Mk-55", "Thud", 0.9, 120, [[0,305], [1,275], [9,0.001]], 8),
new Engine("CR-7", "RAPIER", 2, 180, [[0,305], [1,275], [9,0.001]], 8),
new Engine("RE-L10", "Poodle", 1.75, 250, [[0,350], [1,90], [3,0.001]], 8),
new Engine("RE-I5", "Skipper", 3, 650, [[0,320], [1,280], [6,0.001]], 8),
new Engine("RE-M3", "Mainsail", 6, 1500, [[0,310], [1,285], [9,0.001]], 8),
new Engine("KR-2L", "Rhino", 9, 2000, [[0,340], [1,205], [5,0.001]], 8),
new Engine("KS-25x4", "Mammoth", 15, 4000, [[0,315], [1,295], [12,0.001]], 8),
new Engine("KR-1x2", "Twin Boar", 10.5, 2000, [[0,300], [1,280], [9,0.001]], 8),
new Engine("LV-1", "Ant", 0.02, 2, [[0,315], [1,80], [3,0.001]], 8),
new Engine("LV-1R", "Spider", 0.02, 2, [[0,290], [1,260], [8,0.001]], 8),
new Engine("24-77", "Twitch", 0.09, 16, [[0,290], [1,250], [7,0.001]], 8),
new Engine("48-7S", "Spark", 0.1, 20, [[0,320], [1,270], [7,0.001]], 8),
new Engine("O-10", "Puff", 0.09, 20, [[0,250], [1,120], [4,0.001]], 6),
new Engine("IX-6315", "Dawn", 0.25, 2, [[0,4200], [1,100], [1.2,0.001]], 8),
new Engine("KS-25", "Vector", 4, 1000, [[0,315], [1,295], [12,0.001]], 8),
new Engine("KE-1", "Mastodon", 5, 1350, [[0,305], [1,290], [9,0.001]], 8),
new Engine("LV-T91", "Cheetah", 1, 125, [[0,355], [1,150], [9,0.001]], 8),
new Engine("LV-TX87", "Bobcat", 2, 400, [[0,310], [1,290], [9,0.001]], 8),
new Engine("RE-I2", "Skiff", 1.6, 300, [[0,330], [1,265], [9,0.001]], 8),
new Engine("RE-J10", "Wolfhound", 3.3, 375, [[0,380], [1,70], [3,0.001]], 8),
new Engine("RK-7", "Kodiak", 1.25, 260, [[0,300], [1,285], [9,0.001]], 8),
new Engine("RV-1", "Cub", 0.18, 32, [[0,310], [1,280], [7,0.001]], 8)
];
21 changes: 21 additions & 0 deletions engine_charts.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,15 @@ <h4>Engine selection
<div class="checkbox">
<label><input type="checkbox" name="mediumengines" id="chkT-1" checked>T-1<br>"Aerospike"</label>
</div>
<div class="checkbox">
<label><input type="checkbox" name="mediumengines" id="chkRE-I2" checked>RE-I2<br>"Skiff"</label>
</div>
<div class="checkbox">
<label><input type="checkbox" name="mediumengines" id="chkRE-J10" checked>RE-J10<br>"Wolfhound"</label>
</div>
<div class="checkbox">
<label><input type="checkbox" name="mediumengines" id="chkRK-7" checked>RK-7<br>"Kodiak"</label>
</div>
</div>
</form>
</div>
Expand Down Expand Up @@ -405,6 +414,15 @@ <h4>Engine selection
<div class="checkbox">
<label><input type="checkbox" name="heavyengines" id="chkKS-25x4" checked>KS-25x4<br>"Mammoth"</label>
</div>
<div class="checkbox">
<label><input type="checkbox" name="heavyengines" id="chkKE-1" checked>KE-1<br>"Mastodon"</label>
</div>
<div class="checkbox">
<label><input type="checkbox" name="heavyengines" id="chkLV-T91" checked>LV-T91<br>"Cheetah"</label>
</div>
<div class="checkbox">
<label><input type="checkbox" name="heavyengines" id="chkLV-TX87" checked>LV-TX87<br>"Bobcat"</label>
</div>
</div>
</form>
</div>
Expand All @@ -427,6 +445,9 @@ <h4>Engine selection
<div class="checkbox">
<label><input type="checkbox" name="lightengines" id="chk24-77" checked>24-77<br>"Twitch"</label>
</div>
<div class="checkbox">
<label><input type="checkbox" name="lightengines" id="chkRV-1" checked>RV-1<br>"Cub"</label>
</div>
</div>
</form>
</div>
Expand Down