From 5fd4c1bd1523bf6944f96acfa6649d504af22327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=A2=D1=80=D0=BE=D1=88?= =?UTF-8?q?=D0=B8=D0=BD?= Date: Fri, 31 Jul 2026 23:55:43 +0300 Subject: [PATCH] multiplayer fixes --- index.html | 2 +- src/ai.js | 4 ++-- src/gfx.js | 6 +++--- src/input.js | 6 +++++- src/main.js | 32 ++++++++++++++++++-------------- src/net.js | 2 +- src/panel.js | 4 ++-- src/projectiles.js | 14 +++++++------- src/sky.js | 8 ++++---- src/sound.js | 2 +- src/terrain.js | 6 +++--- src/utils.js | 2 +- src/weapons.js | 10 +++++----- 13 files changed, 53 insertions(+), 45 deletions(-) diff --git a/index.html b/index.html index 60bf297..9ccb036 100644 --- a/index.html +++ b/index.html @@ -17,6 +17,6 @@ - + diff --git a/src/ai.js b/src/ai.js index 7a477ae..3a935f8 100644 --- a/src/ai.js +++ b/src/ai.js @@ -1,5 +1,5 @@ -import {PLAYER_MAX_ENERGY, PLAYER_INITIAL_POWER, PLAYER_ENERGY_POWER_MULTIPLIER} from './constants.js?v=21'; -import {randomInt} from './math.js?v=21'; +import {PLAYER_MAX_ENERGY, PLAYER_INITIAL_POWER, PLAYER_ENERGY_POWER_MULTIPLIER} from './constants.js?v=22'; +import {randomInt} from './math.js?v=22'; export const AI_TYPES = { diff --git a/src/gfx.js b/src/gfx.js index a6dbeaf..99654ba 100644 --- a/src/gfx.js +++ b/src/gfx.js @@ -1,6 +1,6 @@ -import {splitWords} from './utils.js?v=21'; -import {parable} from './math.js?v=21'; -import {FONT_HEIGHT, FONT_WIDTH} from './constants.js?v=21'; +import {splitWords} from './utils.js?v=22'; +import {parable} from './math.js?v=22'; +import {FONT_HEIGHT, FONT_WIDTH} from './constants.js?v=22'; export function createCanvas(width, height, readable) { const canvas = document.createElement('canvas'); diff --git a/src/input.js b/src/input.js index 03e1052..e441f98 100644 --- a/src/input.js +++ b/src/input.js @@ -1,4 +1,4 @@ -import {DEFAULT_KEYPRESS_DELAY, Z} from './constants.js?v=21'; +import {DEFAULT_KEYPRESS_DELAY, Z} from './constants.js?v=22'; const input = {}; let lastKeypressTime = 0; @@ -14,6 +14,10 @@ export function key(key) { return input[key] } +export function clearKeys() { + for (const k in input) input[k] = false; +} + export function afterKeyDelay(amount=DEFAULT_KEYPRESS_DELAY) { const now = Date.now(); if (now - lastKeypressTime >= amount) { diff --git a/src/main.js b/src/main.js index 1bf27e3..1bdc5c6 100644 --- a/src/main.js +++ b/src/main.js @@ -1,17 +1,17 @@ -import {AI_TYPES} from './ai.js?v=21'; -import {DEATH_SPECS, EXPLOSION_SHAKE_REDUCTION_FACTOR, H, MAX_EXPLOSION_SHAKE_FACTOR, MAX_WIND, PARTICLE_AMOUNT, PARTICLE_FADE_AMOUNT, PARTICLE_MAX_POWER_FACTOR, PARTICLE_MIN_LIFETIME, PARTICLE_MIN_POWER_FACTOR, PARTICLE_POWER_REDUCTION_FACTOR, PARTICLE_TIME_FACTOR, PARTICLE_WIND_REDUCTION_FACTOR, PLAYER_ANGLE_FAST_INCREMENT, PLAYER_ANGLE_INCREMENT, PLAYER_ANGLE_TICK_SOUND_INTERVAL, PLAYER_COLORS, PLAYER_ENERGY_POWER_MULTIPLIER, PLAYER_EXPLOSION_PARTICLE_POWER, PLAYER_FALL_DAMAGE_FACTOR, PLAYER_FALL_DAMAGE_HEIGHT, PLAYER_INITIAL_POWER, PLAYER_MAX_ENERGY, PLAYER_POWER_FAST_INCREMENT, PLAYER_POWER_INCREMENT, PLAYER_POWER_TICK_SOUND_INTERVAL, PLAYER_STARTING_TOOLS, PLAYER_STARTING_WEAPONS, PLAYER_TANK_BOUNDING_RADIUS, PLAYER_TANK_Y_FOOTPRINT, SHIELD_TYPES, TRAJECTORY_FADE_SPEED, TRAJECTORY_FLOAT_SPEED, W, WEAPON_TYPES, Z, STARTING_SCORE, SCORE_PER_KILL, SCORE_FOR_WIN, MARKET_ITEMS, NAPALM_SPAWN_RATE, FIRE_DURATION, FIRE_DAMAGE} from './constants.js?v=21'; -import {createCanvas, drawLine, drawRect, drawSemiCircle, drawText, loop, plot, strokeCircle} from './gfx.js?v=21'; -import {afterKeyDelay, key, initClickCanvas, popClick, getPointer} from './input.js?v=21'; -import {clamp, deg2rad, distance, parable, random, randomInt, vec, wrap} from './math.js?v=21'; -import {PROJECTILE_TYPES} from './projectiles.js?v=21'; -import {generateSky} from './sky.js?v=21'; -import {playTickSound} from './sound.js?v=21'; -import {clipTerrain, closestLand, collapseTerrain, generateTerrain, isTerrain, landHeight, startCollapseTerrain, collapseTerrainStep} from './terrain.js?v=21'; -import {sample, shuffle, newPlayerId} from './utils.js?v=21'; -import {EXPLOSION_TYPES} from './weapons.js?v=21'; -import {drawPanelBg, drawPanelTitle, drawPanelTitleFancy, drawPanelText, drawPanelDivider, drawPanelMenu, getPanelBounds, drawButton, checkHit, PANEL_X, PANEL_WIDTH} from './panel.js?v=21'; -import {MSG, CMD, HOST_MSG} from './net/protocol.js?v=21'; -import {netBroadcast, netConnect, netDisconnect, netIsConnected, netIsHost, netMakeRoomCode, netMyId, netOnMessage, netOnStatus, netRoom, netSendCommand} from './net.js?v=21'; +import {AI_TYPES} from './ai.js?v=22'; +import {DEATH_SPECS, EXPLOSION_SHAKE_REDUCTION_FACTOR, H, MAX_EXPLOSION_SHAKE_FACTOR, MAX_WIND, PARTICLE_AMOUNT, PARTICLE_FADE_AMOUNT, PARTICLE_MAX_POWER_FACTOR, PARTICLE_MIN_LIFETIME, PARTICLE_MIN_POWER_FACTOR, PARTICLE_POWER_REDUCTION_FACTOR, PARTICLE_TIME_FACTOR, PARTICLE_WIND_REDUCTION_FACTOR, PLAYER_ANGLE_FAST_INCREMENT, PLAYER_ANGLE_INCREMENT, PLAYER_ANGLE_TICK_SOUND_INTERVAL, PLAYER_COLORS, PLAYER_ENERGY_POWER_MULTIPLIER, PLAYER_EXPLOSION_PARTICLE_POWER, PLAYER_FALL_DAMAGE_FACTOR, PLAYER_FALL_DAMAGE_HEIGHT, PLAYER_INITIAL_POWER, PLAYER_MAX_ENERGY, PLAYER_POWER_FAST_INCREMENT, PLAYER_POWER_INCREMENT, PLAYER_POWER_TICK_SOUND_INTERVAL, PLAYER_STARTING_TOOLS, PLAYER_STARTING_WEAPONS, PLAYER_TANK_BOUNDING_RADIUS, PLAYER_TANK_Y_FOOTPRINT, SHIELD_TYPES, TRAJECTORY_FADE_SPEED, TRAJECTORY_FLOAT_SPEED, W, WEAPON_TYPES, Z, STARTING_SCORE, SCORE_PER_KILL, SCORE_FOR_WIN, MARKET_ITEMS, NAPALM_SPAWN_RATE, FIRE_DURATION, FIRE_DAMAGE} from './constants.js?v=22'; +import {createCanvas, drawLine, drawRect, drawSemiCircle, drawText, loop, plot, strokeCircle} from './gfx.js?v=22'; +import {afterKeyDelay, key, initClickCanvas, popClick, getPointer, clearKeys} from './input.js?v=22'; +import {clamp, deg2rad, distance, parable, random, randomInt, vec, wrap} from './math.js?v=22'; +import {PROJECTILE_TYPES} from './projectiles.js?v=22'; +import {generateSky} from './sky.js?v=22'; +import {playTickSound} from './sound.js?v=22'; +import {clipTerrain, closestLand, collapseTerrain, generateTerrain, isTerrain, landHeight, startCollapseTerrain, collapseTerrainStep} from './terrain.js?v=22'; +import {sample, shuffle, newPlayerId} from './utils.js?v=22'; +import {EXPLOSION_TYPES} from './weapons.js?v=22'; +import {drawPanelBg, drawPanelTitle, drawPanelTitleFancy, drawPanelText, drawPanelDivider, drawPanelMenu, getPanelBounds, drawButton, checkHit, PANEL_X, PANEL_WIDTH} from './panel.js?v=22'; +import {MSG, CMD, HOST_MSG} from './net/protocol.js?v=22'; +import {netBroadcast, netConnect, netDisconnect, netIsConnected, netIsHost, netMakeRoomCode, netMyId, netOnMessage, netOnStatus, netRoom, netSendCommand} from './net.js?v=22'; let state = 'start-game'; @@ -146,6 +146,7 @@ function commitStartMenu() { menuState = null; netError = null; if (multiplayer) { + clearKeys(); netMenuState = {phase: 'setup', selected: 0}; state = 'net-menu'; return; @@ -870,16 +871,19 @@ function updateNetMenu() { let name = s.name; if (!name) { name = prompt('Your name:') || ''; + clearKeys(); if (!name) return; s.name = name.slice(0, 20); } const code = hostBtn ? (new URLSearchParams(location.search).get('room') || netMakeRoomCode()) : (prompt('Room code:') || '').toUpperCase().trim(); + clearKeys(); if (!code) return; s.phase = 'connecting'; netError = null; netConnect(name, code).then((res) => { + clearKeys(); netPlayerId = res.id; networkMode = true; players = []; diff --git a/src/net.js b/src/net.js index 1accfdb..a019e2c 100644 --- a/src/net.js +++ b/src/net.js @@ -1,4 +1,4 @@ -import {MSG, HOST_MSG} from './net/protocol.js?v=21'; +import {MSG, HOST_MSG} from './net/protocol.js?v=22'; let socket = null; let myId = null; diff --git a/src/panel.js b/src/panel.js index cd8bb04..2dce76a 100644 --- a/src/panel.js +++ b/src/panel.js @@ -1,5 +1,5 @@ -import {PANEL_WIDTH, PANEL_HEIGHT, PANEL_FONT_SIZE, PANEL_TITLE_FONT_SIZE, PANEL_BG_COLOR, PANEL_BORDER_COLOR, W, H, FONT_WIDTH} from './constants.js?v=21'; -import {drawRect, drawLine} from './gfx.js?v=21'; +import {PANEL_WIDTH, PANEL_HEIGHT, PANEL_FONT_SIZE, PANEL_TITLE_FONT_SIZE, PANEL_BG_COLOR, PANEL_BORDER_COLOR, W, H, FONT_WIDTH} from './constants.js?v=22'; +import {drawRect, drawLine} from './gfx.js?v=22'; export const PANEL_X = (W - PANEL_WIDTH) / 2; export {PANEL_WIDTH}; diff --git a/src/projectiles.js b/src/projectiles.js index f18bdef..440481e 100644 --- a/src/projectiles.js +++ b/src/projectiles.js @@ -1,10 +1,10 @@ -import {H, PROJECTILE_ITERATIONS_PER_FRAME, PROJECTILE_ITERATION_PROGRESS, PROJECTILE_MAX_SOUND_FREQUENCY, PROJECTILE_MIN_SOUND_FREQUENCY, PROJECTILE_POWER_REDUCTION_FACTOR, PROJECTILE_WIND_REDUCTION_FACTOR, WEAPON_TYPES, PLAYER_TANK_Y_FOOTPRINT} from './constants.js?v=21'; -import {checkLineWith, drawLineVirtual} from './gfx.js?v=21'; -import {createParticles, isTank, isTankShield, spawnNapalm, tracerMode} from './main.js?v=21'; -import {deg2rad, parable, rad2deg, wrap} from './math.js?v=21'; -import {audio, createOsc} from './sound.js?v=21'; -import {isTerrain, landHeight} from './terrain.js?v=21'; -import {EXPLOSION_TYPES} from './weapons.js?v=21'; +import {H, PROJECTILE_ITERATIONS_PER_FRAME, PROJECTILE_ITERATION_PROGRESS, PROJECTILE_MAX_SOUND_FREQUENCY, PROJECTILE_MIN_SOUND_FREQUENCY, PROJECTILE_POWER_REDUCTION_FACTOR, PROJECTILE_WIND_REDUCTION_FACTOR, WEAPON_TYPES, PLAYER_TANK_Y_FOOTPRINT} from './constants.js?v=22'; +import {checkLineWith, drawLineVirtual} from './gfx.js?v=22'; +import {createParticles, isTank, isTankShield, spawnNapalm, tracerMode} from './main.js?v=22'; +import {deg2rad, parable, rad2deg, wrap} from './math.js?v=22'; +import {audio, createOsc} from './sound.js?v=22'; +import {isTerrain, landHeight} from './terrain.js?v=22'; +import {EXPLOSION_TYPES} from './weapons.js?v=22'; export const PROJECTILE_TYPES = { diff --git a/src/sky.js b/src/sky.js index f27fc50..2425d5f 100644 --- a/src/sky.js +++ b/src/sky.js @@ -1,7 +1,7 @@ -import {SKY_COLORS} from './constants.js?v=21'; -import {drawRect} from './gfx.js?v=21'; -import {gradient} from './math.js?v=21'; -import {sample} from './utils.js?v=21'; +import {SKY_COLORS} from './constants.js?v=22'; +import {drawRect} from './gfx.js?v=22'; +import {gradient} from './math.js?v=22'; +import {sample} from './utils.js?v=22'; export function generateSky(ctx) { const {width, height} = ctx.canvas; diff --git a/src/sound.js b/src/sound.js index bb7b84b..354e863 100644 --- a/src/sound.js +++ b/src/sound.js @@ -1,4 +1,4 @@ -import {SOUND_MUSIC_VOLUME, SOUND_SFX_VOLUME} from './constants.js?v=21'; +import {SOUND_MUSIC_VOLUME, SOUND_SFX_VOLUME} from './constants.js?v=22'; // @ts-ignore export const audio = new (window.AudioContext || window.webkitAudioContext)(); diff --git a/src/terrain.js b/src/terrain.js index 5f9be2d..448383c 100644 --- a/src/terrain.js +++ b/src/terrain.js @@ -1,6 +1,6 @@ -import {clipCanvas, drawCircle, drawRect} from './gfx.js?v=21'; -import {clamp, coords2index, random, randomInt} from './math.js?v=21'; -import {sample} from './utils.js?v=21'; +import {clipCanvas, drawCircle, drawRect} from './gfx.js?v=22'; +import {clamp, coords2index, random, randomInt} from './math.js?v=22'; +import {sample} from './utils.js?v=22'; let cachedImageData; diff --git a/src/utils.js b/src/utils.js index 43559b0..67ea367 100644 --- a/src/utils.js +++ b/src/utils.js @@ -1,4 +1,4 @@ -import {randomInt} from './math.js?v=21'; +import {randomInt} from './math.js?v=22'; export function sample(arr) { return arr[randomInt(0, arr.length-1)]; diff --git a/src/weapons.js b/src/weapons.js index ba0f4be..c869225 100644 --- a/src/weapons.js +++ b/src/weapons.js @@ -1,8 +1,8 @@ -import {PLAYER_TANK_BOUNDING_RADIUS, PLAYER_TANK_Y_FOOTPRINT, SHIELD_TYPES} from './constants.js?v=21'; -import {drawCircle, plot} from './gfx.js?v=21'; -import {clamp, cycle, distance, randomInt} from './math.js?v=21'; -import {audio, createOsc} from './sound.js?v=21'; -import {clipTerrain} from './terrain.js?v=21'; +import {PLAYER_TANK_BOUNDING_RADIUS, PLAYER_TANK_Y_FOOTPRINT, SHIELD_TYPES} from './constants.js?v=22'; +import {drawCircle, plot} from './gfx.js?v=22'; +import {clamp, cycle, distance, randomInt} from './math.js?v=22'; +import {audio, createOsc} from './sound.js?v=22'; +import {clipTerrain} from './terrain.js?v=22'; export function drawExplosion(ctx, x, y, r) { const step = Math.max(2, Math.floor(r / 6));