From b1c7860aa6c028c01565e1138f667227982daae4 Mon Sep 17 00:00:00 2001 From: Frederik Goovaerts Date: Fri, 24 Apr 2020 23:46:51 +0200 Subject: [PATCH 01/42] Calculate with estimated buy price without modifying original input values --- js/predictions.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/js/predictions.js b/js/predictions.js index 9c81e3a..27329f9 100644 --- a/js/predictions.js +++ b/js/predictions.js @@ -810,13 +810,14 @@ class Predictor { * generate_possibilities(sell_prices, first_buy, previous_pattern) { if (first_buy || isNaN(sell_prices[0])) { for (var buy_price = 90; buy_price <= 110; buy_price++) { - sell_prices[0] = sell_prices[1] = buy_price; + const temp_sell_prices= sell_prices.slice() + temp_sell_prices[0] = temp_sell_prices[1] = buy_price; if (first_buy) { - yield* this.generate_pattern_3(sell_prices); + yield* this.generate_pattern_3(temp_sell_prices); } else { // All buy prices are equal probability and we're at the outmost layer, // so don't need to multiply_generator_probability here. - yield* this.generate_all_patterns(sell_prices, previous_pattern) + yield* this.generate_all_patterns(temp_sell_prices, previous_pattern) } } } else { From 2e3a0bf03021f84903047d4623e5ec573b9632c2 Mon Sep 17 00:00:00 2001 From: Frederik Goovaerts Date: Sat, 25 Apr 2020 09:18:48 +0200 Subject: [PATCH 02/42] Fix formatting --- js/predictions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/predictions.js b/js/predictions.js index 27329f9..a97700a 100644 --- a/js/predictions.js +++ b/js/predictions.js @@ -810,7 +810,7 @@ class Predictor { * generate_possibilities(sell_prices, first_buy, previous_pattern) { if (first_buy || isNaN(sell_prices[0])) { for (var buy_price = 90; buy_price <= 110; buy_price++) { - const temp_sell_prices= sell_prices.slice() + const temp_sell_prices = sell_prices.slice(); temp_sell_prices[0] = temp_sell_prices[1] = buy_price; if (first_buy) { yield* this.generate_pattern_3(temp_sell_prices); From 3844b94b577ebd04c9a357d7283e77a3128423a9 Mon Sep 17 00:00:00 2001 From: Mike Bryant Date: Sat, 25 Apr 2020 13:44:51 +0100 Subject: [PATCH 03/42] feat: Add link to GitHub sponsors button Closes #141 --- index.html | 1 + locales/en.json | 1 + 2 files changed, 2 insertions(+) diff --git a/index.html b/index.html index 6ddf79f..46763b4 100644 --- a/index.html +++ b/index.html @@ -297,6 +297,7 @@

:

+

:
diff --git a/locales/en.json b/locales/en.json index 7be8c55..ff51f41 100644 --- a/locales/en.json +++ b/locales/en.json @@ -73,6 +73,7 @@ "development": "This app is still in development, but will improve over time!", "thanks": "None of this would have been possible without Ninji's work figuring out just how Timmy and Tommy value their turnips.", "support": "Support, comments and contributions are available through Github", + "sponsor": "Want to sponsor the developers behind this project? Go to the GitHub page and click '❤ Sponsor'", "contributors-text": "Oh! And let's not forget to thank those who have contributed so far!", "contributors": "Contributors", "language": "Language" From 75571ecd6704e8bf35c88699a2e80fe57fb2cfb9 Mon Sep 17 00:00:00 2001 From: smileyhead <15932372+smileyhead@users.noreply.github.com> Date: Sat, 25 Apr 2020 16:24:50 +0200 Subject: [PATCH 04/42] Add sponsor line & small wording adjustment --- locales/hu.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/locales/hu.json b/locales/hu.json index 3b77a3a..34612ae 100644 --- a/locales/hu.json +++ b/locales/hu.json @@ -9,7 +9,7 @@ }, "first-time": { "title": "Első vásárlás", - "description": "Most vásárolsz retket Daisy Mae-től a szigeteden először?(Ez hatással van a mintádra)", + "description": "Most vásárolsz retket először Daisy Mae-től a szigeteden?(Ez hatással van a mintádra)", "yes": "Igen", "no": "Nem" }, @@ -73,6 +73,7 @@ "development": "Ez az alkalmazás fejlesztés alatt áll, de idővel javulni fog!", "thanks": "Ez nem lett volna lehetséges Ninji munkája nélkül, aki megfejtette, hogy Timmy és Tommy hogyan árazzák a retket.", "support": "Minden hibajelentést, megjegyzést és hozzájárulást a Github-on várunk.", + "sponsor": "Szeretnéd szponzorálni a projekt fejlesztőit? Menj a GitHub oldalra és nyomd meg a „❤ Sponsor” gombot!", "contributors-text": "Ó, és ne felejtsünk el köszönetet mondani az eddigi hozzájárulóknak!", "contributors": "Hozzájárulók", "language": "Nyelv" From 056a053234a3e63eb61b4d35855f160f215d0ced Mon Sep 17 00:00:00 2001 From: Splash Date: Sat, 25 Apr 2020 22:28:36 +0800 Subject: [PATCH 05/42] Update Chinese translation --- locales/zh-CN.json | 1 + locales/zh-TW.json | 1 + 2 files changed, 2 insertions(+) diff --git a/locales/zh-CN.json b/locales/zh-CN.json index 35a5a19..b5a986e 100644 --- a/locales/zh-CN.json +++ b/locales/zh-CN.json @@ -73,6 +73,7 @@ "development": "APP仍在开发中，但会随着时间的推移不断完善！", "thanks": "如果不是Ninji发现豆狸和粒狸如何给大头菜定价的，这一切将不可能实现。", "support": "可以在Github获得支持，或讨论和贡献", + "sponsor": "想要赞助这个项目的开发者？进入GitHub页面并点击 ❤ Sponsor", "contributors-text": "哦！别忘记感谢那些至今为止做出过贡献的人。", "contributors": "贡献者", "language": "语言" diff --git a/locales/zh-TW.json b/locales/zh-TW.json index aa0b330..8d8ada2 100644 --- a/locales/zh-TW.json +++ b/locales/zh-TW.json @@ -73,6 +73,7 @@ "development": "此工具仍在開發中，但會隨著時間的推移而改善！", "thanks": "要不是 Ninji 協助釐清豆狸和粒狸的大頭菜估價方式，這一切都不可能實現。", "support": "可於 GitHub 取得支援、討論及貢獻。", + "sponsor": "想要贊助這個項目的開發者？進入GitHub頁面並點擊 ❤ Sponsor", "contributors-text": "嘿！別忘了感謝那些迄今為止作出貢獻的人！", "contributors": "貢獻者", "language": "語言" From 696b0f896f7c39c8fe3c7325d1df70fb7e0be41e Mon Sep 17 00:00:00 2001 From: Splash Date: Sat, 25 Apr 2020 22:43:53 +0800 Subject: [PATCH 06/42] Update --- locales/zh-CN.json | 6 +++--- locales/zh-TW.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/locales/zh-CN.json b/locales/zh-CN.json index b5a986e..d0d85ba 100644 --- a/locales/zh-CN.json +++ b/locales/zh-CN.json @@ -71,9 +71,9 @@ "textbox": { "description": "在填写一些大头菜价格后，大头菜预测工具将预测大头菜的价格并显示本周可能的趋势。", "development": "APP仍在开发中，但会随着时间的推移不断完善！", - "thanks": "如果不是Ninji发现豆狸和粒狸如何给大头菜定价的，这一切将不可能实现。", - "support": "可以在Github获得支持，或讨论和贡献", - "sponsor": "想要赞助这个项目的开发者？进入GitHub页面并点击 ❤ Sponsor", + "thanks": "如果不是 Ninji 发现豆狸和粒狸如何给大头菜定价的，这一切将不可能实现。", + "support": "可以在 Github 获得支持，或讨论和贡献", + "sponsor": "想要赞助这个项目的开发者？进入 GitHub 并点击 ❤ Sponsor", "contributors-text": "哦！别忘记感谢那些至今为止做出过贡献的人。", "contributors": "贡献者", "language": "语言" diff --git a/locales/zh-TW.json b/locales/zh-TW.json index 8d8ada2..0d5b7b5 100644 --- a/locales/zh-TW.json +++ b/locales/zh-TW.json @@ -73,7 +73,7 @@ "development": "此工具仍在開發中，但會隨著時間的推移而改善！", "thanks": "要不是 Ninji 協助釐清豆狸和粒狸的大頭菜估價方式，這一切都不可能實現。", "support": "可於 GitHub 取得支援、討論及貢獻。", - "sponsor": "想要贊助這個項目的開發者？進入GitHub頁面並點擊 ❤ Sponsor", + "sponsor": "想要贊助這個項目的開發者？進入 GitHub 並點擊 ❤ Sponsor", "contributors-text": "嘿！別忘了感謝那些迄今為止作出貢獻的人！", "contributors": "貢獻者", "language": "語言" From 9ceb9ee2d3ae047d313a309aaa537ca13db63d78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lise=20Rubio?= <30841868+Lysoun@users.noreply.github.com> Date: Sat, 25 Apr 2020 17:22:18 +0200 Subject: [PATCH 07/42] Add sponsors link in French translation --- locales/fr.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/locales/fr.json b/locales/fr.json index d9e527f..5b47527 100644 --- a/locales/fr.json +++ b/locales/fr.json @@ -73,8 +73,9 @@ "development": "Cette appli est en développement, mais elle s'améliore jour après jour !", "thanks": "Rien de tout ça n'aurait pu être possible sans le travail de Ninji et son analyse sur comment Méli et Mélo déterminent la valeur des Navets.", "support": "Aide, commentaires et contributions sont disponibles via Github", + "sponsor": "T'aimerais sponsoriser les développeurs derrière ce projet ? Alors va sur la page GitHub du projet et clique sur '❤ Sponsor'" "contributors-text": "Oh ! Et n'oublions pas de remercier toutes les personnes ayant contribué jusqu'à maintenant !", "contributors": "Contributeurs", "language": "Langue" } -} \ No newline at end of file +} From bb9d53a959658947379e99a31d0b1d8d7961c01f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lise=20Rubio?= <30841868+Lysoun@users.noreply.github.com> Date: Sat, 25 Apr 2020 17:24:00 +0200 Subject: [PATCH 08/42] Update fr.json --- locales/fr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/fr.json b/locales/fr.json index 5b47527..487dd21 100644 --- a/locales/fr.json +++ b/locales/fr.json @@ -73,7 +73,7 @@ "development": "Cette appli est en développement, mais elle s'améliore jour après jour !", "thanks": "Rien de tout ça n'aurait pu être possible sans le travail de Ninji et son analyse sur comment Méli et Mélo déterminent la valeur des Navets.", "support": "Aide, commentaires et contributions sont disponibles via Github", - "sponsor": "T'aimerais sponsoriser les développeurs derrière ce projet ? Alors va sur la page GitHub du projet et clique sur '❤ Sponsor'" + "sponsor": "T'aimerais sponsoriser les développeurs derrière ce projet ? Alors va sur la page GitHub du projet et clique sur '❤ Sponsor'", "contributors-text": "Oh ! Et n'oublions pas de remercier toutes les personnes ayant contribué jusqu'à maintenant !", "contributors": "Contributeurs", "language": "Langue" From a03c2ab98470b9001bfa5f69913d45da024f824e Mon Sep 17 00:00:00 2001 From: Frederik Goovaerts Date: Sat, 25 Apr 2020 19:13:49 +0200 Subject: [PATCH 09/42] Update dutch sponsor message --- locales/nl.json | 1 + 1 file changed, 1 insertion(+) diff --git a/locales/nl.json b/locales/nl.json index 5781149..6376bbd 100644 --- a/locales/nl.json +++ b/locales/nl.json @@ -73,6 +73,7 @@ "development": "Deze applicatie is wordt nog ontwikkeld, maar zal met de tijd beter worden!", "thanks": "Dit alles zou niet mogelijk zijn zonder het werk van Ninji om uit te zoeken hoe Timmy en Tommy de waarde van knollen bepalen.", "support": "Ondersteuning, feedback en bijdrages zijn mogelijk via Github", + "sponsor": "Wil je de ontwikkelaars van dit project sponsoren? Ga naar de GitHub pagina en klik op '❤ Sponsor'", "contributors-text": "Oh! En laten we degenen die tot nu toe bijgedragen hebben niet vergeten te bedanken!", "contributors": "Bijdragers", "language": "Taal" From a1e6453cd1ffb70ff4a5eaf74ca8ded3f6d42d8d Mon Sep 17 00:00:00 2001 From: Marcel Deglau Date: Sat, 25 Apr 2020 19:32:20 +0200 Subject: [PATCH 10/42] Update German language file due to #264 --- locales/de.json | 1 + 1 file changed, 1 insertion(+) diff --git a/locales/de.json b/locales/de.json index d0f45cd..f1f113b 100644 --- a/locales/de.json +++ b/locales/de.json @@ -73,6 +73,7 @@ "development": "Diese App befindet sich noch in der Entwicklung, wird sich aber mit der Zeit verbessern!", "thanks": "Nichts von all dem wäre möglich gewesen, ohne das Ninji herausgefunden hätte, wie Nepp und Schlepp ihre Rübenpreise kalkulieren.", "support": "Hilfe, Kommentare und Beiträge sind auffindbar über GitHub.com (nur in Englisch).", + "sponsor": "Möchtest du die Entwickler hinter diesem Projekt unterstützen? Gehe zu GitHub.com und klicke auf den '❤ Sponsor' Button für mehr Informationen.", "contributors-text": "Oh! Und vergessen wir nicht, denen zu danken, die bis jetzt dazu beigetragen haben!", "contributors": "Mitwirkende", "language": "Sprache" From 0a586ef628feb94889f326f985236bd5e075e54d Mon Sep 17 00:00:00 2001 From: Dmitrii <63938599+captaincurls@users.noreply.github.com> Date: Sun, 26 Apr 2020 11:19:44 +0900 Subject: [PATCH 11/42] Update on Russian translation Fixed a small typo and added the "Sponsor" translation! --- locales/ru.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/locales/ru.json b/locales/ru.json index ce67a7e..f0cdc19 100644 --- a/locales/ru.json +++ b/locales/ru.json @@ -25,7 +25,7 @@ "small-spike": "Малый скачок" }, "prices": { - "description": "Какова была стоимость репы у Дейзи Мэй на Вашем острове на этой неделе? (Если вы новичок рынка репы, данное поле будет недоступно)", + "description": "Какова была стоимость репы у Дейзи Мэй на Вашем острове на этой неделе? (Если Вы новичок рынка репы, данное поле будет недоступно)", "open": { "am": "Утро - 8:00 - 11:59", "pm": "День - 12:00 - 22:00" @@ -73,6 +73,7 @@ "development": "Это приложение пока еще в разработке, но со временем обязательно станет лучше!", "thanks": "Если бы Ninji не смог разузнать, как Тимми и Томми определяют стоимость репы, данного приложения могло бы и не быть!", "support": "Поддержать нас, прокомментировать, а также внести свой вклад Вы можете на Github", + "sponsor": "Хотели бы поддержать разработчиков проекта? Для этого Вы можете перейти на GitHub и нажать '❤ Sponsor'", "contributors-text": "Точно! Нельзя забывать тех, кто уже помог проекту!", "contributors": "Вклад внесли", "language": "Язык" From b8000ca9d49f2c63e790199eed77346c9044c6d8 Mon Sep 17 00:00:00 2001 From: Lanae BK Date: Sat, 25 Apr 2020 23:06:26 -0400 Subject: [PATCH 12/42] modify language for clarity --- locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/en.json b/locales/en.json index ff51f41..b057390 100644 --- a/locales/en.json +++ b/locales/en.json @@ -9,7 +9,7 @@ }, "first-time": { "title": "First-Time Buyer", - "description": "Is this your first time buying turnips from Daisy Mae on your island?(This affects your pattern)", + "description": "Is this the first time a resident is buying turnips from Daisy Mae on your own island?(This affects your pattern)", "yes": "Yes", "no": "No" }, From 6cf7ef42fe5b1f76b71f79146e1359306d19d409 Mon Sep 17 00:00:00 2001 From: Pupu Date: Sun, 26 Apr 2020 22:44:44 +0800 Subject: [PATCH 13/42] fixed zh-TW,Chinese (Taiwan) wording --- locales/zh-TW.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/zh-TW.json b/locales/zh-TW.json index 0d5b7b5..aeb2dfe 100644 --- a/locales/zh-TW.json +++ b/locales/zh-TW.json @@ -73,7 +73,7 @@ "development": "此工具仍在開發中，但會隨著時間的推移而改善！", "thanks": "要不是 Ninji 協助釐清豆狸和粒狸的大頭菜估價方式，這一切都不可能實現。", "support": "可於 GitHub 取得支援、討論及貢獻。", - "sponsor": "想要贊助這個項目的開發者？進入 GitHub 並點擊 ❤ Sponsor", + "sponsor": "想要贊助這個專案的開發者？進入 GitHub 並點擊 ❤ Sponsor", "contributors-text": "嘿！別忘了感謝那些迄今為止作出貢獻的人！", "contributors": "貢獻者", "language": "語言" From 2495da07d472f2fb58a5d364b0131523017c0744 Mon Sep 17 00:00:00 2001 From: smileyhead <15932372+smileyhead@users.noreply.github.com> Date: Sun, 26 Apr 2020 18:59:09 +0200 Subject: [PATCH 14/42] Carry over rewording on line 12 & minor change --- locales/hu.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/hu.json b/locales/hu.json index 34612ae..0a9a7dc 100644 --- a/locales/hu.json +++ b/locales/hu.json @@ -9,7 +9,7 @@ }, "first-time": { "title": "Első vásárlás", - "description": "Most vásárolsz retket először Daisy Mae-től a szigeteden?(Ez hatással van a mintádra)", + "description": "Most vásárol valaki először retket Daisy Mae-től a Te szigeteden?(Ez hatással van a mintádra)", "yes": "Igen", "no": "Nem" }, @@ -28,7 +28,7 @@ "description": "Mennyiért vettél ezen a héten retket? (Ha most vásárolsz először, ez a mező le lesz tiltva)", "open": { "am": "Délelőtt - 08:00-tól 11:59-ig", - "pm": "Délután - 12:00-tól 22:00-ig" + "pm": "Délután - 12:00-től 22:00-ig" }, "copy-permalink": "Árak megosztása", "permalink-copied": "Hivatkozás kimásolva!", From b5c2b76e612074c5d2957c1f017d740c0b5f76c5 Mon Sep 17 00:00:00 2001 From: Kai Zhu Date: Sun, 26 Apr 2020 19:57:03 +0100 Subject: [PATCH 15/42] Added background colour to reset and permalink buttons --- css/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/styles.css b/css/styles.css index fa575e3..5b76025 100644 --- a/css/styles.css +++ b/css/styles.css @@ -304,7 +304,7 @@ input[type=number] { padding: 8px 16px; border-width: 0px; border-radius: 40px; - background: transparent; + background: #F3F3F3; font-size: 1.2rem; transition: 0.2s all; position: relative; From 305048c02e921e9590ca89d404149cf938e1a164 Mon Sep 17 00:00:00 2001 From: Splash Date: Mon, 27 Apr 2020 14:32:37 +0800 Subject: [PATCH 16/42] Fix typo --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 46763b4..aab0ded 100644 --- a/index.html +++ b/index.html @@ -315,7 +315,7 @@ - + - +