Refactor: flatten actions

Flatten the action hierarchy, removing sub-actions.
Update the UI and logic to reflect these changes.

Author: liplum

escape_wild/assets/vanilla/l10n/en.yaml

@@ -5,42 +5,22 @@ attribute:
   energy: Energy
 action:
   # Move forward
-  move:
-    name: Move # no direction specified
-    left: Left
-    right: Right
-    up: Up
-    down: Down
-    forward: Forward
-    backward: Backward
+  move: Move
   # Explore the surroundings
-  explore:
-    name: Explore
-  gather:
-    name: Gather
-    get-water: Get Water
-    get-wood: Get Wood
-    get-food: Get Food
-  hunt:
-    name: Hunt
-    trap: With Trap
-    gun: With Gun
+  explore: Explore
+  gather: Gather
+  get-water: Get Water
+  get-wood: Get Wood
+  get-food: Get Food
+  hunt: Hunt
   # Go fishing
-  fish:
-    name: Fish
+  fish: Fish
+  shelter: Shelter
+  campfire: Campfire
   # When player win the game
-  escape-wild:
-    name: Escape Wild
+  escape-wild: Escape Wild
   # When player lose the game
-  stop-heartbeat:
-    name: Stop Heartbeat
-  shelter:
-    name: Shelter
-    sleep-till-tomorrow: Sleep Till Tomorrow
-    # Reinforce the shelter
-    reinforce: Reinforce
-    # Have a rest
-    rest: Rest
+  stop-heartbeat: Stop Heartbeat
 use-type:
   use: Use
   eat: Eat

escape_wild/lib/core/action/action.dart

@@ -1,81 +1,37 @@
 import 'package:escape_wild/core/index.dart';
 
-/// Full name: User Action.
-///
 /// It's to disambiguate with `Action` in flutter.
 class UserAction with Moddable {
-  final UserAction? parent;
   @override
   final String name;
-  final List<UserAction> subActions = [];
 
-  UserAction(this.name, {this.parent}) {
-    parent?.subActions.add(this);
-  }
+  UserAction(this.name);
 
-  /// The sub-action should be in `parent-name.sub-name`.
-  UserAction sub(String name) => UserAction("${this.name}.$name", parent: this);
+  String l10nName() => i18n("action.$name");
 
   factory UserAction.named(String name) => UserAction(name);
 
-  String l10nName() {
-    final parent = this.parent;
-    if (parent != null) {
-      return i18n("action.$name");
-    } else {
-      // It's at the top level.
-      return i18n("action.$name.name");
-    }
-  }
-
-  bool belongsToOrSelf(UserAction ancestorOrSelf) => this == ancestorOrSelf || belongsTo(ancestorOrSelf);
-
-  bool belongsTo(UserAction ancestor) {
-    var cur = parent;
-    while (cur != null) {
-      if (cur == ancestor) return true;
-      cur = parent?.parent;
-    }
-    return false;
-  }
-
   @override
   String toString() => name;
 
   // Move
   static final //
       move = UserAction("move"),
-      moveLeft = move.sub("left"),
-      moveRight = move.sub("right"),
-      moveUp = move.sub("up"),
-      moveDown = move.sub("down"),
-      moveForward = move.sub("forward"),
-      moveBackward = move.sub("backward");
-  static final //
-      explore = UserAction("explore");
-  static final //
+      explore = UserAction("explore"),
       gather = UserAction("gather"),
-      gatherGetWater = gather.sub("get-water"),
-      gatherGetWood = gather.sub("get-wood"),
-      gatherGetFood = gather.sub("get-food");
-
-  static final //
+      getWood = UserAction("get-wood"),
+      getWater = UserAction("get-water"),
+      getFood = UserAction("get-food"),
       shelter = UserAction("shelter"),
-      shelterSleepTillTomorrow = shelter.sub("sleep-till-tomorrow"),
-      shelterReinforce = shelter.sub("reinforce"),
-      shelterRest = shelter.sub("rest");
-
-  static final //
-      campfire = UserAction("campfire");
-  static final //
+      campfire = UserAction("campfire"),
       hunt = UserAction("hunt"),
-      hunTrap = hunt.sub("trap"),
-      hunGun = hunt.sub("gun");
-  static final //
       fish = UserAction("fish");
 
-  // Win or lose the game.
-  static final escapeWild = UserAction("escape-wild"), stopHeartbeat = UserAction("stop-heartbeat");
+  static final
+      // Win the game
+      escapeWild = UserAction("escape-wild"),
+      // Lose the game
+      stopHeartbeat = UserAction("stop-heartbeat");
 
   static final List<UserAction> defaultActions = [
     move,
@@ -93,9 +49,3 @@ class UserAction with Moddable {
   @override
   int get hashCode => name.hashCode;
 }
-
-extension UActionX on UserAction {
-  bool get isTopLevel => parent == null;
-
-  bool get isLeaf => subActions.isEmpty;
-}

escape_wild/lib/core/route/route.dart

@@ -78,17 +78,17 @@ extension PlaceProps on PlaceProtocol {
 mixin PlaceActionDelegateMixin on PlaceProtocol {
   @override
   Future<void> performAction(UserAction action) async {
-    if (action.belongsToOrSelf(UserAction.explore)) {
+    if (action == UserAction.explore) {
       await performExplore();
-    } else if (action.belongsToOrSelf(UserAction.move)) {
+    } else if (action == UserAction.move) {
       await performMove(action);
-    } else if (action.belongsToOrSelf(UserAction.gather)) {
+    } else if (action == UserAction.gather) {
       await performGather(action);
-    } else if (action.belongsToOrSelf(UserAction.fish)) {
+    } else if (action == UserAction.fish) {
       await performFish();
-    } else if (action.belongsToOrSelf(UserAction.shelter)) {
+    } else if (action == UserAction.shelter) {
       await performShelter(action);
-    } else if (action.belongsToOrSelf(UserAction.hunt)) {
+    } else if (action == UserAction.hunt) {
       await performHunt(action);
     } else {
       await performOthers(action);

escape_wild/lib/game/routes/subtropics.dart

@@ -35,15 +35,14 @@ final fishWithTool = PlaceAction(
       ),
 );
 final cutDownTreeWithTool = PlaceAction(
-  UserAction.gatherGetWood,
+  UserAction.getWood,
   () =>
       player.energy > 0.0 &&
       player.backpack.hasAnyToolOfType(
         ToolType.axe,
       ),
 );
 
-final rest = PlaceAction(UserAction.shelterRest, () => true);
 final shelter = PlaceAction(UserAction.shelter, () => true);
 final stopHeartbeatAndLose = PlaceAction(UserAction.stopHeartbeat, () => true);
 final escapeWildAndWin = PlaceAction(UserAction.escapeWild, () => true);
@@ -230,9 +229,7 @@ class SubtropicsRoute extends RouteProtocol with IterableMixin<SubtropicsPlace>
   @override
   PlaceProtocol get initialPlace => places[0];
 
-  bool get canMoveForward => routeProgress.toInt() < placeCount;
-
-  bool get canMoveBackward => 0 < routeProgress.toInt();
+  bool get canMove => routeProgress.toInt() < placeCount;
 
   @override
   Future<void> onPassTime(Ts delta) async {
@@ -306,8 +303,7 @@ class SubtropicsPlace extends CampfirePlaceProtocol with PlaceActionDelegateMixi
 
   SubtropicsPlace(this.name);
 
-  late final PlaceAction forward = PlaceAction(UserAction.moveForward, () => route.canMoveForward);
-  late final PlaceAction backward = PlaceAction(UserAction.moveBackward, () => route.canMoveBackward);
+  late final PlaceAction forward = PlaceAction(UserAction.move, () => route.canMove);
 
   /// Short name to reduce json size.
   @JsonKey(name: "ec")
@@ -331,7 +327,6 @@ class SubtropicsPlace extends CampfirePlaceProtocol with PlaceActionDelegateMixi
   @override
   List<PlaceAction> getAvailableActions() {
     return [
-      backward,
       forward,
       exploreWithEnergy,
       shelter,
@@ -349,11 +344,7 @@ class SubtropicsPlace extends CampfirePlaceProtocol with PlaceActionDelegateMixi
       player.modifyX(Attr.water, -0.0001 * f);
       player.modifyX(Attr.energy, -0.0001 * f);
       var routeProgress = route.getRouteProgress();
-      if (action == UserAction.moveForward) {
-        await route.setRouteProgress(routeProgress + 0.03 * f);
-      } else if (action == UserAction.moveBackward) {
-        await route.setRouteProgress(routeProgress - 0.03 * f);
-      }
+      await route.setRouteProgress(routeProgress + 0.03 * f);
       player.journeyProgress = route.journeyProgress;
       player.location = route.current;
     });
@@ -498,9 +489,9 @@ class ForestPlace extends SubtropicsPlace {
     var isToolBroken = false;
     isToolBroken = player.damageTool(tool.stack, comp, dmg * 30.0);
     if (isToolBroken) {
-      await showToolBroken(UserAction.gatherGetWood, tool.stack);
+      await showToolBroken(UserAction.getWood, tool.stack);
     }
-    await showGain(UserAction.gatherGetWood, gain);
+    await showGain(UserAction.getWood, gain);
   }
 
   @override