New event style #218
New event style #218
Conversation
…- Push_button and Cloth are assumed simply as key and object, respectively.
author HakiRose <[email protected]> 1567777575 -0400 committer HakiRose <[email protected]> 1582743626 -0500 Medium-level Spaceship game -- cloth(finished), Push button (in progress)
…l) is implemented, revisions on FW for stochastic commands, some minor changes on a few other files.
… and refactoring, game files(json, ni, ulx), updated logic files, ...
… adapt the new Predicate, Proposition, & Signature styles. This new framework can track a proposition through the time.
…nt of proposition.activate, etc.
HakiRose
force-pushed
the
New_event_Style
branch
from
9d3f78e to
4de1ba6
Compare
… the fully operating structure of the FW
…w quest/Event design, new world2inform7 structure, and more.
…opments on test files, some updates on the frame work, semi-final updates on Content Check Game, etc.
| state.remove_fact(prop) | ||
|
|
||
| def has_traceable(self): | ||
| for prop in self.get_facts(): |
There was a problem hiding this comment.
This class doesn't seem to have a method called get_facts.
| @@ -63,22 +69,86 @@ def _get_name_mapping(action): | |||
| return commands | |||
|
|
|||
|
|
|||
| class Event: | |||
| class PropositionControl: | |||
There was a problem hiding this comment.
This class doesn't seem to have corresponding unit tests.
| @@ -117,41 +117,60 @@ def _variable_(self): # noqa | |||
| [] | |||
| ) | |||
|
|
|||
| def _predVT_(self, name): | |||
There was a problem hiding this comment.
This file is automatically generated by TatSu depending on the content of textworld/logic/logic.ebnf upon making a new TextWorld release. This means you shouldn't/can't modify it directly. Instead, you must modify logic.ebnf accordingly.
| @@ -37,11 +37,15 @@ class VariableNode(ModelBase): | |||
| class SignatureNode(ModelBase): | |||
| name = None | |||
| types = None | |||
| verb = None | |||
There was a problem hiding this comment.
This file is automatically generated by TatSu depending on the content of textworld/logic/logic.ebnf upon making a new TextWorld release. This means you shouldn't/can't modify it directly. Instead, you must modify logic.ebnf accordingly.
| @@ -266,7 +266,7 @@ def _process_rooms(self) -> None: | |||
|
|
|||
| # Handle door link facts. | |||
| for fact in self.facts: | |||
| if fact.name != "link": | |||
| if fact.name != "is__link": | |||
There was a problem hiding this comment.
For backward compatibility (very important), we should support not having an is__ by default.
| for ph, var in mapping.items(): | ||
| a = ph.name | ||
| b = self.entity_infos[var.name].name |
There was a problem hiding this comment.
It doesn't seem to be used.
| @@ -1928,3 +2051,20 @@ def __str__(self): | |||
| lines.append("})") | |||
|
|
|||
| return "\n".join(lines) | |||
|
|
|||
| def get_facts(self): | |||
There was a problem hiding this comment.
What's the difference with the property .facts?
| @@ -24,3 +24,4 @@ tmp/* | |||
| *.ipynb_checkpoints | |||
| /dist | |||
| /wheelhouse | |||
| *.orig | |||
There was a problem hiding this comment.
Good idea. The branch associated with this PR already contains a bunch of .orig files, though.
| @@ -0,0 +1,341 @@ | |||
| from collections import defaultdict | |||
There was a problem hiding this comment.
Let's remove the spaceship challenge from this PR to keep the changes manageable (for me) to review ;)
| @@ -149,19 +149,19 @@ def make_quest(world: Union[World, State], options: Optional[GameOptions] = None | |||
| for i in range(1, len(chain.nodes)): | |||
| actions.append(chain.actions[i - 1]) | |||
| if chain.nodes[i].breadth != chain.nodes[i - 1].breadth: | |||
| event = Event(actions) | |||
| event = EventCondition(actions) | |||
There was a problem hiding this comment.
Since actions is not the first parameters of the constructor anymore, you need to write actions=actions.
The Traceables!