basic
offense
defense
misc
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
+
+
-
-
+
+
-
+
-
+
-
diff --git a/src/client/ui/templates/inventory/inventory.js b/src/client/ui/templates/inventory/inventory.js
index 51ec4552..db5a5518 100644
--- a/src/client/ui/templates/inventory/inventory.js
+++ b/src/client/ui/templates/inventory/inventory.js
@@ -100,10 +100,14 @@ define([
spritesheet = '../../../images/consumables.png';
}
+ let clickHandler = this.onMouseDown.bind(this, itemEl, item, true);
+ if (isMobile)
+ clickHandler = this.onHover.bind(this, itemEl, item);
+
itemEl
.data('item', item)
.on('click', this.onClick.bind(this, item))
- .on('mousedown', this.onMouseDown.bind(this, itemEl, item, true))
+ .on('mousedown', clickHandler)
.on('mouseup', this.onMouseDown.bind(this, null, null, false))
.on('mousemove', this.onHover.bind(this, itemEl, item))
.on('mouseleave', this.hideTooltip.bind(this, itemEl, item))
@@ -351,6 +355,9 @@ define([
if (config.length > 0)
events.emit('onContextMenu', config, e);
+ if (isMobile)
+ this.hideTooltip(null, this.hoverItem);
+
e.preventDefault();
return false;
},
diff --git a/src/client/ui/templates/messages/messages.js b/src/client/ui/templates/messages/messages.js
index 4e9dcba8..78455443 100644
--- a/src/client/ui/templates/messages/messages.js
+++ b/src/client/ui/templates/messages/messages.js
@@ -186,6 +186,12 @@ define([
if (this.find('.filter[filter="' + m.type + '"]').hasClass('active'))
el.show();
}
+
+ if (m.type === 'loot') {
+ events.emit('onGetAnnouncement', {
+ msg: m.message
+ });
+ }
}
this.messages.push({
diff --git a/src/client/ui/templates/middleHud/middleHud.js b/src/client/ui/templates/middleHud/middleHud.js
index c2891c59..343ba572 100644
--- a/src/client/ui/templates/middleHud/middleHud.js
+++ b/src/client/ui/templates/middleHud/middleHud.js
@@ -10,16 +10,16 @@ define([
return {
tpl: template,
- isOnGatherNode: false,
-
postRender: function () {
this.onEvent('onGetSelfCasting', this.onGetCasting.bind(this));
if (isMobile) {
- this.onEvent('onEnterGatherNode', this.onEnterGatherNode.bind(this));
- this.onEvent('onExitGatherNode', this.onExitGatherNode.bind(this));
- this.onEvent('onRespawn', this.onExitGatherNode.bind(this));
- this.onEvent('onShowProgress', this.onExitGatherNode.bind(this));
+ this.onEvent('onEnterGatherNode', this.toggleGatherButton.bind(this, true));
+ this.onEvent('onExitGatherNode', this.toggleGatherButton.bind(this, false));
+ this.onEvent('onRespawn', this.toggleGatherButton.bind(this, false));
+ this.onEvent('onShowProgress', this.toggleGatherButton.bind(this, false));
+
+ this.onEvent('onGetServerActions', this.onGetServerActions.bind(this));
this.find('.btnGather').on('click', this.gather.bind(this));
}
@@ -38,26 +38,33 @@ define([
}
},
- onEnterGatherNode: function (msg) {
- this.isOnGatherNode = true;
-
- this.toggleGatherButton(true);
- },
-
- onExitGatherNode: function (msg) {
- this.isOnGatherNode = false;
-
- this.toggleGatherButton(false);
- },
-
toggleGatherButton: function (show) {
- let btn = this.find('.btnGather').hide();
+ let btn = this.find('.btnGather').hide().html('gather');
if (show)
btn.show();
},
gather: function () {
- events.emit('onKeyDown', 'g');
+ let btn = this.find('.btnGather');
+ let action = btn.data('action');
+ if (action) {
+ //Server actions use keyUp
+ events.emit('onKeyUp', action.key);
+ } else
+ events.emit('onKeyDown', 'g');
+ },
+
+ onGetServerActions: function (actions) {
+ let btn = this.find('.btnGather').hide().data('action', null);
+
+ let firstAction = actions[0];
+ if (!firstAction)
+ return;
+
+ btn
+ .data('action', firstAction)
+ .html(firstAction.name)
+ .show();
}
};
});
diff --git a/src/client/ui/templates/middleHud/styles.less b/src/client/ui/templates/middleHud/styles.less
index 96073caa..38551cad 100644
--- a/src/client/ui/templates/middleHud/styles.less
+++ b/src/client/ui/templates/middleHud/styles.less
@@ -1,19 +1,24 @@
@import "../../../css/colors.less";
-.middleHud {
+.uiMiddleHud {
position: absolute;
left: calc(50% - 12px);
top: calc(50% + 31px);
.btnGather {
display: none;
- background-color: @greenC;
+ background-color: fade(#3a3b4a, 90%);
padding: 8px 10px 8px 10px;
color: @white;
width: 120px;
margin-top: 8px;
margin-left: calc(12px - 60px);
- text-align:center;
+ text-align: center;
+ position: absolute;
+ left: calc(50vw - 86px);
+ top: calc(50vh - 113px);
+ width: 64px;
+ height: 64px;
}
.casting {
diff --git a/src/client/ui/templates/middleHud/template.html b/src/client/ui/templates/middleHud/template.html
index 535f9e9f..d00471f0 100644
--- a/src/client/ui/templates/middleHud/template.html
+++ b/src/client/ui/templates/middleHud/template.html
@@ -1,4 +1,4 @@
-
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
gather
diff --git a/src/client/ui/templates/tooltipItem/tooltipItem.js b/src/client/ui/templates/tooltipItem/tooltipItem.js
index ba8cd018..2b59c7a4 100644
--- a/src/client/ui/templates/tooltipItem/tooltipItem.js
+++ b/src/client/ui/templates/tooltipItem/tooltipItem.js
@@ -197,7 +197,7 @@ define([
row = '
' + row + '
';
return row;
- }, )
+ })
.sort(function (a, b) {
return (a.replace(' enchanted', '').length - b.replace(' enchanted', '').length);
})
diff --git a/src/server/components/door.js b/src/server/components/door.js
index c30645f2..88551212 100644
--- a/src/server/components/door.js
+++ b/src/server/components/door.js
@@ -84,6 +84,7 @@ module.exports = {
if (canAction) {
obj.syncer.setArray(true, 'serverActions', 'addActions', {
key: 'u',
+ name: this.closed ? 'open door' : 'close door',
action: {
targetId: this.obj.id,
cpn: 'door',
diff --git a/src/server/components/wardrobe.js b/src/server/components/wardrobe.js
index 933dfb3e..9f62ad90 100644
--- a/src/server/components/wardrobe.js
+++ b/src/server/components/wardrobe.js
@@ -54,6 +54,7 @@ module.exports = {
obj.syncer.setArray(true, 'serverActions', 'addActions', {
key: 'u',
+ name: 'open wardrobe',
action: {
targetId: this.obj.id,
cpn: 'wardrobe',
diff --git a/src/server/components/workbench.js b/src/server/components/workbench.js
index 82cd11d8..4e03d48a 100644
--- a/src/server/components/workbench.js
+++ b/src/server/components/workbench.js
@@ -58,6 +58,7 @@ module.exports = {
obj.syncer.setArray(true, 'serverActions', 'addActions', {
key: 'u',
+ name: 'access workbench',
action: {
targetId: this.obj.id,
cpn: 'workbench',