From 4b213676dfc8afbf9d2b6dd021e80c90f8ed5c7f Mon Sep 17 00:00:00 2001 From: Pedro de Oliveira Date: Tue, 18 Oct 2016 22:05:22 +0100 Subject: [PATCH 1/9] Remove webpack from depends --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index cec1af7..08bd5eb 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,6 @@ }, "homepage": "https://github.com/ticklemynausea/paradise.js#readme", "dependencies": { - "html-webpack-plugin": "^2.22.0", "lodash.flattendeep": "^4.4.0", "lodash.mapvalues": "^4.6.0" }, From 1417dcc2eab5ec9e0aa70b45b707114620d0c77c Mon Sep 17 00:00:00 2001 From: Pedro de Oliveira Date: Tue, 18 Oct 2016 22:15:48 +0100 Subject: [PATCH 2/9] remove invalid image --- assets/scenes/anal.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/assets/scenes/anal.json b/assets/scenes/anal.json index a43c554..03cf637 100644 --- a/assets/scenes/anal.json +++ b/assets/scenes/anal.json @@ -70,10 +70,7 @@ ] }, { - "images": [ - "anal_balloon_grosso", - "anal_balloon_aaaa" - ] + "images": "anal_balloon_aaaa" }, { "repeat": 5, From afa2a9bf17922593e7650a16b5ac56a5348548a3 Mon Sep 17 00:00:00 2001 From: Pedro de Oliveira Date: Tue, 18 Oct 2016 22:16:27 +0100 Subject: [PATCH 3/9] 'optimize' oral and add new frame --- assets/scenes/oral.json | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/assets/scenes/oral.json b/assets/scenes/oral.json index 111de86..bc88fe8 100644 --- a/assets/scenes/oral.json +++ b/assets/scenes/oral.json @@ -9,7 +9,7 @@ "duration": 750 }, { - "repeat": 20, + "repeat": 10, "roll": [ { "images": "oral_frame1", @@ -36,6 +36,22 @@ "duration": 150 } ] + }, + { + "images": "oral_balloon_quebom" + }, + { + "repeat": 5, + "roll": [ + { + "images": "oral_frame1", + "duration": 350 + }, + { + "images": "oral_frame2", + "duration": 350 + } + ] } ] } \ No newline at end of file From 684bcc9329addfeaf2645f68a776811777bf812a Mon Sep 17 00:00:00 2001 From: Pedro de Oliveira Date: Tue, 18 Oct 2016 22:24:27 +0100 Subject: [PATCH 4/9] fix image --- assets/images/reinaldo_cabeca.png | Bin 2674 -> 2763 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/images/reinaldo_cabeca.png b/assets/images/reinaldo_cabeca.png index d2f8cf606bbfc31896684dc2bf36a75e941b5eee..d7ecffb1dbb0468ccabc8e68ccc51277536e95e7 100644 GIT binary patch literal 2763 zcmeAS@N?(olHy`uVBq!ia0y~yU;;831vr?2)W;b%=YSMTx}&cn1H;CC?mvmF3=GT+ z0X`wFK=Gpt3}=s>1u{m#Xb6n75cujNxCfX~7)pZtg8z?fz!3bMT@@JroCO|{#S9F5 zhd`K7RKu$QC@5Lt8c`CQpH@e1z0ZL{QJK?t+2e}U`LWdy3W#Fk79GSznZ3)@+4k=)wlQg1!BexMQ>~# z>7+3{y-|52@(jbNjh{O<&tROA{9G{IkXhsSIpuRnYyo|9-RB(TSs-KGZ_zF3U|A+t zNDYnWX4dcBwSV6GcOXM|7C-y_=J-Fh4JR!>TmGqjUd+5>PjOmU{qveUhUw+fGtb&v zd^2xYy}S3!BYBzM(g&{ke!eepfQfB`OmzJtv;B-Qa@qBV7{U_XHUgR6{5%gnMN}m) zOh0~!nR$oJG&zX_Pd9!!z@XQ^6pv5#{W5&f2J*de!_&O~ukI>WRG06neFh30o`jv- zSDycPU%jCE7$}(b`sOld+xpcN|F1DgWC%}ZI6XJnewS*&xqP6V&-i%~1kL_8e2oW( zlg>ZJ*ZaX?93j&m&yWxC?gwk;i03kY1aHfO!_=()z&CbKSigIF{-5+VdvMgSZMakW zA-PiKbTi0RyZP&M`jaccGCBVm-tvRvWVU_6Z)Q+jeg7Kn0Q4(!#5xh_-&J*BrL>7y`X{AP8}TITK^{1NKevO6mK%nkQs}32#1|0% zbscl}zX`yC=&pRy-F$q__SO4whnnPDlKo3RJpr zf6v!=VEH6gEd?yP{QQ%F=Do}W8E)GPlwQ8v5LnuMF=5**8o|0J?9FfcO&_=LCu#g8&DoIQ3H$QT8qAu!TH;H!_|9$-FUC<*cl{y(w-L-2QY zRbc#c7I;J!GcfQS24TkI`72U@f|4b!5hcO-X(i=}MX3x0iJ5sNdU>fO3MP66dWHsT zxwsB6FtDETba4!+htPs_B`){Z|i18{+;`JC*z%ahDNjN3*O~3l$ZCMc_csQxAcL#zMtiJ7BnzUNq+4w z^I7`9+l}AUc@{8b^Yc9T7EzVJu>JTYX67BX)8r(8QeO@*=sFfosZ-9y0hfJ*E^mLQUUZz_3U3#|7)3! z8-w_FZeL*wcv<=B@Z--nTNv-mWt_76SY4S)!P$JE#n1eC7I4h2Kk#ck*i@Z=jIZ}Y zY_*uTpFs{Rc>MuCTflRvKa#iSgZVlCTHgB4Su5$VW4rzD{2Tv{+?>VO0t~(WgXfhXi^O#V<@Ip=gU*x}Fop=y#ptLM~%O|ShcdVwMDJj1Ej=FNX!-uYV(GR}fo Date: Tue, 18 Oct 2016 22:36:58 +0100 Subject: [PATCH 5/9] faltava um delay dps do gajo se vir --- assets/scenes/anal.json | 4 ++++ assets/scenes/oral.json | 4 ++++ assets/scenes/vaginal.json | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/assets/scenes/anal.json b/assets/scenes/anal.json index 03cf637..3a830df 100644 --- a/assets/scenes/anal.json +++ b/assets/scenes/anal.json @@ -84,6 +84,10 @@ "duration": 100 } ] + }, + { + "images": "anal_frame1", + "duration": 2000 } ] } \ No newline at end of file diff --git a/assets/scenes/oral.json b/assets/scenes/oral.json index bc88fe8..bcceeda 100644 --- a/assets/scenes/oral.json +++ b/assets/scenes/oral.json @@ -52,6 +52,10 @@ "duration": 350 } ] + }, + { + "images": "oral_frame1", + "duration": 2000 } ] } \ No newline at end of file diff --git a/assets/scenes/vaginal.json b/assets/scenes/vaginal.json index 40ee8a6..c4eaed7 100644 --- a/assets/scenes/vaginal.json +++ b/assets/scenes/vaginal.json @@ -57,6 +57,10 @@ "vaginal_frame1" ], "duration": 2500 + }, + { + "images": "vaginal_frame1", + "duration": 2000 } ] } \ No newline at end of file From d3959f78cbd652a3af2a1a052a6476b15017825f Mon Sep 17 00:00:00 2001 From: Pedro de Oliveira Date: Tue, 18 Oct 2016 22:37:45 +0100 Subject: [PATCH 6/9] corrigir um bocado o reinaldo, e meter um delay no final --- assets/scenes/reinaldo.json | 41 +++++++++++++++---------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/assets/scenes/reinaldo.json b/assets/scenes/reinaldo.json index 7ad3037..3a752cf 100644 --- a/assets/scenes/reinaldo.json +++ b/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 } ] } \ No newline at end of file From 1c4619c27fbcdfe8ee77ce88550943e6cd8ce60b Mon Sep 17 00:00:00 2001 From: Pedro de Oliveira Date: Tue, 18 Oct 2016 22:49:19 +0100 Subject: [PATCH 7/9] Update README.md --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5af5cd8..e6222ec 100644 --- a/README.md +++ b/README.md @@ -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/). \ No newline at end of file +* [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/). From 26f436d8747511f645a1c46475fc2d39ead376a7 Mon Sep 17 00:00:00 2001 From: Pedro de Oliveira Date: Tue, 18 Oct 2016 23:28:14 +0100 Subject: [PATCH 8/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e6222ec..0b3b40b 100644 --- a/README.md +++ b/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 [https://paradise.cafe/](https://paradise.cafe/). ### Install dependencies From 614da700595f7bdc6bac7da0ee68819d759e841b Mon Sep 17 00:00:00 2001 From: Pedro de Oliveira Date: Tue, 18 Oct 2016 23:28:36 +0100 Subject: [PATCH 9/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0b3b40b..063dcc4 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ HTML canvas implementation of Paradise Café using webpack as build system. -Demo at [https://paradise.cafe/](https://paradise.cafe/). +Demo at [http://paradise.cafe/](http://paradise.cafe/). ### Install dependencies