From 601f7028bd56468bbc2701c32392fb5890eb2541 Mon Sep 17 00:00:00 2001 From: Frederic Jung Date: Fri, 30 Oct 2026 13:24:08 +0100 Subject: [PATCH] Puzzles: city markers move to the top left, clear of the IX badge MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The eyeballs, content and circuit markers sat on the IX badge of cities without a POP yet (reported by Thomas Kjรฆr). Architect's mission-critical marker is now the siren like everywhere else. --- src/game/96-map/85-puzzle-cities.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/96-map/85-puzzle-cities.js b/src/game/96-map/85-puzzle-cities.js index 19041d1..baddeb7 100644 --- a/src/game/96-map/85-puzzle-cities.js +++ b/src/game/96-map/85-puzzle-cities.js @@ -1,7 +1,7 @@ /* Puzzle map: the puzzle's cities stand out (goals with a pulsing ring and a badge for what they send or ask for, stepping stones with a dashed one, cities to avoid crossed out); every other city is on the map as usual, open to build in but not emphasised. */ -function pzBadge(c){const P=S.pz;if(S.ar)return c===S.ar.hq?'๐Ÿ ':S.ar.gold.includes(c)?'๐Ÿฅ‡':'';return P.src.includes(c)?'๐Ÿ—„๏ธ':P.dem.some(f=>f.t==='eye'&&f.a===c)?'๐Ÿ‘€':P.dem.some(f=>f.t==='l2'&&(f.a===c||f.b===c))?'๐Ÿ”—':'';} +function pzBadge(c){const P=S.pz;if(S.ar)return c===S.ar.hq?'๐Ÿ ':S.ar.gold.includes(c)?'๐Ÿšจ':'';return P.src.includes(c)?'๐Ÿ—„๏ธ':P.dem.some(f=>f.t==='eye'&&f.a===c)?'๐Ÿ‘€':P.dem.some(f=>f.t==='l2'&&(f.a===c||f.b===c))?'๐Ÿ”—':'';} function pzDrawCity(v,sc,now){const k=pzKind(v.C.id); if(!k||k==='off'){drawCity(v.C,v.sx,v.sy,sc,now,v.ly===null?undefined:v.ly);return;} const r=(CM.far?16:34)*sc,y=v.sy-(CM.far?0:6*sc),p=S.pops[v.C.id]; @@ -10,7 +10,7 @@ function pzDrawCity(v,sc,now){const k=pzKind(v.C.id); else{const a=animOn()?.55+.35*Math.sin(now/300):.8,gold=S.ar&&S.ar.gold.includes(v.C.id),dk=S.ar&&arDarkNow(v.C.id);ctx.strokeStyle=dk?`rgba(255,77,94,${a})`:gold?`rgba(224,160,0,${p?1:a})`:k==='goal'?`rgba(255,79,154,${p?1:a})`:'rgba(30,38,64,.7)';if(gold||dk)ctx.lineWidth=5;if(k==='via')ctx.setLineDash([5,5]); ctx.fillStyle=k==='goal'&&!p?'rgba(255,210,63,.35)':'rgba(255,255,255,.25)';ctx.beginPath();ctx.arc(v.sx,y,r,0,7);ctx.fill();ctx.stroke();ctx.setLineDash([]);} ctx.restore();drawCity(v.C,v.sx,v.sy,sc,now,v.ly===null?undefined:v.ly); - const b=k==='goal'&&!CM.far?pzBadge(v.C.id):'';if(b){ctx.font=`${Math.round(15*sc)}px sans-serif`;ctx.textAlign='center';ctx.textBaseline='middle';ctx.fillText(b,v.sx+r*.75,y-r*.75);}} + const b=k==='goal'&&!CM.far?pzBadge(v.C.id):'';if(b){ctx.font=`${Math.round(15*sc)}px sans-serif`;ctx.textAlign='center';ctx.textBaseline='middle';ctx.fillText(b,v.sx-r*.75,y-r*.75);}} // top left: the IX badge has the top right // In a puzzle every line says what it is ("2ร—100G ยท 70%"), and a selected POP lights up every pair it has links on. function pzLinkLab(grp,up,load,cap){if(S.ar)return groupLabel(grp,up)+(cap?` ยท ${Math.round(load/cap*100)}%`:'');return groupLabel(grp,up)+(cap?` ยท ${Math.round(load/cap*100)}%`:'');} const pzLinkHot=grp=>!!(UI.sel&&UI.sel.type==='city'&&grp.some(x=>x.a===UI.sel.id||x.b===UI.sel.id));