krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added ability to remove pet, mount, and background. Also, changed text for all dequip buttons.

Browse Source
This commit is contained in:
kholliday
2015-03-08 15:35:37 -05:00
parent cfaedb3ebd
commit fc3e1c6c9b
3 changed files with 41 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/locales/en/character.json
View File

@@ -134,5 +134,7 @@
"displayNameDescription1": "This is what appears in messages you post in the Tavern, guilds, and party chat, along with what is displayed on your avatar. Go to",
"displayNameDescription2": "Settings->Site",
"displayNameDescription3": "and scroll down to the Registration section to change your login name.",
"dequipAll": "Dequip All"
"unequipBattleGear": "Unequip Battle Gear",
"unequipCostume": "Unequip Costume",
"unequipPetMountBackground": "Unequip Pet, Mount, Background"
}

27
website/public/js/controllers/inventoryCtrl.js
View File

@@ -234,24 +234,43 @@ habitrpg.controller("InventoryCtrl",
return filteredArray;
};
$scope.dequip = function(gearSet){
$scope.dequip = function(itemSet){
if ( gearSet == "battleGear" ) {
switch (itemSet) {
case "battleGear":
for ( item in user.items.gear.equipped ){
var itemKey = user.items.gear.equipped[item];
if ( user.items.gear.owned[itemKey] ) {
user.ops.equip({params: {key: itemKey}});
}
}
}
break;
if ( gearSet == "costume" ) {
case "costume":
for ( item in user.items.gear.costume ){
var itemKey = user.items.gear.costume[item];
if ( user.items.gear.owned[itemKey] ) {
user.ops.equip({params: {type:"costume", key: itemKey}});
}
}
break;
case "petMountBackground":
var pet = user.items.currentPet;
if ( pet ) {
user.ops.equip({params:{type: 'pet', key: pet}});
}
var mount = user.items.currentMount;
if ( mount ) {
user.ops.equip({params:{type: 'mount', key: mount}});
}
var background = user.preferences.background;
User.user.ops.unlock({query:{path:"background."+background}});
break;
}
}

9
website/views/options/inventory/inventory.jade
View File

@@ -3,8 +3,8 @@ script(type='text/ng-template', id='partials/options.inventory.equipment.html')
.row
.col-md-6.border-right
h3.equipment-title.hint(popover-trigger='mouseenter', popover-placement='top', popover-append-to-body='true', popover=env.t('battleGearText'))=env.t('battleGear')
div(ng-click='dequip("battleGear");')
button.btn.btn-default(type="button") {{env.t("dequipAll")}}
div
button.btn.btn-default(type="button", ng-click='dequip("battleGear");') {{env.t("unequipBattleGear")}}
li.customize-menu.inventory-gear
menu.pets-menu(label='{{::label}}', ng-repeat='(klass,label) in {warrior:env.t("warrior"), wizard:env.t("mage"), rogue:env.t("rogue"), healer:env.t("healer"), special:env.t("special"), mystery:env.t("mystery")}', ng-show='gear[klass]')
div(ng-repeat='item in gear[klass]')
@@ -16,8 +16,9 @@ script(type='text/ng-template', id='partials/options.inventory.equipment.html')
input(type="checkbox", ng-model="user.preferences.costume", ng-change='set({"preferences.costume":user.preferences.costume ? true : false})')
| 
=env.t('useCostume')
div(ng-click='dequip("costume");')
button.btn.btn-default(type="button") {{env.t("dequipAll")}}
div
button.btn.btn-default(type="button", ng-click='dequip("costume");') {{env.t("unequipCostume")}}
button.btn.btn-default(type="button", ng-click='dequip("petMountBackground");') {{env.t("unequipPetMountBackground")}}
li.customize-menu(ng-if='user.preferences.costume')
menu.pets-menu(label='{{::label}}', ng-repeat='(klass,label) in {warrior:env.t("warrior"), wizard:env.t("mage"), rogue:env.t("rogue"), healer:env.t("healer"), special:env.t("special"), mystery:env.t("mystery")}', ng-show='gear[klass]')
div(ng-repeat='item in gear[klass]')