catarrh/ravaged-planet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

multiplayer fixes

Browse Source
This commit is contained in:
catarrh committed 2026-07-31 23:55:43 +03:00
1 parent 99d82d8fdf
commit 5fd4c1bd15
13 files changed
+53 -45
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

index.html
+1 -1
View File
@@ -17,6 +17,6 @@
</style> </style>
</head> </head>
<body> <body>
<script type="module" src="src/main.js?v=21"></script> <script type="module" src="src/main.js?v=22"></script>
</body> </body>
</html> </html>
src/ai.js
+2 -2
View File
@@ -1,5 +1,5 @@
import {PLAYER_MAX_ENERGY, PLAYER_INITIAL_POWER, PLAYER_ENERGY_POWER_MULTIPLIER} from './constants.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=21'; import {randomInt} from './math.js?v=22';
export const AI_TYPES = { export const AI_TYPES = {
src/gfx.js
+3 -3
View File
@@ -1,6 +1,6 @@
import {splitWords} from './utils.js?v=21'; import {splitWords} from './utils.js?v=22';
import {parable} from './math.js?v=21'; import {parable} from './math.js?v=22';
import {FONT_HEIGHT, FONT_WIDTH} from './constants.js?v=21'; import {FONT_HEIGHT, FONT_WIDTH} from './constants.js?v=22';
export function createCanvas(width, height, readable) { export function createCanvas(width, height, readable) {
const canvas = document.createElement('canvas'); const canvas = document.createElement('canvas');
src/input.js
+5 -1
View File
@@ -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 = {}; const input = {};
let lastKeypressTime = 0; let lastKeypressTime = 0;
@@ -14,6 +14,10 @@ export function key(key) {
return input[key] return input[key]
} }
export function clearKeys() {
for (const k in input) input[k] = false;
}
export function afterKeyDelay(amount=DEFAULT_KEYPRESS_DELAY) { export function afterKeyDelay(amount=DEFAULT_KEYPRESS_DELAY) {
const now = Date.now(); const now = Date.now();
if (now - lastKeypressTime >= amount) { if (now - lastKeypressTime >= amount) {
src/main.js
+18 -14
View File
@@ -1,17 +1,17 @@
import {AI_TYPES} from './ai.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=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=22';
import {createCanvas, drawLine, drawRect, drawSemiCircle, drawText, loop, plot, strokeCircle} from './gfx.js?v=21'; import {createCanvas, drawLine, drawRect, drawSemiCircle, drawText, loop, plot, strokeCircle} from './gfx.js?v=22';
import {afterKeyDelay, key, initClickCanvas, popClick, getPointer} from './input.js?v=21'; 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=21'; import {clamp, deg2rad, distance, parable, random, randomInt, vec, wrap} from './math.js?v=22';
import {PROJECTILE_TYPES} from './projectiles.js?v=21'; import {PROJECTILE_TYPES} from './projectiles.js?v=22';
import {generateSky} from './sky.js?v=21'; import {generateSky} from './sky.js?v=22';
import {playTickSound} from './sound.js?v=21'; import {playTickSound} from './sound.js?v=22';
import {clipTerrain, closestLand, collapseTerrain, generateTerrain, isTerrain, landHeight, startCollapseTerrain, collapseTerrainStep} from './terrain.js?v=21'; import {clipTerrain, closestLand, collapseTerrain, generateTerrain, isTerrain, landHeight, startCollapseTerrain, collapseTerrainStep} from './terrain.js?v=22';
import {sample, shuffle, newPlayerId} from './utils.js?v=21'; import {sample, shuffle, newPlayerId} from './utils.js?v=22';
import {EXPLOSION_TYPES} from './weapons.js?v=21'; 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=21'; 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=21'; 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=21'; import {netBroadcast, netConnect, netDisconnect, netIsConnected, netIsHost, netMakeRoomCode, netMyId, netOnMessage, netOnStatus, netRoom, netSendCommand} from './net.js?v=22';
let state = 'start-game'; let state = 'start-game';
@@ -146,6 +146,7 @@ function commitStartMenu() {
menuState = null; menuState = null;
netError = null; netError = null;
if (multiplayer) { if (multiplayer) {
clearKeys();
netMenuState = {phase: 'setup', selected: 0}; netMenuState = {phase: 'setup', selected: 0};
state = 'net-menu'; state = 'net-menu';
return; return;
@@ -870,16 +871,19 @@ function updateNetMenu() {
let name = s.name; let name = s.name;
if (!name) { if (!name) {
name = prompt('Your name:') || ''; name = prompt('Your name:') || '';
clearKeys();
if (!name) return; if (!name) return;
s.name = name.slice(0, 20); s.name = name.slice(0, 20);
} }
const code = hostBtn const code = hostBtn
? (new URLSearchParams(location.search).get('room') || netMakeRoomCode()) ? (new URLSearchParams(location.search).get('room') || netMakeRoomCode())
: (prompt('Room code:') || '').toUpperCase().trim(); : (prompt('Room code:') || '').toUpperCase().trim();
clearKeys();
if (!code) return; if (!code) return;
s.phase = 'connecting'; s.phase = 'connecting';
netError = null; netError = null;
netConnect(name, code).then((res) => { netConnect(name, code).then((res) => {
clearKeys();
netPlayerId = res.id; netPlayerId = res.id;
networkMode = true; networkMode = true;
players = []; players = [];
src/net.js
+1 -1
View File
@@ -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 socket = null;
let myId = null; let myId = null;
src/panel.js
+2 -2
View File
@@ -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 {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=21'; import {drawRect, drawLine} from './gfx.js?v=22';
export const PANEL_X = (W - PANEL_WIDTH) / 2; export const PANEL_X = (W - PANEL_WIDTH) / 2;
export {PANEL_WIDTH}; export {PANEL_WIDTH};
src/projectiles.js
+7 -7
View File
@@ -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 {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=21'; import {checkLineWith, drawLineVirtual} from './gfx.js?v=22';
import {createParticles, isTank, isTankShield, spawnNapalm, tracerMode} from './main.js?v=21'; import {createParticles, isTank, isTankShield, spawnNapalm, tracerMode} from './main.js?v=22';
import {deg2rad, parable, rad2deg, wrap} from './math.js?v=21'; import {deg2rad, parable, rad2deg, wrap} from './math.js?v=22';
import {audio, createOsc} from './sound.js?v=21'; import {audio, createOsc} from './sound.js?v=22';
import {isTerrain, landHeight} from './terrain.js?v=21'; import {isTerrain, landHeight} from './terrain.js?v=22';
import {EXPLOSION_TYPES} from './weapons.js?v=21'; import {EXPLOSION_TYPES} from './weapons.js?v=22';
export const PROJECTILE_TYPES = { export const PROJECTILE_TYPES = {
src/sky.js
+4 -4
View File
@@ -1,7 +1,7 @@
import {SKY_COLORS} from './constants.js?v=21'; import {SKY_COLORS} from './constants.js?v=22';
import {drawRect} from './gfx.js?v=21'; import {drawRect} from './gfx.js?v=22';
import {gradient} from './math.js?v=21'; import {gradient} from './math.js?v=22';
import {sample} from './utils.js?v=21'; import {sample} from './utils.js?v=22';
export function generateSky(ctx) { export function generateSky(ctx) {
const {width, height} = ctx.canvas; const {width, height} = ctx.canvas;
src/sound.js
+1 -1
View File
@@ -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 // @ts-ignore
export const audio = new (window.AudioContext || window.webkitAudioContext)(); export const audio = new (window.AudioContext || window.webkitAudioContext)();
src/terrain.js
+3 -3
View File
@@ -1,6 +1,6 @@
import {clipCanvas, drawCircle, drawRect} from './gfx.js?v=21'; import {clipCanvas, drawCircle, drawRect} from './gfx.js?v=22';
import {clamp, coords2index, random, randomInt} from './math.js?v=21'; import {clamp, coords2index, random, randomInt} from './math.js?v=22';
import {sample} from './utils.js?v=21'; import {sample} from './utils.js?v=22';
let cachedImageData; let cachedImageData;
src/utils.js
+1 -1
View File
@@ -1,4 +1,4 @@
import {randomInt} from './math.js?v=21'; import {randomInt} from './math.js?v=22';
export function sample(arr) { export function sample(arr) {
return arr[randomInt(0, arr.length-1)]; return arr[randomInt(0, arr.length-1)];
src/weapons.js
+5 -5
View File
@@ -1,8 +1,8 @@
import {PLAYER_TANK_BOUNDING_RADIUS, PLAYER_TANK_Y_FOOTPRINT, SHIELD_TYPES} from './constants.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=21'; import {drawCircle, plot} from './gfx.js?v=22';
import {clamp, cycle, distance, randomInt} from './math.js?v=21'; import {clamp, cycle, distance, randomInt} from './math.js?v=22';
import {audio, createOsc} from './sound.js?v=21'; import {audio, createOsc} from './sound.js?v=22';
import {clipTerrain} from './terrain.js?v=21'; import {clipTerrain} from './terrain.js?v=22';
export function drawExplosion(ctx, x, y, r) { export function drawExplosion(ctx, x, y, r) {
const step = Math.max(2, Math.floor(r / 6)); const step = Math.max(2, Math.floor(r / 6));