Merge branch 'master' of https://github.com/gear-foundation/dapps

frontend/apps/vara-man/src/feature/game/models/Character.ts

@@ -82,11 +82,12 @@ export class Character {
 	}
 
 	getBounds() {
+		const padding = 4; // Величина, на которую уменьшается хитбокс
 		return {
-			x: this.position.x - this.torsoWidth / 2,
-			y: this.position.y - this.torsoHeight * 2,
-			width: this.torsoWidth,
-			height: this.torsoHeight + this.legHeight,
+			x: this.position.x - (this.torsoWidth / 2) + padding,
+			y: this.position.y - (this.torsoHeight * 2) + padding,
+			width: this.torsoWidth - (padding * 2),
+			height: (this.torsoHeight + this.legHeight) - (padding * 2),
 		}
 	}
 
@@ -126,11 +127,11 @@ export class Character {
 		isShift: boolean
 	): void {
 		if (isLeft) {
-			this.rotation -= Math.PI * 0.03
+			this.rotation -= Math.PI * 0.015
 		}
 
 		if (isRight) {
-			this.rotation += Math.PI * 0.03
+			this.rotation += Math.PI * 0.015
 		}
 
 		if (isUp || isDown) {

frontend/apps/vara-man/src/feature/game/models/renders/CharacterRenderer.ts

@@ -38,6 +38,22 @@ export class CharacterRenderer {
 
 		const radius = 5
 
+		// Hands
+		arms.forEach((arm: { limb: string; height: number }) => {
+			context.strokeStyle = '#00E3AE'
+			context.fillStyle = '#00E3AE'
+			context.beginPath()
+			context.roundRect(
+				arm.limb === 'left' ? -torsoWidth / 2 : torsoWidth / 2 - armWidth,
+				-torsoHeight / 4,
+				armWidth,
+				arm.height,
+				5
+			)
+			context.stroke()
+			context.fill()
+		})
+
 		// Torso
 		context.beginPath()
 		context.fillStyle = '#00FFC4'
@@ -73,22 +89,6 @@ export class CharacterRenderer {
 		context.closePath()
 		context.fill()
 
-		// Hands
-		arms.forEach((arm: { limb: string; height: number }) => {
-			context.strokeStyle = '#00E3AE'
-			context.fillStyle = '#00E3AE'
-			context.beginPath()
-			context.roundRect(
-				arm.limb === 'left' ? -torsoWidth / 2 : torsoWidth / 2 - armWidth,
-				-torsoHeight / 4,
-				armWidth,
-				arm.height,
-				5
-			)
-			context.stroke()
-			context.fill()
-		})
-
 		// Head
 		context.beginPath()
 		context.fillStyle = '#000000'
@@ -104,7 +104,7 @@ export class CharacterRenderer {
 		context.restore()
 
 		// Drawing a border for debug
-		// const bounds = enemy.getBounds()
+		// const bounds = character.getBounds()
 		// context.strokeStyle = 'rgba(255, 0, 0, 0.5)'
 		// context.strokeRect(bounds.x, bounds.y, bounds.width, bounds.height)
 	}