diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c64376..8667f98 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -233,6 +233,7 @@ add_executable(My3D include/components/game_display.h src/components/game_display.c src/systems/game_display_system.c + src/teams/absent.c ) add_compile_options(-W -Wall -Wextra -Wshadow) diff --git a/assets/ui/clown.png b/assets/ui/clown.png new file mode 100644 index 0000000..d4670e7 Binary files /dev/null and b/assets/ui/clown.png differ diff --git a/include/components/game_display.h b/include/components/game_display.h index 9f1bb27..c4a6017 100644 --- a/include/components/game_display.h +++ b/include/components/game_display.h @@ -9,7 +9,8 @@ typedef enum display_type { - HAPPINESS_DISPLAY + HAPPINESS_DISPLAY, + STUPIDITY_DISPLAY } display_type; struct game_display diff --git a/include/components/game_manager.h b/include/components/game_manager.h index dc7824a..189e21c 100644 --- a/include/components/game_manager.h +++ b/include/components/game_manager.h @@ -11,6 +11,7 @@ struct game_manager { gc_component base; int happiness; + int stupidity; }; const struct game_manager game_manager; diff --git a/include/components/teams_component.h b/include/components/teams_component.h index 6db17f3..d2234b1 100644 --- a/include/components/teams_component.h +++ b/include/components/teams_component.h @@ -19,4 +19,6 @@ struct teams_component const struct teams_component teams_component; +bool teams_move_up(gc_scene *scene, float amount, float y_level); + #endif //_TEAMS_COMPONENT_C_ diff --git a/include/setup.h b/include/setup.h index d9400fa..abc171c 100644 --- a/include/setup.h +++ b/include/setup.h @@ -22,4 +22,7 @@ void resolution_set_text(gc_entity *entity, gc_engine *engine); bool fullscreen(gc_engine *engine, int entity_id); bool resolution_down(gc_engine *engine, int entity_id); -bool resolution_up(gc_engine *engine, int entity_id); \ No newline at end of file +bool resolution_up(gc_engine *engine, int entity_id); + + +bool absent_check(gc_engine *engine, int entity_id); \ No newline at end of file diff --git a/lib/gamacon b/lib/gamacon index 3e0ba65..da2f00a 160000 --- a/lib/gamacon +++ b/lib/gamacon @@ -1 +1 @@ -Subproject commit 3e0ba651102bb2f0dba0bd9554c77efaaf82c8de +Subproject commit da2f00aea405d2e0a5763ee07e709c82a07ea8ba diff --git a/prefabs/game.gcprefab b/prefabs/game.gcprefab index 390779a..872730a 100644 --- a/prefabs/game.gcprefab +++ b/prefabs/game.gcprefab @@ -6,6 +6,7 @@ + @@ -28,7 +29,7 @@ - + @@ -43,5 +44,9 @@ + + + + \ No newline at end of file diff --git a/prefabs/teams/absent.gcprefab b/prefabs/teams/absent.gcprefab index 52cc769..fd7aec4 100644 --- a/prefabs/teams/absent.gcprefab +++ b/prefabs/teams/absent.gcprefab @@ -1,6 +1,6 @@ - - +