From d27fb9dba2e42988c26beee5b39681de178a668c Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Tue, 6 Oct 2015 15:59:16 -0400 Subject: [PATCH] WIP(world-boss): Rage and rewards Also finishes out written story content. --- .../achievements/achievement-burnout.png | Bin 0 -> 720 bytes .../spritesmith/npcs/npc_daniel_broken.png | Bin 0 -> 4678 bytes .../spritesmith/npcs/npc_ian_broken.png | Bin 0 -> 8025 bytes .../spritesmith/npcs/seasonalshop_broken.png | Bin 0 -> 6357 bytes .../spritesmith_large/promo/promo_burnout.png | Bin 0 -> 7549 bytes common/locales/en/generic.json | 4 +- common/locales/en/pets.json | 1 + common/locales/en/questsContent.json | 10 +-- common/script/content/index.coffee | 2 + .../src/content/pets-mounts/special-mounts.js | 1 + .../src/content/pets-mounts/special-pets.js | 1 + website/src/models/group.js | 6 +- .../options/inventory/seasonal-shop.jade | 2 +- .../options/social/quests/questActive.jade | 1 + website/views/shared/new-stuff.jade | 59 +++++++++++++----- .../views/shared/profiles/achievements.jade | 7 +++ 16 files changed, 69 insertions(+), 25 deletions(-) create mode 100644 common/img/sprites/spritesmith/achievements/achievement-burnout.png create mode 100644 common/img/sprites/spritesmith/npcs/npc_daniel_broken.png create mode 100644 common/img/sprites/spritesmith/npcs/npc_ian_broken.png create mode 100644 common/img/sprites/spritesmith/npcs/seasonalshop_broken.png create mode 100644 common/img/sprites/spritesmith_large/promo/promo_burnout.png diff --git a/common/img/sprites/spritesmith/achievements/achievement-burnout.png b/common/img/sprites/spritesmith/achievements/achievement-burnout.png new file mode 100644 index 0000000000000000000000000000000000000000..d9869947149310d7aa6a705913c9d49a0b6cb12b GIT binary patch literal 720 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 b?Y{v48Sp|i;0+(~00000NkvXXu0mjf`T&7X literal 0 HcmV?d00001 diff --git a/common/img/sprites/spritesmith/npcs/seasonalshop_broken.png b/common/img/sprites/spritesmith/npcs/seasonalshop_broken.png new file mode 100644 index 0000000000000000000000000000000000000000..891609ee6f97745917ab96a3e6278622095db4c1 GIT binary patch literal 6357 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 AxBvhE literal 0 HcmV?d00001 diff --git a/common/img/sprites/spritesmith_large/promo/promo_burnout.png b/common/img/sprites/spritesmith_large/promo/promo_burnout.png new file mode 100644 index 0000000000000000000000000000000000000000..fee3b32a7d1b64bc565aa6cc8cbd13cb0ab0f73a GIT binary patch literal 7549 zcmX|GbzD>b_r8eIVWE-|A}|%C9bM828!?cU7%AN$-3*YD&JhC!3@Hf#m2McFQqsz3 z1ipx$-|vsR_ucEYd+&3e^FHT!&Tg3MYdLZf8WI2i$Q9&epqJ~^u7Fk$EYAJ&1mOfYi40>3IJ}C>1uFw zwY7VqhqHT9N};~-O14lcB1WiGgzw$h#~>!+n~I@K*%MTdmRm1hUZ?HI3dKhtd?TqK zPszeb#tE00au5Nzq2XPp3!b@FqYZ~Ez2{Y9Vyh*%^vZt1W+Jjgd0q&=FIkZk!>##% z_HS(qOPmsZB#-QXn?#i+Opa$Pc)*d5h{zM>X2K=_&uy5L2xxwl+Wed@!lF%6Xg%!PrHe$DWgfYx*1u9?y|FfjfMc&-35lLyLcfaboNq!@sR40sL+ z4dMW(? zjIJ4_NN~2gCsXtI@lnp>dH^6Rmg+KE+?iV+1-h?K08ve0@NE4H!3Fc%w~Ob?{l#_? z0I=ZXGkE@#tCGf7n84TOJco7ry171Smh)kR8HQ4#3dmZUgyHP|a`Q4frfy=pa(`+_ zFaFREGk;TfTc-uOy9l{$kB~`;#PJ}R!=yfNd}kfHF!?d}^b}ugjvpwu6vOk3eO9Pv zjDMiSc2mo#`Ntsu?AF`1jIa~o`!tk3LoqNKwst&r+QbVcsmgQ z$Yl9}$|Y&{S{^)YCZKD%G2KG?$50?p>e07Wshd(HCcbnIh8!jSQtZLK<@6v!t`P}( zzGjGdaGV_lXRAgng{U3ni4jpo3wwhf@pZ`#qB}-Rlc9KT!?jotME8?}j+k2HuiuV% z#Ml{n7s9L*%P-Fj4OeH>kf+}jb+`r&(UtuiE8GF_`2PuRkmHW`!$3qw$f~643I%Bb zWphXeOq{q=qVHv;4mfFn`oNZsFDqcJ#jx+AA zU@jpmZlfvJEWxi2+c)m7aJ_!p?`1Qwz;#zCMk5AEc`aqF*W>bqjC7CqZcP#k65|I# zTG^Q63Y9)R{(S5B+k>|}+#y=>PgzE9N8jPP=@}~hP4Lm}FlipPx|nMU6?y7Iw})hh z-a%Q`o))F@$3e4xe)hxHsUQf)cVcCt;Yz{J#02 zMcGfM&$nh07+xn0z=pclQ*4d;q6*eNgsMIiGqsg1TM( zxght($JJ!YWLpg_P&LSlDz=LxK{4TR0xgJ3y$F?$nnjUn;553`ql@&_ywS26ylRU@ z#3PBt8mM&D4K-Rdc#&{n2nt?kt1h1BqkR@ep#4?(tBQ0UB&)(;v7wET)R?-`?J1KL zd2z6_AOE+<6}=N)E};64XY}NN%l;-rBc$K{%3Fi|& zdv}N92M29FpK=|ysjd|&F)2~2SiTriEVt1pfZi%d&u@HLuYKxAA=$3TrpqP=kM6sX zzN$8%Hd8=SaPO6<&_0?IWrd{8u9tEB@~&X}V@8v{Z-%mM!K{1Z>It1U*O~g6%}K$& z9GMnDCD|i_DYCu?BH#J#ZAIw0+NXX)r1ic^NF$9BjFJ`tW9tS*aM9#3#)5Q6);P0^0l|C8{P%I0c#_*G~Vb{%9f^=vX0i5))(9=sCymvx;SGL{$jyyyiRl>vmjYocCw%s54PQ@{kFNV){4qK8~Lp?h0uN z&8GCFZHs$<-%DKMf@}5P>>uY{tiIFD@y#M#Ep=E9eji@v7=R0n2vhR!=1dafOr>p` z>1bS1blSJqTksg#Pfx8(ZQUxID%%#=w%87t&g|jKOo-T4muf=8A=tj+NIST~UWdJNLy7#2hjg#TG>bXL)9|4SEEdYdUJWRleG0 z7zE8pzh}8Hx$w9c1PXjv@!{-yrQ zEu~E69h)(wOoyu<`(pbnD1uadevS?h8m$;beDxt?3knH>1&br>LbYfHxs&)^2dAYS z=VVS~5@lvn;oK_VvS*6?ATboDrO2eJy@-DEd^^OIxr^)E%45|Y3|P! zF62l057I@?`yaVF^z7WT`&##c3hotg-hL{SD4`ts`bGRN$(x|Udy%ZWcU)N!B<`*B zt#D?pL4m>0acNx;!|Ppn&?}D*o3Rc2?vK9nBA+hT1+o>zG$@lR&!h@v+)Hs`wBZpI zYUB?15F2AJg<^UYR}Ei>ub8=XmzV}&&cDBlsNrHrAndfNj48RH{fwkqD*vbY8}=~} zAqH*=GyBpT)&)*1&Un(h)l=Cu6(g9olX zS7me(oK7o76&8-ZJ9R&a>iszTwA(Umh;7%GE1q^$J2&WIn|!4#(i^^l(svcZ#pduy}XE66>bpj)7`Cg+Qm#Q-+|S_ zQp$u3Y}TFDMb6`fRod&*>Qm5lx>j}D9*tF=W`}FE8G?N?dyVeD?_G>yGr*!VjW`e6 z!|#XtbN6O^9N5nKy6Y!g*|tj?R2mHSB(@|cq-R2~;yUNk<2%#uEt_4laD&rwhXg?Z z{pYd!(Uj6RqLZV$gUN$8GG2&*!9T2J^O|EamBvc zK*4DobzI!Vb^MRGKgPVz{+iG0aLHGa08oMOI)%hterGh6hrR*;4^{y14FG`Si_3Kl z0Gyu#z`7v-2z>;A`?enpzRLo@?T-pFlIm`go9Pu1bca;!@W=}yDtOq45~pMV4;X_N zG2i+?n}klX_l7P9ST98;Xu8&JNUOl4IH0hu^`@TkbICv=jAZQyaY?xb3Cl9c8P%-% zU;|{u6F2+Er&74)^jN(ZyE)ynO}4|kbLhDP>s!UWWp#Hq?vN{J+QW=}@%U|o*S+|x z=^F4(z&GKCO_M(rOpXzQXIF^_(1ZzHizNqYCx8L@z1zq~7(76b7N8+6O{0UA)u40Z zWdwkEGkgh_1v1541Wp$DY20SS$G3w3n6?J+M>>pPf@O~iR8V8IK|NY4Er+Kc=vlAs zETP3>v|w#rACIxEO2sMNocQ|;Ac_uDfwz5b1f+KmH1`q!<|c4&P|}{OPLb*3nh%IM zoGV0*nf5P)G?pmcyuRKfCw(S8ul-sN?*+ZeK?S$IN9*z?_?L)$sYW}PVw6m$s!A_f ztX2eXPXNBD8|SYJl{P5|KJVfCVX#fGtd?@D64mQ#uNo-B|VmwRFP-*6y=7y z-a~!bx7(FXF4K)SpJu*vGajQsFN);mNEpkoHsPz+@-(n0?@}He+vf}lcE|L-g!9w4 zEq-mq%w6)ucN>U$8t8DBY59S#&>QHauSx)6K2Hn-e<`^ODKZ`>phBl;vEO+poS5vh z(d7JYEh;SZA2<`TQf3hEgl(-WS+$2#A8Lg!n=P+bV$vIBJU;#oCd_}6Yt?Igj&<2p zcgeW*CMK)2UHS^+s2q!^kx;(Z8Jt6yOVyleyGi4PTxVoDKA5UZFi1$YG7F7oW#8m- zt8FqIoYC@oYxaG6e1iSwC(GCNKXwrK%3dppmUU?#R&OuBoB8T06&5noYTpXWae|mK zTH!DARy@qjg^7jrX2#>5*Q6Qcv4yFDvJAmb1!^g`9c1v%If{E3kr5cUgsYAPM8+(Fp%HFI+a~*3no)q{$#z z=}fdn@2_hJ1nO7R*~ZLjiw8Q{YfNi(@v??5?^2u}n-Xuv(aUuDNFb?fAi47?Xk(3d zE%~s}$^Nc-S8H~Xq9k%9Y)5lHO?l}1d04_l1J0-(dRayT^1x3?mMLjFbWgS%M-AE) zrtQ~N{SuPE%^L!}N70xDK2Kbw!!kN6R_5ke85fJuy9I?;MJkRWZ=s!WVx!)mbP4g-`Y#)VerTIFG_&`Pw~)@eUBvSau_*BhpQ zW5YJ@xt#9k3@c?9seGxw16_`9vHzD>pLpE;h2yBLC{4O#B&;eU#4MLm%vQrcI&hsX zd^36GOV_)J#X4~-Sj*i_d;Mb=?s(SAiY+hKID{FrjQb>gXu@IjthXj0nh9ZJa^v$t z3)1pb;g`LkiWdxRdHA`Dr;z;b?!#;33N9QOM9pW@M{>H*Bn(+bb{%04)*i&X>Xcxh zKJz)5wJ-hwnn5i*7=RT}^(up$b!nJ$3(=XvgzZtQ^`|z@y_+dJYG<+sBU^`t4_Oh_ zQ&yzgn7YXjc@iEAJ9)a+*dV!n;>umnLdf1bIm15a_C%;Y2ZSkJPJYG+*%X+;@=} zHBZ&3f|SQ1pj}+OVu#@_qZj;xFEj_a=%$=yivg zu(SiH6~c#R;3RX>-%{*38i>@f6z9Rjtw_pAHvBw3ns9WUac9+flm^eK7B`2B)T+;f z`9gLFpkpcYx!KS2pIp*Rbe$4zO|jp=guf-sa>b@8hd@UOB+B@$hBE9*Ec~Hw_$RB* znB;Q2KXaUg9yrhmBc7SErZ**s^N#L|EYlp zZLU{HuGYhsNIbzP4|?w@@0iIxzde%!^z1treRLc9@)VUQ8uK zl`EizI#~)4}Skz?~{^Pj)y)c`U%MmyM!W&~ccIy9+w~w+eM?KTGpgP5x8l?6}I>jv!+?)t1Yfs}@^$Ul~Ya2C* zPwSO?iQk{Rs}}+}zvos`xJGCK|1K@efZG`zqH5OltQ4_Wp{g zDR3HkKP#wu=JphOqk5On;v_gOR(dg$%`2?V$Ep|s@9}#|Kla`#@xv9AtXPI9Yl;>& zgr7Vz39(BZZRYlC4ccg~XT_xwgn4O5m4>JE%^rYycS z>yAdfN_IR4=?zY3TyP1d4#5ipf0%4jv$4Vcj%?52X+M;`auu2pX%ii-w-BO=+AmsN z7sYI%6(iV`>f~*Nxe_KbZalo7JXjSlpGvGPhm7sl*X>6m{@d@mY5Gm}USK|rgw>^# z!=Hnwc!prfpY(|IB&s>1CADpXvaOiO&(3z`l2F$VOaYc*jp&~)9WN*oEd z=hhc=Mdq?K%`r}Ze-z9;l1%$_MeC!iO=d+;4GeXLaeQm$EJD{<{3WsNs1gc!DXW>$R@=tq2{ zZwbE_K#IuG2k2?QiPnEoHzdxfG_(pu%Z{!pv>klS68P)YskI`km)g$%?!=-a&1LYx z+0Q?+DhW>L{SuANXjJQKP@Hxp*;2dsso;Ow($DXh9bbxjgcacT_84mT_2VpSRXbJq zB*(*MRav$&$@13Myr3INNQ3~syF&@0V9dE9f%#3-@%qMC*%w^E&aEq7#>W#uK(@YA z3hjc@sF>EY90cxZ<pXmzqv(D-WWV8R zMRghHl>$Ymw+ER)-sbfsVCQ<$(zl+2%|LTuK=`wjxEE83;fLN)lS5uV3*5)-zYu+6s{iG)j9D-Uit02Ge>2#4-t9P90U0k9 zRwjbdkLLPL;Ge+xI!MT4WCR(})MMvKto%v2?J#sOlz#eQ>KIB_Uekt6S^jc#yfoGW zdMxCMw`^1L`2>ustzhC6#m$=$yCHb$j@_H13a)w$zw)$iJmbxdy~H%gRJV&566w#C z5u@Ra;dj1EQtI&rHP-=d|JMg4Bv|fz>P6+IbPIA%iJUU$-wWbWTAOIn^OJcfkBl!+ zBn@a}F11ADi2GjZ{dY|5ih>ZP7ivJ?>u!lZy5f2837#2#@gViE>>k3=07~j~Wd@p2 z7I|gRs*+Z3ur28!sMuu!v@CM3OG6<79z-+o5c)Hw$BB4TK$CQfaerm;z{b+@(JU;y za72AS$IBSgvXNBneUcz2Rk?xG&?YD$ZLe}tvR>?hdJted`vNZ~&;fa0s^O0J=L>>m z7r%22{#5Vd%W$CD22<~Yey!@|aIGmgs)PUy1&-ZG^Y|pVJ_ooS6<{fDMlz`gHQ5J+YqS|u(z@Bxp zxSbP{HfZQ|@h~bHnWDCS`F3Dq8lHS$42fX!!C}WthXwxW;6C4O73cZyq%X9aeki~B zyV$h7EV|;ZXYGe&eAwZ6bMv`l_F=|&RBiuB_iAcWAv1p8RR2{PRgaYx{TlDh%>Pr^F6T3U5zuX{UU8ZC&rG>vk>pQQ lhN`QVWL$Pdt!L-Lz`GW from <%= userName %>", diff --git a/common/locales/en/pets.json b/common/locales/en/pets.json index 3d3cc45748..3dfd475547 100644 --- a/common/locales/en/pets.json +++ b/common/locales/en/pets.json @@ -18,6 +18,7 @@ "mammoth": "Woolly Mammoth", "orca": "Orca", "royalPurpleGryphon": "Royal Purple Gryphon", + "phoenix": "Phoenix", "rarePetPop1": "Click the gold paw to learn more about how you can obtain this rare pet through contributing to Habitica!", "rarePetPop2": "How to Get this Pet!", "potion": "<%= potionType %> Potion", diff --git a/common/locales/en/questsContent.json b/common/locales/en/questsContent.json index 1856cf7000..1da943d2be 100644 --- a/common/locales/en/questsContent.json +++ b/common/locales/en/questsContent.json @@ -293,13 +293,15 @@ "questHorseDropHorseEgg": "Horse (Egg)", "questHorseUnlockText": "Unlocks purchasable Horse eggs in the Market", - "questBurnoutText": "Placeholder", - "questBurnoutNotes": "Placeholder", - "questBurnoutCompletion": "Placeholder", - "questBurnoutCompletionChat": "Placeholder", + "questBurnoutText": "Burnout and the Exhaust Spirits", + "questBurnoutNotes": "Complete Dailies and To-Dos to damage the World Boss! Incomplete Dailies fill the Exhaust Strike Bar. When the Exhaust Strike bar is full, the World Boss will attack an NPC. A World Boss will never damage individual players or accounts in any way. Only active accounts not resting in the Inn will have their tasks tallied.
It is well past midnight, still and stiflingly hot, when Redphoenix and scout captain Kiwibot abruptly burst through the city gates. \"We need to evacuate all the wooden buildings!\" Redphoenix shouts. \"Hurry!\"

Kiwibot grips the wall as she catches her breath. \"It's draining people and turning them into Exhaust Spirits! That's why everything was delayed. That's where the missing people have gone. It's been stealing their energy!\"

\"'It'?'\" asks Lemoness.

And then the heat takes form.

It rises from the earth in a billowing, twisting mass, and the air chokes with the scent of smoke and sulphur. Flames lick across the molten ground and contort into limbs, writhing to horrific heights. Smoldering eyes snap open, and the creature lets out a deep and crackling cackle.

Kiwibot whispers a single word.

\"Burnout.\"", + "questBurnoutCompletion": "Burnout is DEFEATED!

With a great, soft sigh, Burnout slowly releases the ardent energy that was fueling its fire. As the monster curls quietly into ashes, its stolen energy shimmers through the air, rejuvenating the Exhaust Spirits and returning them to their true forms.

Ian, Daniel, and the Seasonal Sorceress cheer as Habiticans rush to greet them, and all the missing citizens of the Flourishing Fields embrace their friends and families. The final Exhaust Spirit transforms into the Joyful Reaper herself!

\"Look!\" whispers @Baconsaur, as the ashes begin to glitter. Slowly, they resolve into hundreds of shining phoenixes!

One of the glowing birds alights on the Joyful Reaper's skeletal arm, and she grins at it. \"It has been a long time since I've had the exquisite privilege to behold a phoenix in the Flourishing Fields,\" she says. \"Although given recent occurrences, I must say, this is highly thematically appropriate!\"

Her tone sobers, although (naturally) her grin remains. \"We're known for being hard-working here, but we are also known for our feasts and festivities. Rather ironic, I suppose, that as we strove to plan a spectacular party, we refused to permit ourselves any time for fun. We certainly won't make the same mistake twice!\"

She claps her hands. \"Now - let's celebrate!\"", + "questBurnoutCompletionChat": "`Burnout is DEFEATED!`\n\nWith a great, soft sigh, Burnout slowly releases the ardent energy that was fueling its fire. As the monster curls quietly into ashes, its stolen energy shimmers through the air, rejuvenating the Exhaust Spirits and returning them to their true forms.\n\nIan, Daniel, and the Seasonal Sorceress cheer as Habiticans rush to greet them, and all the missing citizens of the Flourishing Fields embrace their friends and families. The final Exhaust Spirit transforms into the Joyful Reaper herself!\n\n\"Look!\" whispers @Baconsaur, as the ashes begin to glitter. Slowly, they resolve into hundreds of shining phoenixes!\n\nOne of the glowing birds alights on the Joyful Reaper's skeletal arm, and she grins at it. \"It has been a long time since I've had the exquisite privilege to behold a phoenix in the Flourishing Fields,\" she says. \"Although given recent occurrences, I must say, this is highly thematically appropriate!\"\n\nHer tone sobers, although (naturally) her grin remains. \"We're known for being hard-working here, but we are also known for our feasts and festivities. Rather ironic, I suppose, that as we strove to plan a spectacular party, we refused to permit ourselves any time for fun. We certainly won't make the same mistake twice!\"\n\nShe claps her hands. \"Now - let's celebrate!\"\n\nAll Habiticans receive:\n\nPhoenix Pet\nPhoenix Mount\nAchievement: Savior of the Flourishing Fields\nBasic Candy\nVanilla Candy\nSand Candy\nCinnamon Candy\nChocolate Candy\nRotten Candy\nSour Pink Candy\nSour Blue Candy\nHoney Candy", "questBurnoutBoss": "Burnout", "questBurnoutBossRageTitle": "Exhaust Strike", "questBurnoutBossRageDescription": "When this gauge fills, Burnout will unleash its Exhaust Strike on Habitica!", + "questBurnoutDropPhoenixPet": "Phoenix (Pet)", + "questBurnoutDropPhoenixMount": "Phoenix (Mount)", "questBurnoutBossRageQuests": "`Burnout uses EXHAUST STRIKE!`\n\nOh no! Despite our best efforts, we've let some Dailies get away from us, and now Burnout is inflamed with energy! With a crackling snarl, it engulfs Ian the Quest Master in a surge of spectral fire. As fallen quest scrolls smolder, the smoke clears, and you see that Ian has been drained of energy and turned into a drifting Exhaust Spirit!\n\nOnly defeating Burnout can break the spell and restore our beloved Quest Master. Let's keep our Dailies in check and defeat this monster before it attacks again!", "questBurnoutBossRageSeasonalShop": "`Burnout uses EXHAUST STRIKE!`\n\nAhh!!! Our incomplete Dailies have fed the flames of Burnout, and now it has enough energy to strike again! It lets loose a gout of spectral flame that sears the Seasonal Shop. You're horrified to see that the cheery Seasonal Sorceress has been transformed into a drooping Exhaust Spirit.\n\nWe have to rescue our NPCs! Hurry, Habiticans, complete your tasks and defeat Burnout before it strikes for a third time!", "questBurnoutBossRageTavern": "`Burnout uses EXHAUST STRIKE!`\n\nMany Habiticans have been hiding from Burnout in the Tavern, but no longer! With a screeching howl, Burnout rakes the Tavern with its white-hot hands. As the Tavern patrons flee, Daniel is caught in Burnout's grip, and transforms into an Exhaust Spirit right in front of you!\n\nThis hot-headed horror has gone on for too long. Don't give up... we're so close to vanquishing Burnout for once and for all!" diff --git a/common/script/content/index.coffee b/common/script/content/index.coffee index 35cb3bae3e..69fd28ae61 100644 --- a/common/script/content/index.coffee +++ b/common/script/content/index.coffee @@ -1143,6 +1143,7 @@ api.specialPets = 'JackOLantern-Base': 'jackolantern' 'Mammoth-Base': 'mammoth' 'Tiger-Veteran': 'veteranTiger' + 'Phoenix-Base': 'phoenix' api.specialMounts = 'BearCub-Polar': 'polarBear' @@ -1152,6 +1153,7 @@ api.specialMounts = 'Mammoth-Base': 'mammoth' 'Orca-Base': 'orca' 'Gryphon-RoyalPurple': 'royalPurpleGryphon' + 'Phoenix-Base': 'phoenix' api.timeTravelStable = pets: diff --git a/common/script/src/content/pets-mounts/special-mounts.js b/common/script/src/content/pets-mounts/special-mounts.js index cafb047b3d..bd85c78a3d 100644 --- a/common/script/src/content/pets-mounts/special-mounts.js +++ b/common/script/src/content/pets-mounts/special-mounts.js @@ -6,6 +6,7 @@ let specialMounts = { 'Mammoth-Base': 'mammoth', 'Orca-Base': 'orca', 'Gryphon-RoyalPurple': 'royalPurpleGryphon', + 'Phoenix-Base': 'phoenix' } export default specialMounts; diff --git a/common/script/src/content/pets-mounts/special-pets.js b/common/script/src/content/pets-mounts/special-pets.js index e27d7ef531..5566830a2d 100644 --- a/common/script/src/content/pets-mounts/special-pets.js +++ b/common/script/src/content/pets-mounts/special-pets.js @@ -8,6 +8,7 @@ let specialPets = { 'JackOLantern-Base': 'jackolantern', 'Mammoth-Base': 'mammoth', 'Tiger-Veteran': 'veteranTiger', + 'Phoenix-Base': 'phoenix' } export default specialPets; diff --git a/website/src/models/group.js b/website/src/models/group.js index 19f3ddcffa..9971f9b649 100644 --- a/website/src/models/group.js +++ b/website/src/models/group.js @@ -318,10 +318,12 @@ GroupSchema.statics.tavernBoss = function(user,progress) { tavern.quest.extra.worldDmg.recent = scene; tavern.markModified('quest.extra.worldDmg'); tavern.quest.progress.rage = 0; - tavern.quest.progress.hp += (quest.boss.rage.healing * tavern.quest.progress.hp); + if (quest.boss.rage.healing) { + tavern.quest.progress.hp += (quest.boss.rage.healing * tavern.quest.progress.hp); + } } } - if ((tavern.quest.progress.hp < quest.boss.desperation.threshold) && !tavern.quest.extra.desperate) { + if (quest.boss.desperation && (tavern.quest.progress.hp < quest.boss.desperation.threshold) && !tavern.quest.extra.desperate) { tavern.sendChat(quest.boss.desperation.text('en')); tavern.quest.extra.desperate = true; tavern.quest.extra.def = quest.boss.desperation.def; diff --git a/website/views/options/inventory/seasonal-shop.jade b/website/views/options/inventory/seasonal-shop.jade index fb63545e17..57ed54c585 100644 --- a/website/views/options/inventory/seasonal-shop.jade +++ b/website/views/options/inventory/seasonal-shop.jade @@ -1,6 +1,6 @@ .container-fluid .stable.row: .col-xs-12 - .seasonalshop_open.pull-left-sm.col-centered + div(class="#{env.worldDmg.seasonalShop ? 'seasonalshop_broken' : 'seasonalshop_open'}").pull-left-sm.col-centered .popover.static-popover.fade.right.in.pull-left-sm.col-centered .arrow.hidden-xs h3.popover-title!=env.t('seasonalShopTitle', {linkStart:"", linkEnd: ""}) diff --git a/website/views/options/social/quests/questActive.jade b/website/views/options/social/quests/questActive.jade index 2b11ca7302..969861e8c1 100644 --- a/website/views/options/social/quests/questActive.jade +++ b/website/views/options/social/quests/questActive.jade @@ -16,6 +16,7 @@ div(ng-if='group.quest.active===true') if tavern include ./bossStats + div(ng-bind-html='::Content.quests[group.quest.key].notes()') hr diff --git a/website/views/shared/new-stuff.jade b/website/views/shared/new-stuff.jade index f368da434c..58ea2f83f7 100644 --- a/website/views/shared/new-stuff.jade +++ b/website/views/shared/new-stuff.jade @@ -1,32 +1,57 @@ -h2 10/5/2015 - OCTOBER BACKGROUNDS REVEALED, COSTUME CHALLENGE BEGINS, AND FALL PLOT-LINE CONTINUES +h2 10/8/2015 - WORLD BOSS REVEALED: BURNOUT! hr tr td - .background_harvest_moon.pull-right - h3 October Backgrounds Revealed - p There are three new avatar backgrounds in the Background Shop! Now your avatar can slog through a Slimy Swamp, cackle under the Harvest Moon, or shiver in the Swarming Darkness! - p.small.muted by Leephon, midori88, and Draayder - tr - td - h3 Costume Challenge Begins - p The Community Costume Challenge has begun! Between now and October 31st, dress up as your avatar in real life and post a photo on social media to get the coveted Costume Challenge badge! Read the full rules on the Challenge page here. - p.small.muted by Lemoness - tr - td - h3 Fall Plot-Line Continues - p Although we are now well into autumn, the Flourishing Fields are locked in a sweltering heat wave. The candies grow sticky in the sun, and the Spooky Pets lie panting in the shade. But this is minor news compared to the calamity that has just occurred. + .promo_burnout.pull-right + h3 Burnout, Scourge of the Flourishing Fields + p It is well past midnight, still and stiflingly hot, when Redphoenix and scout captain Kiwibot abruptly burst through the city gates. "We need to evacuate all the wooden buildings!" Redphoenix shouts. "Hurry!" br - p The Joyful Reaper is gone. + p Kiwibot grips the wall as she catches her breath."It's draining people and turning them into Exhaust Spirits! That's why everything was delayed. That's where the missing people have gone. It's been stealing their energy!" br - p The citizens of the Flourishing Fields are working frantically to find their lost ruler, but many of their search parties have not returned. Those few that do make it back are empty-handed. Worse yet, they report frightening hordes of spirits drifting at the edges of the Fields. + p "'It'?'" asks Lemoness. br - p Redphoenix grimly gathers her scouts. "If these spirits are a threat, we need to face them directly," she says. "There's no point in procrastination." Without fuss or fanfare, they set off into the night. + p And then the heat takes form. + br + p It rises from the earth in a billowing, twisting mass, and the air chokes with the scent of smoke and sulphur. Flames lick across the molten ground and contort into limbs, writhing to horrific heights. Smoldering eyes snap open, and the creature lets out a deep and crackling cackle. + br + p Kiwibot whispers a single word. + br + p "Burnout." + hr + p Quickly, Habiticans, we have to save the Flourishing Fields from incineration! All of us will battle this World Boss together by completing tasks, but it won't attack us individually. However, the more Dailies we skip, the closer we get to triggering its fearsome Exhaust Strike, which will target our NPCs! + br + p Knowing your enemy is the first step to defeating it. Read more about World Bosses here. + br + p.small.muted by Lemoness, SabreCat, and Kiwibot if menuItem !== 'oldNews' hr a(href='/static/old-news', target='_blank') Read older news mixin oldNews + h2 10/5/2015 - OCTOBER BACKGROUNDS REVEALED, COSTUME CHALLENGE BEGINS, AND FALL PLOT-LINE CONTINUES + tr + td + .background_harvest_moon.pull-right + h3 October Backgrounds Revealed + p There are three new avatar backgrounds in the Background Shop! Now your avatar can slog through a Slimy Swamp, cackle under the Harvest Moon, or shiver in the Swarming Darkness! + p.small.muted by Leephon, midori88, and Draayder + tr + td + h3 Costume Challenge Begins + p The Community Costume Challenge has begun! Between now and October 31st, dress up as your avatar in real life and post a photo on social media to get the coveted Costume Challenge badge! Read the full rules on the Challenge page here. + p.small.muted by Lemoness + tr + td + h3 Fall Plot-Line Continues + p Although we are now well into autumn, the Flourishing Fields are locked in a sweltering heat wave. The candies grow sticky in the sun, and the Spooky Pets lie panting in the shade. But this is minor news compared to the calamity that has just occurred. + br + p The Joyful Reaper is gone. + br + p The citizens of the Flourishing Fields are working frantically to find their lost ruler, but many of their search parties have not returned. Those few that do make it back are empty-handed. Worse yet, they report frightening hordes of spirits drifting at the edges of the Fields. + br + p Redphoenix grimly gathers her scouts. "If these spirits are a threat, we need to face them directly," she says. "There's no point in procrastination." Without fuss or fanfare, they set off into the night. + h2 10/1/2015 - SPOOKY HATCHING POTION; NEW ITEMS IN THE ENCHANTED ARMOIRE tr td diff --git a/website/views/shared/profiles/achievements.jade b/website/views/shared/profiles/achievements.jade index 11ec0437a9..f302a7af06 100644 --- a/website/views/shared/profiles/achievements.jade +++ b/website/views/shared/profiles/achievements.jade @@ -219,6 +219,13 @@ div(ng-if='::profile.achievements.quests.stressbeast') =env.t('achievementStressbeastText') hr +div(ng-if='::profile.achievements.quests.burnout') + .achievement.achievement-burnout + h5=env.t('achievementBurnout') + small + =env.t('achievementBurnoutText') + hr + div(ng-if='::profile.achievements.costumeContest') .achievement.achievement-costumeContest h5=env.t('costumeContest')