mirror of
https://github.com/sudoxnym/habitica-self-host.git
synced 2026-07-13 17:52:22 +00:00
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into mountmaster
Conflicts: dist/habitrpg-shared.js
This commit is contained in:
Blade Barringer
commit
c0f51379e7
5 changed files with 46 additions and 38 deletions
|
|
@ -23,8 +23,9 @@ module.exports = function(grunt) {
|
|||
var sliced = images.slice(i * (images.length/COUNT), (i+1) * images.length/COUNT)
|
||||
sprite[''+i] = {
|
||||
src: sliced,
|
||||
destImg: 'dist/spritesmith'+i+'.png',
|
||||
destCSS: 'dist/spritesmith'+i+'.css',
|
||||
dest: 'dist/spritesmith'+i+'.png',
|
||||
destCss: 'dist/spritesmith'+i+'.css',
|
||||
engine: 'phantomjssmith',
|
||||
algorithm: 'binary-tree',
|
||||
padding:1,
|
||||
cssTemplate: 'css/css.template.mustache',
|
||||
|
|
@ -103,4 +104,4 @@ module.exports = function(grunt) {
|
|||
grunt.registerTask('default', ['cssmin', 'browserify']);
|
||||
grunt.registerTask('full', ['clean', 'sprite', 'cssmin', 'browserify']);
|
||||
|
||||
};
|
||||
};
|
||||
|
|
|
|||
7
dist/habitrpg-shared.js
vendored
7
dist/habitrpg-shared.js
vendored
|
|
@ -12477,7 +12477,7 @@ api.spells = {
|
|||
target: 'user',
|
||||
notes: t('nyeCardNotes'),
|
||||
cast: function(user, target) {
|
||||
var _base, _base1;
|
||||
var _base;
|
||||
if (user === target) {
|
||||
if ((_base = user.achievements).nye == null) {
|
||||
_base.nye = 0;
|
||||
|
|
@ -12492,7 +12492,10 @@ api.spells = {
|
|||
return t.achievements.nye++;
|
||||
});
|
||||
}
|
||||
((_base1 = target.items.special).nyeReceived != null ? _base1.nyeReceived : _base1.nyeReceived = []).push(user.profile.name);
|
||||
if (!target.items.special.nyeReceived) {
|
||||
target.items.special.nyeReceived = [];
|
||||
}
|
||||
target.items.special.nyeReceived.push(user.profile.name);
|
||||
if (typeof target.markModified === "function") {
|
||||
target.markModified('items.special.nyeReceived');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -76,13 +76,13 @@
|
|||
"weaponSpecialCriticalNotes": "This champion slew a critical Github foe where many warriors fell. Fashioned from the bones of Bug, this hammer deals a mighty critical hit. Increases Strength and Perception by <%= attrs %> each.",
|
||||
|
||||
"weaponSpecialYetiText": "Yeti-Tamer Spear",
|
||||
"weaponSpecialYetiNotes": "This spear allows its user to command any yeti. Increases Strength by <%= str %>. Limited Edition 2013 Winter Gear.",
|
||||
"weaponSpecialYetiNotes": "This spear allows its user to command any yeti. Increases Strength by <%= str %>. Limited Edition 2013-2014 Winter Gear.",
|
||||
"weaponSpecialSkiText": "Ski-sassin Pole",
|
||||
"weaponSpecialSkiNotes": "A weapon capable of destroying hordes of enemies! It also helps the user make very nice parallel turns. Increases Strength by <%= str %>. Limited Edition 2013 Winter Gear.",
|
||||
"weaponSpecialSkiNotes": "A weapon capable of destroying hordes of enemies! It also helps the user make very nice parallel turns. Increases Strength by <%= str %>. Limited Edition 2013-2014 Winter Gear.",
|
||||
"weaponSpecialCandycaneText": "Candy Cane Staff",
|
||||
"weaponSpecialCandycaneNotes": "A powerful mage's staff. Powerfully DELICIOUS, we mean! Two-handed weapon. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2013 Winter Gear.",
|
||||
"weaponSpecialCandycaneNotes": "A powerful mage's staff. Powerfully DELICIOUS, we mean! Two-handed weapon. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2013-2014 Winter Gear.",
|
||||
"weaponSpecialSnowflakeText": "Snowflake Wand",
|
||||
"weaponSpecialSnowflakeNotes": "This wand sparkles with unlimited healing power. Increases Intelligence by <%= int %>. Limited Edition 2013 Winter Gear.",
|
||||
"weaponSpecialSnowflakeNotes": "This wand sparkles with unlimited healing power. Increases Intelligence by <%= int %>. Limited Edition 2013-2014 Winter Gear.",
|
||||
|
||||
"weaponSpecialSpringRogueText": "Hook Claws",
|
||||
"weaponSpecialSpringRogueNotes": "Great for scaling tall buildings, and also for shredding carpets. Increases Strength by <%= str %>. Limited Edition 2014 Spring Gear.",
|
||||
|
|
@ -112,13 +112,13 @@
|
|||
"weaponSpecialFallHealerNotes": "The scarab on this wand protects and heals its wielder. Increases Intelligence by <%= int %>. Limited Edition 2014 Autumn Gear.",
|
||||
|
||||
"weaponSpecialWinter2015RogueText": "Ice Spike",
|
||||
"weaponSpecialWinter2015RogueNotes": "You truly, definitely, absolutely just picked these up off of the ground. Increases Strength by <%= str %>. Limited Edition 2015 Winter Gear.",
|
||||
"weaponSpecialWinter2015RogueNotes": "You truly, definitely, absolutely just picked these up off of the ground. Increases Strength by <%= str %>. Limited Edition 2014-2015 Winter Gear.",
|
||||
"weaponSpecialWinter2015WarriorText": "Gumdrop Sword",
|
||||
"weaponSpecialWinter2015WarriorNotes": "This delicious sword probably attracts monsters... but you're up for the challenge! Increases Strength by <%= str %>. Limited Edition 2015 Winter Gear.",
|
||||
"weaponSpecialWinter2015WarriorNotes": "This delicious sword probably attracts monsters... but you're up for the challenge! Increases Strength by <%= str %>. Limited Edition 2014-2015 Winter Gear.",
|
||||
"weaponSpecialWinter2015MageText": "Winter-lit Staff",
|
||||
"weaponSpecialWinter2015MageNotes": "The light of this crystal staff fills hearts with cheer. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2015 Winter Gear.",
|
||||
"weaponSpecialWinter2015MageNotes": "The light of this crystal staff fills hearts with cheer. Increases Intelligence by <%= int %> and Perception by <%= per %>. Limited Edition 2014-2015 Winter Gear.",
|
||||
"weaponSpecialWinter2015HealerText": "Soothing Scepter",
|
||||
"weaponSpecialWinter2015HealerNotes": "This scepter warms sore muscles and soothes away stress. Increases Intelligence by <%= int %>. Limited Edition 2015 Winter Gear.",
|
||||
"weaponSpecialWinter2015HealerNotes": "This scepter warms sore muscles and soothes away stress. Increases Intelligence by <%= int %>. Limited Edition 2014-2015 Winter Gear.",
|
||||
|
||||
"weaponMystery201411Text": "Pitchfork of Feasting",
|
||||
"weaponMystery201411Notes": "Stab your enemies or dig in to your favorite foods - this versatile pitchfork does it all! Confers no benefit. November 2014 Subscriber Item.",
|
||||
|
|
@ -182,13 +182,13 @@
|
|||
"armorSpecial2Notes": "Makes you extra fluffy! Increases Constitution and Intelligence by <%= attrs %> each.",
|
||||
|
||||
"armorSpecialYetiText": "Yeti-Tamer Robe",
|
||||
"armorSpecialYetiNotes": "Fuzzy and fierce. Increases Constitution by <%= con %>. Limited Edition 2013 Winter Gear.",
|
||||
"armorSpecialYetiNotes": "Fuzzy and fierce. Increases Constitution by <%= con %>. Limited Edition 2013-2014 Winter Gear.",
|
||||
"armorSpecialSkiText": "Ski-sassin Parka",
|
||||
"armorSpecialSkiNotes": "Full of secret daggers and ski trail maps. Increases Perception by <%= per %>. Limited Edition 2013 Winter Gear.",
|
||||
"armorSpecialSkiNotes": "Full of secret daggers and ski trail maps. Increases Perception by <%= per %>. Limited Edition 2013-2014 Winter Gear.",
|
||||
"armorSpecialCandycaneText": "Candy Cane Robe",
|
||||
"armorSpecialCandycaneNotes": "Spun from sugar and silk. Increases Intelligence by <%= int %>. Limited Edition 2013 Winter Gear.",
|
||||
"armorSpecialCandycaneNotes": "Spun from sugar and silk. Increases Intelligence by <%= int %>. Limited Edition 2013-2014 Winter Gear.",
|
||||
"armorSpecialSnowflakeText": "Snowflake Robe",
|
||||
"armorSpecialSnowflakeNotes": "A robe to keep you warm, even in a blizzard. Increases Constitution by <%= con %>. Limited Edition 2013 Winter Gear.",
|
||||
"armorSpecialSnowflakeNotes": "A robe to keep you warm, even in a blizzard. Increases Constitution by <%= con %>. Limited Edition 2013-2014 Winter Gear.",
|
||||
"armorSpecialBirthdayText": "Absurd Party Robes",
|
||||
"armorSpecialBirthdayNotes": "As part of the festivities, Absurd Party Robes are available free of charge in the Item Store! Swath yourself in those silly garbs and don your matching hats to celebrate this momentous day. Confers no benefit.",
|
||||
|
||||
|
|
@ -223,13 +223,13 @@
|
|||
"armorSpecialFallHealerNotes": "Charge into battle pre-bandaged! Increases Constitution by <%= con %>. Limited Edition 2014 Autumn Gear.",
|
||||
|
||||
"armorSpecialWinter2015RogueText": "Icicle Drake Armor",
|
||||
"armorSpecialWinter2015RogueNotes": "This armor is freezing cold, but it will definitely be worth it when you uncover the untold riches at the center of the Icicle Drake hives. Not that you are looking for any such untold riches, because you are truly, definitely, absolutely a genuine Icicle Drake, okay?! Stop asking questions! Increases Perception by <%= per %>. Limited Edition 2015 Winter Gear.",
|
||||
"armorSpecialWinter2015RogueNotes": "This armor is freezing cold, but it will definitely be worth it when you uncover the untold riches at the center of the Icicle Drake hives. Not that you are looking for any such untold riches, because you are truly, definitely, absolutely a genuine Icicle Drake, okay?! Stop asking questions! Increases Perception by <%= per %>. Limited Edition 2014-2015 Winter Gear.",
|
||||
"armorSpecialWinter2015WarriorText": "Gingerbread Armor",
|
||||
"armorSpecialWinter2015WarriorNotes": "Cozy and warm, straight from the oven! Increases Constitution by <%= con %>. Limited Edition 2015 Winter Gear.",
|
||||
"armorSpecialWinter2015WarriorNotes": "Cozy and warm, straight from the oven! Increases Constitution by <%= con %>. Limited Edition 2014-2015 Winter Gear.",
|
||||
"armorSpecialWinter2015MageText": "Boreal Robe",
|
||||
"armorSpecialWinter2015MageNotes": "You can see the glimmering lights of the north in this robe. Increases Intelligence by <%= int %>. Limited Edition 2015 Winter Gear.",
|
||||
"armorSpecialWinter2015MageNotes": "You can see the glimmering lights of the north in this robe. Increases Intelligence by <%= int %>. Limited Edition 2014-2015 Winter Gear.",
|
||||
"armorSpecialWinter2015HealerText": "Skating Outfit",
|
||||
"armorSpecialWinter2015HealerNotes": "Ice-skating is very relaxing, but you shouldn't try it without this protective gear in case you get attacked by the icicle drakes. Increases Constitution by <%= con %>. Limited Edition 2015 Winter Gear.",
|
||||
"armorSpecialWinter2015HealerNotes": "Ice-skating is very relaxing, but you shouldn't try it without this protective gear in case you get attacked by the icicle drakes. Increases Constitution by <%= con %>. Limited Edition 2014-2015 Winter Gear.",
|
||||
|
||||
"armorMystery201402Text": "Messenger Robes",
|
||||
"armorMystery201402Notes": "Shimmering and strong, these robes have many pockets to carry letters. Confers no benefit. February 2014 Subscriber Item.",
|
||||
|
|
@ -311,13 +311,13 @@
|
|||
"headSpecialNyeText": "Absurd Party Hat",
|
||||
"headSpecialNyeNotes": "You've received an Absurd Party Hat! Wear it with pride while ringing in the New Year! Confers no benefit.",
|
||||
"headSpecialYetiText": "Yeti-Tamer Helm",
|
||||
"headSpecialYetiNotes": "An adorably fearsome hat. Increases Strength by <%= str %>. Limited Edition 2013 Winter Gear.",
|
||||
"headSpecialYetiNotes": "An adorably fearsome hat. Increases Strength by <%= str %>. Limited Edition 2013-2014 Winter Gear.",
|
||||
"headSpecialSkiText": "Ski-sassin Helm",
|
||||
"headSpecialSkiNotes": "Keeps the wearer's identity secret... and their face toasty. Increases Perception by <%= per %>. Limited Edition 2013 Winter Gear.",
|
||||
"headSpecialSkiNotes": "Keeps the wearer's identity secret... and their face toasty. Increases Perception by <%= per %>. Limited Edition 2013-2014 Winter Gear.",
|
||||
"headSpecialCandycaneText": "Candy Cane Hat",
|
||||
"headSpecialCandycaneNotes": "This is the most delicious hat in the world. It's also known to appear and disappear mysteriously. Increases Perception by <%= per %>. Limited Edition 2013 Winter Gear.",
|
||||
"headSpecialCandycaneNotes": "This is the most delicious hat in the world. It's also known to appear and disappear mysteriously. Increases Perception by <%= per %>. Limited Edition 2013-2014 Winter Gear.",
|
||||
"headSpecialSnowflakeText": "Snowflake Crown",
|
||||
"headSpecialSnowflakeNotes": "The wearer of this crown is never cold. Increases Intelligence by <%= int %>. Limited Edition 2013 Winter Gear.",
|
||||
"headSpecialSnowflakeNotes": "The wearer of this crown is never cold. Increases Intelligence by <%= int %>. Limited Edition 2013-2014 Winter Gear.",
|
||||
|
||||
"headSpecialSpringRogueText": "Stealthy Kitty Mask",
|
||||
"headSpecialSpringRogueNotes": "Nobody will EVER guess that you are a cat burglar! Increases Perception by <%= per %>. Limited Edition 2014 Spring Gear.",
|
||||
|
|
@ -349,13 +349,13 @@
|
|||
"headSpecialNye2014Text": "Silly Party Hat",
|
||||
"headSpecialNye2014Notes": "You've received a Silly Party Hat! Wear it with pride while ringing in the New Year! Confers no benefit.",
|
||||
"headSpecialWinter2015RogueText": "Icicle Drake Mask",
|
||||
"headSpecialWinter2015RogueNotes": "You are truly, definitely, absolutely a genuine Icicle Drake. You are not infiltrating the Icicle Drake hives. You have no interest at all in the hoards of riches rumored to lie in their frigid tunnels. Rawr. Increases Perception by <%= per %>. Limited Edition 2015 Winter Gear.",
|
||||
"headSpecialWinter2015RogueNotes": "You are truly, definitely, absolutely a genuine Icicle Drake. You are not infiltrating the Icicle Drake hives. You have no interest at all in the hoards of riches rumored to lie in their frigid tunnels. Rawr. Increases Perception by <%= per %>. Limited Edition 2014-2015 Winter Gear.",
|
||||
"headSpecialWinter2015WarriorText": "Gingerbread Helm",
|
||||
"headSpecialWinter2015WarriorNotes": "Think, think, think as hard as you can. Increases Strength by <%= str %>. Limited Edition 2015 Winter Gear.",
|
||||
"headSpecialWinter2015WarriorNotes": "Think, think, think as hard as you can. Increases Strength by <%= str %>. Limited Edition 2014-2015 Winter Gear.",
|
||||
"headSpecialWinter2015MageText": "Aurora Hat",
|
||||
"headSpecialWinter2015MageNotes": "The fabric of this hat shifts and glows when the wearer studies. Increases Perception by <%= per %>. Limited Edition 2015 Winter Gear.",
|
||||
"headSpecialWinter2015MageNotes": "The fabric of this hat shifts and glows when the wearer studies. Increases Perception by <%= per %>. Limited Edition 2014-2015 Winter Gear.",
|
||||
"headSpecialWinter2015HealerText": "Snuggly Earmuffs",
|
||||
"headSpecialWinter2015HealerNotes": "These warm earmuffs keep out chills and distracting noises. Increases Intelligence by <%= int %>. Limited Edition 2015 Winter Gear.",
|
||||
"headSpecialWinter2015HealerNotes": "These warm earmuffs keep out chills and distracting noises. Increases Intelligence by <%= int %>. Limited Edition 2014-2015 Winter Gear.",
|
||||
|
||||
"headSpecialGaymerxText": "Rainbow Warrior Helm",
|
||||
"headSpecialGaymerxNotes": "In celebration of pride season and GaymerX, this special helmet is decorated with a radiant, colorful rainbow pattern! GaymerX is a game convention celebrating LGBTQ and gaming and is open to everyone. It takes place at the InterContinental in downtown San Francisco on July 11-13! Confers no benefit.",
|
||||
|
|
@ -415,9 +415,9 @@
|
|||
"shieldSpecialGoldenknightNotes": "Meetings, monsters, malaise: managed! Mash! Increases Constitution and Perception by <%= attrs %> each.",
|
||||
|
||||
"shieldSpecialYetiText": "Yeti-Tamer Shield",
|
||||
"shieldSpecialYetiNotes": "This shield reflects light from the snow. Increases Constitution by <%= con %>. Limited Edition 2013 Winter Gear.",
|
||||
"shieldSpecialYetiNotes": "This shield reflects light from the snow. Increases Constitution by <%= con %>. Limited Edition 2013-2014 Winter Gear.",
|
||||
"shieldSpecialSnowflakeText": "Snowflake Shield",
|
||||
"shieldSpecialSnowflakeNotes": "Every shield is unique. Increases Constitution by <%= con %>. Limited Edition 2013 Winter Gear.",
|
||||
"shieldSpecialSnowflakeNotes": "Every shield is unique. Increases Constitution by <%= con %>. Limited Edition 2013-2014 Winter Gear.",
|
||||
|
||||
"shieldSpecialSpringRogueText": "Hook Claws",
|
||||
"shieldSpecialSpringRogueNotes": "Great for scaling tall buildings, and also for shredding carpets. Increases Strength <%= str %>. Limited Edition 2014 Spring Gear.",
|
||||
|
|
@ -441,11 +441,11 @@
|
|||
"shieldSpecialFallHealerNotes": "This glittery shield was found in an ancient tomb. Increases Constitution by <%= con %>. Limited Edition 2014 Autumn Gear.",
|
||||
|
||||
"shieldSpecialWinter2015RogueText": "Ice Spike",
|
||||
"shieldSpecialWinter2015RogueNotes": "You truly, definitely, absolutely just picked these up off of the ground. Increases Strength by <%= str %>. Limited Edition 2015 Winter Gear.",
|
||||
"shieldSpecialWinter2015RogueNotes": "You truly, definitely, absolutely just picked these up off of the ground. Increases Strength by <%= str %>. Limited Edition 2014-2015 Winter Gear.",
|
||||
"shieldSpecialWinter2015WarriorText": "Gumdrop Shield",
|
||||
"shieldSpecialWinter2015WarriorNotes": "This seemingly-sugary shield is actually made of nutritious, gelatinous vegetables. Increases Constitution by <%= con %>. Limited Edition 2015 Winter Gear.",
|
||||
"shieldSpecialWinter2015WarriorNotes": "This seemingly-sugary shield is actually made of nutritious, gelatinous vegetables. Increases Constitution by <%= con %>. Limited Edition 2014-2015 Winter Gear.",
|
||||
"shieldSpecialWinter2015HealerText": "Soothing Shield",
|
||||
"shieldSpecialWinter2015HealerNotes": "This shield deflects the freezing wind. Increases Constitution by <%= con %>. Limited Edition 2015 Winter Gear.",
|
||||
"shieldSpecialWinter2015HealerNotes": "This shield deflects the freezing wind. Increases Constitution by <%= con %>. Limited Edition 2014-2015 Winter Gear.",
|
||||
|
||||
"shieldMystery301405Text": "Clock Shield",
|
||||
"shieldMystery301405Notes": "Time is on your side with this towering clock shield! Confers no benefit. June 3015 Subscriber Item.",
|
||||
|
|
|
|||
|
|
@ -3,11 +3,12 @@
|
|||
"version": "0.0.0",
|
||||
"dependencies": {
|
||||
"browserify": "~3.30.2",
|
||||
"coffeeify": "0.6.0",
|
||||
"coffee-script": "1.7.1",
|
||||
"moment": "~2.8.3",
|
||||
"coffeeify": "0.6.0",
|
||||
"grunt-spritesmith": "~3.5.0",
|
||||
"lodash": "~2.4.1",
|
||||
"grunt-spritesmith": "~1.22.0"
|
||||
"moment": "~2.8.3",
|
||||
"phantomjssmith": "~0.5.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"coffee-coverage": "~0.4.2",
|
||||
|
|
|
|||
|
|
@ -705,7 +705,10 @@ api.spells =
|
|||
_.each [user,target], (t)->
|
||||
t.achievements.nye ?= 0
|
||||
t.achievements.nye++
|
||||
(target.items.special.nyeReceived ?= []).push user.profile.name
|
||||
if !target.items.special.nyeReceived
|
||||
target.items.special.nyeReceived = []
|
||||
target.items.special.nyeReceived.push user.profile.name
|
||||
|
||||
target.markModified? 'items.special.nyeReceived'
|
||||
user.stats.gp -= 10
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue