Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/characters_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def content_params
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,
Expand Down
2 changes: 1 addition & 1 deletion app/models/character.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def self.attribute_categories
{
overview: {
icon: 'info',
attributes: %w(name role gender age universe_id)
attributes: %w(name role gender age archetype universe_id)
},
looks: {
icon: 'face',
Expand Down
6 changes: 6 additions & 0 deletions app/views/content/_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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' %>
<div class="input-field">
<%= f.label attribute %><br />
<%= f.select attribute, options_for_select(t('archetypes'), selected: f.object.archetype), include_blank: true %>
</div>

<% elsif attribute == 'universe_id' %>
<div class="input-field">
<%= f.label attribute %><br />
Expand Down
86 changes: 86 additions & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions db/migrate/20161003000856_add_archetype_to_character.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
class AddArchetypeToCharacter < ActiveRecord::Migration
def change
add_column :characters, :archetype, :string
end
end
3 changes: 2 additions & 1 deletion db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 20160922204317) do
ActiveRecord::Schema.define(version: 20161003000856) do

create_table "archenemyships", force: :cascade do |t|
t.integer "user_id"
Expand Down Expand Up @@ -80,6 +80,7 @@
t.datetime "created_at"
t.datetime "updated_at"
t.string "privacy"
t.string "archetype"
end

create_table "childrenships", force: :cascade do |t|
Expand Down