Merge branch 'master' of https://github.com/falsovsky/paradise.js

README.md

@@ -2,7 +2,7 @@
 
 HTML canvas implementation of Paradise Café using webpack as build system.
 
-Demo at [https://ticklemynausea.net/~mario/paradise/](https://ticklemynausea.net/~mario/paradise/).
+Demo at [http://paradise.cafe/](http://paradise.cafe/).
 
 
 ### Install dependencies
@@ -28,4 +28,9 @@ and doing hot reload. fancy.
 
 ## Credits
 
-All glory to [falsovsky](https://github.com/falsovsky/) for the original implementation (https://github.com/falsovsky/paradise.js) and especially for [the complete ParadiseCafé disassembly with annotations](https://zbr.deadbsd.org/~falso/p/ParadiseCafe/).
+* [falsovsky](https://github.com/falsovsky)
+* [ticklemynausea](https://github.com/ticklemynausea)
+* [brunoperry](https://github.com/brunoperry)
+
+## Moar info
+[The complete Paradise Café disassembly with annotations](https://zbr.deadbsd.org/~falso/p/ParadiseCafe/).

assets/scenes/anal.json

@@ -70,10 +70,7 @@
       ]
     },
     {
-      "images": [
+      "images": "anal_balloon_aaaa"
-        "anal_balloon_grosso",
-        "anal_balloon_aaaa"
-      ]
     },
     {
       "repeat": 5,
@@ -87,6 +84,10 @@
           "duration": 100
         }
       ]
+    },
+    {
+      "images": "anal_frame1",
+      "duration": 2000
     }
   ]
 }

assets/scenes/oral.json

@@ -9,7 +9,7 @@
       "duration": 750
     },
     {
-      "repeat": 20,
+      "repeat": 10,
       "roll": [
         {
           "images": "oral_frame1",
@@ -36,6 +36,26 @@
           "duration": 150
         }
       ]
+    },
+    {
+      "images": "oral_balloon_quebom"
+    },
+    {
+      "repeat": 5,
+      "roll": [
+        {
+          "images": "oral_frame1",
+          "duration": 350
+        },
+        {
+          "images": "oral_frame2",
+          "duration": 350
+        }
+      ]
+    },
+    {
+      "images": "oral_frame1",
+      "duration": 2000
     }
   ]
 }

assets/scenes/reinaldo.json

@@ -12,26 +12,10 @@
       "images": "reinaldo_balloon_sao_1000",
       "duration": 1500
     },
-    {
-      "images": [
-        "room",
-        "whore",
-        "hero"
-      ],
-      "duration": 1500
-    },
     {
       "images": "reinaldo_balloon_nao_tenho",
       "duration": 1500
     },
-    {
-      "images": [
-        "room",
-        "whore",
-        "hero"
-      ],
-      "duration": 1500
-    },
     {
       "images": "reinaldo_balloon_ho_reinaldo",
       "duration": 1500
@@ -42,16 +26,15 @@
         "whore",
         "hero"
       ],
+      "duration": 500
+    },
+    {
+      "images": [
+        "reinaldo_cabeca",
+        "reinaldo_balloon_cu_cu"
+      ],
       "duration": 1500
     },
-    {
-      "images": "reinaldo_cabeca",
-      "duration": 250
-    },
-    {
-      "images": "reinaldo_balloon_cu_cu",
-      "duration": 750
-    },
     {
       "images": [
         "room",
@@ -59,7 +42,7 @@
         "hero",
         "reinaldo"
       ],
-      "duration": 150
+      "duration": 500
     },
     {
       "images": "reinaldo_balloon_o_que_foi",
@@ -107,6 +90,10 @@
         "reinaldo_violar_base"
       ]
     },
+    {
+      "images": "reinaldo_violar_frame1",
+      "duration": 1000
+    },
     {
       "repeat": 7,
       "roll": [
@@ -148,6 +135,10 @@
           "duration": 150
         }
       ]
+    },
+    {
+      "images": "reinaldo_violar_frame1",
+      "duration": 2000
     }
   ]
 }

assets/scenes/vaginal.json

@@ -57,6 +57,10 @@
         "vaginal_frame1"
       ],
       "duration": 2500
+    },
+    {
+      "images": "vaginal_frame1",
+      "duration": 2000
     }
   ]
 }