diff --git a/data-store/src/data-store.ts b/data-store/src/data-store.ts index feb4adc..20ad837 100644 --- a/data-store/src/data-store.ts +++ b/data-store/src/data-store.ts @@ -19,6 +19,11 @@ export class DataStore { * @param _amount */ getItems(_position: number, _amount: number): number[] { - return []; + let a: number[] = []; + + this.collections.map(function(e){ + a = a.concat.apply(a, e.getItems(0, e.getTotal())) + }) + return a.slice(_position, _position + _amount) } } diff --git a/pokemon b/pokemon new file mode 160000 index 0000000..b3f2e96 --- /dev/null +++ b/pokemon @@ -0,0 +1 @@ +Subproject commit b3f2e969c3b11c0aaf92325b15e0b200645af13e