@@ -544,7 +570,7 @@ const NT={C3:130.81,D3:146.83,Eb3:155.56,E3:164.81,F3:174.61,G3:196.00,Ab3:207.6
function playSynth(ac,freq,t,dur,inst,vol,arr){
if(t
s.classList.remove("active"));document.getElementById(id).classList.add("active");}
-function goMenu(){stopGame();stopPreview();show("sm");refreshMiniLB();}
+function goMenu(){if(paused){paused=false;getAc().resume();document.getElementById("pause-overlay").classList.remove("show");}stopGame();stopPreview();show("sm");refreshMiniLB();}
function goScores(){renderScores();show("ss");}
// ── PAD TOGGLES ────────────────────────────────────────
@@ -1969,20 +1999,21 @@ function updateHitModeVisibility(){
// ── MENU ───────────────────────────────────────────────
function buildMenu(){
const gt=document.getElementById("gtabs");gt.innerHTML="";
- Object.keys(GENRES).forEach(g=>{
- const b=document.createElement("button");
- b.className="gtab"+(g===curGenre?" active":"");
- b.textContent=g;b.onclick=()=>{curGenre=g;curIdx=0;stopPreview();buildMenu();};
- gt.appendChild(b);
- });
- // Synth genre tabs (Classical, Video Games, Chiptune Originals, Folk)
- var synthIcons={"Classical":"\uD83C\uDFBB","Video Games":"\uD83C\uDFAE","Chiptune Originals":"\uD83D\uDC7E","Folk":"\uD83C\uDFB6","Christmas":"\uD83C\uDF84","Singalong":"\uD83C\uDFB5"};
+ // Synth genres first (songs people know)
+ var synthIcons={"Singalong":"\uD83C\uDFB5","Christmas":"\uD83C\uDF84","Folk":"\uD83C\uDFB6","Classical":"\uD83C\uDFBB","Video Games":"\uD83C\uDFAE","Chiptune Originals":"\uD83D\uDC7E"};
Object.keys(SYNTH_GENRES).forEach(function(sg){
var cb=document.createElement("button");
cb.className="gtab"+(curGenre===sg?" active":"");
cb.textContent=synthIcons[sg]+" "+sg;cb.onclick=function(){curGenre=sg;curIdx=0;stopPreview();buildMenu();};
gt.appendChild(cb);
});
+ // Drum pattern genres
+ Object.keys(GENRES).forEach(g=>{
+ const b=document.createElement("button");
+ b.className="gtab"+(g===curGenre?" active":"");
+ b.textContent=g;b.onclick=()=>{curGenre=g;curIdx=0;stopPreview();buildMenu();};
+ gt.appendChild(b);
+ });
const rg=document.getElementById("rgrid");rg.innerHTML="";
(SYNTH_GENRES[curGenre]||GENRES[curGenre]).forEach((r,i)=>{
const b=document.createElement("button");
@@ -2101,10 +2132,10 @@ function stopGame(){playing=false;if(mp3Src){try{mp3Src.stop();}catch(e){}mp3Src
function resetStats(){cScore=0;cStreak=0;cTotal=0;cGood=0;cMaxStreak=0;}
function buildNotes(r){
- const bs=60/r.bpm,bars=r.bars||8,res=[];
+ const bs=60/r.bpm/gameSpeed,bars=r.bars||8,res=[];
for(let bar=0;bara.time-b.time);
}
@@ -2117,9 +2148,8 @@ function countdown(cb){
function beginBuiltin(){
playing=true;
- const ac=getAc(),r=gameRhythm,bs=60/r.bpm,bars=r.bars||8;
+ const ac=getAc(),r=gameRhythm,bs=60/r.bpm/gameSpeed,bars=r.bars||8;
gameStartTime=ac.currentTime;
- // Schedule ALL drum hits as audio — this IS the music
for(let bar=0;bar=remapLanes.length){
+ // Done — save mapping
+ gpMap={};
+ for(var k in remapResult)gpMap[k]=remapResult[k];
+ localStorage.setItem("drgameGpMap",JSON.stringify(gpMap));
+ remapping=false;
+ document.getElementById("remap-overlay").classList.remove("show");
+ document.getElementById("remap-prompt").textContent="";
+ return;
+ }
+ var rl=remapLanes[remapStep];
+ document.getElementById("remap-prompt").innerHTML="Hit your "+rl.name+" pad";
+ document.getElementById("remap-status").textContent="Step "+(remapStep+1)+" of "+remapLanes.length+(remapStep===4?" (or press foot pedal)":"");
+}
+function handleRemapButton(bi){
+ if(!remapping)return false;
+ remapResult[bi]=remapLanes[remapStep].l;
+ remapStep++;
+ showRemapStep();
+ return true;
+}
+
// ── INPUT ──────────────────────────────────────────────
window.addEventListener("keydown",e=>{
+ if(e.key==="Escape"){e.preventDefault();togglePause();return;}
+ if(paused)return;
const i=LANES.findIndex(l=>l.key===e.key.toLowerCase()||(l.key===" "&&e.key===" "));
if(i>=0){e.preventDefault();triggerPad(i);}
});
@@ -2380,8 +2461,8 @@ function pollGP(){
document.getElementById("gpd").textContent="🎮 "+gp.id.slice(0,20);
gp.buttons.forEach((btn,bi)=>{
if(btn.pressed&&!prevBtns[bi]){
- const m={0:2,1:3,2:0,3:1,4:4,8:4};
- if(m[bi]!==undefined)triggerPad(m[bi]);
+ if(remapping){handleRemapButton(bi);}
+ else if(!paused&&gpMap[bi]!==undefined)triggerPad(gpMap[bi]);
}
prevBtns[bi]=btn.pressed;
});