rdefeo пре 1 година
родитељ
комит
7057a07d91
5 измењених фајлова са 27 додато и 89 уклоњено
  1. 2 2
      README.md
  2. 1 1
      application.fam
  3. 0 84
      assets/tables/00_dbg Flip0.json
  4. 23 1
      assets/tables/45_dbg Turbos.json
  5. 1 1
      pinball0.h

+ 2 - 2
README.md

@@ -137,12 +137,12 @@ The `"any"` bool will determine __when__ to send the signal. Let's look at an ex
 ```json
 ```json
 "rollovers": [
 "rollovers": [
     {
     {
-        "position": [ X, Y ],
+        "position": [ 100, 100 ],
         "symbol" : "A",
         "symbol" : "A",
         "signal": { "tx": 3 }
         "signal": { "tx": 3 }
     },
     },
     {
     {
-        "position": [ X, Y ],
+        "position": [ 150, 100 ],
         "symbol" : "B",
         "symbol" : "B",
         "signal": { "tx": 3 }
         "signal": { "tx": 3 }
     }
     }

+ 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.4",
+    fap_version="0.5",
     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 - 84
assets/tables/00_dbg Flip0.json

@@ -1,84 +0,0 @@
-{
-    "name": "Flip0",
-    "lives": {
-        "display": false,
-        "position": [ 400, 20 ]
-    },
-    "score": {
-        "display": false,
-        "position": [ 23, 0 ]
-    },
-    "balls": [
-        {
-            "position": [ 30, 1110 ],
-            "velocity": [ 0, -12.0 ]
-        }
-    ],
-    "flippers": [
-        {
-            "position": [ 130, 1200 ],
-            "side": "LEFT",
-            "size": 130
-        },
-        {
-            "position": [ 490, 1200 ],
-            "side": "RIGHT",
-            "size": 130
-        }
-    ],
-    "arcs": [
-        {
-            // peak
-            "position": [ 250, 100 ],
-            "radius": 100,
-            "start_angle": 60,
-            "end_angle": 120,
-            "surface": "INSIDE"
-        },
-        {
-            // top left corner
-            "position": [ 100, 220 ],
-            "radius": 100,
-            "start_angle": 120,
-            "end_angle": 180,
-            "surface": "INSIDE"
-        },
-        {
-            // top right corner
-            "position": [ 540, 330 ],
-            "radius": 100,
-            "start_angle": 0,
-            "end_angle": 50,
-            "surface": "INSIDE"
-        }
-
-    ],
-    "rails": [
-        // top right roof
-        {
-            "start": [ 604, 253 ],
-            "end": [ 300, 13 ]
-        },
-        // top left roof
-        {
-            "start": [ 200, 13 ],
-            "end": [ 50, 133 ]
-        },
-        // left wall
-        {
-            "start": [ 0, 240 ],
-            "end": [ 0, 1200 ]
-        },
-        // left wall rail
-        {
-            "start": [ 70, 240 ],
-            "end": [ 70, 1100 ],
-            "double_sided": true
-        },
-        // right wall
-        {
-            "start": [ 630, 1100 ],
-            "end": [ 630, 330 ]
-        }
-    ]
-}

+ 23 - 1
assets/tables/45_dbg Turbos.json

@@ -2,7 +2,10 @@
     "lives": 3,
     "lives": 3,
     "balls": [
     "balls": [
         {
         {
-            "position": [ 220, 200 ]
+            "position": [ 110, 200 ]
+        },
+        {
+            "position": [ 610, 900 ]
         }
         }
     ],
     ],
     "flippers": [
     "flippers": [
@@ -40,6 +43,7 @@
         }
         }
     ],
     ],
     "turbos": [
     "turbos": [
+        // rect
         {
         {
             "position": [ 100, 400 ],
             "position": [ 100, 400 ],
             "angle": 0
             "angle": 0
@@ -55,6 +59,24 @@
         {
         {
             "position": [ 100, 600 ],
             "position": [ 100, 600 ],
             "angle": 90
             "angle": 90
+        },
+        // loop
+        {
+            "position": [ 440, 740 ],
+            "angle": 0
+        },
+        {
+            "position": [ 440, 1050 ],
+            "angle": 180
+        }
+    ],
+    "arcs": [
+        {
+            "position": [ 440, 900 ],
+            "radius": 180,
+            "surface": "INSIDE",
+            "start_angle": 0,
+            "end_angle": 360
         }
         }
     ]
     ]
 }
 }

+ 1 - 1
pinball0.h

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