Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert

Browse Source 
Conflicts:
	common/img/sprites/spritesmith/npcs/npc_ian.png
	common/img/sprites/spritesmith/npcs/seasonalshop_winter2015.png
	dist/habitrpg-shared.css
	dist/habitrpg-shared.js
	dist/spritesmith1.css
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png
	dist/spritesmith4.css
	dist/spritesmith4.png
This commit is contained in:
Blade Barringer
2015-02-03 19:26:14 -06:00
parent 88be8f3274 7d63c9f8b2
commit 6f4fbfeaeb
118 changed files with 709 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/script/content.coffee
+30 -20
View File
@@ -836,30 +836,30 @@ api.questMounts = _.transform api.questEggs, (m, egg) ->
api.food =
# Base
Meat: canBuy:false, canDrop:false, text: t('foodMeat'), target: 'Base', article: ''
Milk: canBuy:false, canDrop:false, text: t('foodMilk'), target: 'White', article: ''
Potatoe: canBuy:false, canDrop:false, text: t('foodPotatoe'), target: 'Desert', article: 'a '
Strawberry: canBuy:false, canDrop:false, text: t('foodStrawberry'), target: 'Red', article: 'a '
Chocolate: canBuy:false, canDrop:false, text: t('foodChocolate'), target: 'Shade', article: ''
Fish: canBuy:false, canDrop:false, text: t('foodFish'), target: 'Skeleton', article: 'a '
RottenMeat: canBuy:false, canDrop:false, text: t('foodRottenMeat'), target: 'Zombie', article: ''
CottonCandyPink: canBuy:false, canDrop:false, text: t('foodCottonCandyPink'), target: 'CottonCandyPink', article: ''
CottonCandyBlue: canBuy:false, canDrop:false, text: t('foodCottonCandyBlue'), target: 'CottonCandyBlue', article: ''
Honey: canBuy:false, canDrop:false, text: t('foodHoney'), target: 'Golden', article: ''
Meat: canBuy:true, canDrop:true, text: t('foodMeat'), target: 'Base', article: ''
Milk: canBuy:true, canDrop:true, text: t('foodMilk'), target: 'White', article: ''
Potatoe: canBuy:true, canDrop:true, text: t('foodPotatoe'), target: 'Desert', article: 'a '
Strawberry: canBuy:true, canDrop:true, text: t('foodStrawberry'), target: 'Red', article: 'a '
Chocolate: canBuy:true, canDrop:true, text: t('foodChocolate'), target: 'Shade', article: ''
Fish: canBuy:true, canDrop:true, text: t('foodFish'), target: 'Skeleton', article: 'a '
RottenMeat: canBuy:true, canDrop:true, text: t('foodRottenMeat'), target: 'Zombie', article: ''
CottonCandyPink: canBuy:true, canDrop:true, text: t('foodCottonCandyPink'), target: 'CottonCandyPink', article: ''
CottonCandyBlue: canBuy:true, canDrop:true, text: t('foodCottonCandyBlue'), target: 'CottonCandyBlue', article: ''
Honey: canBuy:true, canDrop:true, text: t('foodHoney'), target: 'Golden', article: ''
Saddle: canBuy:true, canDrop:false, text: t('foodSaddleText'), value: 5, notes: t('foodSaddleNotes')
# Cake
Cake_Skeleton: canBuy:true, canDrop:true, text: t('foodCakeSkeleton'), target: 'Skeleton', article: ''
Cake_Base: canBuy:true, canDrop:true, text: t('foodCakeBase'), target: 'Base', article: ''
Cake_CottonCandyBlue: canBuy:true, canDrop:true, text: t('foodCakeCottonCandyBlue'), target: 'CottonCandyBlue', article: ''
Cake_CottonCandyPink: canBuy:true, canDrop:true, text: t('foodCakeCottonCandyPink'), target: 'CottonCandyPink', article: ''
Cake_Shade: canBuy:true, canDrop:true, text: t('foodCakeShade'), target: 'Shade', article: ''
Cake_White: canBuy:true, canDrop:true, text: t('foodCakeWhite'), target: 'White', article: ''
Cake_Golden: canBuy:true, canDrop:true, text: t('foodCakeGolden'), target: 'Golden', article: ''
Cake_Zombie: canBuy:true, canDrop:true, text: t('foodCakeZombie'), target: 'Zombie', article: ''
Cake_Desert: canBuy:true, canDrop:true, text: t('foodCakeDesert'), target: 'Desert', article: ''
Cake_Red: canBuy:true, canDrop:true, text: t('foodCakeRed'), target: 'Red', article: ''
Cake_Skeleton: canBuy:false, canDrop:false, text: t('foodCakeSkeleton'), target: 'Skeleton', article: ''
Cake_Base: canBuy:false, canDrop:false, text: t('foodCakeBase'), target: 'Base', article: ''
Cake_CottonCandyBlue: canBuy:false, canDrop:false, text: t('foodCakeCottonCandyBlue'), target: 'CottonCandyBlue', article: ''
Cake_CottonCandyPink: canBuy:false, canDrop:false, text: t('foodCakeCottonCandyPink'), target: 'CottonCandyPink', article: ''
Cake_Shade: canBuy:false, canDrop:false, text: t('foodCakeShade'), target: 'Shade', article: ''
Cake_White: canBuy:false, canDrop:false, text: t('foodCakeWhite'), target: 'White', article: ''
Cake_Golden: canBuy:false, canDrop:false, text: t('foodCakeGolden'), target: 'Golden', article: ''
Cake_Zombie: canBuy:false, canDrop:false, text: t('foodCakeZombie'), target: 'Zombie', article: ''
Cake_Desert: canBuy:false, canDrop:false, text: t('foodCakeDesert'), target: 'Desert', article: ''
Cake_Red: canBuy:false, canDrop:false, text: t('foodCakeRed'), target: 'Red', article: ''
# Fall
Candy_Skeleton: canBuy:false, canDrop:false, text: t('foodCandySkeleton'), target: 'Skeleton', article: ''
@@ -1576,6 +1576,16 @@ api.backgrounds =
snowy_pines:
text: t('backgroundSnowyPinesText')
notes: t('backgroundSnowyPinesNotes')
backgrounds022015:
blacksmithy:
text: t('backgroundBlacksmithyText')
notes: t('backgroundBlacksmithyNotes')
crystal_cave:
text: t('backgroundCrystalCaveText')
notes: t('backgroundCrystalCaveNotes')
distant_castle:
text: t('backgroundDistantCastleText')
notes: t('backgroundDistantCastleNotes')
api.subscriptionBlocks =
basic_earned: months:1, price:5