BlueGit

timfa questward

Wire combat knockback, dodge, and block flash on the client.

Combat hit/miss/block messages now drive the new world-view shove and flash feedback.

timfa Tim Falken · pushed by timfa

Authored 2026-08-30 · 2 months ago

Hash
7c0f459abf4a19c3056418849e6d4c3eb543cfc7
Parent
b997b836
1 file changed +3 −1
client/src/play/main.js +3 −1
@@ -1764,6 +1764,7 @@ async function main ()
1764 1764 {
1765 1765 view?.updateEntityHealth(message.targetId, message.health, message.maxHealth);
1766 1766 view?.flashDamage(message.targetId);
1767 view?.spawnCombatKnockback?.(message);
1767 1768 view?.spawnDamageNumber(message.targetId, message.damage);
1768 1769 if (message.targetId === view?.localEntityId)
1769 1770 {
@@ -1778,13 +1779,14 @@ async function main ()
1778 1779 break;
1779 1780 }
1780 1781 case MessageType.combatMiss:
1782 view?.spawnCombatDodge?.(message);
1781 1783 view?.markProjectileMiss?.(message);
1782 1784 break;
1783 1785 case MessageType.combatBlock:
1784 1786 {
1785 1787 const applyBlock = () =>
1786 1788 {
1787 view?.flashDamage(message.targetId);
1789 view?.flashBlock?.(message.targetId);
1788 1790 if (message.health != null)
1789 1791 { view?.updateEntityHealth(message.targetId, message.health, message.maxHealth); }
1790 1792 };
@@ -1764,6 +1764,7 @@ async function main ()
1764 {
1764 {
1765 view?.updateEntityHealth(message.targetId, message.health, message.maxHealth);
1765 view?.updateEntityHealth(message.targetId, message.health, message.maxHealth);
1766 view?.flashDamage(message.targetId);
1766 view?.flashDamage(message.targetId);
1767 view?.spawnCombatKnockback?.(message);
1767 view?.spawnDamageNumber(message.targetId, message.damage);
1768 view?.spawnDamageNumber(message.targetId, message.damage);
1768 if (message.targetId === view?.localEntityId)
1769 if (message.targetId === view?.localEntityId)
1769 {
1770 {
@@ -1778,13 +1779,14 @@ async function main ()
1778 break;
1779 break;
1779 }
1780 }
1780 case MessageType.combatMiss:
1781 case MessageType.combatMiss:
1782 view?.spawnCombatDodge?.(message);
1781 view?.markProjectileMiss?.(message);
1783 view?.markProjectileMiss?.(message);
1782 break;
1784 break;
1783 case MessageType.combatBlock:
1785 case MessageType.combatBlock:
1784 {
1786 {
1785 const applyBlock = () =>
1787 const applyBlock = () =>
1786 {
1788 {
1787 view?.flashDamage(message.targetId);
1789 view?.flashBlock?.(message.targetId);
1788 if (message.health != null)
1790 if (message.health != null)
1789 { view?.updateEntityHealth(message.targetId, message.health, message.maxHealth); }
1791 { view?.updateEntityHealth(message.targetId, message.health, message.maxHealth); }
1790 };
1792 };