rdefeo 1 год назад
Родитель
Сommit
774c101cd8
5 измененных файлов с 15 добавлено и 8 удалено
  1. 6 0
      CHANGELOG.md
  2. 7 2
      README.md
  3. 1 1
      application.fam
  4. 0 4
      pinball0.cxx
  5. 1 1
      pinball0.h

+ 6 - 0
CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.4.0
+
+- Table Tilt!
+- Solid flipper rendering
+- Code refactor / cleanup
+
 ## 0.3.0
 ## 0.3.0
 
 
 - Added Idle timeout of 2 minutes
 - Added Idle timeout of 2 minutes

+ 7 - 2
README.md

@@ -21,7 +21,7 @@ Still a work in progress...
 * User-defined tables via JSON files
 * User-defined tables via JSON files
 * Bumpers, flat surfaces, curved surfaces
 * Bumpers, flat surfaces, curved surfaces
 * Scores! (no high scores yet, just a running tally as you play)
 * Scores! (no high scores yet, just a running tally as you play)
-* Table bumps!
+* Table bumps! (Don't tilt the table!)
 * Portals!
 * Portals!
 * Rollover items
 * Rollover items
 * Sounds! Blinky lights! Annoying vibrations!
 * Sounds! Blinky lights! Annoying vibrations!
@@ -52,7 +52,7 @@ In **Debug** mode, test tables will be shown. A test table is one that begins wi
 ### File Format
 ### File Format
 Table units are specified at a 10x scale. This means our table is **630 x 1270** in size (as the F0 display is 64 pixels x 128 pixels). Our origin is in the top-left at 0, 0. Check out the default tables in the `assets/tables` folder for example usage.
 Table units are specified at a 10x scale. This means our table is **630 x 1270** in size (as the F0 display is 64 pixels x 128 pixels). Our origin is in the top-left at 0, 0. Check out the default tables in the `assets/tables` folder for example usage.
 
 
-The JSON can include comments - because why not!
+These JSON elements are all defined at the top-level. The JSON can include comments - because why not!
 
 
 > **DISCLAIMER:** The file format may change from release to release. Sorry. There is some basic error checking when reading / parsing the table files. If the error is serious enough, you will see an error message in the app. Otherwise, check the console logs. For those familiar with `ufbt`, simply run `ufbt cli` and issue the `log` command. Then launch Pinball0. All informational and higher logs will be displayed. These logs are useful when reporting bugs/issues!
 > **DISCLAIMER:** The file format may change from release to release. Sorry. There is some basic error checking when reading / parsing the table files. If the error is serious enough, you will see an error message in the app. Otherwise, check the console logs. For those familiar with `ufbt`, simply run `ufbt cli` and issue the `log` command. Then launch Pinball0. All informational and higher logs will be displayed. These logs are useful when reporting bugs/issues!
 
 
@@ -117,3 +117,8 @@ When the ball passes over/through a rollover object, the symbol will appear. Onl
 * `"b_end": [ X, Y]`
 * `"b_end": [ X, Y]`
 
 
 Defines two portals, **a** and **b**. They are bi-drectional. Like rails, their "surface" - or in this case, their "entry surface" - is "on the left" from their respective start to end direction. You can't "enter" a portal from it's reverse side, you will pass through.
 Defines two portals, **a** and **b**. They are bi-drectional. Like rails, their "surface" - or in this case, their "entry surface" - is "on the left" from their respective start to end direction. You can't "enter" a portal from it's reverse side, you will pass through.
+
+#### tilt_detect : boolean
+* `"tilt_detect": bool` : optional, defaults to `true`
+
+Mainly used to turn off tilt detection. Useful for tables that promote free-play and multiple table bumps without penalty.

+ 1 - 1
application.fam

@@ -9,7 +9,7 @@ App(
     fap_category="Games",
     fap_category="Games",
     requires=["gui"],
     requires=["gui"],
     # Optional values
     # Optional values
-    fap_version="0.3",
+    fap_version="0.4",
     fap_icon="pinball0.png",  # 10x10 1-bit PNG
     fap_icon="pinball0.png",  # 10x10 1-bit PNG
     fap_description="Pinball game",
     fap_description="Pinball game",
     fap_author="Roberto De Feo",
     fap_author="Roberto De Feo",

+ 0 - 4
pinball0.cxx

@@ -491,10 +491,6 @@ extern "C" int32_t pinball0_app(void* p) {
                 case InputKeyUp:
                 case InputKeyUp:
                     switch(app.game_mode) {
                     switch(app.game_mode) {
                     case GM_Playing:
                     case GM_Playing:
-                        app.game_mode = GM_Tilted;
-                        app.table->bump_count = 0;
-                        notify_table_tilted(&app);
-
                         if(event.type == InputTypePress) {
                         if(event.type == InputTypePress) {
                             // Table bump and Tilt tracking
                             // Table bump and Tilt tracking
                             uint32_t current_tick = furi_get_tick();
                             uint32_t current_tick = furi_get_tick();

+ 1 - 1
pinball0.h

@@ -21,7 +21,7 @@
 // #define DRAW_NORMALS
 // #define DRAW_NORMALS
 
 
 #define TAG     "Pinball0"
 #define TAG     "Pinball0"
-#define VERSION "v0.3"
+#define VERSION "v0.4"
 
 
 // Vertical orientation
 // Vertical orientation
 #define LCD_WIDTH  64
 #define LCD_WIDTH  64