diff --git a/src/components/round/DebugInfo.vue b/src/components/round/DebugInfo.vue index 2f7f296..fca1da2 100644 --- a/src/components/round/DebugInfo.vue +++ b/src/components/round/DebugInfo.vue @@ -7,7 +7,7 @@ Discard: {{index}}: {{(discard ?? []).map(card => cardInfo(card))}} 
Departments
Available: {{navigationState.departments}}({{navigationState.departments.length}})
- Player: {{navigationState.playerDepartments}}({{navigationState.playerDepartments.length}}) + {{navigationState.playerNewDepartments}}({{navigationState.playerNewDepartments.length}}), + Player: {{navigationState.playerDepartments}}({{navigationState.playerDepartments.length}}), Reserve: {{navigationState.playerReserveDepartments}}({{navigationState.playerReserveDepartments.length}})
Bot: {{navigationState.botDepartments}}({{navigationState.botDepartments.length}}) + {{navigationState.botNewDepartments}}({{navigationState.botNewDepartments.length}})
Bot
diff --git a/src/components/round/SideBar.vue b/src/components/round/SideBar.vue index 01189ce..7d82948 100644 --- a/src/components/round/SideBar.vue +++ b/src/components/round/SideBar.vue @@ -76,14 +76,13 @@ export default defineComponent({ return this.navigationState.round }, availableDepartments() : string[] { - return [...removeDepartments(this.navigationState.departments, - this.navigationState.playerNewDepartments, this.navigationState.botNewDepartments)] + return [...removeDepartments(this.navigationState.departments, this.navigationState.botNewDepartments)] }, playerReserveDepartments() : string[] { - return [...removeDepartments(this.navigationState.playerReserveDepartments,this.navigationState.playerNewDepartments)] + return [...this.navigationState.playerReserveDepartments] }, playerDepartments() : string[] { - return [...addDepartments(this.navigationState.playerDepartments,this.navigationState.playerNewDepartments)] + return [...this.navigationState.playerDepartments] }, botDepartments() : string[] { return [...addDepartments(this.navigationState.botDepartments,this.navigationState.botNewDepartments)] diff --git a/src/util/NavigationState.ts b/src/util/NavigationState.ts index 443e4f5..36bda9d 100644 --- a/src/util/NavigationState.ts +++ b/src/util/NavigationState.ts @@ -17,7 +17,6 @@ export default class NavigationState { readonly departments : readonly string[] readonly playerReserveDepartments : readonly string[] readonly playerDepartments : readonly string[] - readonly playerNewDepartments : readonly string[] readonly botDepartments : readonly string[] readonly botNewDepartments : readonly string[] readonly selectedAction? : Action @@ -38,7 +37,6 @@ export default class NavigationState { let botDepartments : readonly string[] = [] let selectedAction : Action|undefined let botEventDonationFailed = false - const playerNewDepartments : readonly string[] = [] let botNewDepartments : readonly string[] = [] let botCardShift : number = 0 @@ -68,7 +66,6 @@ export default class NavigationState { this.departments = departments this.playerReserveDepartments = playerReserveDepartments this.playerDepartments = playerDepartments - this.playerNewDepartments = playerNewDepartments this.botDepartments = botDepartments this.botNewDepartments = botNewDepartments this.selectedAction = selectedAction