separated ui into subfolders: action, backpack, camp

liplum · Jan 22, 2025 · 3f9b87f · 3f9b87f
1 parent 0c619e8
commit 3f9b87f
Show file tree

Hide file tree

Showing 17 changed files with 13 additions and 14 deletions.
diff --git a/escape_wild/lib/game/items/stuff.dart b/escape_wild/lib/game/items/stuff.dart
@@ -39,7 +39,7 @@ class Stuff {
     ]);
     // craft
     Contents.items.addAll([
-      strawRope = Item.mergeable("straw-rope", mass: 200).asFuel(heatValue: 100.0).tagged(["rope"]),
+      strawRope = Item.unmergeable("straw-rope", mass: 100).asFuel(heatValue: 50.0).tagged(["rope"]),
     ]);
     // container
     Contents.items.addAll([

diff --git a/escape_wild/lib/game/recipes/craft.dart b/escape_wild/lib/game/recipes/craft.dart
@@ -28,7 +28,6 @@ class CraftRecipes {
         CraftRecipeCat.refine,
         ingredients: [200.tag("straw")],
         output: () => Stuff.strawRope,
-        outputMass: 100,
       ),
       TagCraftRecipe(
         "stone-axe",

diff --git a/escape_wild/lib/game/routes/subtropics.dart b/escape_wild/lib/game/routes/subtropics.dart
@@ -3,7 +3,7 @@ import 'dart:math';
 
 import 'package:escape_wild/core/index.dart';
 import 'package:escape_wild/foundation.dart';
-import 'package:escape_wild/game/ui/move.dart';
+import 'package:escape_wild/ui/game/action/move.dart';
 import 'package:flutter/material.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:noitcelloc/noitcelloc.dart';

diff --git a/escape_wild/lib/ui/game/action.dart → escape_wild/lib/ui/game/action/action.dart b/escape_wild/lib/ui/game/action.dart → escape_wild/lib/ui/game/action/action.dart
diff --git a/escape_wild/lib/ui/game/hud.dart → escape_wild/lib/ui/game/action/hud.dart b/escape_wild/lib/ui/game/hud.dart → escape_wild/lib/ui/game/action/hud.dart
@@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_layout_grid/flutter_layout_grid.dart';
 import 'package:rettulf/rettulf.dart';
 
-import 'shared.dart';
+import '../shared.dart';
 
 class Hud extends StatefulWidget {
   final AttrModel attrs;

diff --git a/escape_wild/lib/game/ui/move.dart → escape_wild/lib/ui/game/action/move.dart b/escape_wild/lib/game/ui/move.dart → escape_wild/lib/ui/game/action/move.dart
diff --git a/escape_wild/lib/ui/game/backpack.dart → ...e_wild/lib/ui/game/backpack/backpack.dart b/escape_wild/lib/ui/game/backpack.dart → ...e_wild/lib/ui/game/backpack/backpack.dart
@@ -7,7 +7,7 @@ import 'package:noitcelloc/noitcelloc.dart';
 import 'package:rettulf/rettulf.dart';
 import 'package:easy_localization/easy_localization.dart';
 
-import 'shared.dart';
+import '../shared.dart';
 
 part 'backpack.i18n.dart';
 

diff --git a/escape_wild/lib/ui/game/backpack.i18n.dart → ...d/lib/ui/game/backpack/backpack.i18n.dart b/escape_wild/lib/ui/game/backpack.i18n.dart → ...d/lib/ui/game/backpack/backpack.i18n.dart
diff --git a/escape_wild/lib/ui/game/camp.dart → escape_wild/lib/ui/game/camp/camp.dart b/escape_wild/lib/ui/game/camp.dart → escape_wild/lib/ui/game/camp/camp.dart
@@ -1,8 +1,8 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:escape_wild/generated/icons.dart';
-import 'package:escape_wild/ui/game/campfire.dart';
 import 'package:flutter/material.dart';
 
+import 'campfire.dart';
 import 'shelter.dart';
 
 part 'camp.i18n.dart';

diff --git a/escape_wild/lib/ui/game/camp.i18n.dart → escape_wild/lib/ui/game/camp/camp.i18n.dart b/escape_wild/lib/ui/game/camp.i18n.dart → escape_wild/lib/ui/game/camp/camp.i18n.dart
diff --git a/escape_wild/lib/ui/game/campfire.dart → escape_wild/lib/ui/game/camp/campfire.dart b/escape_wild/lib/ui/game/campfire.dart → escape_wild/lib/ui/game/camp/campfire.dart
diff --git a/escape_wild/lib/ui/game/campfire.i18n.dart → ..._wild/lib/ui/game/camp/campfire.i18n.dart b/escape_wild/lib/ui/game/campfire.i18n.dart → ..._wild/lib/ui/game/camp/campfire.i18n.dart
diff --git a/escape_wild/lib/ui/game/shelter.dart → escape_wild/lib/ui/game/camp/shelter.dart b/escape_wild/lib/ui/game/shelter.dart → escape_wild/lib/ui/game/camp/shelter.dart
diff --git a/escape_wild/lib/ui/game/craft.dart → escape_wild/lib/ui/game/craft/craft.dart b/escape_wild/lib/ui/game/craft.dart → escape_wild/lib/ui/game/craft/craft.dart
@@ -6,8 +6,8 @@ import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
 import 'package:modal_bottom_sheet/modal_bottom_sheet.dart';
 import 'package:rettulf/rettulf.dart';
 
-import 'backpack.dart';
-import 'shared.dart';
+import '../backpack/backpack.dart';
+import '../shared.dart';
 
 class CraftPage extends StatefulWidget {
   const CraftPage({super.key});

diff --git a/escape_wild/lib/game/ui/gather.dart → escape_wild/lib/ui/game/gather.dart b/escape_wild/lib/game/ui/gather.dart → escape_wild/lib/ui/game/gather.dart
diff --git a/escape_wild/lib/ui/game/home.dart b/escape_wild/lib/ui/game/home.dart
@@ -3,14 +3,14 @@ import 'package:escape_wild/core/index.dart';
 import 'package:escape_wild/foundation.dart';
 import 'package:escape_wild/game/serialization.dart';
 import 'package:escape_wild/generated/icons.dart';
-import 'package:escape_wild/ui/game/backpack.dart';
+import 'package:escape_wild/ui/game/backpack/backpack.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:go_router/go_router.dart';
 import 'package:rettulf/rettulf.dart';
-import 'action.dart';
-import 'camp.dart';
-import 'craft.dart';
+import 'action/action.dart';
+import 'camp/camp.dart';
+import 'craft/craft.dart';
 
 part 'home.i18n.dart';
 

diff --git a/escape_wild/lib/ui/game/shared.dart b/escape_wild/lib/ui/game/shared.dart
@@ -11,8 +11,8 @@ import 'package:modal_bottom_sheet/modal_bottom_sheet.dart';
 import 'package:rettulf/rettulf.dart';
 import 'package:syncfusion_flutter_sliders/sliders.dart';
 
-import 'backpack.dart';
-import 'hud.dart';
+import 'backpack/backpack.dart';
+import 'action/hud.dart';
 
 const itemCellGridDelegatePortrait = SliverGridDelegateWithMaxCrossAxisExtent(
   maxCrossAxisExtent: 180,