diff --git a/src/Survivor.ts b/src/Survivor.ts index 2f92b43..9e2f978 100644 --- a/src/Survivor.ts +++ b/src/Survivor.ts @@ -5,8 +5,8 @@ type Survivor = { Health: string, Items: string, Conditions: string | null, - Jobs: string | null, + Jobs: [{ Name: string, Level: string }], id: string | null } -export default Survivor; \ No newline at end of file +export default Survivor; diff --git a/src/components/SideBar.vue b/src/components/SideBar.vue index 6c1755f..fa61333 100644 --- a/src/components/SideBar.vue +++ b/src/components/SideBar.vue @@ -50,7 +50,8 @@ function funct(str: string): (surv: Survivor) => boolean { case 'jobs': return (surv: Survivor) => value.split(',').every((job) => { if (surv.Jobs != null) { - return surv.Jobs.toLowerCase().match(job.toLowerCase()) != null; + return surv.Jobs.reduce((acc, j) => acc + j.Name, '') + .toLowerCase().match(job.toLowerCase()) != null; } return false; }); case 'items': @@ -94,7 +95,7 @@ export default class SideBar extends Vue { Health: `${inhab.Health}/${inhab.MaxHealth}`, Items: `(${numItems}) ${inhab.items.toString().replace(/,/g, ', ')}`, Conditions: null, - Jobs: null, + Jobs: inhab.jobs, id: uuid.v4(), }; @@ -102,9 +103,6 @@ export default class SideBar extends Vue { if (!inhab.conditions.includes('')) { survivor.Conditions = inhab.conditions.toString().replace(/,/g, ', '); } - if (!inhab.jobs.includes('')) { - survivor.Jobs = inhab.jobs.toString().replace(/,/g, ', '); - } return survivor; }); diff --git a/src/components/Survivor.vue b/src/components/Survivor.vue index 4c166b3..9ee5bfa 100644 --- a/src/components/Survivor.vue +++ b/src/components/Survivor.vue @@ -9,7 +9,9 @@
  • Health: {{ survivor.Health }}
  • Items: {{ survivor.Items }}
  • Conditions: {{ survivor.Conditions }}
  • -
  • Jobs: {{ survivor.Jobs }}
  • +
  • Jobs: {{ + survivor.Jobs.map(job => `${job.Name} ${job.Level}`).toString() + }}