Support early Advanced Charity commitments

game/engine.ts

@@ -17735,8 +17735,8 @@ function charityPromiseRule<T>(run: () => T): T {
   }
 }
 function charityQuestionWindow(g: Game): boolean {
-  const timing = !g.advanced && g.phase >= 0 && g.phase <= 2 && !g.charityOrder ||
-    g.advanced && g.phase === 2 && !!g.charityOrder;
+  const timing = g.phase >= 0 && g.phase < 2 && !g.charityOrder ||
+    g.phase === 2 && (g.advanced ? !!g.charityOrder : !g.charityOrder);
   return g.status === 'playing' && timing &&
     !g.response && !g.decision && !g.phaseOpening && !g.pendingKarama && !g.pendingTreacheryDiscard &&
     (g.phase < 2 || !byFaction(g, 'choam') || g.choamCharity?.turn === g.turn);
@@ -17812,7 +17812,7 @@ function reconcileCharityTruth(g: Game,voluntary?: {actor:string;action:Action})
     const rows: CharityPromise[] = promises.filter(row => row.player === player && !row.fulfilled && !row.released);
     for (const turn of new Set(rows.map(row => row.turn))) {
       const open = g.status === 'playing' && g.turn === turn &&
-        (!g.advanced && g.phase >= 0 && g.phase <= 2 ||
+        (g.phase >= 0 && g.phase < 2 || !g.advanced && g.phase === 2 ||
           g.advanced && g.phase === 2 && !!g.charityOrder?.remaining.includes(player));
       const before: CharityPromise[] = promises;
       promises = charityPromiseRule(() => reconcileCharityPromises(before,player,turn,