Fix one more cfg syntax error #2616
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Cool. Surprised there is only one such error in the repo. Thanks! |
Capkirk123
added a commit
to Capkirk123/RealismOverhaul
that referenced
this pull request
Apr 2, 2022
* Add RO Support for ROTanks KatnissTanks * Add support for Photon Corp RSRM and RSRMV. Waterfall configs only * Fix Photon Corp WaterFall glow clipping * ROWaterfall: fix auto-config for derived MEC * Remove support for ProcFairings pre-v6 Fix PF v6 mass calculations by using the provided decouplerMassMult/decouplerMassBase tooling. Previously, disabling the decoupler was not giving a mass savings. * Fix R-4D-11 TF config (KSP-RO#2582) was using wrong config name in selector * Add PhotonCorp RealPlume configs for RSRM and RSRMV * Increase J57-P-8 temp limit (KSP-RO#2589) Increase the temperature limit of the J57-P-8 to get it a bit closer to it's advertised performance, and more competitive with RD-9B Also edit J48 description to be less confusing * Engine config for Filament Wound Casing RSRM (KSP-RO#2587) * Add source example to Engine Config Template * Add RSRM FWC-SRM config * Link PhotonCorp RSRM color to engine config * Add tagging system for ModuleCargoPart (KSP-RO#2591) Every part that doesn't have ROCargoConfig tag will be stripped of it's ModuleCargoPart PM. * Basic configs for KSP 1.11+ kerbals (KSP-RO#2537) * Revert "Remove kerbalCrewMass (KSP-RO#2290)" * No, KSP, we don't want you to adjust the mass of our crewed parts * Configure mass for KSP 1.11+ jetpack and chute * Make sure only KSP 1.11+ installs get crew mass * Change EVA fuel to Nitrogen and increase Kerbal Carry Capacity * Also change EVA fuel resource for 1.10 Co-authored-by: siimav * Add support for RMM (KSP-RO#2585) Add engine and Waterfall configs for RMM by EStreetrockets. * Add P&W Model 304 (KSP-RO#2581) * Update version to v14.10.0.0 * Added configs for two additional sizes of RCS Blocks * Configured RCS Blocks with Variants that Squad added in 1.11 * Adjust tank masses when LH2 is loaded (KSP-RO#2578) Decrease the tankage mass of all tanks except balloon when LH2 is loaded. This is to simulate the fact that LH2 is extremely light, and requires much less structural mass to support. The 80% mass reduction seems to accurately simulate CBC and SII/SIV, without making smaller stages like DCSS significantly underweight. * Add restart timer to RD-119, S5.92, update descriptions (KSP-RO#2592) * Add restart timer to RD-119 Add restart timer to RD-119 to prevent it from staying in pumped idle forever. Due to lack of data, we're going with 90 minutes. * Add more descriptions Add restart windows to descriptions of applicable engines, and add restart window to the S5.92 and S5.98M * Add RO configs for New Tantares Mir station parts revamp. (KSP-RO#2515) * Change to 1.12's new stock RCS blocks (KSP-RO#2594) * MLI Settings Use RF+PartUpgrades (KSP-RO#2595) Remove MLI definitions from tanks, and instead use part upgrades to upgrade all tanks at once. RF implements default PartUpgrades. RP-0 PR will address separately. * Add RCSBlock so older craft still load (KSP-RO#2576) * Revert "Change to 1.12's new stock RCS blocks (KSP-RO#2594)" This reverts commit b59d721. * Fix broken tech transfer F-1->F-1A (can't have spaces) * Add SolarConfig support for multiple identical solar modules (KSP-RO#2599) * Rename Integral to Isogrid in part title / description but leave RF tank type Integral so as to not break craft * ROWaterfall: colorful plumes April Fools, makes all Waterfall plumes rainbow-colored on April 1st. To disable (effective on game restart), create an empty file named `GameData/RealismOverhaul/Plugins/PluginData/DisableRainbowPloom`. * ROWaterfall: support useRelativeScaling with hybrid plumes * ROWaterfall: import templates from @Katniss218 * Add RD-0120T, fix RD-0120, 701, 704 (KSP-RO#2549) * Add Rocketdyne G-1 (KSP-RO#2598) Add config for Rocketdyne G-1 (NOMAD). * Add more resource boiling points, move resource prices to RP-1 (KSP-RO#2600) * Near Future Propulsion updates (KSP-RO#2574) * SSME variants and triprop support (KSP-RO#2569) Update configs to use MBEC instead of MEC * Near future Launch Vehicles Support (KSP-RO#2567) Add support for Nertea's Near Future Launch Vehicles. * High Performance Prototypes (KSP-RO#2603) Add RS-30, RD301 config, update RD-701, 704, and LR129 configs. Add support for ROE LR129, RD301, RD270. * BDB Keyhole Parachute Fix (KSP-RO#2601) * Dynamic Part Hider (KSP-RO#2586) Adds a system to dynamically hide parts in the VAB/SPH and RnD building based on filters. Implements a filters for hiding speculative parts based on a difficulty setting that is save independent. * Add speclevel tagging to engines, fix techTransfer (KSP-RO#2606) Add specLevel tagging to engine configs, and correct the ordering of techTransfer tags. * Feed 1.12 DLLs to build scripts * Update .version file script to target KSP 1.12 * Update version to v14.11.0.0 * Fix proton verniers (KSP-RO#2611) Apply ignition, ullage and pressurefed tags to Proton verniers and 3rd stage * Finish transfering RO config of ProcParts Last value that hasn't already been pulled from ProcParts into RO * Fix cfg syntax errors (KSP-RO#2612) * Move fuel property data to RF (KSP-RO#2614) Move thermal data to RF, where it probably belongs, and add tank definitions for liquid Nitrogen and liquid Helium * Fix cfg error: invalid use of OR inside HAS (KSP-RO#2616) * Fix Inconsistent CrewCapacity PART.CrewCapacity not PART.crewCapacity * Globally set applyKerbalMassModification Disable KSP 1.12 reducing part mass based on crew capacity by default. Override if desired in later pass. This is because RO by convention assigns part masses without the crew, opposite a later KSP/stock assumption. Based on stock Physics.cfg, set kerbalCrewMass and perSeatReduction to same value (the mass of the kerbal) and perCommandSeatReduction to include jetpack + parachute. Since RO is 1.12-only, remove older version guards in NEEDS Warning: don't set perCommandSeatReduction to 0, it breaks code in kerbal jumping resulting in infinte force applied, which crashes KSP after causing a NaN position/orbit. * Change specparts default to be Speculative This feels like a reasonable midway between Show All The Things and Show None Of The Things. * Fix RD-107 and RD-108 Fix various issues in the RD-107 and RD-108 configs, including incorrect masses, and the 11D511/11D512 configs being swapped. * Fix config names Fix 11D511/11D512 names since this is savebreaking anyway Co-authored-by: Dan <[email protected]> Co-authored-by: stonesmileGit <[email protected]> Co-authored-by: Alvin Meng <[email protected]> Co-authored-by: DRVeyl <[email protected]> Co-authored-by: Louis-Philippe Gagnon <[email protected]> Co-authored-by: Stonesmile <[email protected]> Co-authored-by: siimav <[email protected]> Co-authored-by: GitHub Actions Bot <> Co-authored-by: D0m1nu2 <[email protected]> Co-authored-by: jimmymcgoochie <[email protected]> Co-authored-by: NathanKell <[email protected]> Co-authored-by: Vieju17 <[email protected]> Co-authored-by: HebaruSan <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi KSP-RO team,
This is a follow-up to #2612. I missed one; I think the parser was in a less complete state when I ran it over RO's files.
Quoth @al2me6's superb MM syntax documentation:
:HASsupports logical AND (,/&) but not logical OR (|).RO has one example of trying to use
|in a:HAS; the impact of this would be that the TweakScale module would not be deleted in some cases related to chutes where it is expected to be.This is now fixed by splitting it into two separate node statements, one per part of the OR. Then I noticed that the next line edits
:HAS[@MODULE[RealChuteModule]]already, so I merged one of the new nodes with that block.