summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Daniel Sandler <dsandler@android.com> 2024-06-14 03:39:20 +0000
committer Daniel Sandler <dsandler@android.com> 2024-06-14 03:39:20 +0000
commitf1c52fa7f1eb97b00cdaf6388adb120eb4a888c1 (patch)
tree51d2fda3dc915e4b69835853ddd99332561ff067
parenta956e72a0bb62a05a8b54beec3187c596fb92cee (diff)
Avoid accumulating too many flags on single-body systems.
- Increase sightseeing time to 15 seconds - Increase launch thrust time to 5 seconds - Decrease flag lifetime to 15 minutes Change-Id: I2e85142a1d56acb684ff1750094f61b9e230444f Fixes: 320695719 Test: adb shell am start -n com.android.egg/.landroid.MainActivity Flag: com.android.egg.flags.flag_flag
-rw-r--r--packages/EasterEgg/src/com/android/egg/landroid/Autopilot.kt5
-rw-r--r--packages/EasterEgg/src/com/android/egg/landroid/Universe.kt2
2 files changed, 4 insertions, 3 deletions
diff --git a/packages/EasterEgg/src/com/android/egg/landroid/Autopilot.kt b/packages/EasterEgg/src/com/android/egg/landroid/Autopilot.kt
index f71abee6fb43..fb5954ec9736 100644
--- a/packages/EasterEgg/src/com/android/egg/landroid/Autopilot.kt
+++ b/packages/EasterEgg/src/com/android/egg/landroid/Autopilot.kt
@@ -21,7 +21,8 @@ import kotlin.math.sign
class Autopilot(val ship: Spacecraft, val universe: Universe) : Entity {
val BRAKING_TIME = 5f
- val SIGHTSEEING_TIME = 10f
+ val SIGHTSEEING_TIME = 15f
+ val LAUNCH_THRUST_TIME = 5f
val STRATEGY_MIN_TIME = 0.5f
var enabled = false
@@ -73,7 +74,7 @@ class Autopilot(val ship: Spacecraft, val universe: Universe) : Entity {
strategy = "LAUNCHING"
debug = ""
- nextStrategyTime = sim.now + 2f
+ nextStrategyTime = sim.now + LAUNCH_THRUST_TIME
}
} else {
// select new target
diff --git a/packages/EasterEgg/src/com/android/egg/landroid/Universe.kt b/packages/EasterEgg/src/com/android/egg/landroid/Universe.kt
index d6fbc119edb5..30de11b17874 100644
--- a/packages/EasterEgg/src/com/android/egg/landroid/Universe.kt
+++ b/packages/EasterEgg/src/com/android/egg/landroid/Universe.kt
@@ -43,7 +43,7 @@ const val CRAFT_SPEED_LIMIT = 5_000f
const val MAIN_ENGINE_ACCEL = 1000f // thrust effect, pixels per second squared
const val LAUNCH_MECO = 2f // how long to suspend gravity when launching
-const val LANDING_REMOVAL_TIME = 3600f // one hour of simulation time
+const val LANDING_REMOVAL_TIME = 60 * 15f // 15 min of simulation time
const val SCALED_THRUST = true