From 52b2532b5a05dc0eee8a5085d7bea8161510a367 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Wed, 30 Jan 2013 13:29:59 -0500 Subject: [PATCH] armorset (v1 or v2) settings for females --- src/app/index.coffee | 9 ++++++--- views/app/index.html | 14 ++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/app/index.coffee b/src/app/index.coffee index 356a207e9f..b649e75a7e 100644 --- a/src/app/index.coffee +++ b/src/app/index.coffee @@ -24,11 +24,12 @@ setupModelFns = (model) -> # also update in scoring.coffee. TODO create a function accessible in both locations (lvl*100)/5 - model.fn '_user._armor', '_user.items.armor', '_user.preferences.gender', (armor, gender) -> + model.fn '_user._armor', '_user.items.armor', '_user.preferences.armorSet', '_user.preferences.gender', (armor, armorSet, gender) -> if gender == 'f' str = "armor#{armor}_f" if parseInt(armor) > 1 - str += '_v1' #TODO implement different version + armorSet = if armorSet then armorSet else 'v1' + str += '_' + armorSet return "#{str}.png" else "armor#{armor}_m.png" @@ -315,4 +316,6 @@ ready (model) -> user.set('notifications.kickstarter', 'hide') exports.setMale = -> user.set('preferences.gender', 'm') - exports.setFemale = -> user.set('preferences.gender', 'f') \ No newline at end of file + exports.setFemale = -> user.set('preferences.gender', 'f') + exports.setArmorsetV1 = -> user.set('preferences.armorSet', 'v1') + exports.setArmorsetV2 = -> user.set('preferences.armorSet', 'v2') \ No newline at end of file diff --git a/views/app/index.html b/views/app/index.html index 7848dcb3ca..f9bd1f0309 100644 --- a/views/app/index.html +++ b/views/app/index.html @@ -12,6 +12,7 @@ Copy this ID for use in third party applications.
{_user.id}

+

Gender

+ + {#if equal(_user.preferences.gender,'f')} +

Armor Set

+ + + {/} + <@footer>