Skip to content

Commit

Permalink
Merge pull request #8 from xjyribro/mini-map
Browse files Browse the repository at this point in the history 
add Mini map
  • Loading branch information
@xjyribro
xjyribro authored Feb 26, 2024
2 parents 19b585d + 3b4d85f commit 2156745
Show file tree
Hide file tree
Showing 19 changed files with 355 additions and 120 deletions.
Binary file added assets/images/tile_maps/mini_hood.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/tile_maps/mini_park.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/ui/map_button.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/ui/menu_button.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 8 additions & 8 deletions assets/tiles/hood.tmx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1560,9 +1560,9 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,7221,7222,7223,7224,7225,7226,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,7241,7242,7243,7244,7245,7246,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,7261,7262,7263,7264,7265,7266,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,7281,7282,7283,7284,7285,7286,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,7301,7302,7303,7304,7305,7306,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,7321,7322,7323,7324,7325,7326,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
Expand Down Expand Up @@ -1870,10 +1870,10 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8001,8002,8003,8004,0,0,0,0,0,8001,8002,8003,8004,0,0,0,0,0,8001,8002,8003,8004,0,0,0,0,0,8001,8002,8003,8004,0,0,0,0,8001,8002,8003,8004,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8001,8002,8003,8004,0,0,0,0,0,8001,8002,8003,8004,0,0,0,0,0,8001,8002,8003,8004,0,0,0,0,0,8001,8002,8003,8004,0,0,0,0,8001,8002,8003,8004,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8001,8002,8003,8004,0,0,0,0,0,8001,8002,8003,8004,0,0,0,0,0,8001,8002,8003,8004,0,0,0,0,0,8001,8002,8003,8004,0,0,0,0,8001,8002,8003,8004,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8021,8022,8023,8024,0,0,0,0,0,8021,8022,8023,8024,0,0,0,0,0,8021,8022,8023,8024,0,0,0,0,0,8021,8022,8023,8024,0,0,0,0,8021,8022,8023,8024,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8021,8022,8023,8024,0,0,0,0,0,8021,8022,8023,8024,0,0,0,0,0,8021,8022,8023,8024,0,0,0,0,0,8021,8022,8023,8024,0,0,0,0,8021,8022,8023,8024,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8021,8022,8023,8024,0,0,0,0,0,8021,8022,8023,8024,0,0,0,0,0,8021,8022,8023,8024,0,0,0,0,0,8021,8022,8023,8024,0,0,0,0,8021,8022,8023,8024,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8041,8042,8043,8044,0,0,0,0,0,8041,8042,8043,8044,0,0,0,0,0,8041,8042,8043,8044,0,0,0,0,0,8041,8042,8043,8044,0,0,0,0,8041,8042,8043,8044,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8041,8042,8043,8044,0,0,0,0,0,8041,8042,8043,8044,0,0,0,0,0,8041,8042,8043,8044,0,0,0,0,0,8041,8042,8043,8044,0,0,0,0,8041,8042,8043,8044,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8041,8042,8043,8044,0,0,0,0,0,8041,8042,8043,8044,0,0,0,0,0,8041,8042,8043,8044,0,0,0,0,0,8041,8042,8043,8044,0,0,0,0,8041,8042,8043,8044,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8061,8062,8063,8064,0,0,0,0,0,8061,8062,8063,8064,0,0,0,0,0,8061,8062,8063,8064,0,0,0,0,0,8061,8062,8063,8064,0,0,0,0,8061,8062,8063,8064,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8061,8062,8063,8064,0,0,0,0,0,8061,8062,8063,8064,0,0,0,0,0,8061,8062,8063,8064,0,0,0,0,0,8061,8062,8063,8064,0,0,0,0,8061,8062,8063,8064,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8061,8062,8063,8064,0,0,0,0,0,8061,8062,8063,8064,0,0,0,0,0,8061,8062,8063,8064,0,0,0,0,0,8061,8062,8063,8064,0,0,0,0,8061,8062,8063,8064,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8062,8063,8064,0,0,0,0,0,0,8062,8063,8064,0,0,0,0,0,0,8062,8063,8064,0,0,0,0,0,0,8062,8063,8064,0,0,0,0,0,8062,8063,8064,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8062,8063,8064,0,0,0,0,0,0,8062,8063,8064,0,0,0,0,0,0,8062,8063,8064,0,0,0,0,0,0,8062,8063,8064,0,0,0,0,0,8062,8063,8064,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,8062,8063,8064,0,0,0,0,0,0,8062,8063,8064,0,0,0,0,0,0,8062,8063,8064,0,0,0,0,0,0,8062,8063,8064,0,0,0,0,0,8062,8063,8064,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
Expand Down Expand Up @@ -2448,7 +2448,7 @@
<object id="403" name="street_light" x="1600" y="2016" width="32" height="64"/>
<object id="464" name="street_light" x="3808" y="3744" width="32" height="64"/>
</objectgroup>
<objectgroup id="16" name="obstacles" visible="0">
<objectgroup id="16" name="obstacles">
<object id="168" x="1920" y="416" width="256" height="160"/>
<object id="180" x="0" y="320" width="320" height="4480"/>
<object id="181" x="320" y="4640" width="6080" height="160"/>
Expand Down
2 changes: 1 addition & 1 deletion assets/yarn/himiko.yarn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Himiko: I think people are unsure about how to do this. I will teach you!
Himiko: We have 6 different kinds of rubbish: plastics, paper, glass, metal, food and electronics.
Himiko: There are 6 bins in your home for each kind. The images on the bin tell you what they are.
Himiko: Throw the rubbish into the correct bin and get coins!
Himiko: First, you have pick up the trash from the street.
Himiko: First, you have to pick up the trash from the street.
Himiko: There is one right over there! Pick it up and head home to throw it.
<<increaseBagSize 1>>
<<changeState "post_intro">>
Expand Down
11 changes: 10 additions & 1 deletion lib/assets.dart
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion lib/constants/constants.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ const double viewportHeight = 400;

// ui
const double boxMarginFromLeft = 28;
const double miniMapMarginFromLeft = 144;
const double dialogueBoxMarginFromTop = 270;
const double rightSideButtonFromLeft = 700;
const double rightSideButtonFromTop = 250;

// map
const double tileSize = 32;
Expand All @@ -18,8 +21,12 @@ const double parkStartX = 96;
const double parkStartY = 3660;
const double hoodStartFromRoomX = 1780;
const double hoodStartFromRoomY = 580;
const double hoodStartFromParkX = 6270;
const double hoodStartFromParkX = 6280;
const double hoodStartFromParkY = 4300;
const double mapSizeX = 6400;
const double mapSizeY = 4800;
const double miniMapSizeX = 512;
const double miniMapSizeY = 382;

// game
const int playerSize = 32;
Expand Down
25 changes: 25 additions & 0 deletions lib/game/game.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import 'package:gomiland/game/ui/hud/brightness.dart';
import 'package:gomiland/game/ui/hud/clock.dart';
import 'package:gomiland/game/ui/hud/coins.dart';
import 'package:gomiland/game/ui/hud/game_menu_button.dart';
import 'package:gomiland/game/ui/hud/mini_map_button.dart';
import 'package:gomiland/game/ui/loading_overlay.dart';
import 'package:gomiland/game/ui/mute_button.dart';
import 'package:gomiland/game/ui/warning_popups/confirm_exit_game.dart';
Expand Down Expand Up @@ -103,6 +104,7 @@ class GomilandGame extends FlameGame

final BrightnessOverlay brightnessOverlay = BrightnessOverlay();
late final AButton _aButton;
late final MiniMapButton _mapButton;
late final JoystickComponent joystick;

DialogueControllerComponent dialogueControllerComponent =
Expand Down Expand Up @@ -160,6 +162,9 @@ class GomilandGame extends FlameGame
}

void addHudComponentsForWorld() {
if (!gameStateBloc.state.playerFrozen) {
addMiniMapButton();
}
List<BrightnessOverlay> brightnessOverlays =
cameraComponent.viewport.children.query<BrightnessOverlay>();
if (brightnessOverlays.isEmpty) {
Expand All @@ -170,6 +175,14 @@ class GomilandGame extends FlameGame
}
}

void addMiniMapButton() {
List<MiniMapButton> miniMapButtons =
cameraComponent.viewport.children.query<MiniMapButton>();
if (miniMapButtons.isEmpty) {
cameraComponent.viewport.add(_mapButton);
}
}

void _addPlayerControls() {
List<AButton> aButtons = cameraComponent.viewport.children.query<AButton>();
if (aButtons.isEmpty) {
Expand All @@ -182,7 +195,16 @@ class GomilandGame extends FlameGame
}
}

void removeMiniMapButton() {
List<MiniMapButton> miniMapButtons =
cameraComponent.viewport.children.query<MiniMapButton>();
if (miniMapButtons.isNotEmpty) {
cameraComponent.viewport.remove(_mapButton);
}
}

void removeHudComponentsForWorld() {
removeMiniMapButton();
List<BrightnessOverlay> brightnessOverlays =
cameraComponent.viewport.children.query<BrightnessOverlay>();
if (brightnessOverlays.isNotEmpty) {
Expand All @@ -201,9 +223,11 @@ class GomilandGame extends FlameGame

void freezePlayer() {
gameStateBloc.add(const PlayerFrozen(true));
removeMiniMapButton();
}

void unfreezePlayer() {
addMiniMapButton();
gameStateBloc.add(const PlayerFrozen(false));
}

Expand All @@ -223,6 +247,7 @@ class GomilandGame extends FlameGame
loadFromSave: loadFromSave,
);
final GameMenuButton gameMenuButton = GameMenuButton();
_mapButton = MiniMapButton();
_aButton = AButton(game: this);
joystick = JoystickComponent(
knob: SpriteComponent(
Expand Down
25 changes: 25 additions & 0 deletions lib/game/npcs/himiko_static.dart
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import 'package:flame/components.dart';
import 'package:flame/flame.dart';
import 'package:flame/sprite.dart';
import 'package:gomiland/assets.dart';
import 'package:gomiland/constants/constants.dart';

class HimikoStatic extends SpriteComponent {
HimikoStatic({required super.position});

late SpriteAnimation idleUp;
late SpriteAnimation idleDown;
late SpriteAnimation idleLeft;
late SpriteAnimation idleRight;

@override
void onLoad() async {
final image = await Flame.images.load(Assets.assets_images_npcs_himiko_png);
final spriteSheet = SpriteSheet(
image: image,
srcSize: Vector2.all(tileSize),
);

sprite = spriteSheet.getSprite(0, 0);
}
}
Loading

0 comments on commit 2156745

Please sign in to comment.