Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 395e9caff4 | |||
| e1c73181d4 | |||
| 874e35bba3 | |||
| 69b04d3336 | |||
| c5b212234a | |||
| 8e0ddf3a72 | |||
| bfb24cfb03 | |||
| 8d3bde8d38 | |||
| d25fa67100 | |||
| c7834bd8bf |
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "vue-nonograms-solid",
|
"name": "vue-nonograms-solid",
|
||||||
"version": "1.0.6",
|
"version": "1.3.0",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "vue-nonograms-solid",
|
"name": "vue-nonograms-solid",
|
||||||
"version": "1.0.6",
|
"version": "1.3.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"fireworks-js": "^2.10.8",
|
"fireworks-js": "^2.10.8",
|
||||||
"flag-icons": "^7.5.0",
|
"flag-icons": "^7.5.0",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "vue-nonograms-solid",
|
"name": "vue-nonograms-solid",
|
||||||
"version": "1.0.6",
|
"version": "1.3.0",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|||||||
@@ -1,13 +1,15 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import { ref } from 'vue';
|
import { ref, computed } from 'vue';
|
||||||
import { usePuzzleStore } from '@/stores/puzzle';
|
import { usePuzzleStore } from '@/stores/puzzle';
|
||||||
import { useI18n } from '@/composables/useI18n';
|
import { useI18n } from '@/composables/useI18n';
|
||||||
|
import { calculateDifficulty } from '@/utils/puzzleUtils';
|
||||||
|
|
||||||
const emit = defineEmits(['close']);
|
const emit = defineEmits(['close']);
|
||||||
const store = usePuzzleStore();
|
const store = usePuzzleStore();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
|
|
||||||
const customSize = ref(10);
|
const customSize = ref(10);
|
||||||
|
const fillRate = ref(50);
|
||||||
const errorMsg = ref('');
|
const errorMsg = ref('');
|
||||||
|
|
||||||
const snapToStep = (value, step) => {
|
const snapToStep = (value, step) => {
|
||||||
@@ -19,6 +21,20 @@ const handleSnap = () => {
|
|||||||
customSize.value = snapToStep(Number(customSize.value), 5);
|
customSize.value = snapToStep(Number(customSize.value), 5);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const difficultyLevel = computed(() => {
|
||||||
|
return calculateDifficulty(fillRate.value / 100);
|
||||||
|
});
|
||||||
|
|
||||||
|
const difficultyColor = computed(() => {
|
||||||
|
switch(difficultyLevel.value) {
|
||||||
|
case 'extreme': return '#ff3333';
|
||||||
|
case 'hardest': return '#ff9933';
|
||||||
|
case 'harder': return '#ffff33';
|
||||||
|
case 'easy': return '#33ff33';
|
||||||
|
default: return '#33ff33';
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
const confirm = () => {
|
const confirm = () => {
|
||||||
const size = parseInt(customSize.value);
|
const size = parseInt(customSize.value);
|
||||||
if (isNaN(size) || size < 5 || size > 80) {
|
if (isNaN(size) || size < 5 || size > 80) {
|
||||||
@@ -26,7 +42,7 @@ const confirm = () => {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
store.initCustomGame(size);
|
store.initCustomGame(size, fillRate.value / 100);
|
||||||
emit('close');
|
emit('close');
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
@@ -52,6 +68,29 @@ const confirm = () => {
|
|||||||
<span>80</span>
|
<span>80</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<p>{{ t('custom.fillRate') }}</p>
|
||||||
|
<div class="input-group">
|
||||||
|
<div class="range-value">{{ fillRate }}%</div>
|
||||||
|
<input
|
||||||
|
type="range"
|
||||||
|
v-model="fillRate"
|
||||||
|
min="10"
|
||||||
|
max="90"
|
||||||
|
step="5"
|
||||||
|
/>
|
||||||
|
<div class="range-scale">
|
||||||
|
<span>10%</span>
|
||||||
|
<span>90%</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="difficulty-indicator">
|
||||||
|
<span class="label">{{ t('custom.difficulty') }}:</span>
|
||||||
|
<span class="value" :style="{ color: difficultyColor }">
|
||||||
|
{{ t(`difficulty.${difficultyLevel}`) }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
<p v-if="errorMsg" class="error">{{ errorMsg }}</p>
|
<p v-if="errorMsg" class="error">{{ errorMsg }}</p>
|
||||||
|
|
||||||
@@ -87,6 +126,7 @@ const confirm = () => {
|
|||||||
border: 1px solid var(--accent-cyan);
|
border: 1px solid var(--accent-cyan);
|
||||||
box-shadow: 0 0 50px rgba(0, 242, 255, 0.2);
|
box-shadow: 0 0 50px rgba(0, 242, 255, 0.2);
|
||||||
animation: slideUp 0.3s ease;
|
animation: slideUp 0.3s ease;
|
||||||
|
transition: all 0.3s ease-in-out;
|
||||||
}
|
}
|
||||||
|
|
||||||
h2 {
|
h2 {
|
||||||
@@ -161,6 +201,31 @@ input[type="range"]::-moz-range-thumb {
|
|||||||
font-size: 0.85rem;
|
font-size: 0.85rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.difficulty-indicator {
|
||||||
|
margin: 20px 0;
|
||||||
|
font-size: 1.2rem;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
gap: 10px;
|
||||||
|
align-items: center;
|
||||||
|
white-space: nowrap;
|
||||||
|
height: 1.5em; /* Reserve space for one line of text */
|
||||||
|
}
|
||||||
|
|
||||||
|
.difficulty-indicator .label {
|
||||||
|
color: var(--text-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.difficulty-indicator .value {
|
||||||
|
font-weight: bold;
|
||||||
|
text-transform: uppercase;
|
||||||
|
text-shadow: 0 0 10px currentColor;
|
||||||
|
transition: color 0.3s ease;
|
||||||
|
display: inline-block;
|
||||||
|
min-width: 120px; /* Reserve space for longest text */
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
|
||||||
.error {
|
.error {
|
||||||
color: #ff4d4d;
|
color: #ff4d4d;
|
||||||
font-size: 0.9rem;
|
font-size: 0.9rem;
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import { useTimer } from '@/composables/useTimer';
|
|||||||
import xIcon from '@/assets/brands/x.svg';
|
import xIcon from '@/assets/brands/x.svg';
|
||||||
import facebookIcon from '@/assets/brands/facebook.svg';
|
import facebookIcon from '@/assets/brands/facebook.svg';
|
||||||
import whatsappIcon from '@/assets/brands/whatsapp.svg';
|
import whatsappIcon from '@/assets/brands/whatsapp.svg';
|
||||||
|
import { calculateDifficulty } from '@/utils/puzzleUtils';
|
||||||
|
|
||||||
const store = usePuzzleStore();
|
const store = usePuzzleStore();
|
||||||
const { t } = useI18n();
|
const { t } = useI18n();
|
||||||
@@ -88,8 +89,9 @@ const buildShareCanvas = () => {
|
|||||||
const padding = 28;
|
const padding = 28;
|
||||||
const headerHeight = 64;
|
const headerHeight = 64;
|
||||||
const footerHeight = 28;
|
const footerHeight = 28;
|
||||||
|
const infoHeight = 40; // New space for difficulty/guide info
|
||||||
const width = boardSize + padding * 2;
|
const width = boardSize + padding * 2;
|
||||||
const height = boardSize + padding * 2 + headerHeight + footerHeight;
|
const height = boardSize + padding * 2 + headerHeight + footerHeight + infoHeight;
|
||||||
const scale = window.devicePixelRatio || 1;
|
const scale = window.devicePixelRatio || 1;
|
||||||
const canvas = document.createElement('canvas');
|
const canvas = document.createElement('canvas');
|
||||||
canvas.width = width * scale;
|
canvas.width = width * scale;
|
||||||
@@ -109,6 +111,24 @@ const buildShareCanvas = () => {
|
|||||||
ctx.fillText(t('app.title'), padding, padding + 10);
|
ctx.fillText(t('app.title'), padding, padding + 10);
|
||||||
ctx.font = '600 16px "Segoe UI", sans-serif';
|
ctx.font = '600 16px "Segoe UI", sans-serif';
|
||||||
ctx.fillText(`${t('win.time')} ${formattedTime.value}`, padding, padding + 34);
|
ctx.fillText(`${t('win.time')} ${formattedTime.value}`, padding, padding + 34);
|
||||||
|
|
||||||
|
// Difficulty & Density Info
|
||||||
|
const densityPercent = Math.round(store.currentDensity * 100);
|
||||||
|
const difficultyKey = calculateDifficulty(store.currentDensity);
|
||||||
|
let diffColor = '#33ff33';
|
||||||
|
if (difficultyKey === 'extreme') diffColor = '#ff3333';
|
||||||
|
else if (difficultyKey === 'hardest') diffColor = '#ff9933';
|
||||||
|
else if (difficultyKey === 'harder') diffColor = '#ffff33';
|
||||||
|
|
||||||
|
const difficultyText = t(`difficulty.${difficultyKey}`);
|
||||||
|
ctx.font = '600 14px "Segoe UI", sans-serif';
|
||||||
|
|
||||||
|
// Right aligned difficulty info
|
||||||
|
const diffLabel = `${t('win.difficulty')} ${difficultyText} (${densityPercent}%)`;
|
||||||
|
const diffWidth = ctx.measureText(diffLabel).width;
|
||||||
|
ctx.fillStyle = diffColor;
|
||||||
|
ctx.fillText(diffLabel, width - padding - diffWidth, padding + 34);
|
||||||
|
|
||||||
const gridX = padding;
|
const gridX = padding;
|
||||||
const gridY = padding + headerHeight;
|
const gridY = padding + headerHeight;
|
||||||
ctx.fillStyle = 'rgba(255, 255, 255, 0.06)';
|
ctx.fillStyle = 'rgba(255, 255, 255, 0.06)';
|
||||||
@@ -152,6 +172,15 @@ const buildShareCanvas = () => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Guide Usage Info (Dirty Flag)
|
||||||
|
if (store.guideUsageCount > 0) {
|
||||||
|
ctx.fillStyle = '#ff4d4d';
|
||||||
|
ctx.font = '600 14px "Segoe UI", sans-serif';
|
||||||
|
const guideText = t('win.usedGuide', { count: store.guideUsageCount });
|
||||||
|
ctx.fillText(`⚠️ ${guideText}`, padding, height - padding - footerHeight + 10);
|
||||||
|
}
|
||||||
|
|
||||||
ctx.fillStyle = 'rgba(255, 255, 255, 0.75)';
|
ctx.fillStyle = 'rgba(255, 255, 255, 0.75)';
|
||||||
ctx.font = '500 14px "Segoe UI", sans-serif';
|
ctx.font = '500 14px "Segoe UI", sans-serif';
|
||||||
ctx.fillText(appUrl, padding, height - padding + 6);
|
ctx.fillText(appUrl, padding, height - padding + 6);
|
||||||
@@ -183,7 +212,7 @@ const buildShareUrl = (target, text, url) => {
|
|||||||
const encodedText = encodeURIComponent(text);
|
const encodedText = encodeURIComponent(text);
|
||||||
const encodedUrl = encodeURIComponent(url);
|
const encodedUrl = encodeURIComponent(url);
|
||||||
if (target === 'x') {
|
if (target === 'x') {
|
||||||
return `https://twitter.com/intent/tweet?text=${encodedText}&url=${encodedUrl}`;
|
return `https://x.com/intent/tweet?text=${encodedText}&url=${encodedUrl}`;
|
||||||
}
|
}
|
||||||
if (target === 'facebook') {
|
if (target === 'facebook') {
|
||||||
return `https://www.facebook.com/sharer/sharer.php?u=${encodedUrl}"e=${encodedText}`;
|
return `https://www.facebook.com/sharer/sharer.php?u=${encodedUrl}"e=${encodedText}`;
|
||||||
@@ -197,29 +226,48 @@ const buildShareUrl = (target, text, url) => {
|
|||||||
const shareTo = async (target) => {
|
const shareTo = async (target) => {
|
||||||
if (shareInProgress.value) return;
|
if (shareInProgress.value) return;
|
||||||
shareInProgress.value = true;
|
shareInProgress.value = true;
|
||||||
|
|
||||||
|
const text = shareText.value;
|
||||||
|
const url = window.location.href;
|
||||||
|
const shareUrl = buildShareUrl(target, text, url);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const blob = await createShareBlob();
|
// Try native share first if available (supports images)
|
||||||
if (!blob) return;
|
if (navigator.share && navigator.canShare) {
|
||||||
const file = new File([blob], `nonogram-${store.size}x${store.size}.png`, { type: 'image/png' });
|
const blob = await createShareBlob();
|
||||||
const text = shareText.value;
|
if (blob) {
|
||||||
const url = window.location.href;
|
const file = new File([blob], `nonogram-${store.size}x${store.size}.png`, { type: 'image/png' });
|
||||||
if (navigator.share && navigator.canShare && navigator.canShare({ files: [file] })) {
|
if (navigator.canShare({ files: [file] })) {
|
||||||
await navigator.share({
|
await navigator.share({
|
||||||
files: [file],
|
files: [file],
|
||||||
text,
|
text,
|
||||||
title: t('app.title'),
|
title: t('app.title'),
|
||||||
url
|
url
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
await downloadShareImage();
|
} catch (error) {
|
||||||
const shareUrl = buildShareUrl(target, text, url);
|
if (error.name === 'AbortError') {
|
||||||
if (shareUrl) {
|
return; // User cancelled native share, do nothing
|
||||||
window.open(shareUrl, '_blank', 'noopener');
|
|
||||||
}
|
}
|
||||||
|
// Other errors -> fall through to fallback
|
||||||
} finally {
|
} finally {
|
||||||
shareInProgress.value = false;
|
shareInProgress.value = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Fallback: Direct Link + Download
|
||||||
|
// Open window immediately if possible (though we awaited above, so it might be blocked,
|
||||||
|
// but we can't do much about it if we want to try native share first).
|
||||||
|
// Ideally, for Desktop, navigator.share is undefined so we skip the await above.
|
||||||
|
|
||||||
|
if (shareUrl) {
|
||||||
|
window.open(shareUrl, '_blank', 'noopener');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Trigger download as "screenshot support"
|
||||||
|
downloadShareImage();
|
||||||
};
|
};
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
|
|||||||
@@ -29,6 +29,12 @@ const messages = {
|
|||||||
'custom.cancel': 'Anuluj',
|
'custom.cancel': 'Anuluj',
|
||||||
'custom.start': 'Start',
|
'custom.start': 'Start',
|
||||||
'custom.sizeError': 'Rozmiar musi być między 5 a 80!',
|
'custom.sizeError': 'Rozmiar musi być między 5 a 80!',
|
||||||
|
'custom.fillRate': 'Wypełnienie',
|
||||||
|
'custom.difficulty': 'Poziom trudności',
|
||||||
|
'difficulty.easy': 'Łatwy',
|
||||||
|
'difficulty.harder': 'Trudniejszy',
|
||||||
|
'difficulty.hardest': 'Najtrudniejszy',
|
||||||
|
'difficulty.extreme': 'Ekstremalny',
|
||||||
'win.title': 'GRATULACJE!',
|
'win.title': 'GRATULACJE!',
|
||||||
'win.message': 'Rozwiązałeś zagadkę!',
|
'win.message': 'Rozwiązałeś zagadkę!',
|
||||||
'win.time': 'Czas:',
|
'win.time': 'Czas:',
|
||||||
@@ -39,6 +45,8 @@ const messages = {
|
|||||||
'win.shareFacebook': 'Facebook',
|
'win.shareFacebook': 'Facebook',
|
||||||
'win.shareWhatsapp': 'WhatsApp',
|
'win.shareWhatsapp': 'WhatsApp',
|
||||||
'win.shareDownload': 'Pobierz zrzut',
|
'win.shareDownload': 'Pobierz zrzut',
|
||||||
|
'win.difficulty': 'Poziom:',
|
||||||
|
'win.usedGuide': 'Użyto podpowiedzi: {count}',
|
||||||
'pwa.installTitle': 'Zainstaluj aplikację i graj offline',
|
'pwa.installTitle': 'Zainstaluj aplikację i graj offline',
|
||||||
'pwa.installMobile': 'Dodaj do ekranu głównego',
|
'pwa.installMobile': 'Dodaj do ekranu głównego',
|
||||||
'pwa.installDesktop': 'Zainstaluj na komputerze',
|
'pwa.installDesktop': 'Zainstaluj na komputerze',
|
||||||
@@ -128,6 +136,12 @@ const messages = {
|
|||||||
'custom.cancel': 'Cancel',
|
'custom.cancel': 'Cancel',
|
||||||
'custom.start': 'Start',
|
'custom.start': 'Start',
|
||||||
'custom.sizeError': 'Size must be between 5 and 80!',
|
'custom.sizeError': 'Size must be between 5 and 80!',
|
||||||
|
'custom.fillRate': 'Fill Rate',
|
||||||
|
'custom.difficulty': 'Difficulty',
|
||||||
|
'difficulty.easy': 'Easy',
|
||||||
|
'difficulty.harder': 'Harder',
|
||||||
|
'difficulty.hardest': 'Hardest',
|
||||||
|
'difficulty.extreme': 'Extreme',
|
||||||
'win.title': 'CONGRATULATIONS!',
|
'win.title': 'CONGRATULATIONS!',
|
||||||
'win.message': 'You solved the puzzle!',
|
'win.message': 'You solved the puzzle!',
|
||||||
'win.time': 'Time:',
|
'win.time': 'Time:',
|
||||||
@@ -138,6 +152,8 @@ const messages = {
|
|||||||
'win.shareFacebook': 'Facebook',
|
'win.shareFacebook': 'Facebook',
|
||||||
'win.shareWhatsapp': 'WhatsApp',
|
'win.shareWhatsapp': 'WhatsApp',
|
||||||
'win.shareDownload': 'Download screenshot',
|
'win.shareDownload': 'Download screenshot',
|
||||||
|
'win.difficulty': 'Difficulty:',
|
||||||
|
'win.usedGuide': 'Guide used: {count}',
|
||||||
'pwa.installTitle': 'Install the app and play offline',
|
'pwa.installTitle': 'Install the app and play offline',
|
||||||
'pwa.installMobile': 'Add to home screen',
|
'pwa.installMobile': 'Add to home screen',
|
||||||
'pwa.installDesktop': 'Install on desktop',
|
'pwa.installDesktop': 'Install on desktop',
|
||||||
@@ -279,9 +295,17 @@ const messages = {
|
|||||||
'custom.cancel': '取消',
|
'custom.cancel': '取消',
|
||||||
'custom.start': '开始',
|
'custom.start': '开始',
|
||||||
'custom.sizeError': '尺寸必须在 5 到 80 之间!',
|
'custom.sizeError': '尺寸必须在 5 到 80 之间!',
|
||||||
|
'custom.fillRate': '填充率',
|
||||||
|
'custom.difficulty': '难度',
|
||||||
|
'difficulty.easy': '简单',
|
||||||
|
'difficulty.harder': '较难',
|
||||||
|
'difficulty.hardest': '最难',
|
||||||
|
'difficulty.extreme': '极限',
|
||||||
'win.title': '恭喜!',
|
'win.title': '恭喜!',
|
||||||
'win.message': '你解开了谜题!',
|
'win.message': '你解开了谜题!',
|
||||||
'win.time': '时间:',
|
'win.time': '时间:',
|
||||||
|
'win.difficulty': '难度:',
|
||||||
|
'win.usedGuide': '使用指南: {count}',
|
||||||
'win.playAgain': '再玩一次',
|
'win.playAgain': '再玩一次',
|
||||||
'win.shareTitle': '分享你的结果',
|
'win.shareTitle': '分享你的结果',
|
||||||
'win.shareText': '我在 {time} 内解开了 {size}x{size} 的数织!',
|
'win.shareText': '我在 {time} 内解开了 {size}x{size} 的数织!',
|
||||||
@@ -479,9 +503,17 @@ const messages = {
|
|||||||
'custom.cancel': 'Cancelar',
|
'custom.cancel': 'Cancelar',
|
||||||
'custom.start': 'Empezar',
|
'custom.start': 'Empezar',
|
||||||
'custom.sizeError': '¡El tamaño debe estar entre 5 y 80!',
|
'custom.sizeError': '¡El tamaño debe estar entre 5 y 80!',
|
||||||
|
'custom.fillRate': 'Relleno',
|
||||||
|
'custom.difficulty': 'Dificultad',
|
||||||
|
'difficulty.easy': 'Fácil',
|
||||||
|
'difficulty.harder': 'Más difícil',
|
||||||
|
'difficulty.hardest': 'El más difícil',
|
||||||
|
'difficulty.extreme': 'Extremo',
|
||||||
'win.title': '¡FELICIDADES!',
|
'win.title': '¡FELICIDADES!',
|
||||||
'win.message': '¡Has resuelto el rompecabezas!',
|
'win.message': '¡Has resuelto el rompecabezas!',
|
||||||
'win.time': 'Tiempo:',
|
'win.time': 'Tiempo:',
|
||||||
|
'win.difficulty': 'Dificultad:',
|
||||||
|
'win.usedGuide': 'Guía usada: {count}',
|
||||||
'win.playAgain': 'Jugar de nuevo',
|
'win.playAgain': 'Jugar de nuevo',
|
||||||
'win.shareTitle': 'Comparte tu resultado',
|
'win.shareTitle': 'Comparte tu resultado',
|
||||||
'win.shareText': '¡Resolví un nonograma de {size}x{size} en {time}!',
|
'win.shareText': '¡Resolví un nonograma de {size}x{size} en {time}!',
|
||||||
@@ -545,9 +577,17 @@ const messages = {
|
|||||||
'custom.cancel': 'Annuler',
|
'custom.cancel': 'Annuler',
|
||||||
'custom.start': 'Démarrer',
|
'custom.start': 'Démarrer',
|
||||||
'custom.sizeError': 'La taille doit être entre 5 et 80 !',
|
'custom.sizeError': 'La taille doit être entre 5 et 80 !',
|
||||||
|
'custom.fillRate': 'Remplissage',
|
||||||
|
'custom.difficulty': 'Difficulté',
|
||||||
|
'difficulty.easy': 'Facile',
|
||||||
|
'difficulty.harder': 'Plus difficile',
|
||||||
|
'difficulty.hardest': 'Le plus difficile',
|
||||||
|
'difficulty.extreme': 'Extrême',
|
||||||
'win.title': 'FÉLICITATIONS !',
|
'win.title': 'FÉLICITATIONS !',
|
||||||
'win.message': 'Vous avez résolu le puzzle !',
|
'win.message': 'Vous avez résolu le puzzle !',
|
||||||
'win.time': 'Temps:',
|
'win.time': 'Temps:',
|
||||||
|
'win.difficulty': 'Difficulté :',
|
||||||
|
'win.usedGuide': 'Guide utilisé : {count}',
|
||||||
'win.playAgain': 'Rejouer',
|
'win.playAgain': 'Rejouer',
|
||||||
'win.shareTitle': 'Partagez votre résultat',
|
'win.shareTitle': 'Partagez votre résultat',
|
||||||
'win.shareText': 'J’ai résolu un nonogramme {size}x{size} en {time} !',
|
'win.shareText': 'J’ai résolu un nonogramme {size}x{size} en {time} !',
|
||||||
@@ -611,9 +651,17 @@ const messages = {
|
|||||||
'custom.cancel': 'إلغاء',
|
'custom.cancel': 'إلغاء',
|
||||||
'custom.start': 'ابدأ',
|
'custom.start': 'ابدأ',
|
||||||
'custom.sizeError': 'يجب أن يكون الحجم بين 5 و80!',
|
'custom.sizeError': 'يجب أن يكون الحجم بين 5 و80!',
|
||||||
|
'custom.fillRate': 'معدل الملء',
|
||||||
|
'custom.difficulty': 'الصعوبة',
|
||||||
|
'difficulty.easy': 'سهل',
|
||||||
|
'difficulty.harder': 'أصعب',
|
||||||
|
'difficulty.hardest': 'الأصعب',
|
||||||
|
'difficulty.extreme': 'أقصى',
|
||||||
'win.title': 'تهانينا!',
|
'win.title': 'تهانينا!',
|
||||||
'win.message': 'لقد حللت اللغز!',
|
'win.message': 'لقد حللت اللغز!',
|
||||||
'win.time': 'الوقت:',
|
'win.time': 'الوقت:',
|
||||||
|
'win.difficulty': 'الصعوبة:',
|
||||||
|
'win.usedGuide': 'تم استخدام الدليل: {count}',
|
||||||
'win.playAgain': 'العب مرة أخرى',
|
'win.playAgain': 'العب مرة أخرى',
|
||||||
'win.shareTitle': 'شارك نتيجتك',
|
'win.shareTitle': 'شارك نتيجتك',
|
||||||
'win.shareText': 'حللت نونوغرام {size}x{size} في {time}!',
|
'win.shareText': 'حللت نونوغرام {size}x{size} في {time}!',
|
||||||
@@ -743,9 +791,17 @@ const messages = {
|
|||||||
'custom.cancel': 'Отмена',
|
'custom.cancel': 'Отмена',
|
||||||
'custom.start': 'Старт',
|
'custom.start': 'Старт',
|
||||||
'custom.sizeError': 'Размер должен быть от 5 до 80!',
|
'custom.sizeError': 'Размер должен быть от 5 до 80!',
|
||||||
|
'custom.fillRate': 'Заполнение',
|
||||||
|
'custom.difficulty': 'Сложность',
|
||||||
|
'difficulty.easy': 'Легкий',
|
||||||
|
'difficulty.harder': 'Сложный',
|
||||||
|
'difficulty.hardest': 'Очень сложный',
|
||||||
|
'difficulty.extreme': 'Экстремальный',
|
||||||
'win.title': 'ПОЗДРАВЛЯЕМ!',
|
'win.title': 'ПОЗДРАВЛЯЕМ!',
|
||||||
'win.message': 'Вы решили головоломку!',
|
'win.message': 'Вы решили головоломку!',
|
||||||
'win.time': 'Время:',
|
'win.time': 'Время:',
|
||||||
|
'win.difficulty': 'Сложность:',
|
||||||
|
'win.usedGuide': 'Подсказок использовано: {count}',
|
||||||
'win.playAgain': 'Сыграть снова',
|
'win.playAgain': 'Сыграть снова',
|
||||||
'win.shareTitle': 'Поделитесь результатом',
|
'win.shareTitle': 'Поделитесь результатом',
|
||||||
'win.shareText': 'Я решил(а) нонограмму {size}x{size} за {time}!',
|
'win.shareText': 'Я решил(а) нонограмму {size}x{size} за {time}!',
|
||||||
@@ -942,9 +998,17 @@ const messages = {
|
|||||||
'custom.cancel': 'Abbrechen',
|
'custom.cancel': 'Abbrechen',
|
||||||
'custom.start': 'Start',
|
'custom.start': 'Start',
|
||||||
'custom.sizeError': 'Die Größe muss zwischen 5 und 80 liegen!',
|
'custom.sizeError': 'Die Größe muss zwischen 5 und 80 liegen!',
|
||||||
|
'custom.fillRate': 'Füllrate',
|
||||||
|
'custom.difficulty': 'Schwierigkeit',
|
||||||
|
'difficulty.easy': 'Einfach',
|
||||||
|
'difficulty.harder': 'Schwerer',
|
||||||
|
'difficulty.hardest': 'Am schwersten',
|
||||||
|
'difficulty.extreme': 'Extrem',
|
||||||
'win.title': 'HERZLICHEN GLÜCKWUNSCH!',
|
'win.title': 'HERZLICHEN GLÜCKWUNSCH!',
|
||||||
'win.message': 'Sie haben das Rätsel gelöst!',
|
'win.message': 'Sie haben das Rätsel gelöst!',
|
||||||
'win.time': 'Zeit:',
|
'win.time': 'Zeit:',
|
||||||
|
'win.difficulty': 'Schwierigkeit:',
|
||||||
|
'win.usedGuide': 'Hilfe benutzt: {count}',
|
||||||
'win.playAgain': 'Erneut spielen',
|
'win.playAgain': 'Erneut spielen',
|
||||||
'win.shareTitle': 'Teilen Sie Ihr Ergebnis',
|
'win.shareTitle': 'Teilen Sie Ihr Ergebnis',
|
||||||
'win.shareText': 'Ich habe ein {size}x{size} Nonogramm in {time} gelöst!',
|
'win.shareText': 'Ich habe ein {size}x{size} Nonogramm in {time} gelöst!',
|
||||||
|
|||||||
@@ -78,6 +78,9 @@ export function useSolver() {
|
|||||||
} else if (type === 'done') {
|
} else if (type === 'done') {
|
||||||
isProcessing.value = false;
|
isProcessing.value = false;
|
||||||
pause();
|
pause();
|
||||||
|
} else if (type === 'stuck') {
|
||||||
|
isProcessing.value = false;
|
||||||
|
pause();
|
||||||
} else {
|
} else {
|
||||||
isProcessing.value = false;
|
isProcessing.value = false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -64,6 +64,9 @@ export const usePuzzleStore = defineStore('puzzle', () => {
|
|||||||
const playerGrid = ref([]); // 0: empty, 1: filled, 2: cross
|
const playerGrid = ref([]); // 0: empty, 1: filled, 2: cross
|
||||||
const isGameWon = ref(false);
|
const isGameWon = ref(false);
|
||||||
const hasUsedGuide = ref(false);
|
const hasUsedGuide = ref(false);
|
||||||
|
const guideUsageCount = ref(0);
|
||||||
|
const currentDifficulty = ref(null); // 'easy', 'medium', 'hard', 'custom' or object { density: 0.5 }
|
||||||
|
const currentDensity = ref(0);
|
||||||
const size = ref(5);
|
const size = ref(5);
|
||||||
const startTime = ref(null);
|
const startTime = ref(null);
|
||||||
const elapsedTime = ref(0);
|
const elapsedTime = ref(0);
|
||||||
@@ -118,23 +121,29 @@ export const usePuzzleStore = defineStore('puzzle', () => {
|
|||||||
resetGrid();
|
resetGrid();
|
||||||
isGameWon.value = false;
|
isGameWon.value = false;
|
||||||
hasUsedGuide.value = false;
|
hasUsedGuide.value = false;
|
||||||
|
guideUsageCount.value = 0;
|
||||||
|
currentDensity.value = totalCellsToFill.value / (size.value * size.value);
|
||||||
elapsedTime.value = 0;
|
elapsedTime.value = 0;
|
||||||
startTimer();
|
startTimer();
|
||||||
|
saveState();
|
||||||
}
|
}
|
||||||
|
|
||||||
function initCustomGame(customSize) {
|
function initCustomGame(customSize, density = 0.5) {
|
||||||
stopTimer();
|
stopTimer();
|
||||||
currentLevelId.value = 'custom';
|
currentLevelId.value = 'custom';
|
||||||
size.value = customSize;
|
size.value = customSize;
|
||||||
|
|
||||||
// Generate random grid
|
// Generate random grid
|
||||||
solution.value = generateRandomGrid(customSize);
|
solution.value = generateRandomGrid(customSize, density);
|
||||||
|
|
||||||
resetGrid();
|
resetGrid();
|
||||||
isGameWon.value = false;
|
isGameWon.value = false;
|
||||||
hasUsedGuide.value = false;
|
hasUsedGuide.value = false;
|
||||||
|
guideUsageCount.value = 0;
|
||||||
|
currentDensity.value = density;
|
||||||
elapsedTime.value = 0;
|
elapsedTime.value = 0;
|
||||||
startTimer();
|
startTimer();
|
||||||
|
saveState();
|
||||||
}
|
}
|
||||||
|
|
||||||
function resetGrid() {
|
function resetGrid() {
|
||||||
@@ -242,6 +251,8 @@ export const usePuzzleStore = defineStore('puzzle', () => {
|
|||||||
playerGrid: playerGrid.value,
|
playerGrid: playerGrid.value,
|
||||||
isGameWon: isGameWon.value,
|
isGameWon: isGameWon.value,
|
||||||
hasUsedGuide: hasUsedGuide.value,
|
hasUsedGuide: hasUsedGuide.value,
|
||||||
|
guideUsageCount: guideUsageCount.value,
|
||||||
|
currentDensity: currentDensity.value,
|
||||||
elapsedTime: elapsedTime.value,
|
elapsedTime: elapsedTime.value,
|
||||||
moves: moves.value,
|
moves: moves.value,
|
||||||
history: history.value
|
history: history.value
|
||||||
@@ -259,6 +270,9 @@ export const usePuzzleStore = defineStore('puzzle', () => {
|
|||||||
solution.value = parsed.solution;
|
solution.value = parsed.solution;
|
||||||
playerGrid.value = parsed.playerGrid;
|
playerGrid.value = parsed.playerGrid;
|
||||||
isGameWon.value = parsed.isGameWon;
|
isGameWon.value = parsed.isGameWon;
|
||||||
|
hasUsedGuide.value = parsed.hasUsedGuide || false;
|
||||||
|
guideUsageCount.value = parsed.guideUsageCount || 0;
|
||||||
|
currentDensity.value = parsed.currentDensity || 0;
|
||||||
elapsedTime.value = parsed.elapsedTime || 0;
|
elapsedTime.value = parsed.elapsedTime || 0;
|
||||||
moves.value = parsed.moves || 0;
|
moves.value = parsed.moves || 0;
|
||||||
history.value = parsed.history || [];
|
history.value = parsed.history || [];
|
||||||
@@ -275,44 +289,9 @@ export const usePuzzleStore = defineStore('puzzle', () => {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
function initGame(levelId = 'easy') {
|
// Duplicate initGame removed
|
||||||
// If init called without args and we have save, load it?
|
|
||||||
// User might want to start fresh if clicking buttons.
|
|
||||||
// Let's add explicit 'continue' logic or just auto-load on first run.
|
|
||||||
// For now, let's just stick to explicit init, but maybe load on mount if exists?
|
|
||||||
// The user didn't explicitly ask for "Continue", but "features from HTML".
|
|
||||||
// HTML usually auto-saves and loads.
|
|
||||||
|
|
||||||
stopTimer();
|
|
||||||
currentLevelId.value = levelId;
|
|
||||||
|
|
||||||
let puzzle = PUZZLES[levelId];
|
|
||||||
if (!puzzle) {
|
|
||||||
puzzle = PUZZLES['easy'];
|
|
||||||
}
|
|
||||||
|
|
||||||
size.value = puzzle.size;
|
|
||||||
solution.value = puzzle.grid;
|
|
||||||
|
|
||||||
resetGrid();
|
|
||||||
isGameWon.value = false;
|
|
||||||
elapsedTime.value = 0;
|
|
||||||
startTimer();
|
|
||||||
saveState();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Modify initCustomGame similarly
|
// Duplicate initCustomGame removed
|
||||||
function initCustomGame(customSize) {
|
|
||||||
stopTimer();
|
|
||||||
currentLevelId.value = 'custom';
|
|
||||||
size.value = customSize;
|
|
||||||
solution.value = generateRandomGrid(customSize);
|
|
||||||
resetGrid();
|
|
||||||
isGameWon.value = false;
|
|
||||||
elapsedTime.value = 0;
|
|
||||||
startTimer();
|
|
||||||
saveState();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Duplicate toggleCell/setCell removed
|
// Duplicate toggleCell/setCell removed
|
||||||
|
|
||||||
@@ -321,6 +300,7 @@ export const usePuzzleStore = defineStore('puzzle', () => {
|
|||||||
resetGrid();
|
resetGrid();
|
||||||
isGameWon.value = false;
|
isGameWon.value = false;
|
||||||
hasUsedGuide.value = false;
|
hasUsedGuide.value = false;
|
||||||
|
guideUsageCount.value = 0;
|
||||||
elapsedTime.value = 0;
|
elapsedTime.value = 0;
|
||||||
startTimer();
|
startTimer();
|
||||||
saveState();
|
saveState();
|
||||||
@@ -332,6 +312,7 @@ export const usePuzzleStore = defineStore('puzzle', () => {
|
|||||||
function markGuideUsed() {
|
function markGuideUsed() {
|
||||||
if (isGameWon.value) return;
|
if (isGameWon.value) return;
|
||||||
hasUsedGuide.value = true;
|
hasUsedGuide.value = true;
|
||||||
|
guideUsageCount.value++;
|
||||||
saveState();
|
saveState();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -360,6 +341,8 @@ export const usePuzzleStore = defineStore('puzzle', () => {
|
|||||||
undo,
|
undo,
|
||||||
closeWinModal,
|
closeWinModal,
|
||||||
hasUsedGuide,
|
hasUsedGuide,
|
||||||
|
guideUsageCount,
|
||||||
|
currentDensity,
|
||||||
markGuideUsed
|
markGuideUsed
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -40,15 +40,36 @@ export function calculateHints(grid) {
|
|||||||
return { rowHints, colHints };
|
return { rowHints, colHints };
|
||||||
}
|
}
|
||||||
|
|
||||||
export function generateRandomGrid(size) {
|
export function generateRandomGrid(size, density = 0.5) {
|
||||||
const grid = [];
|
const grid = [];
|
||||||
for (let i = 0; i < size; i++) {
|
for (let i = 0; i < size; i++) {
|
||||||
const row = [];
|
const row = [];
|
||||||
for (let j = 0; j < size; j++) {
|
for (let j = 0; j < size; j++) {
|
||||||
// ~25% empty cells
|
row.push(Math.random() < density ? 1 : 0);
|
||||||
row.push(Math.random() > 0.25 ? 1 : 0);
|
|
||||||
}
|
}
|
||||||
grid.push(row);
|
grid.push(row);
|
||||||
}
|
}
|
||||||
return grid;
|
return grid;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function calculateDifficulty(density) {
|
||||||
|
// Shannon Entropy: H(x) = -x*log2(x) - (1-x)*log2(1-x)
|
||||||
|
// Normalized to 0-1 range (since max entropy at 0.5 is 1)
|
||||||
|
|
||||||
|
// Avoid log(0)
|
||||||
|
if (density <= 0 || density >= 1) return 'easy';
|
||||||
|
|
||||||
|
const entropy = -density * Math.log2(density) - (1 - density) * Math.log2(1 - density);
|
||||||
|
|
||||||
|
// Thresholds based on entropy
|
||||||
|
// 0.5 density -> entropy 1.0 (Extreme)
|
||||||
|
// 0.4/0.6 density -> entropy ~0.97 (Extreme)
|
||||||
|
// 0.3/0.7 density -> entropy ~0.88 (Hardest)
|
||||||
|
// 0.2/0.8 density -> entropy ~0.72 (Harder)
|
||||||
|
// <0.2/>0.8 density -> entropy <0.72 (Easy)
|
||||||
|
|
||||||
|
if (entropy >= 0.96) return 'extreme'; // approx 38% - 62%
|
||||||
|
if (entropy >= 0.85) return 'hardest'; // approx 28% - 38% & 62% - 72%
|
||||||
|
if (entropy >= 0.65) return 'harder'; // approx 17% - 28% & 72% - 83%
|
||||||
|
return 'easy';
|
||||||
|
}
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ const messages = {
|
|||||||
'worker.solved': 'Rozwiązane!',
|
'worker.solved': 'Rozwiązane!',
|
||||||
'worker.logicRow': 'Logika: Wiersz {row}, Kolumna {col} -> {state}',
|
'worker.logicRow': 'Logika: Wiersz {row}, Kolumna {col} -> {state}',
|
||||||
'worker.logicCol': 'Logika: Kolumna {col}, Wiersz {row} -> {state}',
|
'worker.logicCol': 'Logika: Kolumna {col}, Wiersz {row} -> {state}',
|
||||||
'worker.guess': 'Zgadywanie: Wiersz {row}, Kolumna {col}',
|
'worker.stuck': 'Brak logicznego ruchu. Spróbuj zgadnąć lub cofnąć.',
|
||||||
'worker.done': 'Koniec!',
|
'worker.done': 'Koniec!',
|
||||||
'worker.state.filled': 'Pełne',
|
'worker.state.filled': 'Pełne',
|
||||||
'worker.state.empty': 'Puste'
|
'worker.state.empty': 'Puste'
|
||||||
@@ -14,7 +14,7 @@ const messages = {
|
|||||||
'worker.solved': 'Solved!',
|
'worker.solved': 'Solved!',
|
||||||
'worker.logicRow': 'Logic: Row {row}, Column {col} -> {state}',
|
'worker.logicRow': 'Logic: Row {row}, Column {col} -> {state}',
|
||||||
'worker.logicCol': 'Logic: Column {col}, Row {row} -> {state}',
|
'worker.logicCol': 'Logic: Column {col}, Row {row} -> {state}',
|
||||||
'worker.guess': 'Guessing: Row {row}, Column {col}',
|
'worker.stuck': 'No logical move found. Try guessing or undoing.',
|
||||||
'worker.done': 'Done!',
|
'worker.done': 'Done!',
|
||||||
'worker.state.filled': 'Filled',
|
'worker.state.filled': 'Filled',
|
||||||
'worker.state.empty': 'Empty'
|
'worker.state.empty': 'Empty'
|
||||||
@@ -236,29 +236,9 @@ const handleStep = (playerGrid, solution, locale) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (let r = 0; r < size; r++) {
|
// Check for guess logic - we want to avoid this unless strictly necessary
|
||||||
for (let c = 0; c < size; c++) {
|
// If no logic move found, return 'stuck' instead of cheating
|
||||||
const current = playerGrid[r][c];
|
return { type: 'stuck', statusText: t(locale, 'worker.stuck') };
|
||||||
const target = solution[r][c];
|
|
||||||
let isCorrect = false;
|
|
||||||
if (target === 1 && current === 1) isCorrect = true;
|
|
||||||
if (target === 0 && current === 2) isCorrect = true;
|
|
||||||
if (target === 0 && current === 0) isCorrect = false;
|
|
||||||
if (target === 1 && current === 0) isCorrect = false;
|
|
||||||
if (!isCorrect) {
|
|
||||||
const newState = target === 1 ? 1 : 2;
|
|
||||||
return {
|
|
||||||
type: 'move',
|
|
||||||
r,
|
|
||||||
c,
|
|
||||||
state: newState,
|
|
||||||
statusText: t(locale, 'worker.guess', { row: r + 1, col: c + 1 })
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return { type: 'done', statusText: t(locale, 'worker.done') };
|
|
||||||
};
|
};
|
||||||
|
|
||||||
self.onmessage = (event) => {
|
self.onmessage = (event) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user