sebastian/ConceptCreator
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases Wiki Activity

inventory-items-2 #44

Closed
sebastian wants to merge 32 commits from inventory-items-2 into inventory
pull from: inventory-items-2
merge into: sebastian:inventory
Conversation 0 Commits 32 Files Changed 58 +11 -1
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a57024c6af - Show all commits

1
src/app/project/game-model/GameModel.ts
View File

@ -13,7 +13,6 @@ import {ProductTemplateCreator} from "./templates/productGamesystem/ProductTempl
import {CharacterRelation} from "./characters/CharacterRelation"; import {CharacterRelation} from "./characters/CharacterRelation";
import {ItemGroup} from "./inventory/ItemGroup"; import {ItemGroup} from "./inventory/ItemGroup";
import {AbstractItemGroup} from "./inventory/AbstractItemGroup"; import {AbstractItemGroup} from "./inventory/AbstractItemGroup";
import {GameModelLoader} from "../../../../app/storage/loader/GameModelLoader";
import {ConcreteItemGroup} from "./inventory/ConcreteItemGroup"; import {ConcreteItemGroup} from "./inventory/ConcreteItemGroup";
import {Item} from "./inventory/Item"; import {Item} from "./inventory/Item";

1
src/app/project/game-model/inventory/ConcreteItemGroup.ts
View File

@ -7,6 +7,7 @@ export class ConcreteItemGroup extends ItemGroup {
addItem(item: Item) { addItem(item: Item) {
if(this.findItemByName(item.componentName) == undefined) { if(this.findItemByName(item.componentName) == undefined) {
item.addInheritedGroup(this);
this.items.push(item); this.items.push(item);
} }
} }

10
src/app/project/game-model/inventory/Item.ts
View File

@ -4,4 +4,14 @@ import {ItemGroup} from "./ItemGroup";
export class Item extends ModelComponent { export class Item extends ModelComponent {
inheritedGroups: ItemGroup[] = [] inheritedGroups: ItemGroup[] = []
addInheritedGroup(itemgroup: ItemGroup) {
if(this.findItemgroupByName(itemgroup.componentName) == undefined) {
this.inheritedGroups.push(itemgroup);
}
}
findItemgroupByName(groupName: string) {
return this.inheritedGroups.find(group => group.componentName === groupName);
}
} }