Compare commits
6 Commits
7f06ac94e8
...
main
Author | SHA1 | Date | |
---|---|---|---|
105d2aad88
|
|||
1f2bee0b08
|
|||
86d07570c6
|
|||
906dbeca22
|
|||
60bbe418a6
|
|||
650d77bbfd
|
@@ -2,7 +2,7 @@
|
|||||||
"expo": {
|
"expo": {
|
||||||
"name": "Traintrape-moi",
|
"name": "Traintrape-moi",
|
||||||
"slug": "traintrape-moi-client",
|
"slug": "traintrape-moi-client",
|
||||||
"version": "1.0.1",
|
"version": "1.1.1",
|
||||||
"orientation": "portrait",
|
"orientation": "portrait",
|
||||||
"icon": "./assets/images/icon.png",
|
"icon": "./assets/images/icon.png",
|
||||||
"scheme": "traintrapemoi",
|
"scheme": "traintrapemoi",
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
"android": {
|
"android": {
|
||||||
"adaptiveIcon": {
|
"adaptiveIcon": {
|
||||||
"foregroundImage": "./assets/images/adaptive-icon.png",
|
"foregroundImage": "./assets/images/adaptive-icon.png",
|
||||||
"backgroundColor": "#ffffff"
|
"backgroundColor": "#0033fe"
|
||||||
},
|
},
|
||||||
"package": "eu.luemy.traintrapemoi",
|
"package": "eu.luemy.traintrapemoi",
|
||||||
"permissions": [
|
"permissions": [
|
||||||
@@ -49,9 +49,9 @@
|
|||||||
"expo-splash-screen",
|
"expo-splash-screen",
|
||||||
{
|
{
|
||||||
"image": "./assets/images/splash-icon.png",
|
"image": "./assets/images/splash-icon.png",
|
||||||
"imageWidth": 200,
|
"imageWidth": 128,
|
||||||
"resizeMode": "contain",
|
"resizeMode": "contain",
|
||||||
"backgroundColor": "#ffffff"
|
"backgroundColor": "#0033fe"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"expo-task-manager",
|
"expo-task-manager",
|
||||||
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 5.0 KiB |
Before Width: | Height: | Size: 6.2 KiB |
Before Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 17 KiB |
@@ -2,10 +2,5 @@ module.exports = function(api) {
|
|||||||
api.cache(true);
|
api.cache(true);
|
||||||
return {
|
return {
|
||||||
presets: ['babel-preset-expo'],
|
presets: ['babel-preset-expo'],
|
||||||
env: {
|
|
||||||
production: {
|
|
||||||
plugins: ['react-native-paper/babel'],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -80,7 +80,7 @@ function PlayerLocationsMarkers({ setDisplayedPlayerId }: { setDisplayedPlayerId
|
|||||||
const game = useGame()
|
const game = useGame()
|
||||||
const lastPlayerLocations = useLastPlayerLocations()
|
const lastPlayerLocations = useLastPlayerLocations()
|
||||||
return lastPlayerLocations ? lastPlayerLocations
|
return lastPlayerLocations ? lastPlayerLocations
|
||||||
.filter(() => game.currentRunner === true || !game.gameStarted)
|
.filter(() => !game.currentRunner || !game.gameStarted)
|
||||||
.filter(playerLoc => playerLoc.playerId !== game.playerId)
|
.filter(playerLoc => playerLoc.playerId !== game.playerId)
|
||||||
.map(playerLoc => <PlayerLocationMarker key={`player-${playerLoc.playerId}-loc`} playerLocation={playerLoc} setDisplayedPlayerId={setDisplayedPlayerId} />) : <></>
|
.map(playerLoc => <PlayerLocationMarker key={`player-${playerLoc.playerId}-loc`} playerLocation={playerLoc} setDisplayedPlayerId={setDisplayedPlayerId} />) : <></>
|
||||||
}
|
}
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "traintrape-moi-client",
|
"name": "traintrape-moi-client",
|
||||||
"main": "expo-router/entry",
|
"main": "expo-router/entry",
|
||||||
"version": "1.0.1",
|
"version": "1.1.1",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "expo start",
|
"start": "expo start",
|
||||||
"android": "expo run:android",
|
"android": "expo run:android",
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "traintrape-moi-server",
|
"name": "traintrape-moi-server",
|
||||||
"version": "1.0.1",
|
"version": "1.1.1",
|
||||||
"description": "",
|
"description": "",
|
||||||
"author": "",
|
"author": "",
|
||||||
"private": true,
|
"private": true,
|
||||||
|
@@ -1,8 +1,13 @@
|
|||||||
export const Constants = {
|
export const Constants = {
|
||||||
/**
|
/**
|
||||||
* Nombre de points attribués au début de la partie
|
* Nombre de points attribués au début de la partie pour la première joueuse
|
||||||
*/
|
*/
|
||||||
INITIAL_MONEY: 2000,
|
INITIAL_MONEY_1ST_PLAYER: 1500,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Nombre de points attribués au début de la partie pour la première joueuse
|
||||||
|
*/
|
||||||
|
INITIAL_MONEY_2ND_PLAYER: 1000,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Nombre de points attribués lors d'une nouvelle tentative
|
* Nombre de points attribués lors d'une nouvelle tentative
|
||||||
|
@@ -20,16 +20,16 @@ export class GameService {
|
|||||||
const alreadyStarted = game.currentRunId !== null
|
const alreadyStarted = game.currentRunId !== null
|
||||||
let run
|
let run
|
||||||
if (!alreadyStarted) {
|
if (!alreadyStarted) {
|
||||||
|
const runnerId = players[Math.floor(players.length * Math.random())].id
|
||||||
for (const player of players) {
|
for (const player of players) {
|
||||||
await this.prisma.moneyUpdate.create({
|
await this.prisma.moneyUpdate.create({
|
||||||
data: {
|
data: {
|
||||||
playerId: player.id,
|
playerId: player.id,
|
||||||
amount: Constants.INITIAL_MONEY,
|
amount: player.id === runnerId ? Constants.INITIAL_MONEY_1ST_PLAYER : Constants.INITIAL_MONEY_2ND_PLAYER,
|
||||||
reason: MoneyUpdateType.START,
|
reason: MoneyUpdateType.START,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
const runnerId = players[Math.floor(players.length * Math.random())].id
|
|
||||||
run = await this.prisma.playerRun.create({
|
run = await this.prisma.playerRun.create({
|
||||||
data: {
|
data: {
|
||||||
gameId: game.id,
|
gameId: game.id,
|
||||||
|