From 3d4d20ba3a5e6e8329bf525f6d0bc0e55e315f4a Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Date: Thu, 25 Feb 2021 00:47:52 -0500
Subject: [PATCH] Fixed lexicon bug.
---
lib/aethyr/core/actions/commands/smell.rb | 2 +-
lib/aethyr/core/objects/player.rb | 5 +++++
lib/aethyr/core/objects/traits/lexicon.rb | 10 +++++-----
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/lib/aethyr/core/actions/commands/smell.rb b/lib/aethyr/core/actions/commands/smell.rb
index 67fac43..accfd60 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 ab2b0a3..4342c16 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 1f9237c..2173a32 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
--
GitLab