Skip to content

Fix pirate battle UI cleanup and water tiling #1

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
papiguy merged 1 commit into from
Jun 3, 2026
Merged

Fix pirate battle UI cleanup and water tiling #1

Show file tree
Hide file tree
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
158 changes: 123 additions & 35 deletions Pirate-Ship-Battle-Royal-v1.0/behaviors/GameManager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ code: |-
this._restartTimer = 0;
this._prevCount = -1;
this._gracePeriod = 0;
this._countdownFadeTimer = null;
this._countdownRemoveTimer = null;
var _self = this;
this.game.scene.userData._skipToNextMatch = function() { _self._doRestart(); };
};
Expand Down Expand Up @@ -85,80 +87,113 @@ code: |-
this._doRestart();
};

this._getSafeArea = function() {
if (this.erth && this.erth.viewport && this.erth.viewport.getSafeArea) {
return this.erth.viewport.getSafeArea();
}
if (this.game && this.game.getViewportSafeArea) {
return this.game.getViewportSafeArea();
}
Comment thread
querielo marked this conversation as resolved.
return {
left: 0,
top: 0,
right: window.innerWidth,
bottom: window.innerHeight,
width: window.innerWidth,
height: window.innerHeight,
insetLeft: 0,
insetTop: 0,
insetRight: 0,
insetBottom: 0
};
};

this._applyOverlaySafeArea = function() {
var el = document.getElementById('pirate-overlay');
if (!el) return;
var safe = this._getSafeArea();
var key = [safe.left, safe.top, safe.width, safe.height].join(':');
if (el._safeKey === key) return;
el._safeKey = key;
el.style.left = safe.left + 'px';
el.style.top = safe.top + 'px';
el.style.width = safe.width + 'px';
el.style.height = safe.height + 'px';
};

this._applyCenteredSafeArea = function(el) {
if (!el) return;
var safe = this._getSafeArea();
var key = [safe.left, safe.top, safe.width, safe.height].join(':');
if (el._safeKey === key) return;
el._safeKey = key;
el.style.left = (safe.left + safe.width * 0.5) + 'px';
el.style.top = (safe.top + safe.height * 0.5) + 'px';
};

this._createUI = function() {
window._stemScene = this.game.scene;
var safe = this._getSafeArea();
var old = document.getElementById('pirate-overlay');
if (old) old.remove();
var div = document.createElement('div');
div.id = 'pirate-overlay';
div.style.cssText = [
'position:fixed', 'top:0', 'left:0', 'width:100%', 'height:100%',
'position:fixed', 'top:' + safe.top + 'px', 'left:' + safe.left + 'px',
'width:' + safe.width + 'px', 'height:' + safe.height + 'px',
'display:flex', 'flex-direction:column', 'align-items:center',
'justify-content:flex-start',
'padding-top:max(16px, env(safe-area-inset-top, 16px))',
'padding-top:16px',
Comment thread
querielo marked this conversation as resolved.
'pointer-events:none', 'z-index:9999', 'font-family:serif'
].join(';');

div.innerHTML =
'<div id="ships-remaining" style="background:rgba(0,0,0,0.55);color:#f5d76e;' +
'font-size:clamp(14px,2.5vw,20px);padding:6px 14px;border-radius:8px;' +
'border:2px solid #8b6914;max-width:90vw;text-align:center;">' +
'border:2px solid #8b6914;max-width:90%;text-align:center;">' +
'\u2875 Ships Afloat: ' + TOTAL + '</div>' +
'<div id="pirate-winner" style="display:none;margin-top:clamp(4px,2vh,20px);' +
'background:rgba(0,0,0,0.82);color:#f5d76e;' +
'font-size:clamp(24px,5vw,48px);' +
'padding:clamp(14px,3vw,30px) clamp(20px,5vw,60px);' +
'border-radius:16px;border:3px solid #f5d76e;text-align:center;' +
'text-shadow:2px 2px 4px #000;pointer-events:auto;' +
'max-width:90vw;word-break:break-word;">' +
'max-width:90%;word-break:break-word;">' +
'</div>';
document.body.appendChild(div);
this._applyOverlaySafeArea();
};

this._doRestart = function() {
var skipEl = document.getElementById('pirate-skip-btn');
if (skipEl) skipEl.remove();
var scene = this.game.scene;
for (var i = 0; i < ALL_SHIPS.length; i++) {
var name = ALL_SHIPS[i];
var ship = scene.getObjectByName(name);
if (!ship) continue;
var sp = SHIP_STARTS[name];
ship.position.set(sp.x, sp.y, sp.z);
ship.rotation.set(0, sp.ry, 0);
ship.visible = true;
var h = ship.userData._shipHealth;
if (h) {
if (h._dieTimeout) { clearTimeout(h._dieTimeout); h._dieTimeout = null; }
h.hp = h.maxHp || 100; h.isDead = false;
h._flashTimer = -99;
h._damageLevel = 0;
h._dmgTimer = 0;
if (h._originalColors) h._originalColors.forEach(function(e) {
if (e.m && e.m.color && e.c) e.m.color.copy(e.c);
});
}
ship.userData._cannonCd = 0; ship.userData._cannonCdMax = 3;
this._clearCountdownTimers = function() {
if (this._countdownFadeTimer) {
clearTimeout(this._countdownFadeTimer);
this._countdownFadeTimer = null;
}
if (this._countdownRemoveTimer) {
clearTimeout(this._countdownRemoveTimer);
this._countdownRemoveTimer = null;
}
};

this._clearTransientSceneObjects = function() {
var scene = this.game && this.game.scene;
if (!scene || !scene.userData) return;
['_cannonballs','_cannonVFX','_wake'].forEach(function(key) {
var arr = scene.userData[key];
if (!arr) return;
arr.forEach(function(item) {
if (!item) return;
// Cannonballs are direct meshes
if (item.parent) {
scene.remove(item);
if (item.geometry) item.geometry.dispose();
if (item.material) item.material.dispose();
Comment thread
querielo marked this conversation as resolved.
return;
}
// Wake entries have a .mesh
if (item.mesh && item.mesh.parent) {
scene.remove(item.mesh);
if (item.mesh.geometry) item.mesh.geometry.dispose();
if (item.mesh.material) item.mesh.material.dispose();
}
// VFX entries have .parts array
if (item.parts) item.parts.forEach(function(p) {
if (p.mesh && p.mesh.parent) {
scene.remove(p.mesh);
Expand All @@ -169,6 +204,42 @@ code: |-
});
scene.userData[key] = [];
});
};

this._destroyUI = function() {
this._clearCountdownTimers();
var countdownEl = document.getElementById('pirate-countdown');
if (countdownEl) countdownEl.remove();
var overlayEl = document.getElementById('pirate-overlay');
if (overlayEl) overlayEl.remove();
};

this._doRestart = function() {
var skipEl = document.getElementById('pirate-skip-btn');
if (skipEl) skipEl.remove();
var scene = this.game.scene;
for (var i = 0; i < ALL_SHIPS.length; i++) {
var name = ALL_SHIPS[i];
var ship = scene.getObjectByName(name);
if (!ship) continue;
var sp = SHIP_STARTS[name];
ship.position.set(sp.x, sp.y, sp.z);
ship.rotation.set(0, sp.ry, 0);
ship.visible = true;
var h = ship.userData._shipHealth;
if (h) {
if (h._dieTimeout) { clearTimeout(h._dieTimeout); h._dieTimeout = null; }
h.hp = h.maxHp || 100; h.isDead = false;
h._flashTimer = -99;
h._damageLevel = 0;
h._dmgTimer = 0;
if (h._originalColors) h._originalColors.forEach(function(e) {
if (e.m && e.m.color && e.c) e.m.color.copy(e.c);
});
}
ship.userData._cannonCd = 0; ship.userData._cannonCdMax = 3;
}
this._clearTransientSceneObjects();
this.gameOver = false; this._restartTimer = 0; this._prevCount = -1; this._gracePeriod = 3.0; this._lastCountNum = -1; this._matchElapsed = 0; this.game.scene.userData._matchStarted = false; this._showCountdown(3);
var winEl = document.getElementById('pirate-winner');
if (winEl) winEl.style.display = 'none';
Expand Down Expand Up @@ -205,6 +276,8 @@ code: |-

this.update = function(dt) {
if (!this._shipRefs) { this._shipRefCd -= dt; if (this._shipRefCd <= 0) this._ensureShipRefs(); }
this._applyOverlaySafeArea();
this._applyCenteredSafeArea(document.getElementById('pirate-countdown'));
if (this._gracePeriod > 0) {
this._gracePeriod -= dt;
var cNum = Math.ceil(this._gracePeriod);
Expand Down Expand Up @@ -323,26 +396,41 @@ code: |-
};

this._showCountdown = function(n) {
this._clearCountdownTimers();
var el = document.getElementById('pirate-countdown');
if (!el) {
el = document.createElement('div');
el.id = 'pirate-countdown';
el.style.cssText = 'position:fixed;top:50%;left:50%;transform:translate(-50%,-50%);' +
el.style.cssText = 'position:fixed;transform:translate(-50%,-50%);' +
'font-family:Georgia,serif;font-size:clamp(60px,15vw,120px);font-weight:bold;' +
'color:#f5d76e;text-shadow:0 0 30px rgba(245,215,110,0.8);pointer-events:none;' +
'z-index:99999;text-align:center;transition:opacity 0.3s;';
document.body.appendChild(el);
}
this._applyCenteredSafeArea(el);
el.style.opacity = '1';
el.textContent = n > 0 ? n : 'GO!';
if (n === 0) {
var _el = el;
setTimeout(function() { _el.style.opacity = '0'; setTimeout(function(){ _el.remove(); }, 400); }, 600);
this._countdownFadeTimer = setTimeout(function() {
_el.style.opacity = '0';
this._countdownFadeTimer = null;
this._countdownRemoveTimer = setTimeout(function() {
_el.remove();
this._countdownRemoveTimer = null;
}.bind(this), 400);
}.bind(this), 600);
}
};
this.dispose = function() {
this._destroyUI();
this._clearTransientSceneObjects();
if (this.game && this.game.scene && this.game.scene.userData) {
delete this.game.scene.userData._skipToNextMatch;
delete this.game.scene.userData._matchStarted;
}
if (window._stemScene === (this.game && this.game.scene)) window._stemScene = null;
this._shipRefs = null;
var skipEl2 = document.getElementById('pirate-skip-btn');
if (skipEl2) skipEl2.remove();
var el = document.getElementById('pirate-overlay');
if (el) el.remove();
};
60 changes: 57 additions & 3 deletions Pirate-Ship-Battle-Royal-v1.0/behaviors/PirateHUD.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,58 @@ code: |+
this._createHUD();
};

this._getSafeArea = function() {
if (this.erth && this.erth.viewport && this.erth.viewport.getSafeArea) {
return this.erth.viewport.getSafeArea();
}
if (this.game && this.game.getViewportSafeArea) {
return this.game.getViewportSafeArea();
}
return {
left: 0,
top: 0,
right: window.innerWidth,
bottom: window.innerHeight,
width: window.innerWidth,
height: window.innerHeight,
insetLeft: 0,
insetTop: 0,
insetRight: 0,
insetBottom: 0
};
};

this._syncHUDLayout = function() {
var safe = this._getSafeArea();
var hud = document.getElementById('pirate-hud');
if (hud) {
var hudKey = [safe.left, safe.width, safe.insetBottom].join(':');
if (hud._safeKey !== hudKey) {
hud._safeKey = hudKey;
hud.style.left = (safe.left + safe.width * 0.5) + 'px';
hud.style.bottom = (safe.insetBottom + 18) + 'px';
}
}

var wrap = document.getElementById('pirate-sprint-wrap');
if (wrap) {
var wrapKey = [safe.left, safe.width, safe.insetBottom, safe.insetRight, this._hudIsMobile ? 'm' : 'd'].join(':');
if (wrap._safeKey !== wrapKey) {
wrap._safeKey = wrapKey;
if (this._hudIsMobile) {
wrap.style.right = (safe.insetRight + 20) + 'px';
wrap.style.bottom = (safe.insetBottom + 234) + 'px';
} else {
wrap.style.left = (safe.left + safe.width * 0.5) + 'px';
wrap.style.bottom = (safe.insetBottom + 50) + 'px';
}
}
}
};

this._createHUD = function() {
var isMobile = ('ontouchstart' in window) || navigator.maxTouchPoints > 0;
this._hudIsMobile = isMobile;

var old = document.getElementById('pirate-hud');
if (old) old.remove();
Expand Down Expand Up @@ -88,9 +138,11 @@ code: |+
wrap.appendChild(lbl);
wrap.appendChild(track);
document.body.appendChild(wrap);
this._syncHUDLayout();
};

this.update = function(dt) {
this._syncHUDLayout();
Comment thread
querielo marked this conversation as resolved.
// Sprint fuel gauge
var sp = this.game.scene.userData._playerSprint;
var bar = document.getElementById('sprint-bar');
Expand Down Expand Up @@ -119,7 +171,9 @@ code: |+
var playerUUID = scene.userData._playerShipUUID;
var THREE = window.THREE;
if (camera && THREE && aiShips.length) {
var w = window.innerWidth, h = window.innerHeight;
var safe = this._getSafeArea();
var w = safe.width, h = safe.height;
if (w <= 0 || h <= 0) return;
var tmpV = this._tmpV;
aiShips.forEach(function(ship) {
if (!ship || ship.uuid === playerUUID) return;
Expand All @@ -146,8 +200,8 @@ code: |+
tmpV.copy(ship.position);
tmpV.y += 8;
tmpV.project(camera);
var sx = (tmpV.x * 0.5 + 0.5) * w;
var sy = (-tmpV.y * 0.5 + 0.5) * h;
var sx = safe.left + (tmpV.x * 0.5 + 0.5) * w;
var sy = safe.top + (-tmpV.y * 0.5 + 0.5) * h;
if (tmpV.z > 1) { el.style.display = 'none'; return; }
el.style.display = 'block';
el.style.left = sx + 'px';
Expand Down
Loading