Terncode/pixel.horse
1
0
Fork 0
mirror of https://github.com/Terncode/pixel.horse.git synced 2026-09-24 21:55:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

getkissRect -> getKissRect

Browse Source
This commit is contained in:
Eliot Partridge
2019-10-04 10:49:15 -05:00
parent 8b32e997ed
commit c868cead62
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ts/common/entityUtils.ts
+1 -1
View File
@@ -60,7 +60,7 @@ export function getBoopRect(entity: Entity) {
return rect(entity.x + (right ? 0.6 : -0.9) * (sitting ? 0.6 : 1), entity.y - 0.2, 0.3, 0.4); return rect(entity.x + (right ? 0.6 : -0.9) * (sitting ? 0.6 : 1), entity.y - 0.2, 0.3, 0.4);
} }
export function getkissRect(entity: Entity) { export function getKissRect(entity: Entity) {
const right = hasFlag(entity.state, EntityState.FacingRight); const right = hasFlag(entity.state, EntityState.FacingRight);
const sitting = isPonySitting(entity); const sitting = isPonySitting(entity);
return rect(entity.x + (right ? 0.4 : -0.8) * (sitting ? 0.6 : 1), entity.y - 0.225, 0.4, 0.45); return rect(entity.x + (right ? 0.4 : -0.8) * (sitting ? 0.6 : 1), entity.y - 0.225, 0.4, 0.45);
src/ts/server/playerUtils.ts
+2 -2
View File
@@ -32,7 +32,7 @@ import { replaceEmojis } from '../client/emoji';
import { expression, parseExpression } from '../common/expressionUtils'; import { expression, parseExpression } from '../common/expressionUtils';
import { import {
canBoopOrKiss, isPonySitting, isPonyStanding, getBoopRect, canStand, isPonyFlying, setPonyState, canSit, canBoopOrKiss, isPonySitting, isPonyStanding, getBoopRect, canStand, isPonyFlying, setPonyState, canSit,
canLie, getkissRect, getSneezeRect canLie, getKissRect, getSneezeRect
} from '../common/entityUtils'; } from '../common/entityUtils';
import { withBorder } from '../common/rect'; import { withBorder } from '../common/rect';
import { isOnlineFriend } from './services/friends'; import { isOnlineFriend } from './services/friends';
@@ -484,7 +484,7 @@ export function kiss(client: IClient, now: number) {
if (canPerformAction(client, now) && canBoopOrKiss(client.pony)) { if (canPerformAction(client, now) && canBoopOrKiss(client.pony)) {
cancelEntityExpression(client.pony); cancelEntityExpression(client.pony);
sendAction(client.pony, Action.Kiss); sendAction(client.pony, Action.Kiss);
boopEntity(client, getkissRect(client.pony), false); boopEntity(client, getKissRect(client.pony), false);
client.lastBoopOrKissAction = now + 3400; client.lastBoopOrKissAction = now + 3400;
} }
} }