fix: merge conflicts

.firebaserc

@@ -9,6 +9,13 @@
           "endless-runner-9481713-383737"
         ]
       }
+    },
+    "super-dash-game": {
+      "hosting": {
+        "app_prod": [
+          "super-dash-game"
+        ]
+      }
     }
   },
   "etags": {}

.github/CODEOWNERS

@@ -0,0 +1,3 @@
+# Every request must be reviewed and accepted by:
+
+*	@marcossevilla @erickzanardo

.github/workflows/deploy_app_dev.yaml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Deploy App Development
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: subosito/flutter-action@v2
         with:
           channel: "stable"

.github/workflows/main.yaml

@@ -20,8 +20,7 @@ jobs:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1
     with:
       flutter_channel: stable
-      # TODO(erickzanardo): remove after prototyping phase.
-      min_coverage: 0
+      min_coverage: 29 
 
   spell-check:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/spell_check.yml@v1

.gitignore

@@ -124,3 +124,5 @@ app.*.map.json
 !.idea/codeStyles/
 !.idea/dictionaries/
 !.idea/runConfigurations/
+
+.firebase

.vscode/launch.json

@@ -8,11 +8,13 @@
       "name": "Launch game",
       "request": "launch",
       "type": "dart",
-      "program": "lib/main_development.dart",
-      "args": [
-        "--target",
-        "lib/main.dart"
-      ]
+      "program": "lib/main.dart",
+    },
+    {
+      "name": "Launch game tester",
+      "request": "launch",
+      "type": "dart",
+      "program": "lib/main_tester.dart",
     }
   ]
 }

assets/map/.gitignore

@@ -0,0 +1,2 @@
+*.tiled-project
+*.tiled-session

assets/map/objects/tile_enemies_v2.tsx

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.10.2" name="tile_enemies_v2" tilewidth="64" tileheight="64" tilecount="6" columns="2">
+ <image source="tile_enemies_v2.png" width="128" height="192"/>
+</tileset>

assets/map/objects/tile_forest_trees_back_v02.tsx

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.10.2" name="tile_forest_trees_back_v02" tilewidth="448" tileheight="704" tilecount="3" columns="3">
+ <image source="tile_forest_trees_back_v02.png" width="1344" height="704"/>
+</tileset>

assets/map/objects/tile_forest_trees_front_v02.tsx

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.10.2" name="tile_forest_trees_front_v02" tilewidth="192" tileheight="320" tilecount="3" columns="3">
+ <image source="tile_forest_trees_front_v02.png" width="576" height="320"/>
+</tileset>

assets/map/objects/tile_items_v2.tsx

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.10.2" name="tile_items_v2" tilewidth="64" tileheight="64" tilecount="4" columns="2">
+ <image source="tile_items_v2.png" width="128" height="128"/>
+</tileset>

assets/map/objects/tile_mountain_tree_v01.tsx

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.10.2" name="tile_mountain_tree_v01" tilewidth="256" tileheight="320" tilecount="2" columns="2">
+ <image source="tile_mountain_tree_v01.png" width="512" height="320"/>
+</tileset>

assets/map/objects/tile_plains_mountains_v01.tsx

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.10.2" name="tile_plains_mountains_v01" tilewidth="576" tileheight="384" tilecount="2" columns="2">
+ <image source="tile_plains_mountains_v01.png" width="1152" height="384"/>
+</tileset>

assets/map/tiles/tile_clouds_v02.tsx

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.10.2" name="tile_clouds_v02" tilewidth="64" tileheight="64" tilecount="72" columns="8">
+ <image source="tile_clouds_v02.png" width="512" height="576"/>
+</tileset>

assets/map/tiles/tile_decorations_v01.tsx

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.10.2" name="tile_decorations_v01" tilewidth="64" tileheight="64" tilecount="27" columns="9">
+ <image source="tile_decorations_v01.png" width="576" height="192"/>
+</tileset>

assets/map/tiles/tile_forest_bushes_v02.tsx

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.10.2" name="tile_forest_bushes_v02" tilewidth="64" tileheight="64" tilecount="60" columns="12">
+ <image source="tile_forest_bushes_v02.png" width="768" height="320"/>
+</tileset>

assets/map/tiles/tile_forest_ground_v02.tsx

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.10.2" name="tile_forest_ground_v02" tilewidth="64" tileheight="64" tilecount="30" columns="6">
+ <image source="tile_forest_ground_v02.png" width="384" height="320"/>
+ <tile id="0" type="Platform"/>
+ <tile id="1" type="Platform"/>
+ <tile id="2" type="Platform"/>
+ <tile id="3" type="Platform"/>
+ <tile id="4" type="Platform"/>
+ <tile id="5" type="Platform"/>
+ <tile id="6" type="Platform">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="32" y="0" width="32" height="64"/>
+  </objectgroup>
+ </tile>
+ <tile id="7" type="Slope">
+  <properties>
+   <property name="LeftTop" type="int" value="0"/>
+   <property name="RightTop" type="int" value="64"/>
+  </properties>
+ </tile>
+ <tile id="8" type="Platform"/>
+ <tile id="9" type="Platform">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="39" y="0" width="25" height="39"/>
+  </objectgroup>
+ </tile>
+ <tile id="10" type="Platform"/>
+ <tile id="12">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="32" y="0" width="32" height="64"/>
+  </objectgroup>
+ </tile>
+ <tile id="13" type="Slope">
+  <properties>
+   <property name="LeftTop" type="int" value="0"/>
+   <property name="RightTop" type="int" value="52"/>
+  </properties>
+ </tile>
+ <tile id="14" type="Slope">
+  <properties>
+   <property name="LeftTop" type="int" value="52"/>
+   <property name="RightTop" type="int" value="64"/>
+  </properties>
+ </tile>
+ <tile id="15" type="Platform"/>
+ <tile id="18" type="Slope">
+  <properties>
+   <property name="LeftTop" type="int" value="0"/>
+   <property name="RightTop" type="int" value="64"/>
+  </properties>
+ </tile>
+ <tile id="19" type="Hazard"/>
+ <tile id="21" type="Platform">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="27" y="0" width="37" height="64"/>
+  </objectgroup>
+ </tile>
+ <tile id="22" type="Platform"/>
+</tileset>

assets/map/tiles/tile_forest_ground_v03.tsx

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.10.2" name="tile_forest_ground_v03" tilewidth="64" tileheight="64" tilecount="60" columns="6">
+ <image source="tile_forest_ground_v03.png" width="384" height="640"/>
+</tileset>

assets/map/tiles/tile_forest_ground_v04.tsx

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.10.2" name="tile_forest_ground_v04" tilewidth="64" tileheight="64" tilecount="132" columns="11">
+ <image source="tile_forest_ground_v04.png" width="704" height="768"/>
+</tileset>

assets/map/tiles/tile_gate_v2.tsx

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.10.2" name="tile_gate_v2" tilewidth="64" tileheight="64" tilecount="20" columns="5">
+ <image source="tile_gate_v2.png" width="320" height="256"/>
+</tileset>

assets/map/tiles/tile_ground_transition_v02.tsx

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.10.2" name="tile_ground_transition_v02" tilewidth="64" tileheight="64" tilecount="20" columns="10">
+ <image source="tile_ground_transition_v02.png" width="640" height="128"/>
+</tileset>

assets/map/tiles/tile_mountain_ground_v02.tsx

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.10.2" name="tile_mountain_ground_v02" tilewidth="64" tileheight="64" tilecount="66" columns="11">
+ <image source="tile_mountain_ground_v02.png" width="704" height="320"/>
+ <tile id="0">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="32" y="0" width="32" height="64"/>
+  </objectgroup>
+ </tile>
+ <tile id="5" type="Platform"/>
+ <tile id="6" type="Platform"/>
+ <tile id="7" type="Platform"/>
+ <tile id="8" type="Platform"/>
+ <tile id="9" type="Platform">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="31" height="64"/>
+  </objectgroup>
+ </tile>
+ <tile id="10" type="Hazard">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="22" y="0" width="23" height="20"/>
+  </objectgroup>
+ </tile>
+ <tile id="11">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="32" y="0" width="32" height="64"/>
+  </objectgroup>
+ </tile>
+ <tile id="18" type="Platform">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="34" y="0" width="30" height="39"/>
+  </objectgroup>
+ </tile>
+ <tile id="19" type="Platform"/>
+ <tile id="20" type="Platform">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="31" height="39"/>
+  </objectgroup>
+ </tile>
+ <tile id="21" type="Hazard">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="1" y="0" width="54" height="41"/>
+  </objectgroup>
+ </tile>
+ <tile id="33">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="17" y="0" width="47" height="64"/>
+  </objectgroup>
+ </tile>
+ <tile id="37">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="43" y="0" width="21" height="55"/>
+  </objectgroup>
+ </tile>
+ <tile id="39">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="30" y="0" width="34" height="64"/>
+  </objectgroup>
+ </tile>
+ <tile id="42" type="Slope">
+  <properties>
+   <property name="LeftTop" type="int" value="64"/>
+   <property name="RightTop" type="int" value="0"/>
+  </properties>
+ </tile>
+ <tile id="43" type="Hazard">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="0" width="62" height="38"/>
+  </objectgroup>
+ </tile>
+ <tile id="44">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="35" y="0" width="29" height="42"/>
+  </objectgroup>
+ </tile>
+ <tile id="50">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="30" y="0" width="34" height="64"/>
+  </objectgroup>
+ </tile>
+ <tile id="52" type="Slope">
+  <properties>
+   <property name="LeftTop" type="int" value="64"/>
+   <property name="RightTop" type="int" value="0"/>
+  </properties>
+ </tile>
+ <tile id="54" type="Hazard">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="7" y="0" width="54" height="30"/>
+  </objectgroup>
+ </tile>
+</tileset>

assets/map/tiles/tile_mountain_mountains_v01.tsx

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.10.2" name="tile_mountain_mountains_v01" tilewidth="64" tileheight="64" tilecount="33" columns="11">
+ <image source="tile_mountain_mountains_v01.png" width="704" height="192"/>
+</tileset>

assets/map/tiles/tile_mountain_stars_v01.tsx

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.10.2" name="tile_mountain_stars_v01" tilewidth="64" tileheight="64" tilecount="8" columns="4">
+ <image source="tile_mountain_stars_v01.png" width="256" height="128"/>
+</tileset>

assets/map/tiles/tile_plains_ground_v02.tsx

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.10.2" name="tile_plains_ground_v02" tilewidth="64" tileheight="64" tilecount="30" columns="6">
+ <image source="tile_plains_ground_v02.png" width="384" height="320"/>
+ <tile id="0" type="Platform"/>
+ <tile id="1" type="Platform"/>
+ <tile id="2" type="Platform"/>
+ <tile id="3" type="Platform"/>
+ <tile id="4" type="Platform"/>
+ <tile id="5" type="Platform"/>
+ <tile id="6" type="Platform">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="32" y="0" width="32" height="64"/>
+  </objectgroup>
+ </tile>
+ <tile id="7" type="Slope">
+  <properties>
+   <property name="LeftTop" type="int" value="0"/>
+   <property name="RightTop" type="int" value="64"/>
+  </properties>
+ </tile>
+ <tile id="8" type="Platform"/>
+ <tile id="9" type="Platform">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="32" y="0" width="32" height="64"/>
+  </objectgroup>
+ </tile>
+ <tile id="10" type="Platform"/>
+ <tile id="11" type="Platform"/>
+ <tile id="12">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="31.68" y="0" width="32.32" height="64"/>
+  </objectgroup>
+ </tile>
+ <tile id="13" type="Slope">
+  <properties>
+   <property name="LeftTop" type="int" value="0"/>
+   <property name="RightTop" type="int" value="52"/>
+  </properties>
+ </tile>
+ <tile id="14" type="Slope">
+  <properties>
+   <property name="LeftTop" type="int" value="52"/>
+   <property name="RightTop" type="int" value="64"/>
+  </properties>
+ </tile>
+ <tile id="15" type="Slope">
+  <properties>
+   <property name="LeftTop" type="int" value="0"/>
+   <property name="RightTop" type="int" value="47"/>
+  </properties>
+ </tile>
+ <tile id="16" type="Slope">
+  <properties>
+   <property name="LeftTop" type="int" value="47"/>
+   <property name="RightTop" type="int" value="64"/>
+  </properties>
+ </tile>
+ <tile id="19" type="Hazard"/>
+ <tile id="20" type="Platform">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="31.68" y="0" width="32.32" height="64"/>
+  </objectgroup>
+ </tile>
+ <tile id="28" type="Hazard">
+  <objectgroup draworder="index" id="2">
+   <object id="1" x="0" y="37" width="64" height="27"/>
+  </objectgroup>
+ </tile>
+ <tile id="29" type="Hazard"/>
+</tileset>

assets/map/tiles/tile_plains_hills_v01.tsx

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.10.2" name="tile_plains_hills_v01" tilewidth="64" tileheight="64" tilecount="78" columns="13">
+ <image source="tile_plains_hills_v01.png" width="832" height="384"/>
+</tileset>

assets/map/tiles/tile_sky_v02.tsx

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.10.2" name="tile_sky_v02" tilewidth="64" tileheight="64" tilecount="440" columns="22">
+ <image source="tile_sky_v02.png" width="1408" height="1280"/>
+</tileset>