Skip to content

演算子の優先順位の切り出しなど #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 30, 2025
Merged

演算子の優先順位の切り出しなど #8

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7794846
演算子の出現設定の切り出し
k-meltpot Oct 22, 2025
ee812a1
カード出現のアニメーション修正
k-meltpot Oct 22, 2025
88dec6e
セミコロン抜け
k-meltpot Oct 22, 2025
e737e5a
コメントを少し追加
k-meltpot Oct 24, 2025
9812c5d
Merge branch 'main' into op_prior
T-Kozima Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 35 additions & 5 deletions play/page/play.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// 演算選択用の重み付き乱数
class WeightRandom {
#weight;
constructor(weight) {
// weight: 各添え字の値の重み
this.#weight = [...weight];
for (let i = 1; i < this.#weight.length; i++)
this.#weight[i] += this.#weight[i - 1];
Expand All @@ -11,6 +13,7 @@ class WeightRandom {
}
}

// 手札・場のカードの状態管理
class State {
static oninit = () => { };
static onfocus = () => { };
Expand All @@ -27,20 +30,24 @@ class State {

this.values.forEach((value, index) => State.oninit(this.key, index, value, game));
}
// 選択中の値 or null
get value() {
if (this.chosen === -1) return null;
return this.values[this.chosen];
}
// 選択中の値と添え字
get info() {
return {
value: this.value,
index: this.chosen
};
}
// 新しい値で埋める
make(value) {
if (this.chosen === -1) return;
this.values[this.chosen] = value ?? this.create();
}
// n番目を選択状態に
focus(n) {
if (n === this.chosen) n = -1;
if (n !== -1 && !this.valid[n]) return;
Expand All @@ -57,6 +64,7 @@ class State {
if (n === -1) return;
State.onunfocus(this.key, n);
}
// isValid(value)がtrueのカードのみ有効にする
filter(isValid) {
this.values.forEach((value, i) => {
const valid = isValid ? isValid(value) : true;
Expand All @@ -76,7 +84,13 @@ class State {

const gcd = (a, b) => a % b ? gcd(b, a % b) : b;

// 演算子の定義をまとめる
class Op {
// [演算子名, 演算関数(field, param), {
// wrap: カード配置を変更する場合のラッパー,
// isFValid: 場のカードが有効か判定する,
// isPValid: 手札の数字カードが有効か判定する
//}]
static list = [
new Op('add', (f, p) => f + p),
new Op('sub', (f, p) => Math.abs(f - p), {
Expand Down Expand Up @@ -137,6 +151,7 @@ class Op {
this.isPValid = this.r_param ? (option.isPValid ?? (() => true)) : () => false;
this.wrap = option.wrap ?? (() => { });
}
//カードが中央に集まるときの配置を設定
getArrange(f, p) {
const arr = this.r_param
? {
Expand All @@ -163,6 +178,7 @@ class Game {
constructor(level) {
this.level = level;

this.opgen = new WeightRandom(getOpPriority(level));
// this.opgen = new WeightRandom([
// [1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0],
// [1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1],
Expand Down Expand Up @@ -200,6 +216,7 @@ class Game {
this.input = false;
}

// 演算開始
apply() {
if (!this.input || !this.valid) return;

Expand All @@ -224,6 +241,7 @@ class Game {
this.state.num.focus(-1);
}

// カード選択を有効化 / 無効化
accept() {
this.input = true;
document.body.classList.remove('is-animating');
Expand All @@ -233,6 +251,7 @@ class Game {
document.body.classList.add('is-animating');
}

// 演算を開始できるか
get valid() {
if (this.state.field.value === null) return false;
if (this.state.op.value === null) return false;
Expand Down Expand Up @@ -285,9 +304,10 @@ for (const key in cards) {
});
}

async function animate(ele, keyframes, duration) {
async function animate(ele, keyframes, duration, delay = 0) {
const anime = ele.animate(keyframes, {
duration,
delay,
fill: 'forwards',
easing: 'ease-in-out'
});
Expand Down Expand Up @@ -316,7 +336,7 @@ async function startAnimation() {
translate: '0 0 0',
opacity: 1
}
], 500))
], 500, i * 20))
);

await Promise.all([
Expand All @@ -329,7 +349,7 @@ async function startAnimation() {
scale: 1,
opacity: 1
}
], 500)),
], 500, i * 20)),
...[...cards.num].map((ele, i) => animate(ele, [
{
scale: 0,
Expand All @@ -339,7 +359,7 @@ async function startAnimation() {
scale: 1,
opacity: 1
}
], 500)),
], 500, (i + cards.op.length) * 20)),
]);

[...cards.op].forEach((ele) => ele.removeAttribute('style'));
Expand All @@ -350,7 +370,7 @@ async function applyAnimation(old, renew, index) {
const getCenter = (ele) => {
const rect = ele.getBoundingClientRect();
return { x: rect.left + rect.width / 2, y: rect.top + rect.height / 2 };
}
};

const arrange = old.op.getArrange(old.field, old.num);
const keys = Object.keys(arrange).filter((v) => v != 'new_field');
Expand Down Expand Up @@ -493,6 +513,16 @@ function displayOperator(index, name) {
}
}

// 演算子の優先順位
function getOpPriority(level) {
// Op.listの順番に重みづけ
return [
[1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0],
[1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1],
[1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0],
][level];
}

function init() {
State.oninit = (key, index, value, game) => {
if (key === 'op') {
Expand Down