diff --git a/lib/aethyr/core/actions/commands/smell.rb b/lib/aethyr/core/actions/commands/smell.rb index 67fac43222523cdefa9552358419d68c48ec5b36..accfd60eca1d42287794e00c0733d4604c84b426 100644 --- a/lib/aethyr/core/actions/commands/smell.rb +++ b/lib/aethyr/core/actions/commands/smell.rb @@ -10,7 +10,7 @@ module Aethyr end def action - event = @data + event = @data.dup room = $manager.get_object(@player.container) if event[:target].nil? if room.info.smell diff --git a/lib/aethyr/core/objects/player.rb b/lib/aethyr/core/objects/player.rb index ab2b0a3096bfeff73a3bbbd726ed5312d2d95ae6..4342c166359f142c01aaea663f1f562ccb26c74f 100644 --- a/lib/aethyr/core/objects/player.rb +++ b/lib/aethyr/core/objects/player.rb @@ -56,6 +56,7 @@ class Player < LivingObject @word_wrap = 120 @page_height = nil @deaf = false + @blind = false @reply_to = nil @prompt_shown = false @layout = :basic @@ -70,6 +71,10 @@ class Player < LivingObject map_skill.add_xp 750 end + def blind? + @blind + end + def set_connection(new_player) @player = new_player @player.display.color_settings = @color_settings diff --git a/lib/aethyr/core/objects/traits/lexicon.rb b/lib/aethyr/core/objects/traits/lexicon.rb index 1f9237c718e69162ec819bdc81c821fac9ed8d5d..2173a32c2c2da284704f9a39050141c619585f9a 100644 --- a/lib/aethyr/core/objects/traits/lexicon.rb +++ b/lib/aethyr/core/objects/traits/lexicon.rb @@ -260,15 +260,15 @@ module Lexicon # For legacy purposes def pronoun(type = :normal) if type == :normal - return noun(false, plurality: Plurality::Singular, gramatical_person: GramaticalPerson::THIRD_PERSON, subjectivity: Subjectivity::SUBJECTIVE ) + return noun(false, plurality: Plurality::SINGULAR, gramatical_person: GramaticalPerson::THIRD_PERSON, subjectivity: Subjectivity::SUBJECTIVE ) elsif type == :reflexive - return noun(false, plurality: Plurality::Singular, gramatical_person: GramaticalPerson::THIRD_PERSON, relation: Relation::REFLEXIVE ) + return noun(false, plurality: Plurality::SINGUAR, gramatical_person: GramaticalPerson::THIRD_PERSON, relation: Relation::REFLEXIVE ) elsif type == :possessive - return noun(false, plurality: Plurality::Singular, gramatical_person: GramaticalPerson::THIRD_PERSON, relation: Relation::POSSESSIVE, subjectivity: Subjectivity::SUBJECTIVE ) + return noun(false, plurality: Plurality::SINGULAR, gramatical_person: GramaticalPerson::THIRD_PERSON, relation: Relation::POSSESSIVE, subjectivity: Subjectivity::SUBJECTIVE ) elsif type == :objective - return noun(false, plurality: Plurality::Singular, gramatical_person: GramaticalPerson::THIRD_PERSON, subjectivity: Subjectivity::OBJECTIVE ) + return noun(false, plurality: Plurality::SINGULAR, gramatical_person: GramaticalPerson::THIRD_PERSON, subjectivity: Subjectivity::OBJECTIVE ) elsif type == :obj_poss - return noun(false, plurality: Plurality::Singular, gramatical_person: GramaticalPerson::THIRD_PERSON, relation: Relation::POSSESSIVE, subjectivity: Subjectivity::OBJECTIVE ) + return noun(false, plurality: Plurality::SINGULAR, gramatical_person: GramaticalPerson::THIRD_PERSON, relation: Relation::POSSESSIVE, subjectivity: Subjectivity::OBJECTIVE ) else raise ArgumentError "Unrecognized typed #{type}" end