From 6cbee54ee8b5b1d8f6f0db51279f4b88dd05f50b Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavian.barnes@microsoft.com>
Date: Tue, 11 Sep 2018 10:02:10 -0400
Subject: [PATCH] data/logic: Don't duplicate the Inform 7 at() predicate

Fixes #33, though we may need to allow these conflicts, taking the more
specific definition, for more interesting uses of multiple inheritance/
attributes.
---
 textworld/generator/data/logic/room.twl | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/textworld/generator/data/logic/room.twl b/textworld/generator/data/logic/room.twl
index 3ff77ecb..0393c487 100644
--- a/textworld/generator/data/logic/room.twl
+++ b/textworld/generator/data/logic/room.twl
@@ -58,9 +58,7 @@ type r {
 
         predicates {
             at(P, r) :: "The player is in {r}";
-            at(s, r) :: "The {s} is in {r}";
-            at(c, r) :: "The {c} is in {r}";
-            at(o, r) :: "The {o} is in {r}";
+            at(t, r) :: "The {t} is in {r}";
 
             north_of(r, r') :: "The {r} is mapped north of {r'}";
             south_of(r, r') :: "The {r} is mapped south of {r'}";