Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c210223cc775
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4f8ff41fe9cf
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 18, 2019

  1. Rename the b planet.

    pleroy committed Apr 18, 2019
    Copy the full SHA
    c0344a1 View commit details
  2. Merge pull request #2138 from pleroy/2129

    Rename the Slippist b planet.
    pleroy authored Apr 18, 2019
    Copy the full SHA
    4f8ff41 View commit details
Showing with 9 additions and 9 deletions.
  1. +8 −8 astronomy/trappist_gravity_model_slippist1.cfg
  2. +1 −1 tools/generate_kopernicus.cpp
16 changes: 8 additions & 8 deletions astronomy/trappist_gravity_model_slippist1.cfg
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
}
}
}
@Body[Beta] {
@Body[Bravo] {
@name = Trappist-1b
@Properties {
!geeASL = delete
@@ -257,8 +257,8 @@
@reference_angle = +4.38120802495890693e+00 rad
}
}
@Scatterer_atmosphere:HAS[@Atmo[Beta]]:AFTER[aSLIPPIST-1] {
@Atmo[Beta] {
@Scatterer_atmosphere:HAS[@Atmo[Bravo]]:AFTER[aSLIPPIST-1] {
@Atmo[Bravo] {
@name = Trappist-1b
@configPoints {
@Item,* {
@@ -267,8 +267,8 @@
}
}
}
@Scatterer_ocean:HAS[@Ocean[Beta]]:AFTER[aSLIPPIST-1] {
@Ocean[Beta] {
@Scatterer_ocean:HAS[@Ocean[Bravo]]:AFTER[aSLIPPIST-1] {
@Ocean[Bravo] {
@name = Trappist-1b
}
}
@@ -364,7 +364,7 @@
}
@Scatterer_planetsList:AFTER[aSLIPPIST-1] {
@scattererCelestialBodies {
@Item[Beta] {
@Item[Bravo] {
@celestialBodyName = Trappist-1b
@transformName = Trappist-1b
}
@@ -395,7 +395,7 @@
}
}
@EVE_CLOUDS:AFTER[aSLIPPIST-1] {
@OBJECT:HAS[#body[Beta]] {
@OBJECT:HAS[#body[Bravo]] {
@body = Trappist-1b
@altitude *= 2
}
@@ -425,7 +425,7 @@
}
}
@EVE_SHADOWS:AFTER[aSLIPPIST-1] {
@OBJECT:HAS[#body[Beta]] {
@OBJECT:HAS[#body[Bravo]] {
@body = Trappist-1b
!caster,* = delete
}
2 changes: 1 addition & 1 deletion tools/generate_kopernicus.cpp
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ std::map<std::string, std::string> const body_description_map = {
"Requires envelope of volatiles in the form of oceans or ice."}};
std::map<std::string, std::string> const body_name_map = {
{"Trappist-1", "Sun"},
{"Trappist-1b", "Beta"},
{"Trappist-1b", "Bravo"},
{"Trappist-1c", "Charlie"},
{"Trappist-1d", "Delta"},
{"Trappist-1e", "Kerbin"},