diff --git a/console_play.py b/console_play.py index 0ea4c73..3faa15c 100644 --- a/console_play.py +++ b/console_play.py @@ -11,7 +11,7 @@ import textwrap CRED_FILE = "./AI-Adventure-2bb65e3a4e2f.json" # Set the key -def console_print(str, pycharm=True): +def console_print(str, pycharm=False): if pycharm: LINE_WIDTH=80 diff --git a/generator/ctrl/ctrl_generator.py b/generator/ctrl/ctrl_generator.py index 47b5b6c..a19b15e 100644 --- a/generator/ctrl/ctrl_generator.py +++ b/generator/ctrl/ctrl_generator.py @@ -216,7 +216,7 @@ class CTRLGenerator(): prompt_logits[_token][generated_token] /= self.penalty # disallow some tokens - forbidden_tokens = ['', 'Sco@@', "&@@", "1]@@", "2]@@", "3]@@", "4]@@", "https://www.@@", "[@@"] + forbidden_tokens = ['', 'Sco@@', "&@@", "1]@@", "2]@@", "3]@@", "4]@@", "https://www.@@", "[@@", ":@@"] if num_new_lines > self.max_new_lines: forbidden_tokens.append("\n") diff --git a/story/story_manager.py b/story/story_manager.py index 5330130..ad506c2 100644 --- a/story/story_manager.py +++ b/story/story_manager.py @@ -39,9 +39,9 @@ class Story(): self.results.append(story_block) def latest_result(self): - if len(self.results) > 1: - return self.actions[-2] + self.results[-2] + self.actions[-1] + self.results[-1] - elif len(self.results) == 1: + # if len(self.results) > 1: + # return self.actions[-2] + self.results[-2] + self.actions[-1] + self.results[-1] + if len(self.results) >= 1: return self.story_start + self.actions[-1] + self.results[-1] else: return self.story_start diff --git a/story/utils.py b/story/utils.py index b5f51b4..76a4075 100644 --- a/story/utils.py +++ b/story/utils.py @@ -114,16 +114,18 @@ first_to_second_mappings = [ ("me", "you"), ("us", "you"), ("our", "your"), - ("I'll", "you'll") + ("I'll", "you'll"), + ("myself", "yourself") ] second_to_first_mappings = [ ("you're", "I'm"), - ("your ", "my "), + ("your", "my "), ("you are", "I am"), ("you", "I"), ("you", "me"), - ("you'll", "I'll") + ("you'll", "I'll"), + ("yourself", "myself") ] def capitalize_helper(string):