Compare commits
32 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 43822d03ac | |||
| 2e83d3ea9f | |||
| 0023190f5a | |||
| 2552ea9423 | |||
| e08be0574d | |||
| 3797e7715f | |||
| 19c4516d22 | |||
| 06c345e8f0 | |||
| d9ae630fe5 | |||
| 132c4ebced | |||
| 0b8dcacd18 | |||
| 4ef4f2b251 | |||
| 17d8cbfedd | |||
| a41e337c43 | |||
| 1f1de61044 | |||
| 7f22aa9198 | |||
| 133a676682 | |||
| 30318fafaf | |||
| 5549e24c17 | |||
| ca3193d07e | |||
| 41a36768cd | |||
| 315fb29eac | |||
| 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",
|
||||
"version": "1.0.6",
|
||||
"version": "1.8.2",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "vue-nonograms-solid",
|
||||
"version": "1.0.6",
|
||||
"version": "1.8.2",
|
||||
"dependencies": {
|
||||
"fireworks-js": "^2.10.8",
|
||||
"flag-icons": "^7.5.0",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "vue-nonograms-solid",
|
||||
"version": "1.0.6",
|
||||
"version": "1.8.2",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
|
||||
75
scripts/simulate_difficulty.js
Normal file
75
scripts/simulate_difficulty.js
Normal file
@@ -0,0 +1,75 @@
|
||||
|
||||
import fs from 'fs';
|
||||
import path from 'path';
|
||||
import { generateRandomGrid, calculateHints } from '../src/utils/puzzleUtils.js';
|
||||
import { solvePuzzle } from '../src/utils/solver.js';
|
||||
|
||||
const OUTPUT_FILE = 'difficulty_simulation_results.json';
|
||||
const CSV_FILE = 'difficulty_simulation_results.csv';
|
||||
|
||||
// Configuration
|
||||
const SIZES = [5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 60, 70, 80]; // Steps of 5 up to 50, then 10
|
||||
const DENSITIES = [0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9];
|
||||
const SAMPLES_PER_POINT = 20; // Adjust based on time/accuracy needs
|
||||
|
||||
console.log('Starting Monte Carlo Simulation for Nonogram Difficulty...');
|
||||
console.log(`Config: Sizes=${SIZES.length}, Densities=${DENSITIES.length}, Samples=${SAMPLES_PER_POINT}`);
|
||||
|
||||
const results = [];
|
||||
const csvRows = ['size,density,avg_solved_percent,min_solved_percent,max_solved_percent,avg_time_ms'];
|
||||
|
||||
const startTime = Date.now();
|
||||
|
||||
for (const size of SIZES) {
|
||||
for (const density of DENSITIES) {
|
||||
let totalSolved = 0;
|
||||
let minSolved = 100;
|
||||
let maxSolved = 0;
|
||||
let totalTime = 0;
|
||||
|
||||
process.stdout.write(`Simulating Size: ${size}x${size}, Density: ${density} ... `);
|
||||
|
||||
for (let i = 0; i < SAMPLES_PER_POINT; i++) {
|
||||
const t0 = performance.now();
|
||||
|
||||
// 1. Generate
|
||||
const grid = generateRandomGrid(size, density);
|
||||
const { rowHints, colHints } = calculateHints(grid);
|
||||
|
||||
// 2. Solve
|
||||
const { percentSolved } = solvePuzzle(rowHints, colHints);
|
||||
|
||||
const t1 = performance.now();
|
||||
|
||||
totalSolved += percentSolved;
|
||||
minSolved = Math.min(minSolved, percentSolved);
|
||||
maxSolved = Math.max(maxSolved, percentSolved);
|
||||
totalTime += (t1 - t0);
|
||||
}
|
||||
|
||||
const avgSolved = totalSolved / SAMPLES_PER_POINT;
|
||||
const avgTime = totalTime / SAMPLES_PER_POINT;
|
||||
|
||||
results.push({
|
||||
size,
|
||||
density,
|
||||
avgSolved,
|
||||
minSolved,
|
||||
maxSolved,
|
||||
avgTime
|
||||
});
|
||||
|
||||
csvRows.push(`${size},${density},${avgSolved.toFixed(2)},${minSolved.toFixed(2)},${maxSolved.toFixed(2)},${avgTime.toFixed(2)}`);
|
||||
|
||||
console.log(`Avg Solved: ${avgSolved.toFixed(1)}%`);
|
||||
}
|
||||
}
|
||||
|
||||
const totalDuration = (Date.now() - startTime) / 1000;
|
||||
console.log(`Simulation complete in ${totalDuration.toFixed(1)}s`);
|
||||
|
||||
// Save results
|
||||
fs.writeFileSync(OUTPUT_FILE, JSON.stringify(results, null, 2));
|
||||
fs.writeFileSync(CSV_FILE, csvRows.join('\n'));
|
||||
|
||||
console.log(`Results saved to ${OUTPUT_FILE} and ${CSV_FILE}`);
|
||||
@@ -8,6 +8,7 @@ import StatusPanel from './components/StatusPanel.vue';
|
||||
import GuidePanel from './components/GuidePanel.vue';
|
||||
import WinModal from './components/WinModal.vue';
|
||||
import CustomGameModal from './components/CustomGameModal.vue';
|
||||
import SimulationView from './components/SimulationView.vue';
|
||||
import FixedBar from './components/FixedBar.vue';
|
||||
import ReloadPrompt from './components/ReloadPrompt.vue';
|
||||
|
||||
@@ -15,6 +16,7 @@ import ReloadPrompt from './components/ReloadPrompt.vue';
|
||||
const store = usePuzzleStore();
|
||||
const { t, locale, setLocale, locales } = useI18n();
|
||||
const showCustomModal = ref(false);
|
||||
const showSimulation = ref(false);
|
||||
const showGuide = ref(false);
|
||||
const deferredPrompt = ref(null);
|
||||
const canInstall = ref(false);
|
||||
@@ -173,7 +175,8 @@ onUnmounted(() => {
|
||||
<!-- Modals Teleport -->
|
||||
<Teleport to="body">
|
||||
<WinModal v-if="store.isGameWon" />
|
||||
<CustomGameModal v-if="showCustomModal" @close="showCustomModal = false" />
|
||||
<CustomGameModal v-if="showCustomModal" @close="showCustomModal = false" @open-simulation="showSimulation = true" />
|
||||
<SimulationView v-if="showSimulation" @close="showSimulation = false" />
|
||||
<ReloadPrompt />
|
||||
</Teleport>
|
||||
</main>
|
||||
|
||||
@@ -1,14 +1,202 @@
|
||||
<script setup>
|
||||
import { ref } from 'vue';
|
||||
import { ref, computed, onMounted, onUnmounted, watch, nextTick } from 'vue';
|
||||
import { usePuzzleStore } from '@/stores/puzzle';
|
||||
import { useI18n } from '@/composables/useI18n';
|
||||
import { calculateDifficulty } from '@/utils/puzzleUtils';
|
||||
import { HelpCircle } from 'lucide-vue-next';
|
||||
|
||||
const emit = defineEmits(['close']);
|
||||
const emit = defineEmits(['close', 'open-simulation']);
|
||||
const store = usePuzzleStore();
|
||||
const { t } = useI18n();
|
||||
|
||||
const customSize = ref(10);
|
||||
const fillRate = ref(50);
|
||||
const errorMsg = ref('');
|
||||
const difficultyCanvas = ref(null);
|
||||
const isDragging = ref(false);
|
||||
|
||||
const drawMap = () => {
|
||||
const canvas = difficultyCanvas.value;
|
||||
if (!canvas) return;
|
||||
const ctx = canvas.getContext('2d');
|
||||
const width = canvas.width;
|
||||
const height = canvas.height;
|
||||
|
||||
// Clear
|
||||
ctx.clearRect(0, 0, width, height);
|
||||
|
||||
// Draw Gradient Background
|
||||
// Optimization: Create an image data once if static, but here it's small enough.
|
||||
const imgData = ctx.createImageData(width, height);
|
||||
const data = imgData.data;
|
||||
|
||||
// Ranges:
|
||||
// X: Fill Rate 10% -> 90%
|
||||
// Y: Size 5 -> 80
|
||||
|
||||
for (let y = 0; y < height; y++) {
|
||||
for (let x = 0; x < width; x++) {
|
||||
// Map x, y to fillRate, size
|
||||
// y=0 -> size 80 (top), y=height -> size 5 (bottom)
|
||||
// x=0 -> fill 10%, x=width -> fill 90%
|
||||
|
||||
const normalizedX = x / width;
|
||||
const normalizedY = 1 - (y / height); // 0 at bottom, 1 at top
|
||||
|
||||
const fRate = 0.1 + normalizedX * 0.8; // 0.1 to 0.9
|
||||
const sSize = 5 + normalizedY * 75; // 5 to 80
|
||||
|
||||
const { value } = calculateDifficulty(fRate, sSize);
|
||||
|
||||
// Color Mapping:
|
||||
// Green (0%) -> Yellow (50%) -> Red (100%)
|
||||
// Hue: 120 -> 0
|
||||
const hue = 120 * (1 - value / 100);
|
||||
|
||||
// Convert HSL to RGB (Simplified)
|
||||
// Saturation 100%, Lightness 50%
|
||||
const [r, g, b] = hslToRgb(hue / 360, 1, 0.5);
|
||||
|
||||
const index = (y * width + x) * 4;
|
||||
data[index] = r;
|
||||
data[index + 1] = g;
|
||||
data[index + 2] = b;
|
||||
data[index + 3] = 255; // Alpha
|
||||
}
|
||||
}
|
||||
ctx.putImageData(imgData, 0, 0);
|
||||
|
||||
// Draw current position
|
||||
// Map current fillRate/size to x,y
|
||||
// Fill: 10..90. Size: 5..80.
|
||||
const currentFill = Math.max(10, Math.min(90, fillRate.value));
|
||||
const currentSize = Math.max(5, Math.min(80, customSize.value));
|
||||
|
||||
const posX = ((currentFill - 10) / 80) * width;
|
||||
const posY = (1 - (currentSize - 5) / 75) * height;
|
||||
|
||||
// Draw Crosshair/Circle
|
||||
ctx.beginPath();
|
||||
ctx.arc(posX, posY, 6, 0, Math.PI * 2);
|
||||
ctx.fillStyle = '#fff';
|
||||
ctx.fill();
|
||||
ctx.lineWidth = 2;
|
||||
ctx.strokeStyle = '#000';
|
||||
ctx.stroke();
|
||||
};
|
||||
|
||||
const hslToRgb = (h, s, l) => {
|
||||
let r, g, b;
|
||||
if (s === 0) {
|
||||
r = g = b = l; // achromatic
|
||||
} else {
|
||||
const hue2rgb = (p, q, t) => {
|
||||
if (t < 0) t += 1;
|
||||
if (t > 1) t -= 1;
|
||||
if (t < 1 / 6) return p + (q - p) * 6 * t;
|
||||
if (t < 1 / 2) return q;
|
||||
if (t < 2 / 3) return p + (q - p) * (2 / 3 - t) * 6;
|
||||
return p;
|
||||
};
|
||||
const q = l < 0.5 ? l * (1 + s) : l + s - l * s;
|
||||
const p = 2 * l - q;
|
||||
r = hue2rgb(p, q, h + 1 / 3);
|
||||
g = hue2rgb(p, q, h);
|
||||
b = hue2rgb(p, q, h - 1 / 3);
|
||||
}
|
||||
return [Math.round(r * 255), Math.round(g * 255), Math.round(b * 255)];
|
||||
};
|
||||
|
||||
const updateFromEvent = (e) => {
|
||||
const canvas = difficultyCanvas.value;
|
||||
if (!canvas) return;
|
||||
const rect = canvas.getBoundingClientRect();
|
||||
|
||||
// Handle Touch or Mouse
|
||||
const clientX = e.touches ? e.touches[0].clientX : e.clientX;
|
||||
const clientY = e.touches ? e.touches[0].clientY : e.clientY;
|
||||
|
||||
let x = clientX - rect.left;
|
||||
let y = clientY - rect.top;
|
||||
|
||||
// Clamp
|
||||
x = Math.max(0, Math.min(rect.width, x));
|
||||
y = Math.max(0, Math.min(rect.height, y));
|
||||
|
||||
// Reverse Map
|
||||
// x / width -> fillRate (10..90)
|
||||
// 1 - y / height -> size (5..80)
|
||||
|
||||
const normalizedX = x / rect.width;
|
||||
const normalizedY = 1 - (y / rect.height);
|
||||
|
||||
const newFill = 10 + normalizedX * 80;
|
||||
const newSize = 5 + normalizedY * 75;
|
||||
|
||||
fillRate.value = Math.round(newFill);
|
||||
customSize.value = Math.round(newSize);
|
||||
};
|
||||
|
||||
const startDrag = (e) => {
|
||||
isDragging.value = true;
|
||||
updateFromEvent(e);
|
||||
// Add global listeners for mouse to handle dragging outside canvas
|
||||
window.addEventListener('mousemove', onDrag);
|
||||
window.addEventListener('mouseup', stopDrag);
|
||||
};
|
||||
|
||||
const onDrag = (e) => {
|
||||
if (!isDragging.value) return;
|
||||
updateFromEvent(e);
|
||||
};
|
||||
|
||||
const stopDrag = () => {
|
||||
isDragging.value = false;
|
||||
window.removeEventListener('mousemove', onDrag);
|
||||
window.removeEventListener('mouseup', stopDrag);
|
||||
};
|
||||
|
||||
onUnmounted(() => {
|
||||
window.removeEventListener('mousemove', onDrag);
|
||||
window.removeEventListener('mouseup', stopDrag);
|
||||
});
|
||||
|
||||
const showAdvanced = ref(false);
|
||||
|
||||
const toggleAdvanced = () => {
|
||||
showAdvanced.value = !showAdvanced.value;
|
||||
if (showAdvanced.value) {
|
||||
nextTick(drawMap);
|
||||
}
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
const savedSize = localStorage.getItem('nonograms_custom_size');
|
||||
if (savedSize && !isNaN(savedSize)) {
|
||||
customSize.value = Math.max(5, Math.min(80, Number(savedSize)));
|
||||
}
|
||||
|
||||
const savedFillRate = localStorage.getItem('nonograms_custom_fill_rate');
|
||||
if (savedFillRate && !isNaN(savedFillRate)) {
|
||||
fillRate.value = Math.max(10, Math.min(90, Number(savedFillRate)));
|
||||
}
|
||||
|
||||
// Don't draw map initially if hidden
|
||||
});
|
||||
|
||||
watch([customSize, fillRate], () => {
|
||||
if (showAdvanced.value) {
|
||||
drawMap();
|
||||
}
|
||||
});
|
||||
|
||||
watch(customSize, (newVal) => {
|
||||
localStorage.setItem('nonograms_custom_size', newVal);
|
||||
});
|
||||
|
||||
watch(fillRate, (newVal) => {
|
||||
localStorage.setItem('nonograms_custom_fill_rate', newVal);
|
||||
});
|
||||
|
||||
const snapToStep = (value, step) => {
|
||||
const rounded = Math.round(value / step) * step;
|
||||
@@ -19,6 +207,20 @@ const handleSnap = () => {
|
||||
customSize.value = snapToStep(Number(customSize.value), 5);
|
||||
};
|
||||
|
||||
const difficultyInfo = computed(() => {
|
||||
return calculateDifficulty(fillRate.value / 100, customSize.value);
|
||||
});
|
||||
|
||||
const difficultyColor = computed(() => {
|
||||
switch(difficultyInfo.value.level) {
|
||||
case 'extreme': return '#ff3333';
|
||||
case 'hardest': return '#ff9933';
|
||||
case 'harder': return '#ffff33';
|
||||
case 'easy': return '#33ff33';
|
||||
default: return '#33ff33';
|
||||
}
|
||||
});
|
||||
|
||||
const confirm = () => {
|
||||
const size = parseInt(customSize.value);
|
||||
if (isNaN(size) || size < 5 || size > 80) {
|
||||
@@ -26,7 +228,7 @@ const confirm = () => {
|
||||
return;
|
||||
}
|
||||
|
||||
store.initCustomGame(size);
|
||||
store.initCustomGame(size, fillRate.value / 100);
|
||||
emit('close');
|
||||
};
|
||||
</script>
|
||||
@@ -35,22 +237,77 @@ const confirm = () => {
|
||||
<div class="modal-overlay" @click.self="emit('close')">
|
||||
<div class="modal glass-panel">
|
||||
<h2>{{ t('custom.title') }}</h2>
|
||||
<p>{{ t('custom.prompt') }}</p>
|
||||
|
||||
<div class="input-group">
|
||||
<div class="range-value">{{ customSize }}</div>
|
||||
<input
|
||||
type="range"
|
||||
v-model="customSize"
|
||||
min="5"
|
||||
max="80"
|
||||
step="1"
|
||||
@change="handleSnap"
|
||||
/>
|
||||
<div class="range-scale">
|
||||
<span>5</span>
|
||||
<span>80</span>
|
||||
<div class="modal-content">
|
||||
<div class="sliders-section">
|
||||
<div class="slider-container">
|
||||
<p>{{ t('custom.prompt') }}</p>
|
||||
<div class="input-group">
|
||||
<div class="range-value">{{ customSize }}</div>
|
||||
<input
|
||||
type="range"
|
||||
v-model="customSize"
|
||||
min="5"
|
||||
max="80"
|
||||
step="1"
|
||||
@change="handleSnap"
|
||||
/>
|
||||
<div class="range-scale">
|
||||
<span>5</span>
|
||||
<span>80</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="slider-container">
|
||||
<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="1"
|
||||
/>
|
||||
<div class="range-scale">
|
||||
<span>10%</span>
|
||||
<span>90%</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="map-section" v-if="showAdvanced">
|
||||
<canvas
|
||||
ref="difficultyCanvas"
|
||||
width="400"
|
||||
height="400"
|
||||
@mousedown="startDrag"
|
||||
@touchstart.prevent="startDrag"
|
||||
@touchmove.prevent="onDrag"
|
||||
@touchend="stopDrag"
|
||||
></canvas>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="difficulty-indicator">
|
||||
<div class="label-row">
|
||||
<div class="label">{{ t('custom.difficulty') }}</div>
|
||||
<button class="help-btn" @click="emit('open-simulation')" :title="t('custom.simulationHelp') || 'How is this calculated?'">
|
||||
<HelpCircle class="icon-sm" />
|
||||
</button>
|
||||
</div>
|
||||
<div class="difficulty-row">
|
||||
<div class="level" :style="{ color: difficultyColor }">{{ t(`difficulty.${difficultyInfo.level}`) }}</div>
|
||||
<div class="percentage" :style="{ color: difficultyColor }">({{ difficultyInfo.value }}%)</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="advanced-toggle">
|
||||
<button class="btn-text" @click="toggleAdvanced">
|
||||
{{ showAdvanced ? 'Ukryj mapę trudności' : 'Pokaż mapę trudności' }}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<p v-if="errorMsg" class="error">{{ errorMsg }}</p>
|
||||
@@ -82,11 +339,60 @@ const confirm = () => {
|
||||
.modal {
|
||||
padding: 40px;
|
||||
text-align: center;
|
||||
max-width: 400px;
|
||||
max-width: 800px;
|
||||
width: 90%;
|
||||
border: 1px solid var(--accent-cyan);
|
||||
box-shadow: 0 0 50px rgba(0, 242, 255, 0.2);
|
||||
animation: slideUp 0.3s ease;
|
||||
transition: all 0.3s ease-in-out;
|
||||
}
|
||||
|
||||
.modal-content {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
gap: 40px;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
@media (max-width: 700px) {
|
||||
.modal-content {
|
||||
flex-direction: column;
|
||||
gap: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
.sliders-section {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.map-section {
|
||||
flex: 0 0 auto;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
canvas {
|
||||
width: 400px;
|
||||
height: 400px;
|
||||
border: 2px solid var(--panel-border);
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 0 20px rgba(0, 242, 255, 0.1);
|
||||
cursor: crosshair;
|
||||
background: #000;
|
||||
}
|
||||
|
||||
@media (max-width: 600px) {
|
||||
canvas {
|
||||
width: 100%;
|
||||
height: auto;
|
||||
aspect-ratio: 1;
|
||||
}
|
||||
}
|
||||
|
||||
h2 {
|
||||
@@ -102,6 +408,11 @@ p {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.slider-container {
|
||||
width: 100%;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.input-group {
|
||||
margin-bottom: 20px;
|
||||
display: flex;
|
||||
@@ -161,11 +472,107 @@ input[type="range"]::-moz-range-thumb {
|
||||
font-size: 0.85rem;
|
||||
}
|
||||
|
||||
.difficulty-indicator {
|
||||
margin: 20px 0 40px 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
gap: 5px;
|
||||
}
|
||||
|
||||
.label-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.help-btn {
|
||||
background: none;
|
||||
border: none;
|
||||
color: var(--text-muted);
|
||||
cursor: pointer;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 4px;
|
||||
border-radius: 50%;
|
||||
transition: color 0.3s, background 0.3s;
|
||||
}
|
||||
|
||||
.help-btn:hover {
|
||||
color: var(--accent-cyan);
|
||||
background: rgba(0, 242, 255, 0.1);
|
||||
}
|
||||
|
||||
.icon-sm {
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
}
|
||||
|
||||
.difficulty-row {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
gap: 8px;
|
||||
align-items: baseline;
|
||||
justify-content: center;
|
||||
white-space: nowrap;
|
||||
flex-wrap: nowrap;
|
||||
}
|
||||
|
||||
.label {
|
||||
font-size: 1rem;
|
||||
color: var(--text-muted);
|
||||
}
|
||||
|
||||
.level {
|
||||
font-size: 1.4rem;
|
||||
font-weight: bold;
|
||||
text-transform: uppercase;
|
||||
line-height: 1.2;
|
||||
}
|
||||
|
||||
.percentage {
|
||||
font-size: 1rem;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.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 {
|
||||
color: #ff4d4d;
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
|
||||
.btn-text {
|
||||
background: none;
|
||||
border: none;
|
||||
color: var(--accent-cyan);
|
||||
font-size: 0.9rem;
|
||||
cursor: pointer;
|
||||
text-decoration: underline;
|
||||
opacity: 0.8;
|
||||
transition: opacity 0.3s;
|
||||
}
|
||||
|
||||
.btn-text:hover {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.advanced-toggle {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.actions {
|
||||
display: flex;
|
||||
gap: 15px;
|
||||
|
||||
320
src/components/SimulationView.vue
Normal file
320
src/components/SimulationView.vue
Normal file
@@ -0,0 +1,320 @@
|
||||
|
||||
<script setup>
|
||||
import { ref, computed } from 'vue';
|
||||
import { generateRandomGrid, calculateHints } from '@/utils/puzzleUtils';
|
||||
import { solvePuzzle } from '@/utils/solver';
|
||||
import { useI18n } from '@/composables/useI18n';
|
||||
import { X, Play, Square, RotateCcw } from 'lucide-vue-next';
|
||||
|
||||
const emit = defineEmits(['close']);
|
||||
const { t } = useI18n();
|
||||
|
||||
const SIZES = [5, 10, 15, 20, 25, 30, 35, 40, 45, 50];
|
||||
const DENSITIES = [0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9];
|
||||
const SAMPLES_PER_POINT = 10; // Reduced for web performance demo
|
||||
|
||||
const isRunning = ref(false);
|
||||
const progress = ref(0);
|
||||
const currentStatus = ref('');
|
||||
const results = ref([]);
|
||||
const simulationSpeed = ref(1); // 1 = Normal, 2 = Fast (less render updates)
|
||||
|
||||
let stopRequested = false;
|
||||
|
||||
const displayStatus = computed(() => {
|
||||
if (!currentStatus.value) return t('simulation.status.ready');
|
||||
return currentStatus.value;
|
||||
});
|
||||
|
||||
const startSimulation = async () => {
|
||||
if (isRunning.value) return;
|
||||
isRunning.value = true;
|
||||
stopRequested = false;
|
||||
results.value = [];
|
||||
progress.value = 0;
|
||||
|
||||
const totalSteps = SIZES.length * DENSITIES.length;
|
||||
let stepCount = 0;
|
||||
|
||||
for (const size of SIZES) {
|
||||
for (const density of DENSITIES) {
|
||||
if (stopRequested) {
|
||||
currentStatus.value = t('simulation.status.stopped');
|
||||
isRunning.value = false;
|
||||
return;
|
||||
}
|
||||
|
||||
currentStatus.value = t('simulation.status.simulating', {
|
||||
size: size,
|
||||
density: (density * 100).toFixed(0)
|
||||
});
|
||||
|
||||
let totalSolved = 0;
|
||||
|
||||
// Run samples
|
||||
for (let i = 0; i < SAMPLES_PER_POINT; i++) {
|
||||
const grid = generateRandomGrid(size, density);
|
||||
const { rowHints, colHints } = calculateHints(grid);
|
||||
const { percentSolved } = solvePuzzle(rowHints, colHints);
|
||||
totalSolved += percentSolved;
|
||||
|
||||
// Yield to UI every few samples to keep it responsive
|
||||
if (i % 2 === 0) await new Promise(r => setTimeout(r, 0));
|
||||
}
|
||||
|
||||
const avgSolved = totalSolved / SAMPLES_PER_POINT;
|
||||
|
||||
results.value.unshift({
|
||||
size,
|
||||
density,
|
||||
avgSolved: avgSolved.toFixed(1)
|
||||
});
|
||||
|
||||
stepCount++;
|
||||
progress.value = (stepCount / totalSteps) * 100;
|
||||
}
|
||||
}
|
||||
|
||||
isRunning.value = false;
|
||||
currentStatus.value = t('simulation.status.completed');
|
||||
};
|
||||
|
||||
const stopSimulation = () => {
|
||||
stopRequested = true;
|
||||
};
|
||||
|
||||
const getRowColor = (solved) => {
|
||||
if (solved >= 90) return 'color-easy';
|
||||
if (solved >= 60) return 'color-harder';
|
||||
if (solved >= 30) return 'color-hardest';
|
||||
return 'color-extreme';
|
||||
};
|
||||
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="modal-overlay" @click.self="emit('close')">
|
||||
<div class="modal glass-panel">
|
||||
<div class="header">
|
||||
<h2>{{ t('simulation.title') }}</h2>
|
||||
<button class="close-btn" @click="emit('close')">
|
||||
<X />
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="content">
|
||||
<div class="controls">
|
||||
<div class="status-bar">
|
||||
<div class="status-text">{{ displayStatus }}</div>
|
||||
<div class="progress-track">
|
||||
<div class="progress-fill" :style="{ width: progress + '%' }"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="actions">
|
||||
<button v-if="!isRunning" class="btn-neon" @click="startSimulation">
|
||||
<Play class="icon" /> {{ t('simulation.start') }}
|
||||
</button>
|
||||
<button v-else class="btn-neon secondary" @click="stopSimulation">
|
||||
<Square class="icon" /> {{ t('simulation.stop') }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="results-container">
|
||||
<table class="results-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{ t('simulation.table.size') }}</th>
|
||||
<th>{{ t('simulation.table.density') }}</th>
|
||||
<th>{{ t('simulation.table.solved') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="(row, idx) in results" :key="idx" :class="getRowColor(row.avgSolved)">
|
||||
<td>{{ row.size }}x{{ row.size }}</td>
|
||||
<td>{{ (row.density * 100).toFixed(0) }}%</td>
|
||||
<td>{{ row.avgSolved }}%</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<div v-if="results.length === 0" class="empty-state">
|
||||
{{ t('simulation.empty') }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.modal-overlay {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100vw;
|
||||
height: 100vh;
|
||||
background: var(--modal-overlay);
|
||||
backdrop-filter: blur(5px);
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
z-index: 3000;
|
||||
animation: fadeIn 0.3s ease;
|
||||
}
|
||||
|
||||
.modal {
|
||||
padding: 30px;
|
||||
width: 90%;
|
||||
max-width: 600px;
|
||||
height: 80vh;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
border: 1px solid var(--accent-cyan);
|
||||
box-shadow: 0 0 50px rgba(0, 242, 255, 0.2);
|
||||
}
|
||||
|
||||
.header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
h2 {
|
||||
color: var(--accent-cyan);
|
||||
margin: 0;
|
||||
font-size: 1.5rem;
|
||||
}
|
||||
|
||||
.close-btn {
|
||||
background: none;
|
||||
border: none;
|
||||
color: var(--text-muted);
|
||||
cursor: pointer;
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
.close-btn:hover {
|
||||
color: var(--text-color);
|
||||
}
|
||||
|
||||
.content {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 20px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.controls {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 15px;
|
||||
padding-bottom: 15px;
|
||||
border-bottom: 1px solid var(--panel-border);
|
||||
}
|
||||
|
||||
.status-bar {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 5px;
|
||||
}
|
||||
|
||||
.status-text {
|
||||
font-size: 0.9rem;
|
||||
color: var(--text-muted);
|
||||
}
|
||||
|
||||
.progress-track {
|
||||
width: 100%;
|
||||
height: 4px;
|
||||
background: var(--panel-bg-strong);
|
||||
border-radius: 2px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.progress-fill {
|
||||
height: 100%;
|
||||
background: var(--accent-cyan);
|
||||
transition: width 0.3s ease;
|
||||
}
|
||||
|
||||
.actions {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
}
|
||||
|
||||
.btn-neon {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
padding: 8px 16px;
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
|
||||
.icon {
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
}
|
||||
|
||||
.results-container {
|
||||
flex: 1;
|
||||
overflow-y: auto;
|
||||
background: rgba(0, 0, 0, 0.2);
|
||||
border-radius: 8px;
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
.results-table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
|
||||
.results-table th {
|
||||
text-align: left;
|
||||
padding: 8px;
|
||||
color: var(--text-muted);
|
||||
border-bottom: 1px solid var(--panel-border);
|
||||
position: sticky;
|
||||
top: 0;
|
||||
background: var(--panel-bg);
|
||||
}
|
||||
|
||||
.results-table td {
|
||||
padding: 8px;
|
||||
border-bottom: 1px solid rgba(255, 255, 255, 0.05);
|
||||
}
|
||||
|
||||
.color-easy { color: #33ff33; }
|
||||
.color-harder { color: #ffff33; }
|
||||
.color-hardest { color: #ff9933; }
|
||||
.color-extreme { color: #ff3333; }
|
||||
|
||||
.empty-state {
|
||||
padding: 40px;
|
||||
text-align: center;
|
||||
color: var(--text-muted);
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
/* Scrollbar styling */
|
||||
.results-container::-webkit-scrollbar {
|
||||
width: 8px;
|
||||
}
|
||||
|
||||
.results-container::-webkit-scrollbar-track {
|
||||
background: rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.results-container::-webkit-scrollbar-thumb {
|
||||
background: var(--panel-border);
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
@keyframes fadeIn {
|
||||
from { opacity: 0; }
|
||||
to { opacity: 1; }
|
||||
}
|
||||
</style>
|
||||
@@ -4,9 +4,8 @@ import { Fireworks } from 'fireworks-js';
|
||||
import { usePuzzleStore } from '@/stores/puzzle';
|
||||
import { useI18n } from '@/composables/useI18n';
|
||||
import { useTimer } from '@/composables/useTimer';
|
||||
import xIcon from '@/assets/brands/x.svg';
|
||||
import facebookIcon from '@/assets/brands/facebook.svg';
|
||||
import whatsappIcon from '@/assets/brands/whatsapp.svg';
|
||||
import { Download, FileCode } from 'lucide-vue-next';
|
||||
import { calculateDifficulty } from '@/utils/puzzleUtils';
|
||||
|
||||
const store = usePuzzleStore();
|
||||
const { t } = useI18n();
|
||||
@@ -42,30 +41,43 @@ const playFanfare = async () => {
|
||||
}
|
||||
}
|
||||
masterGain = audioContext.createGain();
|
||||
masterGain.gain.value = 0.18;
|
||||
masterGain.gain.value = 0.25; // Slightly louder but softer tone
|
||||
masterGain.connect(audioContext.destination);
|
||||
const notes = [
|
||||
{ time: 0.0, dur: 0.18, freqs: [523.25, 659.25, 783.99] },
|
||||
{ time: 0.2, dur: 0.18, freqs: [587.33, 740.0, 880.0] },
|
||||
{ time: 0.4, dur: 0.22, freqs: [659.25, 830.61, 987.77] },
|
||||
{ time: 0.7, dur: 0.35, freqs: [698.46, 880.0, 1046.5] }
|
||||
];
|
||||
|
||||
const now = audioContext.currentTime;
|
||||
notes.forEach(({ time, dur, freqs }) => {
|
||||
freqs.forEach((freq) => {
|
||||
const osc = audioContext.createOscillator();
|
||||
const gain = audioContext.createGain();
|
||||
osc.type = 'triangle';
|
||||
osc.frequency.value = freq;
|
||||
gain.gain.setValueAtTime(0.0001, now + time);
|
||||
gain.gain.linearRampToValueAtTime(0.8, now + time + 0.02);
|
||||
gain.gain.exponentialRampToValueAtTime(0.0001, now + time + dur);
|
||||
osc.connect(gain);
|
||||
gain.connect(masterGain);
|
||||
osc.start(now + time);
|
||||
osc.stop(now + time + dur + 0.05);
|
||||
});
|
||||
});
|
||||
|
||||
const playNote = (freq, startTime, duration) => {
|
||||
const osc = audioContext.createOscillator();
|
||||
const gain = audioContext.createGain();
|
||||
|
||||
// Mix of sine and triangle for a bell-like quality
|
||||
osc.type = 'sine';
|
||||
osc.frequency.value = freq;
|
||||
|
||||
// Envelope for elegant bell/chime sound
|
||||
gain.gain.setValueAtTime(0, startTime);
|
||||
gain.gain.linearRampToValueAtTime(0.4, startTime + 0.05); // Soft attack
|
||||
gain.gain.exponentialRampToValueAtTime(0.01, startTime + duration); // Long release
|
||||
|
||||
osc.connect(gain);
|
||||
gain.connect(masterGain);
|
||||
|
||||
osc.start(startTime);
|
||||
osc.stop(startTime + duration + 0.1);
|
||||
};
|
||||
|
||||
// C Major 7 Arpeggio sequence (C5, E5, G5, B5, C6) - Elegant & Uplifting
|
||||
const sequence = [
|
||||
{ freq: 523.25, time: 0.0, dur: 0.8 }, // C5
|
||||
{ freq: 659.25, time: 0.1, dur: 0.8 }, // E5
|
||||
{ freq: 783.99, time: 0.2, dur: 0.8 }, // G5
|
||||
{ freq: 987.77, time: 0.3, dur: 0.8 }, // B5 (Maj7)
|
||||
{ freq: 1046.50, time: 0.4, dur: 2.0 }, // C6 (High C resolve)
|
||||
// Add a bass root note at the end for fullness
|
||||
{ freq: 523.25, time: 0.4, dur: 2.0 } // C5
|
||||
];
|
||||
|
||||
sequence.forEach(note => playNote(note.freq, now + note.time, note.dur));
|
||||
};
|
||||
|
||||
const triggerVibration = () => {
|
||||
@@ -88,8 +100,9 @@ const buildShareCanvas = () => {
|
||||
const padding = 28;
|
||||
const headerHeight = 64;
|
||||
const footerHeight = 28;
|
||||
const infoHeight = 40; // New space for difficulty/guide info
|
||||
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 canvas = document.createElement('canvas');
|
||||
canvas.width = width * scale;
|
||||
@@ -109,6 +122,24 @@ const buildShareCanvas = () => {
|
||||
ctx.fillText(t('app.title'), padding, padding + 10);
|
||||
ctx.font = '600 16px "Segoe UI", sans-serif';
|
||||
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 gridY = padding + headerHeight;
|
||||
ctx.fillStyle = 'rgba(255, 255, 255, 0.06)';
|
||||
@@ -152,12 +183,144 @@ const buildShareCanvas = () => {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Guide Usage Info (Dirty Flag)
|
||||
if (store.guideUsageCount > 0) {
|
||||
ctx.fillStyle = '#ff4d4d';
|
||||
ctx.font = '600 14px "Segoe UI", sans-serif';
|
||||
|
||||
const totalCells = store.size * store.size;
|
||||
const percent = Math.min(100, Math.round((store.guideUsageCount / totalCells) * 100));
|
||||
const guideText = t('win.usedGuide', { count: store.guideUsageCount, percent });
|
||||
|
||||
ctx.fillText(`⚠️ ${guideText}`, padding, height - padding - footerHeight + 10);
|
||||
}
|
||||
|
||||
ctx.fillStyle = 'rgba(255, 255, 255, 0.75)';
|
||||
ctx.font = '500 14px "Segoe UI", sans-serif';
|
||||
ctx.fillText(appUrl, padding, height - padding + 6);
|
||||
return canvas;
|
||||
};
|
||||
|
||||
const buildShareSVG = () => {
|
||||
const grid = store.playerGrid;
|
||||
if (!grid || !grid.length) return null;
|
||||
|
||||
const appUrl = 'https://nonograms.7u.pl/';
|
||||
const size = store.size;
|
||||
const maxBoard = 640;
|
||||
const cellSize = Math.max(8, Math.floor(maxBoard / size));
|
||||
const boardSize = cellSize * size;
|
||||
const padding = 28;
|
||||
const headerHeight = 64;
|
||||
const footerHeight = 28;
|
||||
const infoHeight = 40;
|
||||
const width = boardSize + padding * 2;
|
||||
const height = boardSize + padding * 2 + headerHeight + footerHeight + infoHeight;
|
||||
|
||||
// Colors
|
||||
const bgGradientStart = '#1b2a4a';
|
||||
const bgGradientEnd = '#0a1324';
|
||||
const overlayColor = 'rgba(0, 0, 0, 0.35)';
|
||||
const textColor = '#e8fbff';
|
||||
const gridColor = 'rgba(255, 255, 255, 0.06)';
|
||||
const gridLineColor = 'rgba(255, 255, 255, 0.12)';
|
||||
const filledColor = '#00f2fe';
|
||||
const crossColor = 'rgba(255, 255, 255, 0.5)';
|
||||
const urlColor = 'rgba(255, 255, 255, 0.75)';
|
||||
|
||||
// Difficulty Logic
|
||||
const densityPercent = Math.round(store.currentDensity * 100);
|
||||
const diffInfo = calculateDifficulty(store.currentDensity, store.size);
|
||||
const difficultyKey = diffInfo.level;
|
||||
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}`);
|
||||
const diffLabel = `${t('win.difficulty')} ${difficultyText} (${densityPercent}%)`;
|
||||
|
||||
let svgContent = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 ${width} ${height}" width="${width}" height="${height}">`;
|
||||
|
||||
// Background
|
||||
svgContent += `
|
||||
<defs>
|
||||
<linearGradient id="bg" x1="0%" y1="0%" x2="100%" y2="100%">
|
||||
<stop offset="0%" stop-color="${bgGradientStart}"/>
|
||||
<stop offset="100%" stop-color="${bgGradientEnd}"/>
|
||||
</linearGradient>
|
||||
</defs>
|
||||
<rect width="100%" height="100%" fill="url(#bg)"/>
|
||||
<rect x="12" y="12" width="${width - 24}" height="${height - 24}" fill="${overlayColor}"/>
|
||||
`;
|
||||
|
||||
// Text: Title & Time
|
||||
svgContent += `
|
||||
<text x="${padding}" y="${padding + 28}" font-family="Segoe UI, sans-serif" font-weight="700" font-size="26" fill="${textColor}">${t('app.title')}</text>
|
||||
<text x="${padding}" y="${padding + 56}" font-family="Segoe UI, sans-serif" font-weight="600" font-size="16" fill="${textColor}">${t('win.time')} ${formattedTime.value}</text>
|
||||
`;
|
||||
|
||||
// Text: Difficulty (Right Aligned - manual approx or end anchor)
|
||||
svgContent += `
|
||||
<text x="${width - padding}" y="${padding + 56}" font-family="Segoe UI, sans-serif" font-weight="600" font-size="14" fill="${diffColor}" text-anchor="end">${diffLabel}</text>
|
||||
`;
|
||||
|
||||
const gridX = padding;
|
||||
const gridY = padding + headerHeight;
|
||||
|
||||
// Grid Background
|
||||
svgContent += `<rect x="${gridX}" y="${gridY}" width="${boardSize}" height="${boardSize}" fill="${gridColor}"/>`;
|
||||
|
||||
// Grid Lines
|
||||
let gridLines = '';
|
||||
for (let i = 0; i <= size; i++) {
|
||||
const pos = i * cellSize;
|
||||
// Vertical
|
||||
gridLines += `<line x1="${gridX + pos}" y1="${gridY}" x2="${gridX + pos}" y2="${gridY + boardSize}" stroke="${gridLineColor}" stroke-width="1"/>`;
|
||||
// Horizontal
|
||||
gridLines += `<line x1="${gridX}" y1="${gridY + pos}" x2="${gridX + boardSize}" y2="${gridY + pos}" stroke="${gridLineColor}" stroke-width="1"/>`;
|
||||
}
|
||||
svgContent += gridLines;
|
||||
|
||||
// Cells
|
||||
let cells = '';
|
||||
const lineWidth = Math.max(1.5, Math.floor(cellSize * 0.12));
|
||||
|
||||
for (let r = 0; r < size; r++) {
|
||||
for (let c = 0; c < size; c++) {
|
||||
const state = grid[r]?.[c];
|
||||
const cx = gridX + c * cellSize;
|
||||
const cy = gridY + r * cellSize;
|
||||
|
||||
if (state === 1) { // Filled
|
||||
cells += `<rect x="${cx + 1}" y="${cy + 1}" width="${cellSize - 2}" height="${cellSize - 2}" fill="${filledColor}"/>`;
|
||||
} else if (state === 2) { // Cross
|
||||
const d = cellSize * 0.6;
|
||||
const off = cellSize * 0.2;
|
||||
cells += `
|
||||
<path d="M${cx + off} ${cy + off} L${cx + off + d} ${cy + off + d} M${cx + off + d} ${cy + off} L${cx + off} ${cy + off + d}"
|
||||
stroke="${crossColor}" stroke-width="${lineWidth}" stroke-linecap="round"/>
|
||||
`;
|
||||
}
|
||||
}
|
||||
}
|
||||
svgContent += cells;
|
||||
|
||||
// Guide Usage
|
||||
if (store.guideUsageCount > 0) {
|
||||
const totalCells = store.size * store.size;
|
||||
const percent = Math.min(100, Math.round((store.guideUsageCount / totalCells) * 100));
|
||||
const guideText = t('win.usedGuide', { count: store.guideUsageCount, percent });
|
||||
svgContent += `<text x="${padding}" y="${height - padding - footerHeight + 10}" font-family="Segoe UI, sans-serif" font-weight="600" font-size="14" fill="#ff4d4d">⚠️ ${guideText}</text>`;
|
||||
}
|
||||
|
||||
// URL
|
||||
svgContent += `<text x="${padding}" y="${height - padding + 6}" font-family="Segoe UI, sans-serif" font-weight="500" font-size="14" fill="${urlColor}">${appUrl}</text>`;
|
||||
|
||||
svgContent += '</svg>';
|
||||
return svgContent;
|
||||
};
|
||||
|
||||
const canvasToBlob = (canvas) => new Promise((resolve) => canvas.toBlob((blob) => resolve(blob), 'image/png'));
|
||||
|
||||
const createShareBlob = async () => {
|
||||
@@ -166,6 +329,20 @@ const createShareBlob = async () => {
|
||||
return canvasToBlob(canvas);
|
||||
};
|
||||
|
||||
const downloadShareSVG = () => {
|
||||
const svgString = buildShareSVG();
|
||||
if (!svgString) return;
|
||||
const blob = new Blob([svgString], { type: 'image/svg+xml' });
|
||||
const url = URL.createObjectURL(blob);
|
||||
const link = document.createElement('a');
|
||||
link.href = url;
|
||||
link.download = `nonogram-${store.size}x${store.size}.svg`;
|
||||
document.body.appendChild(link);
|
||||
link.click();
|
||||
link.remove();
|
||||
URL.revokeObjectURL(url);
|
||||
};
|
||||
|
||||
const downloadShareImage = async () => {
|
||||
const blob = await createShareBlob();
|
||||
if (!blob) return;
|
||||
@@ -183,7 +360,7 @@ const buildShareUrl = (target, text, url) => {
|
||||
const encodedText = encodeURIComponent(text);
|
||||
const encodedUrl = encodeURIComponent(url);
|
||||
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') {
|
||||
return `https://www.facebook.com/sharer/sharer.php?u=${encodedUrl}"e=${encodedText}`;
|
||||
@@ -197,29 +374,48 @@ const buildShareUrl = (target, text, url) => {
|
||||
const shareTo = async (target) => {
|
||||
if (shareInProgress.value) return;
|
||||
shareInProgress.value = true;
|
||||
|
||||
const text = shareText.value;
|
||||
const url = window.location.href;
|
||||
const shareUrl = buildShareUrl(target, text, url);
|
||||
|
||||
try {
|
||||
const blob = await createShareBlob();
|
||||
if (!blob) return;
|
||||
const file = new File([blob], `nonogram-${store.size}x${store.size}.png`, { type: 'image/png' });
|
||||
const text = shareText.value;
|
||||
const url = window.location.href;
|
||||
if (navigator.share && navigator.canShare && navigator.canShare({ files: [file] })) {
|
||||
await navigator.share({
|
||||
files: [file],
|
||||
text,
|
||||
title: t('app.title'),
|
||||
url
|
||||
});
|
||||
return;
|
||||
// Try native share first if available (supports images)
|
||||
if (navigator.share && navigator.canShare) {
|
||||
const blob = await createShareBlob();
|
||||
if (blob) {
|
||||
const file = new File([blob], `nonogram-${store.size}x${store.size}.png`, { type: 'image/png' });
|
||||
if (navigator.canShare({ files: [file] })) {
|
||||
await navigator.share({
|
||||
files: [file],
|
||||
text,
|
||||
title: t('app.title'),
|
||||
url
|
||||
});
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
await downloadShareImage();
|
||||
const shareUrl = buildShareUrl(target, text, url);
|
||||
if (shareUrl) {
|
||||
window.open(shareUrl, '_blank', 'noopener');
|
||||
} catch (error) {
|
||||
if (error.name === 'AbortError') {
|
||||
return; // User cancelled native share, do nothing
|
||||
}
|
||||
// Other errors -> fall through to fallback
|
||||
} finally {
|
||||
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(() => {
|
||||
@@ -279,19 +475,27 @@ onUnmounted(() => {
|
||||
<div class="share">
|
||||
<div class="share-title">{{ t('win.shareTitle') }}</div>
|
||||
<div class="share-buttons">
|
||||
<!-- X (Twitter) -->
|
||||
<button class="btn-neon secondary share-btn" :disabled="shareInProgress" :aria-label="t('win.shareX')" @click="shareTo('x')">
|
||||
<img :src="xIcon" alt="" class="share-icon" />
|
||||
<svg viewBox="0 0 24 24" fill="currentColor" class="share-icon"><path d="M18.901 3H22l-7.21 8.26L23 21h-6.66L11.13 14.76 5.66 21H2.56l7.73-8.83L1 3h6.8l4.63 5.56L18.9 3h.001zm-1.2 15.9h1.77L6.44 5.1H4.44l13.26 13.8z"/></svg>
|
||||
</button>
|
||||
<!-- Facebook -->
|
||||
<button class="btn-neon secondary share-btn" :disabled="shareInProgress" :aria-label="t('win.shareFacebook')" @click="shareTo('facebook')">
|
||||
<img :src="facebookIcon" alt="" class="share-icon" />
|
||||
<svg viewBox="0 0 24 24" fill="currentColor" class="share-icon"><path d="M24 12.073c0-6.627-5.373-12-12-12s-12 5.373-12 12c0 5.99 4.388 10.954 10.125 11.854v-8.385H7.078v-3.47h3.047V9.43c0-3.007 1.791-4.669 4.533-4.669 1.312 0 2.686.235 2.686.235v2.953H15.83c-1.491 0-1.956.925-1.956 1.874v2.25h3.328l-.532 3.47h-2.796v8.385C19.612 23.027 24 18.062 24 12.073z"/></svg>
|
||||
</button>
|
||||
<!-- WhatsApp -->
|
||||
<button class="btn-neon secondary share-btn" :disabled="shareInProgress" :aria-label="t('win.shareWhatsapp')" @click="shareTo('whatsapp')">
|
||||
<img :src="whatsappIcon" alt="" class="share-icon" />
|
||||
<svg viewBox="0 0 24 24" fill="currentColor" class="share-icon"><path d="M17.472 14.382c-.297-.149-1.758-.867-2.03-.967-.273-.099-.471-.148-.67.15-.197.297-.767.966-.94 1.164-.173.199-.347.223-.644.075-.297-.15-1.255-.463-2.39-1.475-.883-.788-1.48-1.761-1.653-2.059-.173-.297-.018-.458.13-.606.134-.133.298-.347.446-.52.149-.174.198-.298.298-.497.099-.198.05-.371-.025-.52-.075-.149-.669-1.612-.916-2.207-.242-.579-.487-.5-.669-.51-.173-.008-.371-.008-.57-.008-.198 0-.52.074-.792.372-.272.297-1.04 1.016-1.04 2.479 0 1.462 1.065 2.875 1.213 3.074.149.198 2.096 3.2 5.077 4.487.709.306 1.262.489 1.694.625.712.227 1.36.195 1.871.118.571-.085 1.758-.719 2.006-1.413.248-.694.248-1.289.173-1.413-.074-.124-.272-.198-.57-.347m-5.421 7.403h-.004a9.87 9.87 0 01-5.031-1.378l-.361-.214-3.741.982.998-3.648-.235-.374a9.86 9.86 0 01-1.51-5.26c.001-5.45 4.436-9.884 9.888-9.884 2.64 0 5.122 1.03 6.988 2.898a9.825 9.825 0 012.893 6.994c-.003 5.45-4.437 9.884-9.885 9.884m8.413-18.297A11.815 11.815 0 0012.05 0C5.495 0 .16 5.335.157 11.892c0 2.096.547 4.142 1.588 5.945L.057 24l6.305-1.654a11.882 11.882 0 005.683 1.448h.005c6.554 0 11.89-5.335 11.893-11.893a11.821 11.821 0 00-3.48-8.413Z"/></svg>
|
||||
</button>
|
||||
<!-- Download Screenshot (Compact) -->
|
||||
<button class="btn-neon secondary share-btn" :disabled="shareInProgress" :aria-label="t('win.shareDownload')" @click="downloadShareImage">
|
||||
<Download :size="20" />
|
||||
</button>
|
||||
<!-- Download SVG (Compact) -->
|
||||
<button class="btn-neon secondary share-btn" :disabled="shareInProgress" aria-label="Download SVG" @click="downloadShareSVG">
|
||||
<FileCode :size="20" />
|
||||
</button>
|
||||
</div>
|
||||
<button class="btn-neon secondary share-download" :disabled="shareInProgress" @click="downloadShareImage">
|
||||
{{ t('win.shareDownload') }}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="actions">
|
||||
|
||||
@@ -29,6 +29,12 @@ const messages = {
|
||||
'custom.cancel': 'Anuluj',
|
||||
'custom.start': 'Start',
|
||||
'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.message': 'Rozwiązałeś zagadkę!',
|
||||
'win.time': 'Czas:',
|
||||
@@ -39,6 +45,8 @@ const messages = {
|
||||
'win.shareFacebook': 'Facebook',
|
||||
'win.shareWhatsapp': 'WhatsApp',
|
||||
'win.shareDownload': 'Pobierz zrzut',
|
||||
'win.difficulty': 'Poziom:',
|
||||
'win.usedGuide': 'Podpowiedzi: {percent}% ({count})',
|
||||
'pwa.installTitle': 'Zainstaluj aplikację i graj offline',
|
||||
'pwa.installMobile': 'Dodaj do ekranu głównego',
|
||||
'pwa.installDesktop': 'Zainstaluj na komputerze',
|
||||
@@ -98,7 +106,19 @@ const messages = {
|
||||
'language.searchLabel': 'Wyszukaj język',
|
||||
'language.searchPlaceholder': 'Wpisz nazwę języka...',
|
||||
'nav.newGame': 'NOWA GRA',
|
||||
'nav.guide': 'PRZEWODNIK'
|
||||
'nav.guide': 'PRZEWODNIK',
|
||||
'custom.simulationHelp': 'Jak to jest obliczane?',
|
||||
'simulation.title': 'Symulacja Trudności',
|
||||
'simulation.status.ready': 'Gotowy',
|
||||
'simulation.status.stopped': 'Zatrzymano',
|
||||
'simulation.status.completed': 'Zakończono',
|
||||
'simulation.status.simulating': 'Symulacja {size}x{size} @ {density}%',
|
||||
'simulation.start': 'Start Symulacji',
|
||||
'simulation.stop': 'Stop',
|
||||
'simulation.table.size': 'Rozmiar',
|
||||
'simulation.table.density': 'Gęstość',
|
||||
'simulation.table.solved': 'Rozwiązano (Logika)',
|
||||
'simulation.empty': 'Naciśnij Start, aby uruchomić symulację Monte Carlo'
|
||||
},
|
||||
en: {
|
||||
'app.title': 'Nonograms',
|
||||
@@ -128,6 +148,12 @@ const messages = {
|
||||
'custom.cancel': 'Cancel',
|
||||
'custom.start': 'Start',
|
||||
'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.message': 'You solved the puzzle!',
|
||||
'win.time': 'Time:',
|
||||
@@ -138,6 +164,8 @@ const messages = {
|
||||
'win.shareFacebook': 'Facebook',
|
||||
'win.shareWhatsapp': 'WhatsApp',
|
||||
'win.shareDownload': 'Download screenshot',
|
||||
'win.difficulty': 'Difficulty:',
|
||||
'win.usedGuide': 'Hints: {percent}% ({count})',
|
||||
'pwa.installTitle': 'Install the app and play offline',
|
||||
'pwa.installMobile': 'Add to home screen',
|
||||
'pwa.installDesktop': 'Install on desktop',
|
||||
@@ -249,7 +277,19 @@ const messages = {
|
||||
'language.searchLabel': 'Search language',
|
||||
'language.searchPlaceholder': 'Type language name...',
|
||||
'nav.newGame': 'NEW GAME',
|
||||
'nav.guide': 'GUIDE'
|
||||
'nav.guide': 'GUIDE',
|
||||
'custom.simulationHelp': 'How is this calculated?',
|
||||
'simulation.title': 'Difficulty Simulation',
|
||||
'simulation.status.ready': 'Ready',
|
||||
'simulation.status.stopped': 'Stopped',
|
||||
'simulation.status.completed': 'Completed',
|
||||
'simulation.status.simulating': 'Simulating {size}x{size} @ {density}%',
|
||||
'simulation.start': 'Start Simulation',
|
||||
'simulation.stop': 'Stop',
|
||||
'simulation.table.size': 'Size',
|
||||
'simulation.table.density': 'Density',
|
||||
'simulation.table.solved': 'Solved (Logic)',
|
||||
'simulation.empty': 'Press Start to run Monte Carlo simulation'
|
||||
},
|
||||
zh: {
|
||||
'app.title': 'Nonograms',
|
||||
@@ -279,9 +319,17 @@ const messages = {
|
||||
'custom.cancel': '取消',
|
||||
'custom.start': '开始',
|
||||
'custom.sizeError': '尺寸必须在 5 到 80 之间!',
|
||||
'custom.fillRate': '填充率',
|
||||
'custom.difficulty': '难度',
|
||||
'difficulty.easy': '简单',
|
||||
'difficulty.harder': '较难',
|
||||
'difficulty.hardest': '最难',
|
||||
'difficulty.extreme': '极限',
|
||||
'win.title': '恭喜!',
|
||||
'win.message': '你解开了谜题!',
|
||||
'win.time': '时间:',
|
||||
'win.difficulty': '难度:',
|
||||
'win.usedGuide': '使用指南: {count}',
|
||||
'win.playAgain': '再玩一次',
|
||||
'win.shareTitle': '分享你的结果',
|
||||
'win.shareText': '我在 {time} 内解开了 {size}x{size} 的数织!',
|
||||
@@ -479,9 +527,17 @@ const messages = {
|
||||
'custom.cancel': 'Cancelar',
|
||||
'custom.start': 'Empezar',
|
||||
'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.message': '¡Has resuelto el rompecabezas!',
|
||||
'win.time': 'Tiempo:',
|
||||
'win.difficulty': 'Dificultad:',
|
||||
'win.usedGuide': 'Guía usada: {count}',
|
||||
'win.playAgain': 'Jugar de nuevo',
|
||||
'win.shareTitle': 'Comparte tu resultado',
|
||||
'win.shareText': '¡Resolví un nonograma de {size}x{size} en {time}!',
|
||||
@@ -545,9 +601,17 @@ const messages = {
|
||||
'custom.cancel': 'Annuler',
|
||||
'custom.start': 'Démarrer',
|
||||
'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.message': 'Vous avez résolu le puzzle !',
|
||||
'win.time': 'Temps:',
|
||||
'win.difficulty': 'Difficulté :',
|
||||
'win.usedGuide': 'Guide utilisé : {count}',
|
||||
'win.playAgain': 'Rejouer',
|
||||
'win.shareTitle': 'Partagez votre résultat',
|
||||
'win.shareText': 'J’ai résolu un nonogramme {size}x{size} en {time} !',
|
||||
@@ -611,9 +675,17 @@ const messages = {
|
||||
'custom.cancel': 'إلغاء',
|
||||
'custom.start': 'ابدأ',
|
||||
'custom.sizeError': 'يجب أن يكون الحجم بين 5 و80!',
|
||||
'custom.fillRate': 'معدل الملء',
|
||||
'custom.difficulty': 'الصعوبة',
|
||||
'difficulty.easy': 'سهل',
|
||||
'difficulty.harder': 'أصعب',
|
||||
'difficulty.hardest': 'الأصعب',
|
||||
'difficulty.extreme': 'أقصى',
|
||||
'win.title': 'تهانينا!',
|
||||
'win.message': 'لقد حللت اللغز!',
|
||||
'win.time': 'الوقت:',
|
||||
'win.difficulty': 'الصعوبة:',
|
||||
'win.usedGuide': 'تم استخدام الدليل: {count}',
|
||||
'win.playAgain': 'العب مرة أخرى',
|
||||
'win.shareTitle': 'شارك نتيجتك',
|
||||
'win.shareText': 'حللت نونوغرام {size}x{size} في {time}!',
|
||||
@@ -743,9 +815,17 @@ const messages = {
|
||||
'custom.cancel': 'Отмена',
|
||||
'custom.start': 'Старт',
|
||||
'custom.sizeError': 'Размер должен быть от 5 до 80!',
|
||||
'custom.fillRate': 'Заполнение',
|
||||
'custom.difficulty': 'Сложность',
|
||||
'difficulty.easy': 'Легкий',
|
||||
'difficulty.harder': 'Сложный',
|
||||
'difficulty.hardest': 'Очень сложный',
|
||||
'difficulty.extreme': 'Экстремальный',
|
||||
'win.title': 'ПОЗДРАВЛЯЕМ!',
|
||||
'win.message': 'Вы решили головоломку!',
|
||||
'win.time': 'Время:',
|
||||
'win.difficulty': 'Сложность:',
|
||||
'win.usedGuide': 'Подсказок использовано: {count}',
|
||||
'win.playAgain': 'Сыграть снова',
|
||||
'win.shareTitle': 'Поделитесь результатом',
|
||||
'win.shareText': 'Я решил(а) нонограмму {size}x{size} за {time}!',
|
||||
@@ -942,9 +1022,17 @@ const messages = {
|
||||
'custom.cancel': 'Abbrechen',
|
||||
'custom.start': 'Start',
|
||||
'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.message': 'Sie haben das Rätsel gelöst!',
|
||||
'win.time': 'Zeit:',
|
||||
'win.difficulty': 'Schwierigkeit:',
|
||||
'win.usedGuide': 'Hilfe benutzt: {count}',
|
||||
'win.playAgain': 'Erneut spielen',
|
||||
'win.shareTitle': 'Teilen Sie Ihr Ergebnis',
|
||||
'win.shareText': 'Ich habe ein {size}x{size} Nonogramm in {time} gelöst!',
|
||||
|
||||
@@ -78,6 +78,9 @@ export function useSolver() {
|
||||
} else if (type === 'done') {
|
||||
isProcessing.value = false;
|
||||
pause();
|
||||
} else if (type === 'stuck') {
|
||||
isProcessing.value = false;
|
||||
pause();
|
||||
} else {
|
||||
isProcessing.value = false;
|
||||
}
|
||||
|
||||
@@ -64,6 +64,9 @@ export const usePuzzleStore = defineStore('puzzle', () => {
|
||||
const playerGrid = ref([]); // 0: empty, 1: filled, 2: cross
|
||||
const isGameWon = 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 startTime = ref(null);
|
||||
const elapsedTime = ref(0);
|
||||
@@ -118,23 +121,29 @@ export const usePuzzleStore = defineStore('puzzle', () => {
|
||||
resetGrid();
|
||||
isGameWon.value = false;
|
||||
hasUsedGuide.value = false;
|
||||
guideUsageCount.value = 0;
|
||||
currentDensity.value = totalCellsToFill.value / (size.value * size.value);
|
||||
elapsedTime.value = 0;
|
||||
startTimer();
|
||||
saveState();
|
||||
}
|
||||
|
||||
function initCustomGame(customSize) {
|
||||
function initCustomGame(customSize, density = 0.5) {
|
||||
stopTimer();
|
||||
currentLevelId.value = 'custom';
|
||||
size.value = customSize;
|
||||
|
||||
// Generate random grid
|
||||
solution.value = generateRandomGrid(customSize);
|
||||
solution.value = generateRandomGrid(customSize, density);
|
||||
|
||||
resetGrid();
|
||||
isGameWon.value = false;
|
||||
hasUsedGuide.value = false;
|
||||
guideUsageCount.value = 0;
|
||||
currentDensity.value = density;
|
||||
elapsedTime.value = 0;
|
||||
startTimer();
|
||||
saveState();
|
||||
}
|
||||
|
||||
function resetGrid() {
|
||||
@@ -242,6 +251,8 @@ export const usePuzzleStore = defineStore('puzzle', () => {
|
||||
playerGrid: playerGrid.value,
|
||||
isGameWon: isGameWon.value,
|
||||
hasUsedGuide: hasUsedGuide.value,
|
||||
guideUsageCount: guideUsageCount.value,
|
||||
currentDensity: currentDensity.value,
|
||||
elapsedTime: elapsedTime.value,
|
||||
moves: moves.value,
|
||||
history: history.value
|
||||
@@ -259,6 +270,9 @@ export const usePuzzleStore = defineStore('puzzle', () => {
|
||||
solution.value = parsed.solution;
|
||||
playerGrid.value = parsed.playerGrid;
|
||||
isGameWon.value = parsed.isGameWon;
|
||||
hasUsedGuide.value = parsed.hasUsedGuide || false;
|
||||
guideUsageCount.value = parsed.guideUsageCount || 0;
|
||||
currentDensity.value = parsed.currentDensity || 0;
|
||||
elapsedTime.value = parsed.elapsedTime || 0;
|
||||
moves.value = parsed.moves || 0;
|
||||
history.value = parsed.history || [];
|
||||
@@ -275,44 +289,9 @@ export const usePuzzleStore = defineStore('puzzle', () => {
|
||||
return false;
|
||||
}
|
||||
|
||||
function initGame(levelId = 'easy') {
|
||||
// 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.
|
||||
// Duplicate initGame removed
|
||||
|
||||
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
|
||||
function initCustomGame(customSize) {
|
||||
stopTimer();
|
||||
currentLevelId.value = 'custom';
|
||||
size.value = customSize;
|
||||
solution.value = generateRandomGrid(customSize);
|
||||
resetGrid();
|
||||
isGameWon.value = false;
|
||||
elapsedTime.value = 0;
|
||||
startTimer();
|
||||
saveState();
|
||||
}
|
||||
// Duplicate initCustomGame removed
|
||||
|
||||
// Duplicate toggleCell/setCell removed
|
||||
|
||||
@@ -321,6 +300,7 @@ export const usePuzzleStore = defineStore('puzzle', () => {
|
||||
resetGrid();
|
||||
isGameWon.value = false;
|
||||
hasUsedGuide.value = false;
|
||||
guideUsageCount.value = 0;
|
||||
elapsedTime.value = 0;
|
||||
startTimer();
|
||||
saveState();
|
||||
@@ -332,6 +312,7 @@ export const usePuzzleStore = defineStore('puzzle', () => {
|
||||
function markGuideUsed() {
|
||||
if (isGameWon.value) return;
|
||||
hasUsedGuide.value = true;
|
||||
guideUsageCount.value++;
|
||||
saveState();
|
||||
}
|
||||
|
||||
@@ -360,6 +341,8 @@ export const usePuzzleStore = defineStore('puzzle', () => {
|
||||
undo,
|
||||
closeWinModal,
|
||||
hasUsedGuide,
|
||||
guideUsageCount,
|
||||
currentDensity,
|
||||
markGuideUsed
|
||||
};
|
||||
|
||||
|
||||
@@ -40,15 +40,91 @@ export function calculateHints(grid) {
|
||||
return { rowHints, colHints };
|
||||
}
|
||||
|
||||
export function generateRandomGrid(size) {
|
||||
export function generateRandomGrid(size, density = 0.5) {
|
||||
const grid = [];
|
||||
for (let i = 0; i < size; i++) {
|
||||
const row = [];
|
||||
for (let j = 0; j < size; j++) {
|
||||
// ~25% empty cells
|
||||
row.push(Math.random() > 0.25 ? 1 : 0);
|
||||
row.push(Math.random() < density ? 1 : 0);
|
||||
}
|
||||
grid.push(row);
|
||||
}
|
||||
return grid;
|
||||
}
|
||||
|
||||
export function calculateDifficulty(density, size = 10) {
|
||||
// Data derived from Monte Carlo Simulation (Logical Solver)
|
||||
// Format: { size: [solved_pct_at_0.1, ..., solved_pct_at_0.9] }
|
||||
// Densities: 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9
|
||||
const SIM_DATA = {
|
||||
5: [89, 74, 74, 81, 97, 98, 99, 100, 100],
|
||||
10: [57, 20, 16, 54, 92, 100, 100, 100, 100],
|
||||
15: [37, 10, 2, 12, 68, 100, 100, 100, 100],
|
||||
20: [23, 3, 1, 2, 37, 100, 100, 100, 100],
|
||||
25: [16, 0, 0, 1, 19, 99, 100, 100, 100],
|
||||
30: [8, 0, 0, 0, 5, 99, 100, 100, 100],
|
||||
35: [6, 0, 0, 0, 4, 91, 100, 100, 100],
|
||||
40: [3, 0, 0, 0, 2, 91, 100, 100, 100],
|
||||
45: [2, 0, 0, 0, 1, 82, 100, 100, 100],
|
||||
50: [2, 0, 0, 0, 1, 73, 100, 100, 100],
|
||||
60: [0, 0, 0, 0, 0, 35, 100, 100, 100],
|
||||
70: [0, 0, 0, 0, 0, 16, 100, 100, 100],
|
||||
80: [0, 0, 0, 0, 0, 1, 100, 100, 100]
|
||||
};
|
||||
|
||||
// Helper to get interpolated value from array
|
||||
const getSimulatedSolvedPct = (s, d) => {
|
||||
// Find closest sizes
|
||||
const sizes = Object.keys(SIM_DATA).map(Number).sort((a, b) => a - b);
|
||||
let sLower = sizes[0];
|
||||
let sUpper = sizes[sizes.length - 1];
|
||||
|
||||
for (let i = 0; i < sizes.length - 1; i++) {
|
||||
if (s >= sizes[i] && s <= sizes[i+1]) {
|
||||
sLower = sizes[i];
|
||||
sUpper = sizes[i+1];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// Clamp density to 0.1 - 0.9
|
||||
const dClamped = Math.max(0.1, Math.min(0.9, d));
|
||||
// Index in array: 0.1 -> 0, 0.9 -> 8
|
||||
const dIndex = (dClamped - 0.1) * 10;
|
||||
const dLowerIdx = Math.floor(dIndex);
|
||||
const dUpperIdx = Math.ceil(dIndex);
|
||||
const dFraction = dIndex - dLowerIdx;
|
||||
|
||||
// Bilinear Interpolation
|
||||
|
||||
// 1. Interpolate Density for Lower Size
|
||||
const rowLower = SIM_DATA[sLower];
|
||||
const valLower = rowLower[dLowerIdx] * (1 - dFraction) + (rowLower[dUpperIdx] || rowLower[dLowerIdx]) * dFraction;
|
||||
|
||||
// 2. Interpolate Density for Upper Size
|
||||
const rowUpper = SIM_DATA[sUpper];
|
||||
const valUpper = rowUpper[dLowerIdx] * (1 - dFraction) + (rowUpper[dUpperIdx] || rowUpper[dLowerIdx]) * dFraction;
|
||||
|
||||
// 3. Interpolate Size
|
||||
if (sLower === sUpper) return valLower;
|
||||
const sFraction = (s - sLower) / (sUpper - sLower);
|
||||
|
||||
return valLower * (1 - sFraction) + valUpper * sFraction;
|
||||
};
|
||||
|
||||
const solvedPct = getSimulatedSolvedPct(size, density);
|
||||
|
||||
// Difficulty Score: Inverse of Solved Percent
|
||||
// 100% Solved -> 0 Difficulty
|
||||
// 0% Solved -> 100 Difficulty
|
||||
const value = Math.round(100 - solvedPct);
|
||||
|
||||
// Thresholds
|
||||
let level = 'easy';
|
||||
if (value >= 90) level = 'extreme'; // < 10% Solved
|
||||
else if (value >= 60) level = 'hardest'; // < 40% Solved
|
||||
else if (value >= 30) level = 'harder'; // < 70% Solved
|
||||
else level = 'easy'; // > 70% Solved
|
||||
|
||||
return { level, value };
|
||||
}
|
||||
|
||||
278
src/utils/solver.js
Normal file
278
src/utils/solver.js
Normal file
@@ -0,0 +1,278 @@
|
||||
|
||||
/**
|
||||
* Represents the state of a cell in the solver.
|
||||
* -1: Unknown
|
||||
* 0: Empty
|
||||
* 1: Filled
|
||||
*/
|
||||
|
||||
/**
|
||||
* Solves a single line (row or column) based on hints and current knowledge.
|
||||
* Uses the "Left-Right Overlap" algorithm to find common filled cells.
|
||||
* Also identifies definitely empty cells (reachable by no block).
|
||||
*
|
||||
* @param {number[]} currentLine - Array of -1, 0, 1
|
||||
* @param {number[]} hints - Array of block lengths
|
||||
* @returns {number[]} - Updated line (or null if contradiction/impossible - though shouldn't happen for valid puzzles)
|
||||
*/
|
||||
function solveLine(currentLine, hints) {
|
||||
const length = currentLine.length;
|
||||
|
||||
// If no hints, all must be empty
|
||||
if (hints.length === 0 || (hints.length === 1 && hints[0] === 0)) {
|
||||
return Array(length).fill(0);
|
||||
}
|
||||
|
||||
// Helper to check if a block can be placed at start index
|
||||
const canPlace = (line, start, blockSize) => {
|
||||
if (start + blockSize > line.length) return false;
|
||||
// Check if any cell in block is 0 (Empty) -> Invalid
|
||||
for (let i = start; i < start + blockSize; i++) {
|
||||
if (line[i] === 0) return false;
|
||||
}
|
||||
// Check boundaries (must be separated by empty or edge)
|
||||
if (start > 0 && line[start - 1] === 1) return false;
|
||||
if (start + blockSize < line.length && line[start + blockSize] === 1) return false;
|
||||
return true;
|
||||
};
|
||||
|
||||
// 1. Calculate Left-Most Positions
|
||||
const leftPositions = [];
|
||||
let currentIdx = 0;
|
||||
for (let hIndex = 0; hIndex < hints.length; hIndex++) {
|
||||
const block = hints[hIndex];
|
||||
// Find first valid position
|
||||
while (currentIdx <= length - block) {
|
||||
if (canPlace(currentLine, currentIdx, block)) {
|
||||
// Verify we can fit remaining blocks
|
||||
// Simple heuristic: do we have enough space?
|
||||
// A full recursive check is better but slower.
|
||||
// For "Logical Solver" we assume valid placement is possible if we respect current constraints.
|
||||
// However, strictly, we need to know if there is *any* valid arrangement starting here.
|
||||
// Let's use a recursive check with memoization for "can fit rest".
|
||||
if (canFitRest(currentLine, currentIdx + block + 1, hints, hIndex + 1)) {
|
||||
leftPositions.push(currentIdx);
|
||||
currentIdx += block + 1; // Move past this block + 1 space
|
||||
break;
|
||||
}
|
||||
}
|
||||
currentIdx++;
|
||||
}
|
||||
if (leftPositions.length <= hIndex) return null; // Impossible
|
||||
}
|
||||
|
||||
// 2. Calculate Right-Most Positions (by reversing line and hints)
|
||||
// This is symmetrical to Left-Most.
|
||||
// Instead of implementing reverse logic, we can just reverse inputs, run left-most, and reverse back.
|
||||
// But we need to respect the "currentLine" constraints which might be asymmetric.
|
||||
|
||||
// Actually, "Right-Most" is just "Left-Most" on the reversed grid.
|
||||
const reversedLine = [...currentLine].reverse();
|
||||
const reversedHints = [...hints].reverse();
|
||||
const rightPositionsReversed = [];
|
||||
|
||||
currentIdx = 0;
|
||||
for (let hIndex = 0; hIndex < reversedHints.length; hIndex++) {
|
||||
const block = reversedHints[hIndex];
|
||||
while (currentIdx <= length - block) {
|
||||
if (canPlace(reversedLine, currentIdx, block)) {
|
||||
if (canFitRest(reversedLine, currentIdx + block + 1, reversedHints, hIndex + 1)) {
|
||||
rightPositionsReversed.push(currentIdx);
|
||||
currentIdx += block + 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
currentIdx++;
|
||||
}
|
||||
if (rightPositionsReversed.length <= hIndex) return null;
|
||||
}
|
||||
|
||||
// Convert reversed positions to actual indices
|
||||
// index in reversed = length - 1 - (original_index + block_size - 1)
|
||||
// original_start = length - 1 - (reversed_start + block_size - 1) = length - reversed_start - block_size
|
||||
const rightPositions = rightPositionsReversed.map((rStart, i) => {
|
||||
const block = reversedHints[i];
|
||||
return length - rStart - block;
|
||||
}).reverse();
|
||||
|
||||
|
||||
// 3. Intersect
|
||||
const newLine = [...currentLine];
|
||||
|
||||
// Fill intersection
|
||||
for (let i = 0; i < hints.length; i++) {
|
||||
const l = leftPositions[i];
|
||||
const r = rightPositions[i];
|
||||
const block = hints[i];
|
||||
|
||||
// If overlap exists: [r, l + block - 1]
|
||||
// Example: Block 5. Left: 2, Right: 4.
|
||||
// Left: ..XXXXX...
|
||||
// Right: ....XXXXX.
|
||||
// Overlap: ..XXX...
|
||||
// Indices: max(l, r) to min(l+block, r+block) - 1 ?
|
||||
// Range is [r, l + block - 1] (inclusive)
|
||||
|
||||
if (r < l + block) {
|
||||
for (let k = r; k < l + block; k++) {
|
||||
newLine[k] = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Determine Empty cells?
|
||||
// A cell is empty if it is not covered by ANY block in ANY valid configuration.
|
||||
// This is harder with just L/R limits.
|
||||
// However, we can use the "Simple Glue" logic:
|
||||
// If a cell is outside the range [LeftLimit[i], RightLimit[i] + block] for ALL i, it's empty.
|
||||
// Wait, indices are not strictly partitioned. Block 1 could be at 0 or 10.
|
||||
// But logic dictates order.
|
||||
// Range of block i is [LeftPositions[i], RightPositions[i] + hints[i]].
|
||||
// If a cell k is not in ANY of these ranges, it is 0.
|
||||
|
||||
// Mask of possible filled cells
|
||||
const possibleFilled = Array(length).fill(false);
|
||||
for (let i = 0; i < hints.length; i++) {
|
||||
for (let k = leftPositions[i]; k < rightPositions[i] + hints[i]; k++) {
|
||||
possibleFilled[k] = true;
|
||||
}
|
||||
}
|
||||
|
||||
for (let k = 0; k < length; k++) {
|
||||
if (!possibleFilled[k]) {
|
||||
newLine[k] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
return newLine;
|
||||
}
|
||||
|
||||
// Memoized helper for checking if hints fit
|
||||
const memo = new Map();
|
||||
function canFitRest(line, startIndex, hints, hintIndex) {
|
||||
// Optimization: If hints are empty, we just need to check if remaining line has no '1's
|
||||
if (hintIndex >= hints.length) {
|
||||
for (let i = startIndex; i < line.length; i++) {
|
||||
if (line[i] === 1) return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
// Key for memoization (primitive approach)
|
||||
// In a full solver, we'd pass a cache. For single line, maybe overkill, but safe.
|
||||
// let key = `${startIndex}-${hintIndex}`;
|
||||
// Skipping memo for now as line lengths are small (<80) and recursion depth is low.
|
||||
|
||||
const remainingLen = line.length - startIndex;
|
||||
// Min space needed: sum of hints + (hints.length - 1) spaces
|
||||
// Calculate lazily or precalc?
|
||||
let minSpace = 0;
|
||||
for(let i=hintIndex; i<hints.length; i++) minSpace += hints[i] + (i < hints.length - 1 ? 1 : 0);
|
||||
|
||||
if (remainingLen < minSpace) return false;
|
||||
|
||||
const block = hints[hintIndex];
|
||||
// Try to find *any* valid placement for this block
|
||||
// We only need ONE valid path to return true.
|
||||
for (let i = startIndex; i <= line.length - minSpace; i++) { // Optimization on upper bound?
|
||||
// Check placement
|
||||
let valid = true;
|
||||
// Block
|
||||
for (let k = 0; k < block; k++) {
|
||||
if (line[i+k] === 0) { valid = false; break; }
|
||||
}
|
||||
if (!valid) continue;
|
||||
|
||||
// Boundary before (checked by loop start usually, but strictly:
|
||||
if (i > 0 && line[i-1] === 1) valid = false; // Should have been handled by caller or skip
|
||||
// Wait, the caller (loop) iterates i.
|
||||
// If i > startIndex, we implied space at i-1.
|
||||
// If line[i-1] is 1, we can't place here if we skipped it.
|
||||
// Actually, if we skip a '1', that's invalid.
|
||||
// So we can't just skip '1's.
|
||||
|
||||
// Correct logic:
|
||||
// We iterate i. If we pass a '1' at index < i, that 1 is orphaned -> Invalid path.
|
||||
// So we can only scan forward as long as we don't skip a '1'.
|
||||
|
||||
let skippedOne = false;
|
||||
for (let x = startIndex; x < i; x++) {
|
||||
if (line[x] === 1) { skippedOne = true; break; }
|
||||
}
|
||||
if (skippedOne) break; // Cannot go further right, we left a 1 behind.
|
||||
|
||||
// Boundary after
|
||||
if (i + block < line.length && line[i+block] === 1) valid = false;
|
||||
|
||||
if (valid) {
|
||||
// Recurse
|
||||
if (canFitRest(line, i + block + 1, hints, hintIndex + 1)) return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Solves the puzzle using logical iteration.
|
||||
* @param {number[][]} rowHints
|
||||
* @param {number[][]} colHints
|
||||
* @returns {object} { solvedGrid: number[][], percentSolved: number }
|
||||
*/
|
||||
export function solvePuzzle(rowHints, colHints) {
|
||||
const rows = rowHints.length;
|
||||
const cols = colHints.length;
|
||||
|
||||
// Initialize grid with -1
|
||||
let grid = Array(rows).fill(null).map(() => Array(cols).fill(-1));
|
||||
|
||||
let changed = true;
|
||||
let iterations = 0;
|
||||
const MAX_ITER = 100; // Safety break
|
||||
|
||||
while (changed && iterations < MAX_ITER) {
|
||||
changed = false;
|
||||
iterations++;
|
||||
|
||||
// Rows
|
||||
for (let r = 0; r < rows; r++) {
|
||||
const newLine = solveLine(grid[r], rowHints[r]);
|
||||
if (newLine) {
|
||||
for (let c = 0; c < cols; c++) {
|
||||
if (grid[r][c] !== newLine[c]) {
|
||||
grid[r][c] = newLine[c];
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Cols
|
||||
for (let c = 0; c < cols; c++) {
|
||||
const currentCol = grid.map(row => row[c]);
|
||||
const newCol = solveLine(currentCol, colHints[c]);
|
||||
if (newCol) {
|
||||
for (let r = 0; r < rows; r++) {
|
||||
if (grid[r][c] !== newCol[r]) {
|
||||
grid[r][c] = newCol[r];
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Calculate solved %
|
||||
let solvedCount = 0;
|
||||
for (let r = 0; r < rows; r++) {
|
||||
for (let c = 0; c < cols; c++) {
|
||||
if (grid[r][c] !== -1) solvedCount++;
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
solvedGrid: grid,
|
||||
percentSolved: (solvedCount / (rows * cols)) * 100
|
||||
};
|
||||
}
|
||||
@@ -5,7 +5,7 @@ const messages = {
|
||||
'worker.solved': 'Rozwiązane!',
|
||||
'worker.logicRow': 'Logika: Wiersz {row}, Kolumna {col} -> {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.state.filled': 'Pełne',
|
||||
'worker.state.empty': 'Puste'
|
||||
@@ -14,7 +14,7 @@ const messages = {
|
||||
'worker.solved': 'Solved!',
|
||||
'worker.logicRow': 'Logic: Row {row}, Column {col} -> {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.state.filled': 'Filled',
|
||||
'worker.state.empty': 'Empty'
|
||||
@@ -91,15 +91,33 @@ const solveLineLogic = (lineState, hints) => {
|
||||
return result;
|
||||
}
|
||||
const len = hints[hintIndex];
|
||||
// maxStart logic: we need enough space for this block (len) + subsequent blocks/gaps (suffixMin[hintIndex+1])
|
||||
// suffixMin[hintIndex] = len + (m - hintIndex - 1) + suffixMin[hintIndex+1]
|
||||
// Actually suffixMin[hintIndex] already includes everything needed from here to end.
|
||||
// So if we place block at start, end is start + len.
|
||||
// Total space needed is suffixMin[hintIndex].
|
||||
// So start can go up to n - suffixMin[hintIndex].
|
||||
const maxStart = n - suffixMin[hintIndex];
|
||||
|
||||
for (let start = pos; start <= maxStart; start++) {
|
||||
if (hasFilled(pos, start)) continue;
|
||||
if (hasCross(start, start + len)) continue;
|
||||
if (start + len < n && lineState[start + len] === 1) continue;
|
||||
const nextPos = start + len < n ? start + len + 1 : start + len;
|
||||
if (canPlaceSuffix(nextPos, hintIndex + 1)) {
|
||||
memoSuffix[pos][hintIndex] = true;
|
||||
return true;
|
||||
if (hasFilled(pos, start)) continue; // Must be empty before this block
|
||||
if (hasCross(start, start + len)) continue; // Block space must be free of crosses
|
||||
|
||||
// If not the last block, we need a gap after
|
||||
if (hintIndex < m - 1) {
|
||||
if (start + len < n && lineState[start + len] === 1) continue; // Gap must not be filled
|
||||
// We can assume gap is at start + len. Next block starts at least at start + len + 1
|
||||
const nextPos = start + len + 1;
|
||||
if (canPlaceSuffix(nextPos, hintIndex + 1)) {
|
||||
memoSuffix[pos][hintIndex] = true;
|
||||
return true;
|
||||
}
|
||||
} else {
|
||||
// Last block
|
||||
// Check if we can fill the rest with empty
|
||||
if (hasFilled(start + len, n)) continue;
|
||||
memoSuffix[pos][hintIndex] = true;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
memoSuffix[pos][hintIndex] = false;
|
||||
@@ -115,16 +133,42 @@ const solveLineLogic = (lineState, hints) => {
|
||||
return result;
|
||||
}
|
||||
const len = hints[hintCount - 1];
|
||||
const maxStart = pos - len;
|
||||
|
||||
// Logic for prefix:
|
||||
// We are placing the (hintCount-1)-th block ending at 'start + len' <= pos.
|
||||
// So 'start' <= pos - len.
|
||||
// But we also need to ensure there is space for previous blocks.
|
||||
// However, the simple constraint is just iterating backwards.
|
||||
|
||||
// maxStart: if this is the only block, maxStart = pos - len.
|
||||
// If there are previous blocks, we need a gap before this block.
|
||||
// So previous block ended at start - 1.
|
||||
// Actually the recursive call will handle space check.
|
||||
// But for the gap check:
|
||||
// If we place block at 'start', we need lineState[start-1] != 1 (if start > 0).
|
||||
// And we recursively check canPlacePrefix(start-1, count-1).
|
||||
// But if start=0 and count > 1, impossible.
|
||||
|
||||
const maxStart = pos - len; // Simplified, loop condition handles rest
|
||||
|
||||
for (let start = maxStart; start >= 0; start--) {
|
||||
if (hasCross(start, start + len)) continue;
|
||||
if (start + len < pos && lineState[start + len] === 1) continue;
|
||||
if (hasFilled(start + len, pos)) continue;
|
||||
if (start > 0 && lineState[start - 1] === 1) continue;
|
||||
const prevPos = start > 0 ? start - 1 : 0;
|
||||
if (canPlacePrefix(prevPos, hintCount - 1)) {
|
||||
memoPrefix[pos][hintCount] = true;
|
||||
return true;
|
||||
if (hasFilled(start + len, pos)) continue; // Must be empty after this block up to pos
|
||||
|
||||
// Check gap before
|
||||
if (hintCount > 1) {
|
||||
if (start === 0) continue; // No space for previous blocks
|
||||
if (lineState[start - 1] === 1) continue; // Gap must not be filled
|
||||
const prevPos = start - 1;
|
||||
if (canPlacePrefix(prevPos, hintCount - 1)) {
|
||||
memoPrefix[pos][hintCount] = true;
|
||||
return true;
|
||||
}
|
||||
} else {
|
||||
// First block
|
||||
if (hasFilled(0, start)) continue; // Before first block must be empty
|
||||
memoPrefix[pos][hintCount] = true;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
memoPrefix[pos][hintCount] = false;
|
||||
@@ -136,7 +180,14 @@ const solveLineLogic = (lineState, hints) => {
|
||||
const len = hints[i];
|
||||
const starts = [];
|
||||
for (let start = 0; start <= n - len; start++) {
|
||||
if (!canPlacePrefix(start, i)) continue;
|
||||
if (i === 0) {
|
||||
if (!canPlacePrefix(start, 0)) continue;
|
||||
} else {
|
||||
if (start === 0) continue;
|
||||
if (lineState[start - 1] === 1) continue;
|
||||
if (!canPlacePrefix(start - 1, i)) continue;
|
||||
}
|
||||
|
||||
if (hasCross(start, start + len)) continue;
|
||||
if (start + len < n && lineState[start + len] === 1) continue;
|
||||
const nextPos = start + len < n ? start + len + 1 : start + len;
|
||||
@@ -236,29 +287,9 @@ const handleStep = (playerGrid, solution, locale) => {
|
||||
}
|
||||
}
|
||||
|
||||
for (let r = 0; r < size; r++) {
|
||||
for (let c = 0; c < size; c++) {
|
||||
const current = playerGrid[r][c];
|
||||
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') };
|
||||
// Check for guess logic - we want to avoid this unless strictly necessary
|
||||
// If no logic move found, return 'stuck' instead of cheating
|
||||
return { type: 'stuck', statusText: t(locale, 'worker.stuck') };
|
||||
};
|
||||
|
||||
self.onmessage = (event) => {
|
||||
|
||||
Reference in New Issue
Block a user