Turn timer + auto-play, disconnect/reconnect, cosmetics, queue & paid plan
- Turn timer (20s) for play/trump; system auto-plays a smart move on timeout - Disconnect handling (mock): wait-for-return countdown, system covers turns - Cosmetics: titles, card-back styles, custom profile-image upload, badges; pickers in Profile; shop sells card styles; reward modal shows new titles - Paid plan (pro): free players queue when server busy, pro skips; upgrade flow - OnlineService extended (upgradePlan, richer profile patch); mock implements queue + plans; gamification adds TITLES + CARD_STYLES Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
soroush.asadi
@@ -2,7 +2,7 @@
|
||||
// Simulates remote players, friends presence, room invites and matchmaking
|
||||
// with timers, and computes rewards via gamification.ts.
|
||||
|
||||
import { applyMatchResult, dailyRewardFor } from "./gamification";
|
||||
import { CARD_STYLES, applyMatchResult, dailyRewardFor } from "./gamification";
|
||||
import {
|
||||
CreateRoomOptions,
|
||||
MatchmakingOptions,
|
||||
@@ -94,7 +94,7 @@ function defaultProfile(session: AuthSession): UserProfile {
|
||||
username: "player_" + session.userId.slice(-4),
|
||||
displayName: "بازیکن",
|
||||
avatar: AVATARS[0].id,
|
||||
phone: session.method === "phone" ? undefined : undefined,
|
||||
plan: "free",
|
||||
level: 1,
|
||||
xp: 0,
|
||||
coins: 1000,
|
||||
@@ -110,13 +110,29 @@ function defaultProfile(session: AuthSession): UserProfile {
|
||||
currentWinStreak: 0,
|
||||
},
|
||||
ownedAvatars: [AVATARS[0].id, AVATARS[1].id],
|
||||
ownedThemes: ["royal"],
|
||||
ownedCardStyles: ["classic"],
|
||||
ownedTitles: ["novice"],
|
||||
title: "novice",
|
||||
cardStyle: "classic",
|
||||
achievements: {},
|
||||
unlocked: [],
|
||||
createdAt: Date.now(),
|
||||
};
|
||||
}
|
||||
|
||||
/** Backfill fields on older persisted profiles so the app never crashes. */
|
||||
function migrateProfile(p: UserProfile): UserProfile {
|
||||
return {
|
||||
...p,
|
||||
plan: p.plan ?? "free",
|
||||
ownedAvatars: p.ownedAvatars ?? [AVATARS[0].id],
|
||||
ownedCardStyles: p.ownedCardStyles ?? ["classic"],
|
||||
ownedTitles: p.ownedTitles ?? ["novice"],
|
||||
title: p.title ?? "novice",
|
||||
cardStyle: p.cardStyle ?? "classic",
|
||||
};
|
||||
}
|
||||
|
||||
function makeFriend(status?: PresenceStatus): Friend {
|
||||
return {
|
||||
id: rid("fr"),
|
||||
@@ -147,6 +163,7 @@ export class MockOnlineService implements OnlineService {
|
||||
| null = null;
|
||||
private currentOppRating = 1000;
|
||||
private lastOtp = "";
|
||||
private mmOpts: MatchmakingOptions | null = null;
|
||||
|
||||
private messages: Record<string, ChatMessage[]> = {};
|
||||
private unread: Record<string, number> = {};
|
||||
@@ -159,7 +176,8 @@ export class MockOnlineService implements OnlineService {
|
||||
|
||||
constructor() {
|
||||
this.session = load<AuthSession>(LS.session);
|
||||
this.profile = load<UserProfile>(LS.profile);
|
||||
const loaded = load<UserProfile>(LS.profile);
|
||||
this.profile = loaded ? migrateProfile(loaded) : null;
|
||||
this.messages = load<Record<string, ChatMessage[]>>(LS.chats) ?? {};
|
||||
this.seedFriends();
|
||||
}
|
||||
@@ -282,27 +300,40 @@ export class MockOnlineService implements OnlineService {
|
||||
|
||||
async getProfile() {
|
||||
if (!this.profile) {
|
||||
// guest fallback profile (not persisted as session)
|
||||
this.profile =
|
||||
load<UserProfile>(LS.profile) ??
|
||||
defaultProfile({
|
||||
userId: rid("guest"),
|
||||
token: "",
|
||||
method: "guest",
|
||||
createdAt: Date.now(),
|
||||
});
|
||||
const loaded = load<UserProfile>(LS.profile);
|
||||
this.profile = loaded
|
||||
? migrateProfile(loaded)
|
||||
: defaultProfile({
|
||||
userId: rid("guest"),
|
||||
token: "",
|
||||
method: "guest",
|
||||
createdAt: Date.now(),
|
||||
});
|
||||
this.saveProfile();
|
||||
}
|
||||
return this.profile;
|
||||
}
|
||||
|
||||
async updateProfile(patch: Partial<Pick<UserProfile, "displayName" | "avatar">>) {
|
||||
async updateProfile(
|
||||
patch: Partial<
|
||||
Pick<UserProfile, "displayName" | "avatar" | "avatarImage" | "title" | "cardStyle">
|
||||
>
|
||||
) {
|
||||
const p = await this.getProfile();
|
||||
this.profile = { ...p, ...patch };
|
||||
this.saveProfile();
|
||||
return this.profile;
|
||||
}
|
||||
|
||||
async upgradePlan(): Promise<UserProfile> {
|
||||
const p = await this.getProfile();
|
||||
this.profile = { ...p, plan: "pro", planUntil: Date.now() + 30 * 864e5 };
|
||||
this.saveProfile();
|
||||
// pro players skip the queue immediately
|
||||
if (this.matchmaking.phase === "queued") this.beginSearch();
|
||||
return this.profile;
|
||||
}
|
||||
|
||||
/* ----------------------------- friends ----------------------------- */
|
||||
|
||||
async listFriends() {
|
||||
@@ -536,6 +567,44 @@ export class MockOnlineService implements OnlineService {
|
||||
|
||||
async startMatchmaking(opts: MatchmakingOptions) {
|
||||
await this.getProfile();
|
||||
this.mmOpts = opts;
|
||||
const me = this.profile!;
|
||||
const pro = me.plan === "pro";
|
||||
const busy = Math.random() < 0.7;
|
||||
|
||||
if (!pro && busy) {
|
||||
// server is busy and the player is on the free plan → queue them
|
||||
let pos = randInt(3, 8);
|
||||
this.matchmaking = {
|
||||
phase: "queued",
|
||||
players: [{ id: me.id, displayName: me.displayName, avatar: me.avatar, level: me.level, rating: me.rating }],
|
||||
elapsedMs: 0,
|
||||
ranked: opts.ranked,
|
||||
stake: opts.stake,
|
||||
queuePosition: pos,
|
||||
};
|
||||
this.emitMM();
|
||||
const tick = () =>
|
||||
this.after(1100, () => {
|
||||
if (this.matchmaking.phase !== "queued") return;
|
||||
pos -= 1;
|
||||
if (pos <= 0) {
|
||||
this.beginSearch();
|
||||
} else {
|
||||
this.matchmaking.queuePosition = pos;
|
||||
this.emitMM();
|
||||
tick();
|
||||
}
|
||||
});
|
||||
tick();
|
||||
return;
|
||||
}
|
||||
|
||||
this.beginSearch();
|
||||
}
|
||||
|
||||
private beginSearch() {
|
||||
const opts = this.mmOpts!;
|
||||
const me = this.profile!;
|
||||
this.matchmaking = {
|
||||
phase: "searching",
|
||||
@@ -646,12 +715,15 @@ export class MockOnlineService implements OnlineService {
|
||||
price: 500 + i * 150,
|
||||
preview: a.emoji,
|
||||
}));
|
||||
const themes: ShopItem[] = [
|
||||
{ id: "midnight", kind: "theme", nameFa: "تم نیمهشب", nameEn: "Midnight", price: 1200, preview: "#0a142e" },
|
||||
{ id: "emerald", kind: "theme", nameFa: "تم زمرد", nameEn: "Emerald", price: 1500, preview: "#0d6b6b" },
|
||||
{ id: "crimson", kind: "theme", nameFa: "تم یاقوت", nameEn: "Crimson", price: 1800, preview: "#7f1d2e" },
|
||||
];
|
||||
return [...avatarItems, ...themes];
|
||||
const cardItems: ShopItem[] = CARD_STYLES.filter((c) => c.price > 0).map((c) => ({
|
||||
id: c.id,
|
||||
kind: "cardstyle",
|
||||
nameFa: c.nameFa,
|
||||
nameEn: c.nameEn,
|
||||
price: c.price,
|
||||
preview: c.accent,
|
||||
}));
|
||||
return [...avatarItems, ...cardItems];
|
||||
}
|
||||
|
||||
async buyItem(id: string) {
|
||||
@@ -660,7 +732,7 @@ export class MockOnlineService implements OnlineService {
|
||||
const item = items.find((i) => i.id === id);
|
||||
if (!item) return { ok: false, messageFa: "آیتم یافت نشد", messageEn: "Item not found" };
|
||||
const owned =
|
||||
item.kind === "avatar" ? p.ownedAvatars.includes(id) : p.ownedThemes.includes(id);
|
||||
item.kind === "avatar" ? p.ownedAvatars.includes(id) : p.ownedCardStyles.includes(id);
|
||||
if (owned) return { ok: false, messageFa: "قبلاً خریداری شده", messageEn: "Already owned" };
|
||||
if (p.coins < item.price)
|
||||
return { ok: false, messageFa: "سکه کافی نیست", messageEn: "Not enough coins" };
|
||||
@@ -669,7 +741,8 @@ export class MockOnlineService implements OnlineService {
|
||||
...p,
|
||||
coins: p.coins - item.price,
|
||||
ownedAvatars: item.kind === "avatar" ? [...p.ownedAvatars, id] : p.ownedAvatars,
|
||||
ownedThemes: item.kind === "theme" ? [...p.ownedThemes, id] : p.ownedThemes,
|
||||
ownedCardStyles:
|
||||
item.kind === "cardstyle" ? [...p.ownedCardStyles, id] : p.ownedCardStyles,
|
||||
};
|
||||
this.saveProfile();
|
||||
return { ok: true, profile: this.profile, messageFa: "خرید انجام شد", messageEn: "Purchased" };
|
||||
|
||||
Reference in New Issue
Block a user