jschaufuss/DiceCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

implemented UI for new parenting

Browse Source
This commit is contained in:
Thaum
2015-03-20 09:12:38 +00:00
parent ecc43752aa
commit 48f8cef928
23 changed files with 126 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rpg-docs/client/views/character/inventory/inventory.css
View File

@@ -116,7 +116,7 @@ div#stats {
.inventoryItem {
background: white;
transition: box-shadow 0.3s ease,
opacity 0.3s ease;
opacity 0.5s ease-in-out;
height: 40px;
margin: 1px 0 1px 0;
font-size: 16px;

43
rpg-docs/client/views/character/inventory/inventory.js
View File

@@ -7,10 +7,10 @@ Template.inventory.helpers({
return Containers.find({charId: this._id}, {sort: {color: 1, name: 1}})
},
items: function(charId, containerId){
return Items.find({charId: charId, equipped: false, container: containerId }, {sort: {color: 1, name: 1}});
return Items.find({charId: charId, "parent.id": containerId }, {sort: {color: 1, name: 1}});
},
equipment: function(){
return Items.find({ charId: this._id, equipped: true }, {sort: {color: 1, name: 1}});
return Items.find({ charId: this._id, enabled: true }, {sort: {color: 1, name: 1}});
},
showAddButtons: function(){
return Template.instance().showAddButtons.get();
@@ -30,21 +30,21 @@ Template.inventory.helpers({
Containers.find({charId: this._id, isCarried: true}).forEach(function(container){
weight += container.totalWeight();
});
Items.find({charId: this._id, equipped: true}, {fields: {weight : 1, quantity: 1}}).forEach(function(item){
Items.find({charId: this._id, "parent.id": this._id}, {fields: {weight : 1, quantity: 1}}).forEach(function(item){
weight += item.totalWeight();
});
return weight;
},
equipmentValue: function(){
var value = 0;
Items.find({charId: this._id, equipped: true}, {fields: {value : 1, quantity: 1}}).forEach(function(item){
Items.find({charId: this._id, enabled: true}, {fields: {value : 1, quantity: 1}}).forEach(function(item){
value += item.totalValue();
});
return value;
},
equipmentWeight: function(){
var weight = 0;
Items.find({charId: this._id, equipped: true}, {fields: {weight : 1, quantity: 1}}).forEach(function(item){
Items.find({charId: this._id, enabled: true}, {fields: {weight : 1, quantity: 1}}).forEach(function(item){
weight += item.totalWeight();
});
return weight;
@@ -63,7 +63,13 @@ Template.inventory.events({
containerId = Containers.insert({name: "New Container", isCarried: true, charId: this._id});
}
_.defer(function(){
var itemId = Items.insert({charId: charId, container: containerId});
var itemId = Items.insert({
charId: charId,
parent:{
id: containerId,
collection: "Containers"
}
});
GlobalUI.setDetail({
template: "itemDialog",
data: {itemId: itemId, charId: charId},
@@ -128,35 +134,18 @@ Template.layout.events({
event.preventDefault();
},
"dragover .equipmentContainer": function(event, instance){
var containerId = Session.get("inventory.dragItemOriginalContainer");
var charId = Session.get("inventory.dragItemOriginalCharacter");
if (this._id !== charId) return; //we can't equip something we don't own
var item = Items.findOne(Session.get("inventory.dragItemId"));
if (item.equipmentSlot === "none") return; //we can't equip this
event.preventDefault(); //this is a valid drop zone
},
"drop .container": function(event, instacne){
"drop .itemContainer": function(event, instacne){
var item = Items.findOne(Session.get("inventory.dragItemId"));
if (!item) return; //the item doesn't exist
if (item.container === this._id && !item.equipped) return; //the item is already here
if(Containers.findOne(this._id)){//the container exists
Items.update(item._id, {$set: {container: this._id, charId: this.charId, equipped: false}});
}
//move item to the container
item.moveToContainer(this._id)
resetInvetorySession();
},
"drop .equipmentContainer": function(event, instance){
var containerId = Session.get("inventory.dragItemOriginalContainer");
var charId = Session.get("inventory.dragItemOriginalCharacter");
if (this._id !== charId) return; //we can't equip something we don't own
var item = Items.findOne(Session.get("inventory.dragItemId"));
if (item.equipmentSlot === "none") return; //we can't equip this
//equip the item if it's not equipped
if(!item.equipped) Items.update(item._id, {$set: {equipped: true, container: containerId, charId: charId}});
item.equip(charId);
resetInvetorySession();
}
})

8
rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html
View File

@@ -7,9 +7,9 @@
<!--Container dropdown-->
<paper-dropdown-menu id="containerDropDown" label="Container">
<paper-dropdown layered class="dropdown">
<core-menu class="menu" selected={{containerIndex}}>
<core-menu class="menu" selected={{parent.id}}>
{{#each containers}}
<paper-item containerId={{_id}} class="containerMenuItem">{{name}}</paper-item>
<paper-item name={{_id}} class="containerMenuItem">{{name}}</paper-item>
{{/each}}
</core-menu>
</paper-dropdown>
@@ -57,9 +57,9 @@
</paper-input-decorator>
{{#if canEquip}}
<!--Effects-->
{{> effectsEditList sourceId=_id charId=charId type="equipment" enabled=equipped name=name}}
{{> effectsEditList parentId=_id parentCollection="Items" charId=charId type="equipment" enabled=equipped name=name}}
<!--Attacks-->
{{> attackEditList sourceId=_id charId=charId type="equipment" enabled=equipped name=name}}
{{> attackEditList parentId=_id parentCollection="Items" charId=charId type="equipment" enabled=equipped name=name}}
{{/if}}
{{/baseDialog}}
{{/with}}

10
rpg-docs/client/views/character/inventory/itemDialog/itemDialog.js
View File

@@ -19,11 +19,6 @@ Template.itemDialog.helpers({
containers: function(){
return getContainers(this.charId);
},
containerIndex: function(){
var containers = getContainers(this.charId);
var containerIds = _.pluck(containers, "_id");
return _.indexOf(containerIds, this.container);
},
equipmentSlots: function(){
return equipmentSlots;
},
@@ -79,8 +74,9 @@ Template.itemDialog.events({
"core-select #containerDropDown": function(event){
var detail = event.originalEvent.detail;
if(!detail.isSelected) return;
var containerId = detail.item.getAttribute("containerId");
Items.update(Template.currentData().itemId, {$set: {container: containerId}});
var containerId = detail.item.getAttribute("name");
var item = Items.findOne(Template.currentData().itemId);
item.moveToContainer(containerId);
},
"core-select #slotDropDown": function(event){
var detail = event.originalEvent.detail;