diff --git a/src/cmd.rs b/src/cmd.rs index aeeb860..c6483e9 100644 --- a/src/cmd.rs +++ b/src/cmd.rs @@ -102,6 +102,7 @@ struct ParserState { is_point_of_interest: bool, is_tidally_locked: bool, is_mirror: bool, + is_orbitring: bool, orbit_distance: Option, orbit_object_id: Option, orbit_phase: Option, @@ -166,6 +167,7 @@ impl Default for ParserState { is_point_of_interest: false, is_tidally_locked: false, is_mirror: false, + is_orbitring: false, orbit_distance: None, orbit_object_id: None, orbit_phase: None, @@ -481,6 +483,11 @@ pub fn load_defs(mut ew_spawn: EventWriter) { ["aurora", "yes"] => { state.has_aurora = true; } + ["orbitring", "yes"] => { + state.is_orbitring = true; + state.has_physics = false; + state.is_clickable = false; + } ["tidally", "locked"] => { state.is_tidally_locked = true; } @@ -1443,6 +1450,9 @@ fn spawn_entities( })); actor.insert((NotShadowCaster, NotShadowReceiver)); } + if state.is_orbitring { + actor.insert((NotShadowCaster, NotShadowReceiver)); + } if state.is_targeted_on_startup { actor.insert(hud::IsTargeted); } diff --git a/src/data/defs.txt b/src/data/defs.txt index d24b020..3fe3cb4 100644 --- a/src/data/defs.txt +++ b/src/data/defs.txt @@ -17,8 +17,7 @@ actor 0 0 0 scale 57.91e9 rotationz 6.35 only_in_map_at_dist 1e10 jupiter - clickable no - physics off + orbitring yes actor 0 0 0 venus name Venus planet yes @@ -31,8 +30,7 @@ actor 0 0 0 scale 108.21e9 rotationz 2.15 only_in_map_at_dist 1e10 jupiter - clickable no - physics off + orbitring yes actor 0 0 0 earth name Earth id earth @@ -46,8 +44,7 @@ actor 0 0 0 scale 149.598023e9 rotationz 1.57869 only_in_map_at_dist 1e10 jupiter - clickable no - physics off + orbitring yes actor 0 0 0 luna name "The Moon™" relativeto earth @@ -64,8 +61,7 @@ actor 0 0 0 relativeto earth scale 384399e3 only_in_map_at_dist 1e8 themoon - clickable no - physics off + orbitring yes actor 0 0 0 mars name Mars planet yes @@ -78,8 +74,7 @@ actor 0 0 0 scale 227.939366e9 rotationz 1.65 only_in_map_at_dist 1e10 jupiter - clickable no - physics off + orbitring yes actor 0 0 0 jupiter relativeto sol orbit 778479000e3 0.5 @@ -97,8 +92,7 @@ actor 0 0 0 actor 0 0 0 orbitring scale 778.479e9 only_in_map_at_dist 1e10 jupiter - clickable no - physics off + orbitring yes actor 0 0 0 metis name Metis relativeto jupiter @@ -113,8 +107,7 @@ actor 0 0 0 relativeto jupiter scale 128000e3 only_in_map_at_dist 1e7 metis - clickable no - physics off + orbitring yes actor 0 0 0 metis name Adrastea relativeto jupiter @@ -129,8 +122,7 @@ actor 0 0 0 relativeto jupiter scale 129000e3 only_in_map_at_dist 1e7 adrastea - clickable no - physics off + orbitring yes actor 0 0 0 metis name Amalthea relativeto jupiter @@ -145,8 +137,7 @@ actor 0 0 0 relativeto jupiter scale 181365.84e3 only_in_map_at_dist 1e7 amalthea - clickable no - physics off + orbitring yes actor 0 0 0 thebe name Thebe relativeto jupiter @@ -161,8 +152,7 @@ actor 0 0 0 relativeto jupiter scale 221900e3 only_in_map_at_dist 1e7 thebe - clickable no - physics off + orbitring yes actor 0 -53e3 0 metis name Moonlet relativeto jupiter @@ -203,8 +193,7 @@ actor 0 0 0 relativeto jupiter scale 421700e3 only_in_map_at_dist 1e8 io - clickable no - physics off + orbitring yes actor 0 0 0 europa name Europa id europa @@ -220,8 +209,7 @@ actor 0 0 0 relativeto jupiter scale 670900e3 only_in_map_at_dist 1e8 europa - clickable no - physics off + orbitring yes actor 0 0 0 ganymede name Ganymede id ganymede @@ -237,8 +225,7 @@ actor 0 0 0 relativeto jupiter scale 1070400e3 only_in_map_at_dist 1e8 ganymede - clickable no - physics off + orbitring yes actor 0 0 0 callisto name Callisto id callisto @@ -254,8 +241,7 @@ actor 0 0 0 relativeto jupiter scale 1882700e3 only_in_map_at_dist 1e8 callisto - clickable no - physics off + orbitring yes actor 0 0 0 saturn name Saturn planet yes @@ -270,8 +256,7 @@ actor 0 0 0 scale 1433.53e9 rotationz 0.93 only_in_map_at_dist 1e10 jupiter - clickable no - physics off + orbitring yes actor 0 0 0 uranus name Uranus planet yes @@ -285,8 +270,7 @@ actor 0 0 0 scale 2870.972e9 rotationz 1 only_in_map_at_dist 1e10 jupiter - clickable no - physics off + orbitring yes actor 0 0 0 neptune name Neptune planet yes @@ -300,8 +284,7 @@ actor 0 0 0 scale 4500e9 rotationz 0.74 only_in_map_at_dist 1e10 jupiter - clickable no - physics off + orbitring yes actor 0 0 0 name Pluto orbitaround sol 5906.38e9 @@ -309,8 +292,7 @@ actor 0 0 0 scale 5906.38e9 rotationz 15.55 only_in_map_at_dist 1e10 jupiter - clickable no - physics off + orbitring yes actor 0 59305 0 suitv2