stable
This commit is contained in:
parent
86226ccc94
commit
077d4ab9ac
71 changed files with 2905 additions and 1063 deletions
|
|
@ -178,22 +178,18 @@
|
|||
for (const t of this.tarinai || []) {
|
||||
if (!t || t.dead) continue;
|
||||
if (t.state === "sunbath" || (t.sunbathTimer || 0) > 0.04) {
|
||||
const fallbackX = Number.isFinite(t.sunbathAnchorX) ? t.sunbathAnchorX : (Number.isFinite(t._lastSunbathDrawX) ? t._lastSunbathDrawX : (Number.isFinite(t._lastValidX) ? t._lastValidX : pad));
|
||||
const fallbackY = Number.isFinite(t.sunbathAnchorY) ? t.sunbathAnchorY : (Number.isFinite(t._lastSunbathDrawY) ? t._lastSunbathDrawY : (Number.isFinite(t._lastValidY) ? t._lastValidY : pad));
|
||||
t.sunbathAnchorX = clamp(fallbackX, pad, safeW - pad);
|
||||
t.sunbathAnchorY = clamp(fallbackY, pad, safeH - pad);
|
||||
if (!Number.isFinite(t.x)) t.x = t.sunbathAnchorX;
|
||||
if (!Number.isFinite(t.y)) t.y = t.sunbathAnchorY;
|
||||
if (!Number.isFinite(t.x)) t.x = Number.isFinite(t.sunbathAnchorX) ? t.sunbathAnchorX : pad;
|
||||
if (!Number.isFinite(t.y)) t.y = Number.isFinite(t.sunbathAnchorY) ? t.sunbathAnchorY : pad;
|
||||
t.sunbathAnchorX = clamp(t.x, pad, safeW - pad);
|
||||
t.sunbathAnchorY = clamp(t.y, pad, safeH - pad);
|
||||
}
|
||||
const result = repairPoint(t, t.radius || 22);
|
||||
if (result === "missing" || result === "moved") repairTarinai(t);
|
||||
if (t.state === "sunbath" || (t.sunbathTimer || 0) > 0.04) {
|
||||
t.sunbathAnchorX = clamp(Number.isFinite(t.sunbathAnchorX) ? t.sunbathAnchorX : t.x, pad, safeW - pad);
|
||||
t.sunbathAnchorY = clamp(Number.isFinite(t.sunbathAnchorY) ? t.sunbathAnchorY : t.y, pad, safeH - pad);
|
||||
t.sunbathAnchorX = clamp(Number.isFinite(t.x) ? t.x : (Number.isFinite(t.sunbathAnchorX) ? t.sunbathAnchorX : pad), pad, safeW - pad);
|
||||
t.sunbathAnchorY = clamp(Number.isFinite(t.y) ? t.y : (Number.isFinite(t.sunbathAnchorY) ? t.sunbathAnchorY : pad), pad, safeH - pad);
|
||||
t.x = t.sunbathAnchorX;
|
||||
t.y = t.sunbathAnchorY;
|
||||
t.vx = 0;
|
||||
t.vy = 0;
|
||||
t._lastSunbathDrawX = t.x;
|
||||
t._lastSunbathDrawY = t.y;
|
||||
t._lastValidX = t.x;
|
||||
|
|
@ -227,6 +223,7 @@
|
|||
},
|
||||
|
||||
updateWeather(dt) {
|
||||
if (window.TarinaiWeatherSystem?.enforceFixedWeather?.(this)) return;
|
||||
this.nextWeatherChange -= dt;
|
||||
if (this.nextWeatherChange > 0) return;
|
||||
if (window.TarinaiWeatherSystem?.applyNextWeather) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue