Skip to content

Some highlights and partial rendering fixes for frogger. #282

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
mcdemarco merged 1 commit into from
Dec 31, 2025
Merged

Some highlights and partial rendering fixes for frogger. #282

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
63 changes: 33 additions & 30 deletions src/games/frogger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ export class FroggerGame extends GameBase {
private marketsize: number = 6;
private deck!: Deck;
private suitboard!: Map<string, string>;
private selected: string[] = [];

constructor(state: number | IFroggerState | string, variants?: string[]) {
super();
Expand Down Expand Up @@ -1232,6 +1233,7 @@ export class FroggerGame extends GameBase {
if ( ! complete ) {
result.valid = true;
result.complete = -1;
result.canrender = true;
result.message = i18next.t("apgames:validation.frogger.PIECE_NEXT");
return result;
} else {
Expand Down Expand Up @@ -1267,6 +1269,7 @@ export class FroggerGame extends GameBase {
if ( ! complete ) {
result.valid = true;
result.complete = -1;
// result.canrender = true;
result.message = i18next.t("apgames:validation.frogger.PLACE_NEXT");
return result;
} else {
Expand Down Expand Up @@ -1380,6 +1383,7 @@ export class FroggerGame extends GameBase {

//Really really done.
result.valid = true;
result.canrender = true;
result.complete = (allcomplete && moves.length === this.nummoves) ? 1 : 0;
result.message = i18next.t("apgames:validation._general.VALID_MOVE");
return result;
Expand All @@ -1400,6 +1404,8 @@ export class FroggerGame extends GameBase {
}

this.results = [];
this.selected = [];

let marketEmpty = false;
let refill = false;
let remaining: number;
Expand All @@ -1425,42 +1431,25 @@ export class FroggerGame extends GameBase {

if (subIFM.refill)
refill = true;
/*

if (submove.indexOf(":") > -1) {
//Card followed by move is a hand card.
[ca, mv] = submove.split(":");
handcard = true;
} else if (submove.indexOf(",") > -1) {
//Move followed by card is a backwards move.
[mv, ca] = submove.split(",");
} else if (submove.indexOf("-") > -1) {
//Raw move is a unproductive or partial backwards move.
[from, to] = submove.split("-");
// nocard = true;
} else {
//Raw card must be a blocked move or a partial.
ca = submove;
if (!partial)
this.results.push({type: "claim", what: ca});
}

if ( mv )
[from, to] = mv!.split("-");
*/
//Make the submove.
//Possible card adjustments.
if (subIFM.forward && subIFM.card) {
this.popHand(subIFM.card);
this.results.push({type: "move", from: subIFM.from!, to: subIFM.to!, what: subIFM.card!, how: "forward"});
const bounced = this.moveNeighbors(subIFM.to!,subIFM.card!);
bounced.forEach( ([from, to]) => {
this.results.push({type: "eject", from: from, to: to, what: "a Crown or Ace"});
});
if (subIFM.from && subIFM.to) {
this.popHand(subIFM.card);
this.results.push({type: "move", from: subIFM.from, to: subIFM.to, what: subIFM.card, how: "forward"});
const bounced = this.moveNeighbors(subIFM.to,subIFM.card);
bounced.forEach( ([from, to]) => {
this.results.push({type: "eject", from: from, to: to, what: "a Crown or Ace"});
});
} else {
//Partial.
}
} else if (subIFM.card) {
marketEmpty = this.popMarket(subIFM.card);

if (subIFM.from) {
this.results.push({type: "move", from: subIFM.from!, to: subIFM.to!, what: subIFM.card!, how: "back"});
this.results.push({type: "move", from: subIFM.from, to: subIFM.to!, what: subIFM.card!, how: "back"});
}
} else {
this.results.push({type: "move", from: subIFM.from!, to: subIFM.to!, what: "no card", how: "back"});
Expand All @@ -1474,6 +1463,11 @@ export class FroggerGame extends GameBase {
remaining = 2 - s;
break;
}

if (subIFM.card) {
this.selected.push(subIFM.card);
//console.log("selecting ", subIFM.card);
}
}
}

Expand Down Expand Up @@ -1694,7 +1688,16 @@ export class FroggerGame extends GameBase {
// build legend of ALL cards
const legend: ILegendObj = {};
for (const card of allcards) {
legend["c" + card.uid] = card.toGlyph();
let glyph = card.toGlyph();
if (this.selected.indexOf(card.uid) > -1) {
glyph = card.toGlyph({border: true, fill: {
func: "flatten",
fg: "_context_fill",
bg: "_context_background",
opacity: 0.2
}});
}
legend["c" + card.uid] = glyph;
}

const excuses = [...cardsExtended.filter(c => c.rank.uid === "0")];
Expand Down