Skip to content

Commit

Permalink
Merge branch 'release/1.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
web-flow committed Nov 30, 2024
2 parents a2b6ce0 + 9bfa7ef commit 257fd6a
Show file tree
Hide file tree
Showing 212 changed files with 1,411 additions and 189 deletions.
98 changes: 49 additions & 49 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@brdgm/gaia-project-solo-helper",
"version": "1.0.9",
"version": "1.1.0",
"private": true,
"description": "Gaia Project Solo Helper",
"appDeployName": "gaia-project",
Expand All @@ -21,10 +21,10 @@
"bootstrap": "^5.3.3",
"core-js": "^3.39.0",
"lodash": "^4.17.21",
"pinia": "^2.2.6",
"pinia": "^2.2.8",
"pinia-plugin-persistedstate": "^4.1.3",
"vue": "^3.5.13",
"vue-i18n": "^10.0.4",
"vue-i18n": "^10.0.5",
"vue-router": "^4.5.0"
},
"devDependencies": {
Expand All @@ -40,7 +40,7 @@
"@vitejs/plugin-legacy": "^5.4.3",
"@vitejs/plugin-vue": "^5.2.1",
"@vitest/coverage-istanbul": "^2.1.6",
"@vitest/eslint-plugin": "^1.1.11",
"@vitest/eslint-plugin": "^1.1.12",
"@vue/eslint-config-typescript": "^14.1.4",
"babel-plugin-istanbul": "^7.0.0",
"chai": "^5.1.2",
Expand Down
Binary file added resources/sector-map-indexes-lost-fleet.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/sector-map-indexes.pptx
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File renamed without changes.
File renamed without changes.
Binary file not shown.
Binary file not shown.
Binary file removed src/assets/icons/round-booster/1.png
Binary file not shown.
Binary file added src/assets/icons/round-booster/1.webp
Binary file not shown.
Binary file removed src/assets/icons/round-booster/10.png
Binary file not shown.
Binary file added src/assets/icons/round-booster/10.webp
Binary file not shown.
Binary file added src/assets/icons/round-booster/11.webp
Binary file not shown.
Binary file added src/assets/icons/round-booster/12.webp
Binary file not shown.
Binary file added src/assets/icons/round-booster/13.webp
Binary file not shown.
Binary file added src/assets/icons/round-booster/14.webp
Binary file not shown.
Binary file removed src/assets/icons/round-booster/2.png
Binary file not shown.
Binary file added src/assets/icons/round-booster/2.webp
Binary file not shown.
Binary file removed src/assets/icons/round-booster/3.png
Binary file not shown.
Binary file added src/assets/icons/round-booster/3.webp
Binary file not shown.
Binary file removed src/assets/icons/round-booster/4.png
Binary file not shown.
Binary file added src/assets/icons/round-booster/4.webp
Binary file not shown.
Binary file removed src/assets/icons/round-booster/5.png
Binary file not shown.
Binary file added src/assets/icons/round-booster/5.webp
Binary file not shown.
Binary file removed src/assets/icons/round-booster/6.png
Binary file not shown.
Binary file added src/assets/icons/round-booster/6.webp
Binary file not shown.
Binary file removed src/assets/icons/round-booster/7.png
Binary file not shown.
Binary file added src/assets/icons/round-booster/7.webp
Binary file not shown.
Binary file removed src/assets/icons/round-booster/8.png
Binary file not shown.
Binary file added src/assets/icons/round-booster/8.webp
Binary file not shown.
Binary file removed src/assets/icons/round-booster/9.png
Binary file not shown.
Binary file added src/assets/icons/round-booster/9.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed src/assets/icons/scoring-final/gaia-planets.png
Binary file not shown.
Binary file added src/assets/icons/scoring-final/gaia-planets.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed src/assets/icons/scoring-final/planet-types.png
Binary file not shown.
Binary file added src/assets/icons/scoring-final/planet-types.webp
Binary file not shown.
Binary file removed src/assets/icons/scoring-final/satellites.png
Binary file not shown.
Binary file added src/assets/icons/scoring-final/satellites.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed src/assets/icons/scoring-final/structures.png
Binary file not shown.
Binary file added src/assets/icons/scoring-final/structures.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed src/assets/icons/scoring-round/federation-token.png
Binary file not shown.
Binary file not shown.
Binary file removed src/assets/icons/scoring-round/gaia-planet-1.png
Binary file not shown.
Binary file added src/assets/icons/scoring-round/gaia-planet-1.webp
Binary file not shown.
Binary file removed src/assets/icons/scoring-round/gaia-planet-2.png
Binary file not shown.
Binary file added src/assets/icons/scoring-round/gaia-planet-2.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed src/assets/icons/scoring-round/mine.png
Binary file not shown.
Binary file added src/assets/icons/scoring-round/mine.webp
Binary file not shown.
Binary file removed src/assets/icons/scoring-round/research-area.png
Binary file not shown.
Binary file not shown.
Binary file removed src/assets/icons/scoring-round/terraforming.png
Binary file not shown.
Binary file added src/assets/icons/scoring-round/terraforming.webp
Binary file not shown.
Binary file removed src/assets/icons/scoring-round/trading-station-1.png
Diff not rendered.
Binary file not shown.
Binary file removed src/assets/icons/scoring-round/trading-station-2.png
Diff not rendered.
Binary file not shown.
Binary file removed src/assets/icons/tech-advanced-tile/1.png
Diff not rendered.
Binary file added src/assets/icons/tech-advanced-tile/1.webp
Binary file not shown.
Binary file removed src/assets/icons/tech-advanced-tile/10.png
Diff not rendered.
Binary file added src/assets/icons/tech-advanced-tile/10.webp
Binary file not shown.
Binary file removed src/assets/icons/tech-advanced-tile/11.png
Diff not rendered.
Binary file added src/assets/icons/tech-advanced-tile/11.webp
Binary file not shown.
Binary file removed src/assets/icons/tech-advanced-tile/12.png
Diff not rendered.
Binary file added src/assets/icons/tech-advanced-tile/12.webp
Binary file not shown.
Binary file removed src/assets/icons/tech-advanced-tile/13.png
Diff not rendered.
Binary file added src/assets/icons/tech-advanced-tile/13.webp
Binary file not shown.
Binary file removed src/assets/icons/tech-advanced-tile/14.png
Diff not rendered.
Binary file added src/assets/icons/tech-advanced-tile/14.webp
Binary file not shown.
Binary file removed src/assets/icons/tech-advanced-tile/15.png
Diff not rendered.
Binary file added src/assets/icons/tech-advanced-tile/15.webp
Binary file not shown.
Binary file added src/assets/icons/tech-advanced-tile/16.webp
Binary file not shown.
Binary file added src/assets/icons/tech-advanced-tile/17.webp
Binary file not shown.
Binary file added src/assets/icons/tech-advanced-tile/18.webp
Binary file not shown.
Binary file added src/assets/icons/tech-advanced-tile/19.webp
Binary file not shown.
Binary file removed src/assets/icons/tech-advanced-tile/2.png
Diff not rendered.
Binary file added src/assets/icons/tech-advanced-tile/2.webp
Binary file not shown.
Binary file added src/assets/icons/tech-advanced-tile/20.webp
Binary file not shown.
Binary file added src/assets/icons/tech-advanced-tile/21.webp
Binary file not shown.
Binary file removed src/assets/icons/tech-advanced-tile/3.png
Diff not rendered.
Binary file added src/assets/icons/tech-advanced-tile/3.webp
Binary file not shown.
Binary file removed src/assets/icons/tech-advanced-tile/4.png
Diff not rendered.
Binary file added src/assets/icons/tech-advanced-tile/4.webp
Binary file not shown.
Binary file removed src/assets/icons/tech-advanced-tile/5.png
Diff not rendered.
Binary file added src/assets/icons/tech-advanced-tile/5.webp
Binary file not shown.
Binary file removed src/assets/icons/tech-advanced-tile/6.png
Diff not rendered.
Binary file added src/assets/icons/tech-advanced-tile/6.webp
Binary file not shown.
Binary file not shown.
Binary file removed src/assets/icons/tech-advanced-tile/7.png
Diff not rendered.
Binary file added src/assets/icons/tech-advanced-tile/7.webp
Binary file not shown.
Binary file removed src/assets/icons/tech-advanced-tile/8.png
Diff not rendered.
Binary file added src/assets/icons/tech-advanced-tile/8.webp
Binary file not shown.
Binary file removed src/assets/icons/tech-advanced-tile/9.png
Diff not rendered.
Binary file added src/assets/icons/tech-advanced-tile/9.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed src/assets/icons/terraforming-reference/firaks.jpg
Diff not rendered.
Binary file not shown.
Binary file removed src/assets/icons/terraforming-reference/geodens.jpg
Diff not rendered.
Binary file not shown.
Diff not rendered.
Binary file not shown.
Binary file removed src/assets/icons/terraforming-reference/itars.jpg
Diff not rendered.
Binary file not shown.
Binary file removed src/assets/icons/terraforming-reference/taklons.jpg
Diff not rendered.
Binary file not shown.
Binary file removed src/assets/icons/terraforming-reference/terrans.jpg
Diff not rendered.
Binary file not shown.
Binary file removed src/assets/icons/terraforming-reference/xenos.jpg
Diff not rendered.
Binary file not shown.
25 changes: 25 additions & 0 deletions src/components/setup/AutomaSetup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
<li v-html="t('setupGameAutoma.playerTokens')"></li>
<li v-html="t('setupGameAutoma.startVP', {count:botStartVP})"></li>
<li v-html="t('setupGameAutoma.satellites')"></li>
<ul v-if="isScoringFinalTileFederationStructures">
<li v-html="t('endOfGame.scoringFinalTileFederationStructures')"></li>
</ul>
<template v-if="hasLostFleet">
<li v-html="t('setupGameAutoma.explorationShuttle')"></li>
</template>
<li v-for="(faction,index) of botFactions" :key="faction">
<AppIcon type="faction" :name="faction" class="factionIcon"/>
<span class="fw-bold" v-html="t(`botFaction.${faction}`)"></span>
Expand Down Expand Up @@ -33,6 +39,8 @@ import BotFaction from '@/services/enum/BotFaction'
import { useStateStore } from '@/store/state'
import DifficultyLevel from '@/services/enum/DifficultyLevel'
import DirectionalSelection from '@/services/enum/DirectionalSelection'
import Expansion from '@/services/enum/Expansion'
import ScoringFinalTile from '@/services/enum/ScoringFinalTile'
export default defineComponent({
name: 'AutomaSetup',
Expand All @@ -46,6 +54,9 @@ export default defineComponent({
return { t, state }
},
computed: {
hasLostFleet() : boolean {
return this.state.setup.expansions.includes(Expansion.LOST_FLEET)
},
totalPlayerCount() : number {
return this.state.setup.playerSetup.botCount + this.state.setup.playerSetup.playerCount
},
Expand All @@ -56,6 +67,17 @@ export default defineComponent({
return this.state.setup.playerSetup.botFaction.toReversed()
},
botStartVP() : number {
if (this.hasLostFleet) {
if (this.state.setup.difficultyLevel == DifficultyLevel.AUTOMA) {
return 15
}
else if (this.state.setup.difficultyLevel == DifficultyLevel.AUTOMAECHTIG) {
return 20
}
else if (this.state.setup.difficultyLevel == DifficultyLevel.ULTOMA) {
return 25
}
}
if (this.state.setup.difficultyLevel == DifficultyLevel.AUTOMALEIN) {
return 0
}
Expand All @@ -66,6 +88,9 @@ export default defineComponent({
},
isNeutralPlayer() : boolean {
return this.totalPlayerCount < 3
},
isScoringFinalTileFederationStructures() : boolean {
return (this.state.setup.scoringFinalTiles ?? []).includes(ScoringFinalTile.FEDERATION_STRUCTURES)
}
},
methods: {
Expand Down
Loading

0 comments on commit 257fd6a

Please sign in to comment.