diff --git a/app/controllers/characters_controller.rb b/app/controllers/characters_controller.rb
index fd498e98..d4a650a0 100644
--- a/app/controllers/characters_controller.rb
+++ b/app/controllers/characters_controller.rb
@@ -11,7 +11,7 @@ class CharactersController < ContentController
def content_param_list
[
:universe_id, :user_id,
- :name, :age, :role, :gender, :age, :height, :weight, :haircolor,
+ :name, :age, :role, :gender, :age, :archetype, :height, :weight, :haircolor,
:facialhair, :eyecolor, :race, :skintone, :bodytype, :identmarks,
:religion, :politics, :prejudices, :occupation, :pets,
:mannerisms, :birthday, :education, :background,
diff --git a/app/models/character.rb b/app/models/character.rb
index 7d5a28dc..9c8d92a6 100644
--- a/app/models/character.rb
+++ b/app/models/character.rb
@@ -51,7 +51,7 @@ class Character < ActiveRecord::Base
{
overview: {
icon: 'info',
- attributes: %w(name role gender age universe_id)
+ attributes: %w(name role gender age archetype universe_id)
},
looks: {
icon: 'face',
diff --git a/app/views/content/_form.html.erb b/app/views/content/_form.html.erb
index 4839d943..48dc2094 100644
--- a/app/views/content/_form.html.erb
+++ b/app/views/content/_form.html.erb
@@ -67,6 +67,12 @@
<% through_class = content.class.reflect_on_association(attribute).options[:through].to_s %>
<%= render 'content/form/relation_input', f: f, attribute: attribute, relation: through_class %>
+ <% elsif attribute == 'archetype' %>
+
+ <%= f.label attribute %>
+ <%= f.select attribute, options_for_select(t('archetypes'), selected: f.object.archetype), include_blank: true %>
+
+
<% elsif attribute == 'universe_id' %>
<%= f.label attribute %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d64e73e5..e0a564bd 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -539,6 +539,92 @@ en:
- Jet black
- Raven black
+ archetypes:
+ - Anthropomorphic Personification
+ - Anti-Hero
+ - Archmage
+ - Barefoot Sage
+ - Big Fun
+ - Blind Seer
+ - Blue-Collar Warlock
+ - Bruiser with a Soft Center
+ - The Champion
+ - The Chosen One
+ - The Chooser of The One
+ - Classic Villain
+ - The Cynic
+ - The Dragonslayer
+ - The Drunken Sailor
+ - Dumb Muscle
+ - Eccentric Mentor
+ - Enigmatic Empowering Entity
+ - Evil Overlord
+ - The Fair Folk
+ - Father Neptune
+ - Ferryman
+ - The Fool
+ - Fool for Love
+ - Gentle Giant
+ - The Good King
+ - Granny Classic
+ - The Grotesque
+ - Herald
+ - Heroic Archetype
+ - Heroic Wannabe
+ - The High Queen
+ - Higher Self
+ - The Hunter
+ - Ideal Hero
+ - The Idealist
+ - Ineffectual Loner
+ - The Kirk
+ - The Klutz
+ - Knight in Shining Armor
+ - Lady and Knight
+ - Loser Archetype
+ - Lovable Rogue
+ - Magical Barefooter
+ - Mary Sue
+ - The McCoy
+ - Mentor
+ - Messianic
+ - Mixed
+ - Mock Millionaire
+ - Modern Major General
+ - My Girl Back Home
+ - Obstructive Bureaucrat
+ - Oedipus Complex
+ - Old Soldier
+ - The Paladin
+ - The Patriarch
+ - Person of Mass Destruction
+ - The Pollyanna
+ - Powers That Be
+ - Prince Charming
+ - Princess Classic
+ - A Protagonist Shall Lead Them
+ - Rebel Leader
+ - Rebellious Spirit
+ - Reluctant Monster
+ - Satanic Archetype
+ - Seeker Archetype
+ - Shadow Archetype
+ - Shapeshifter
+ - The Spock
+ - Star-Crossed Lovers
+ - The Storyteller
+ - Threshold Guardians
+ - Turn Coat
+ - The Trickster
+ - Visitor
+ - Wicked Stepmother
+ - Wicked Witch
+ - Wizard Classic
+ - Wolf Man
+ - World's Best Warrior
+ - World's Most Beautiful Woman
+ - World's Strongest Man
+
location_name_prefixes:
- New
- Los
diff --git a/db/migrate/20161003000856_add_archetype_to_character.rb b/db/migrate/20161003000856_add_archetype_to_character.rb
new file mode 100644
index 00000000..6aa67993
--- /dev/null
+++ b/db/migrate/20161003000856_add_archetype_to_character.rb
@@ -0,0 +1,5 @@
+class AddArchetypeToCharacter < ActiveRecord::Migration
+ def change
+ add_column :characters, :archetype, :string
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 023e38ab..360c58a5 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,8 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20161001232324) do
-
+ActiveRecord::Schema.define(version: 20161003000856) do
create_table "archenemyships", force: :cascade do |t|
t.integer "user_id"
t.integer "character_id"
@@ -80,6 +79,7 @@ ActiveRecord::Schema.define(version: 20161001232324) do
t.datetime "created_at"
t.datetime "updated_at"
t.string "privacy"
+ t.string "archetype"
end
create_table "childrenships", force: :cascade do |t|