Crypteam
/
Cryptid
4
0
Fork 0
Code Issues 10 Pull Requests Packages Projects 9 Releases Wiki Activity

les bots peuvent jouer après que quelqu'un ait quitté
continuous-integration/drone/push Build is failing Details

Browse Source
pull/93/head
Thomas Chazot 1 year ago
parent 36b48ff6bf
commit 9c9402c3bb
3 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File

16
cryptide_project/server/server.js
Unescape View File

@ -145,15 +145,17 @@ io.on('connection', (socket) => {
}) })
socket.on("who plays", (room) => { socket.on("who plays", (room) => {
let player = map.get(room).actualPlayer if (map.get(room) !== undefined){
if (map.get(room).tab[player].type != "User"){ let player = map.get(room).actualPlayer
player = player + 1 if (map.get(room).tab[player].type != "User"){
if (player == map.get(room).tab.length){ player = player + 1
player=0 if (player == map.get(room).tab.length){
player=0
}
} }
console.log(player)
io.to(room).emit("who plays", player, map.get(room).lastWorks)
} }
console.log(player)
io.to(room).emit("who plays", player, map.get(room).lastWorks)
}) })
socket.on("disconnect", () =>{ socket.on("disconnect", () =>{

46
cryptide_project/src/Components/GraphContainer.tsx
Unescape View File

@ -61,6 +61,7 @@ let cptPlayerLeft = 0
let firstPlayer = 0 let firstPlayer = 0
let cptBug = 0 let cptBug = 0
let cptUseEffect = 0 let cptUseEffect = 0
let testPlayers: Player[] = []
const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleShowTurnBar, handleTurnBarTextChange, playerTouched, setPlayerTouched, changecptTour, solo, isDaily, isEasy, addToHistory, showLast, setNetwork, setNetworkEnigme, setPlayerIndex, askedWrong, setAskedWrong}) => { const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleShowTurnBar, handleTurnBarTextChange, playerTouched, setPlayerTouched, changecptTour, solo, isDaily, isEasy, addToHistory, showLast, setNetwork, setNetworkEnigme, setPlayerIndex, askedWrong, setAskedWrong}) => {
@ -102,8 +103,14 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
}, [elapsedTime, endgame]); }, [elapsedTime, endgame]);
useEffect(() => {
testPlayers = players
console.log(testPlayers)
}, [players])
useEffect(() =>{ useEffect(() =>{
touchedPlayer=playerTouched touchedPlayer=playerTouched
console.log(playerTouched)
if (touchedPlayer == -1){ if (touchedPlayer == -1){
if (!askedWrongLocal){ if (!askedWrongLocal){
socket.emit("put correct background", socket.id) socket.emit("put correct background", socket.id)
@ -157,7 +164,7 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
useEffect(() =>{ useEffect(() =>{
cptBug=0 cptBug=0
if (actualPlayerIndex==firstPlayer){ if (actualPlayerIndex==firstPlayer){
const bot = players[lastIndex] const bot = testPlayers[lastIndex]
if(bot instanceof Bot && botIndex != lastIndex){ if(bot instanceof Bot && botIndex != lastIndex){
botIndex = lastIndex botIndex = lastIndex
if (personNetwork!=null){ if (personNetwork!=null){
@ -181,7 +188,7 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
} }
const tester = IndiceTesterFactory.Create(indices[playerIndex]) const tester = IndiceTesterFactory.Create(indices[playerIndex])
const works = tester.Works(person) const works = tester.Works(person)
socket.emit("asked all 1by1", person.getId(), players[playerIndex].id) socket.emit("asked all 1by1", person.getId(), testPlayers[playerIndex].id)
if (i==players.length){ if (i==players.length){
socket.emit("node checked", personIndex, works, playerIndex, room, nextPlayerIndex) socket.emit("node checked", personIndex, works, playerIndex, room, nextPlayerIndex)
} }
@ -190,7 +197,7 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
} }
if(!works){ if(!works){
socket.emit("node checked", personIndex, works, playerIndex, room, nextPlayerIndex) socket.emit("node checked", personIndex, works, playerIndex, room, nextPlayerIndex)
const ind = bot.placeSquare(personNetwork, players) const ind = bot.placeSquare(personNetwork, testPlayers)
if (ind == -1 ){ if (ind == -1 ){
socket.emit("can't put square", lastIndex, room) socket.emit("can't put square", lastIndex, room)
return return
@ -209,7 +216,7 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
} }
else{ else{
if (person!=undefined){ if (person!=undefined){
if (players[choosedPlayerIndex] instanceof Bot){ if (testPlayers[choosedPlayerIndex] instanceof Bot){
console.log("BOT") console.log("BOT")
const tester = IndiceTesterFactory.Create(indices[choosedPlayerIndex]) const tester = IndiceTesterFactory.Create(indices[choosedPlayerIndex])
const works = tester.Works(person) const works = tester.Works(person)
@ -224,7 +231,7 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
else{ else{
console.log(lastIndex + " interroge " + choosedPlayerIndex + " a propos de " + person.getName() + " et dit non") console.log(lastIndex + " interroge " + choosedPlayerIndex + " a propos de " + person.getName() + " et dit non")
socket.emit("node checked", personIndex, false, choosedPlayerIndex, room, lastIndex) socket.emit("node checked", personIndex, false, choosedPlayerIndex, room, lastIndex)
const ind = bot.placeSquare(personNetwork, players) const ind = bot.placeSquare(personNetwork, testPlayers)
if (ind == -1 ){ if (ind == -1 ){
socket.emit("can't put square", playerIndex, room) socket.emit("can't put square", playerIndex, room)
return return
@ -239,11 +246,11 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
} }
else{ else{
console.log(choosedPlayerIndex + " => Pas bot" ) console.log(choosedPlayerIndex + " => Pas bot" )
socket.emit("ask player", personIndex, players[choosedPlayerIndex].id, players[lastIndex]) socket.emit("ask player", personIndex, testPlayers[choosedPlayerIndex].id, testPlayers[lastIndex])
console.log(lastIndex + " interroge " + +choosedPlayerIndex + " sur " + personNetwork.getPersons()[personIndex].getName()) console.log(lastIndex + " interroge " + +choosedPlayerIndex + " sur " + personNetwork.getPersons()[personIndex].getName())
const tester = IndiceTesterFactory.Create(indices[choosedPlayerIndex]) const tester = IndiceTesterFactory.Create(indices[choosedPlayerIndex])
if (!tester.Works(person)){ if (!tester.Works(person)){
const ind = bot.placeSquare(personNetwork, players) const ind = bot.placeSquare(personNetwork, testPlayers)
if (ind == -1 ){ if (ind == -1 ){
socket.emit("can't put square", playerIndex, room) socket.emit("can't put square", playerIndex, room)
return return
@ -382,7 +389,7 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
tmpTab.push(JSONParser.JSONToPlayer(p)) tmpTab.push(JSONParser.JSONToPlayer(p))
} }
else{ else{
tmpTab.push(players[ind]) tmpTab.push(testPlayers[ind])
} }
ind ++ ind ++
} }
@ -399,12 +406,11 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
tmpTab.push(JSONParser.JSONToPlayer(p)) tmpTab.push(JSONParser.JSONToPlayer(p))
} }
else{ else{
tmpTab.push(players[ind]) tmpTab.push(testPlayers[ind])
} }
ind ++ ind ++
} }
if (i==firstPlayer){ if (i==firstPlayer){
console.log(tmpTab)
for(let index = 0; index < tmpTab.length; index++){ for(let index = 0; index < tmpTab.length; index++){
const test = tmpTab[index] const test = tmpTab[index]
if (test instanceof User){ if (test instanceof User){
@ -508,7 +514,7 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
if (p!=undefined && tab != undefined){ if (p!=undefined && tab != undefined){
tab.push(p) tab.push(p)
if (actualPlayerIndex == 0){ if (actualPlayerIndex == 0){
players.forEach((player) => { testPlayers.forEach((player) => {
if (player instanceof Bot){ if (player instanceof Bot){
player.newInformation(p, askedIndex, works) player.newInformation(p, askedIndex, works)
} }
@ -522,7 +528,7 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
cptHistory++ cptHistory++
if (cptHistory % 2 == 0){ if (cptHistory % 2 == 0){
lastNodes.push(node) lastNodes.push(node)
addToHistory(players[askedIndex].pseudo + " à mis un " + positionToEmoji(askedIndex, works) + " à " + personNetwork.getPersons()[id].getName()) addToHistory(testPlayers[askedIndex].pseudo + " à mis un " + positionToEmoji(askedIndex, works) + " à " + personNetwork.getPersons()[id].getName())
} }
} }
@ -584,7 +590,7 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
cptBug=0 cptBug=0
cptOnAskedWrong ++ cptOnAskedWrong ++
if (cptOnAskedWrong % 2 == 0){ if (cptOnAskedWrong % 2 == 0){
addToHistory(players[askingPlayer].pseudo + " ne peut plus poser de carré") addToHistory(testPlayers[askingPlayer].pseudo + " ne peut plus poser de carré")
playerIndex = askingPlayer + 1 playerIndex = askingPlayer + 1
if(playerIndex == players.length){ if(playerIndex == players.length){
playerIndex = 0 playerIndex = 0
@ -629,8 +635,8 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
socket.emit("node checked", nodeId, true, actualPlayerIndex, room, playerIndex) socket.emit("node checked", nodeId, true, actualPlayerIndex, room, playerIndex)
} }
else{ else{
let index = players.findIndex((p) => p.id == askingPlayer.id) let index = testPlayers.findIndex((p) => p.id == askingPlayer.id)
if (players[index] instanceof Bot){ if (testPlayers[index] instanceof Bot){
index = playerIndex + 1 index = playerIndex + 1
if(index == players.length){ if(index == players.length){
index = 0 index = 0
@ -816,9 +822,9 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
network.on("click", async (params) => { network.on("click", async (params) => {
if(params.nodes.length > 0){ if(params.nodes.length > 0){
console.log(actualPlayerIndex + " => " + playerIndex) console.log(touchedPlayer)
console.log(playerTouched)
setNodeIdData(params.nodes[0]) setNodeIdData(params.nodes[0])
console.log(players)
// addToHistory("Le joueur a cliqué") //! TEST DEBUG // addToHistory("Le joueur a cliqué") //! TEST DEBUG
if (!solo){ if (!solo){
if (askedWrongLocal){ if (askedWrongLocal){
@ -848,7 +854,9 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
} }
else if(touchedPlayer != -1 && playerIndex == actualPlayerIndex && touchedPlayer<players.length){ else if(touchedPlayer != -1 && playerIndex == actualPlayerIndex && touchedPlayer<players.length){
botIndex = -1 botIndex = -1
if (players[touchedPlayer] instanceof Bot){ console.log(testPlayers[touchedPlayer])
if (testPlayers[touchedPlayer] instanceof Bot){
console.log("BOT TOUCHÉ")
const ind = indices[touchedPlayer] const ind = indices[touchedPlayer]
const test = IndiceTesterFactory.Create(ind) const test = IndiceTesterFactory.Create(ind)
//@ts-ignore //@ts-ignore
@ -871,7 +879,7 @@ const MyGraphComponent: React.FC<MyGraphComponentProps> = ({onNodeClick, handleS
} }
else{ else{
if (touchedPlayer >= 0){ if (touchedPlayer >= 0){
console.log(touchedPlayer) console.log("CE N'EST PAS UN BOT")
//@ts-ignore //@ts-ignore
socket.emit("ask player", params.nodes[0], players[touchedPlayer].id, players.find((p) => p.id === socket.id, actualPlayerIndex)) socket.emit("ask player", params.nodes[0], players[touchedPlayer].id, players.find((p) => p.id === socket.id, actualPlayerIndex))
socket.emit("put correct background", socket.id) socket.emit("put correct background", socket.id)

1
cryptide_project/src/Components/PersonStatus.tsx
Unescape View File

@ -51,6 +51,7 @@ const PersonStatus: React.FC<PlayerStatusProps> = ({img = Person, state= Person,
function onTouch(){ function onTouch(){
if (IsActualPlayer && !askedWrong){ if (IsActualPlayer && !askedWrong){
setPlayerTouched(index) setPlayerTouched(index)
setTouchedPlayer(index)
} }
} }

Write Preview
Loading…
Cancel
Save