Skip to content

Commit

Permalink
Refactor : 헝가리안 표기법 + 닉네임 비어있는 거 하려면 이전꺼로
Browse files Browse the repository at this point in the history
  • Loading branch information
sbyeol3 committed Dec 17, 2020
1 parent 5540c98 commit 53ac89b
Show file tree
Hide file tree
Showing 14 changed files with 27 additions and 34 deletions.
4 changes: 2 additions & 2 deletions src/backend/game/GameMethods/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ function getUsers() {
}

function getTeller() {
const [teller] = this.getUsers().filter((user) => user.isTeller);
const [teller] = this.getUsers().filter((user) => user.bTeller);
return teller;
}

function getGuessers() {
return this.getUsers().filter((user) => !user.isTeller);
return this.getUsers().filter((user) => !user.bTeller);
}

function getUsersProfile() {
Expand Down
14 changes: 5 additions & 9 deletions src/backend/game/User.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class User {
this.nickname = nickname;
this.color = color;

this.isTeller = false;
this.bTeller = false;

this.turnID = 0;
this.score = 0;
Expand All @@ -32,7 +32,7 @@ class User {
}

setTeller(boolean) {
this.isTeller = boolean;
this.bTeller = boolean;
}

setReady(bReady) {
Expand All @@ -57,16 +57,12 @@ class User {

submitCard(cardID) {
this.submittedCard = cardID;

// 뽑은 카드를 리스트에서 지움
this.cards = this.cards.filter((card) => card !== cardID);
}

voteCard(cardID) {
// 악성 유저가 있을까봐 자기 카드 선택하는거 방지
if (cardID === this.submittedCard) return;
// 텔러가 vote 못하게 막기
if (this.isTeller) return;
if (this.bTeller) return;

this.votedCard = cardID;
}
Expand All @@ -83,7 +79,7 @@ class User {
turnID,
submittedCard,
votedCard,
isTeller,
bTeller,
cards,
score,
bReady,
Expand All @@ -96,7 +92,7 @@ class User {
turnID,
submittedCard,
votedCard,
isTeller,
bTeller,
cards,
score,
bReady,
Expand Down
6 changes: 3 additions & 3 deletions src/backend/sockets/waitingRoom.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ function onUpdatePlayer(updatedUserProfile = {}) {
const timeoutMap = new Map();

const isPossibleStartGame = ({ users }) => {
const isAllReady = [...users].every(([, user]) => user.bReady);
const isValidSize = users.size >= PLAYER.MIN && users.size <= PLAYER.MAX;
return isAllReady && isValidSize;
const bAllReady = [...users].every(([, user]) => user.bReady);
const bValidSize = users.size >= PLAYER.MIN && users.size <= PLAYER.MAX;
return bAllReady && bValidSize;
};

const deleteGameStartTimeout = (roomID) => {
Expand Down
4 changes: 2 additions & 2 deletions src/backend/utils/calcScore.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ const mapScore = (correctScore, bonusScore) => ({ correctScore, bonusScore });
const getScoreMap = (game) => {
const scoreMap = new Map();
const users = game.getUsers();
const [teller] = users.filter((user) => user.isTeller);
const guessers = users.filter((user) => !user.isTeller);
const [teller] = users.filter((user) => user.bTeller);
const guessers = users.filter((user) => !user.bTeller);

// Teller
// [다 맞추거나 아무도 못 맞춤]인지 [한명이라도 맞춤]인지 확인
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/game/LeftTab.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class LeftTab {
updateDuck(playerInfo) {
const updatedDuck = this.findDuck(playerInfo.socketID);
if (updatedDuck) {
updatedDuck.setHat(playerInfo.isTeller);
updatedDuck.setHat(playerInfo.bTeller);
updatedDuck.update(playerInfo);
} else this.addDuck(playerInfo);
}
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/scenes/guesserWaiting/render.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const renderGuesserWaiting = ({ endTime }) => {
ProgressBar.start();

PlayerManager.getPlayers().forEach((player) =>
player.duck.setVisibility(!player.isTeller, player.isCurrentPlayer),
player.duck.setVisibility(!player.bTeller, player.isCurrentPlayer),
);

const tellerColor = PlayerManager.getTeller().color;
Expand Down
4 changes: 2 additions & 2 deletions src/frontend/scenes/scoreboard/render.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import template from './template.html';
const defineRenderRow = (TableBody) => (player) => {
const {
nickname,
isTeller,
bTeller,
score: { current, correct, bonus },
} = player;
const TableRow = new GameObject({
Expand All @@ -24,7 +24,7 @@ const defineRenderRow = (TableBody) => (player) => {
width: 60,
parent: PlayerInfoWrapper,
});
DuckIcon.setHat(isTeller);
DuckIcon.setHat(bTeller);
const NicknameObject = new TextObject({
parent: PlayerInfoWrapper,
}).setContent(nickname);
Expand Down
4 changes: 2 additions & 2 deletions src/frontend/scenes/voteResult/render.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const renderVoteResult = () => {
votedCardID,
submittedCardID,
nickname,
isTeller,
bTeller,
score,
} = player;

Expand All @@ -82,7 +82,7 @@ const renderVoteResult = () => {
bonusScore.attachToObject(scoreContainer);
bonusScore.addClass('bonus-score');

if (isTeller) {
if (bTeller) {
const tellerCard = cards.find((card) => card.cardID === submittedCardID);
tellerCard.addClass('card-glow-gold');
return [...prev, nameDuck, nicknameText, nameContainer];
Expand Down
3 changes: 2 additions & 1 deletion src/frontend/scenes/waitingRoom/events.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ export const copyGameCode = (e) => {
export const changeNickname = (NicknameInput) => {
const newNickname = NicknameInput.instance.value;
if (!newNickname || newNickname.length > 12) {
// 이전 닉네임으로 되돌아가는 기능 추가해야 함
const { nickname } = PlayerManager.getCurrentPlayer();
NicknameInput.setValue(nickname);
return;
}
socket.emit('update player', { nickname: newNickname });
Expand Down
4 changes: 2 additions & 2 deletions src/frontend/socket/scoreboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ const onTellerSelect = ({ tellerID, cards, endTime }) => {
PlayerManager.setTellerID(tellerID);
CardManager.initializeMyCards(cards);
SceneManager.initializeSubmiitingPlayers();
const { isTeller } = PlayerManager.getCurrentPlayer();
const nextScene = isTeller
const { bTeller } = PlayerManager.getCurrentPlayer();
const nextScene = bTeller
? new TellerSelectCard({ cards, endTime })
: new GuesserWaiting({ endTime });
SceneManager.renderNextScene(nextScene);
Expand Down
4 changes: 2 additions & 2 deletions src/frontend/socket/waitingRoom.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ const setupWaitingRoomSocket = () => {
if (!SceneManager.isCurrentScene(WaitingRoom)) return;
PlayerManager.setTellerID(tellerID);
CardManager.initializeMyCards(cards);
const { isTeller } = PlayerManager.getCurrentPlayer();
const nextScene = isTeller
const { bTeller } = PlayerManager.getCurrentPlayer();
const nextScene = bTeller
? new TellerSelectCard({ cards, endTime })
: new GuesserWaiting({ endTime });
SceneManager.renderNextScene(nextScene);
Expand Down
4 changes: 2 additions & 2 deletions src/frontend/utils/Player.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const Player = class {
socketID,
nickname,
color,
isTeller = false,
bTeller = false,
isCurrentPlayer = false,
bReady = false,
} = {}) {
Expand All @@ -18,7 +18,7 @@ const Player = class {
bonus: 0,
current: 0,
};
this.isTeller = isTeller;
this.bTeller = bTeller;
this.isCurrentPlayer = isCurrentPlayer;
this.bReady = bReady;
this.duck = new DuckCursorObject({ bReady, color });
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/utils/PlayerManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ const PlayerManager = class extends Map {

getTeller() {
if (this.tellerID) return this.get(this.tellerID);
return [...this.map].find((player) => player.isTeller) || null;
return [...this.map].find((player) => player.bTeller) || null;
}

isTeller() {
Expand Down
4 changes: 0 additions & 4 deletions src/frontend/utils/voiceChatUtil.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,13 @@ const addAudioStream = ({ mediaConnection, peerMap }) => {
});
};

// socket을 통해 다른 사람이 접속한걸 받았을 때
// 다른 사람에게 mediaConnection 요청을 보냄
const connectToNewUser = ({ peer, socketID, stream, peerMap }) => {
const mediaConnection = peer.call(socketID, stream);
addAudioStream({ mediaConnection, peerMap });
};

// 내가 다른 사람의 mediaConnection 요청을 받았을 때
const setAnswerBehavior = ({ stream, peerMap, peer }) => {
peer.on('call', (mediaConnection) => {
// 다른 사람의 요청에 answer를 날림
mediaConnection.answer(stream);
addAudioStream({ mediaConnection, peerMap });
});
Expand Down

0 comments on commit 53ac89b

Please sign in to comment.