Merge branch 'master' of https://github.com/mikebryant/ac-nh-turnip-prices into mikebryant-master

master
Lawrence Luk 4 years ago
commit e16aba23ed

@ -1,6 +1,7 @@
# ac-nh-turnip-prices
[![discord](https://img.shields.io/badge/discord-join-7289DA.svg?logo=discord&longCache=true&style=flat)](https://discord.gg/bRh74X8)
Price calculator/predictor for Turnip prices
## Scope
This tool is:

@ -513,39 +513,21 @@ input[type=number] {
to {bottom: 0; opacity: 0;}
}
/* Animation */
.parallax>use {
animation: move-forever 25s cubic-bezier(.55, .5, .45, .5) infinite;
}
/* Cloud SVG placement */
.parallax>use:nth-child(1) {
animation-delay: -2s;
animation-duration: 7s;
transform: translate3d(-30px, 0, 0);
}
.parallax>use:nth-child(2) {
animation-delay: -3s;
animation-duration: 10s;
transform: translate3d(-90px, 0, 0);
}
.parallax>use:nth-child(3) {
animation-delay: -4s;
animation-duration: 13s;
transform: translate3d(45px, 0, 0);
}
.parallax>use:nth-child(4) {
animation-delay: -5s;
animation-duration: 20s;
}
@keyframes move-forever {
0% {
transform: translate3d(-90px, 0, 0);
}
100% {
transform: translate3d(85px, 0, 0);
}
transform: translate3d(20px, 0, 0);
}
/*Shrinking for mobile*/
@ -555,3 +537,76 @@ input[type=number] {
min-height: 40px;
}
}
/*Darkmodjs*/
.darkmode-layer, .darkmode-toggle {
z-index: 1;
}
.darkmode-toggle {
opacity: 0.7;
transition: opacity 0.15s;
}
.darkmode-toggle:hover {
opacity: 0.9;
}
.darkmode-toggle:active {
transition: opacity 0s;
opacity: 1;
}
.darkmode-toggle:focus {
outline: none;
}
div.darkmode-background{
background: #fef0e3;
background-image:
radial-gradient(#fff 20%, transparent 0),
radial-gradient(#fff 20%, transparent 0);
position: inherit;
}
body.darkmode--activated{
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
font-family: 'Varela Round', sans-serif;
width: 100%;
margin: 0 0 0 0;
position: absolute
}
body.darkmode--activated div[class^="dialog-box"],
body.darkmode--activated div[class^="nook-phone"],
body.darkmode--activated form[class^="input__form"],
{
background: #fee0c4;
color: #010F1D;
}
body.darkmode--activated svg[class^="waves"]{
background: #fef0e3;
}
body.darkmode--activated a,
body.darkmode--activated b,
body.darkmode--activated input[type=number]:not(:placeholder-shown){
color: #586472;
}
body.darkmode--activated input[type="radio"]+label,
body.darkmode--activated input[type=number]:placeholder-shown{
background: #bda284;
}
body.darkmode--activated input[type="radio"]:checked+label{
background: #7b6955;
}
body.darkmode--activated i{
color: #7b6955;
}

@ -313,6 +313,8 @@
<script src="js/chart.js"></script>
<script src="js/predictions.js"></script>
<script src="js/scripts.js"></script>
<script src="https://cdn.jsdelivr.net/npm/darkmode-js@1.5.5/lib/darkmode-js.min.js"></script>
<script> new Darkmode({label: '🌓', buttonColorDark: '#fff00'}).showWidget();</script>
<script src="js/translations.js"></script>
<script src="js/contributors.js"></script>
<script>

@ -18,34 +18,35 @@ const chart_options = {
};
function update_chart(input_data, possibilities) {
var ctx = $("#chart");
datasets = [
{
let ctx = $("#chart"),
datasets = [{
label: i18next.t("output.chart.input"),
data: input_data.slice(1),
fill: false,
},
{
}, {
label: i18next.t("output.chart.minimum"),
data: possibilities[0].prices.slice(1).map(day => day.min),
fill: false,
},
{
}, {
label: i18next.t("output.chart.maximum"),
data: possibilities[0].prices.slice(1).map(day => day.max),
fill: "-1",
},
];
],
labels = [i18next.t("weekdays.sunday")].concat(...[i18next.t("weekdays.abr.monday"), i18next.t("weekdays.abr.tuesday"), i18next.t("weekdays.abr.wednesday"), i18next.t("weekdays.abr.thursday"), i18next.t("weekdays.abr.friday"), i18next.t("weekdays.abr.saturday")].map(
day => [i18next.t("times.morning"),
i18next.t("times.afternoon")].map(
time => `${day} ${time}`)));
if (chart_instance) {
chart_instance.data.datasets = datasets;
chart_instance.data.labels = labels;
chart_instance.update();
} else {
chart_instance = new Chart(ctx, {
data: {
datasets: datasets,
labels: [i18next.t("weekdays.sunday"), i18next.t("weekdays.abr.monday") + " " + i18next.t("times.morning"), i18next.t("weekdays.abr.monday") + " " + i18next.t("times.afternoon"), i18next.t("weekdays.abr.tuesday") + " " + i18next.t("times.morning"), i18next.t("weekdays.abr.tuesday") + " " + i18next.t("times.afternoon"), i18next.t("weekdays.abr.wednesday") + " " + i18next.t("times.morning"), i18next.t("weekdays.abr.wednesday") + " " + i18next.t("times.afternoon"), i18next.t("weekdays.abr.thursday") + " " + i18next.t("times.morning"), i18next.t("weekdays.abr.thursday") + " " + i18next.t("times.afternoon"), i18next.t("weekdays.abr.friday") + " " + i18next.t("times.morning"), i18next.t("weekdays.abr.friday") + " " + i18next.t("times.afternoon"), i18next.t("weekdays.abr.saturday") + " " + i18next.t("times.morning"), i18next.t("weekdays.abr.saturday") + " " + i18next.t("times.afternoon")],
labels: labels
},
options: chart_options,
type: "line",

@ -3,12 +3,14 @@ function getContributors() {
const container = $('#contributors');
jQuery.ajax('https://api.github.com/repos/mikebryant/ac-nh-turnip-prices/contributors', {})
.done(function (data) {
const contributorList = [];
data.forEach((contributor, idx) => {
container.append(`<a href="${contributor.html_url}">${contributor.login}</a>`);
contributorList.push(`<a href="${contributor.html_url}">${contributor.login}</a>`);
if (idx < data.length - 1) {
container.append(', ');
contributorList.push(', ');
}
});
container.append(contributorList.join(''));
});
}
}

File diff suppressed because it is too large Load Diff

@ -265,7 +265,8 @@ const calculateOutput = function (data, first_buy, previous_pattern) {
return;
}
let output_possibilities = "";
let analyzed_possibilities = analyze_possibilities(data, first_buy, previous_pattern);
let predictor = new Predictor(data, first_buy, previous_pattern);
let analyzed_possibilities = predictor.analyze_possibilities();
previous_pattern_number = ""
for (let poss of analyzed_possibilities) {
var out_line = "<tr><td class='table-pattern'>" + poss.pattern_description + "</td>"

@ -19,12 +19,13 @@ i18next
['es-ES', 'Español'],
['fr', 'Français'],
['it', 'Italiano'],
['ru', 'Русский'],
['ja', '日本語'],
['ko', '한국어'],
['pt-BR', 'Português'],
['ru', 'Русский'],
['zh-CN', '简体中文'],
['zh-TW', '繁體中文']
],
].sort(),
languageSelector = $('#language');
languages.map(([code, name]) => {
languageSelector.append(`<option value="${code}"${code == i18next.language ? ' selected' : ''}>${name}</option>`);

@ -25,10 +25,10 @@
"small-spike": "Pico moderado"
},
"prices": {
"description": "¿Cuál fue el precio más alto que alcanzaron los nabos en tu isla durante la semana? <i>(Si esta ha sido tu primera vez comprando nabos, este campo se desactivará)</i>",
"description": "¿Cuál fue el precio de los nabos en su isla esta semana? <i>(Si esta ha sido tu primera vez comprando nabos, este campo se desactivará)</i>",
"open": {
"am": "AM - De 8:00 a 11:59",
"pm": "PM - De 12:00 a 10:00"
"pm": "PM - De 12:00 a 22:00"
},
"copy-permalink": "Copiar permalink",
"permalink-copied": "¡Permalink copiado!",
@ -65,7 +65,7 @@
"chart": {
"input": "Precio de entrada",
"minimum": "Mínimo garantizado",
"maximum": "´Máximo potencial"
"maximum": "Máximo potencial"
}
},
"textbox": {

@ -65,7 +65,7 @@
"maximum": "Massimo Potenziale",
"chart": {
"input": "Prezzo Iniziale",
"minimum": "Minimo Gatantito",
"minimum": "Minimo Garantito",
"maximum": "Massimo Potenziale"
}
},

@ -0,0 +1,80 @@
{
"general": {
"daisy-mae": "무파니"
},
"welcome": {
"salutation": "안녕하세요, Nook Inc. 스마트폰의 <b>Turnip Prophet</b>앱을 사용해주셔서 감사합니다.",
"description": "이 앱은 당신의 섬의 매일의 무 가격을 추적 할 수 있게 도와줍니다. 하지만 가격은 직접 입력해야 합니다!",
"conclusion": "가격을 입력하고 나면, 이번 주 동안의 무 가격을 <b>마법처럼</b> 예측해줍니다."
},
"first-time": {
"title": "첫 구매",
"description": "당신의 섬에 방문한 무파니에게서 처음으로 무를 샀습니까?<i>(패턴에 영향을 끼칩니다)</i>",
"yes": "예",
"no": "아니오"
},
"patterns": {
"title": "이전 패턴",
"description": "저번 주의 무 가격 패턴이 어떻게 됩니까?<i>(패턴에 영향을 끼칩니다)</i>",
"pattern": "패턴",
"all": "모든 패턴",
"decreasing": "감소",
"fluctuating": "파동형",
"unknown": "모름",
"large-spike": "큰 급등",
"small-spike": "작은 급등"
},
"prices": {
"description": "이번 주에 당신의 섬에서 무를 샀을 때의 가격이 어떻게 됩니까? <i>(첫 구매인 경우에는 입력란이 비활성화됩니다)</i>",
"open": {
"am": "오전 - 오전 8:00 ~ 오전 11:59",
"pm": "오후 - 오후 12:00 ~ 오후 10:00"
},
"copy-permalink": "고유주소 복사",
"permalink-copied": "고유주소가 복사되었습니다!",
"reset": "Turnip Prophet 초기화",
"reset-warning": "정말로 모든 입력한 값을 지우겠습니까?\n\n되돌릴 수 없습니다!"
},
"weekdays": {
"monday": "월요일",
"tuesday": "화요일",
"wednesday": "수요일",
"thursday": "목요일",
"friday": "금요일",
"saturday" : "토요일",
"sunday": "일요일",
"abr": {
"monday": "월",
"tuesday": "화",
"wednesday": "수",
"thursday": "목",
"friday": "금",
"saturday" : "토"
}
},
"times": {
"morning": "오전",
"afternoon": "오후"
},
"output": {
"title": "결과",
"chance": "% 확률",
"to": "~",
"minimum": "최저 보장 가격",
"maximum": "가능한 최고 가격",
"chart": {
"input": "입력된 가격",
"minimum": "최저 보장 가격",
"maximum": "가능한 최고 가격"
}
},
"textbox": {
"description": "지금까지의 무 가격을 입력하고 나면, Turnip Prophet이 당신의 섬에서 일어날 수 있는 가격 패턴을 보여줍니다.",
"development": "이 앱은 아직 개발 중입니다. 앞으로도 계속해서 개선될 겁니다!",
"thanks": "콩돌이와 밤돌이가 무 가격을 어떻게 결정하는지 알아낸 <a href=\"https://twitter.com/_Ninji/status/1244818665851289602?s=20\">Ninji의 연구</a>가 있었기에 이 앱이 만들어질 수 있었습니다.",
"support": "<a href=\"https://github.com/mikebryant/ac-nh-turnip-prices/issues\">Github</a>을 통해서 문의, 의견 제시, 기여가 가능합니다",
"contributors-text": "그리고 기여를 해주신 분들에게 감사를 표합니다!",
"contributors": "기여해 주신 분들",
"language": "언어"
}
}

@ -3,19 +3,19 @@
"daisy-mae": "曹賣"
},
"welcome": {
"salutation": "你好,歡迎使用Nook手機上的 <b>大頭菜預測工具</b> 。",
"description": "這個程式可以讓你每天追蹤你島上的大頭菜價格,但你必須自己記錄價格!",
"conclusion": "接下來,大頭菜預測工具將 <b>神奇地</b> 預測本週剩餘時間的大頭菜價格。"
"salutation": "你好,歡迎使用 Nook 手機上的 <b>Turnip Prophet</b>。",
"description": "這個工具可以讓你每天追蹤自己島上的大頭菜價格,但你必須自己輸入價格!",
"conclusion": "接下來,Turnip Prophet 將 <b>神奇地</b> 預測本週剩餘時間的大頭菜價格。"
},
"first-time": {
"title": "首次購買",
"description": "這是您第一次從自己的島上和曹賣購買大頭菜嗎?<i>(將影響這次的模型)</i>",
"description": "這是你第一次從自己島上和曹賣購買大頭菜嗎?<i>(將影響這次的模型)</i>",
"yes": "是",
"no": "否"
},
"patterns": {
"title": "上次的模型",
"description": "上週的大頭菜價格模型如何?<i>(將影響您這次的模型)</i>",
"description": "上週大頭菜的價格模型是什麼?<i>(將影響這次的模型)</i>",
"pattern": "模型",
"all": "所有模型",
"decreasing": "遞減型",
@ -25,10 +25,10 @@
"small-spike": "四期型"
},
"prices": {
"description": "本週大頭菜的購買價格是多少?<i>(如果這是您第一次購買大頭菜,則此欄位會被停用)</i>",
"description": "本週自己島上的大頭菜買價?<i>(若這是你第一次購買大頭菜,則此欄位會被停用)</i>",
"open": {
"am": "上午 - 08:00 to 11:59",
"pm": "下午 - 12:00 to 22:00"
"am": "上午 - 08:00 11:59",
"pm": "下午 - 12:00 22:00"
},
"copy-permalink": "複製價格分享網址",
"permalink-copied": "網址已複製!",
@ -69,11 +69,11 @@
}
},
"textbox": {
"description": "在您紀錄了一些大頭菜價格後,大頭菜預測工具會預測,並顯示你島上可能出現的不同模型。",
"description": "在你紀錄了一些大頭菜價格後Turnip Prophet 會預測,並顯示自己島上可能出現的不同模型。",
"development": "此工具仍在開發中,但會隨著時間的推移而改善!",
"thanks": "如果沒有<a href=\"https://twitter.com/_Ninji/status/1244818665851289602?s=20\">Ninji 的幫忙</a>來弄清楚豆狸和粒狸如何對他們的大頭菜的估價,這一切都是不可能實現的。",
"support": "可透過 <a href=\"https://github.com/mikebryant/ac-nh-turnip-prices/issues\">Github</a>獲得支援、討論及貢獻",
"contributors-text": "哦!讓我們不要忘記感謝那些迄今為止作出貢獻的人!",
"thanks": "要不是 <a href=\"https://twitter.com/_Ninji/status/1244818665851289602?s=20\">Ninji</a> 協助釐清豆狸和粒狸的大頭菜估價方式,這一切都不可能實現。",
"support": "可於 <a href=\"https://github.com/mikebryant/ac-nh-turnip-prices/issues\">GitHub</a> 取得支援、討論及貢獻。",
"contributors-text": "嘿!別忘了感謝那些迄今為止作出貢獻的人!",
"contributors": "貢獻者",
"language": "語言"
}

Loading…
Cancel
Save