World 2 Now in english

example_worlds.py

@@ -226,13 +226,13 @@ def get_world_2_spanish() -> World:
     place_1.block_passage(place_2, item_3)
 
     place_3 = Location("Celda",
-                       ["Una celda cuadrada de dos metros cuadrados", "Las vegetación del monte ya ha ingresado al interior"])
+                       ["Una celda cuadrada de dos metros cuadrados", "La vegetación del monte ya ha ingresado al interior"])
     place_3.connecting_locations = [place_2]
     place_2.connecting_locations = [place_3]
     place_2.block_passage(place_3,puzzle_1)
 
     npc = Character("José Artigas",
-                       ["El héroe nacional de Uruguay", "Está cansado, de estar tanto tiempo encerrado"],
+                       ["El héroe nacional de Uruguay", "Está muy debilitado al estar tanto tiempo encerrado"],
                        inventory = [],
                        location = place_3)
     
@@ -247,4 +247,55 @@ def get_world_2_spanish() -> World:
     the_world.add_character(npc)
     the_world.set_objective(player,npc)
 
+    return the_world
+
+def get_world_2_english() -> World:
+    
+    item_1 = Item("Writings",
+                  ["There is something written on the wall.", "It says 'You have to trust in the powers that have been given to you.'"], 
+                  gettable=False)
+    item_2 = Item("Pond",
+                  ["A pond full of crystal clear water", "The water is so clear that it works like a mirror"],
+                   gettable=False)
+    item_3 = Item("Firewall",
+                  ["The flames are very hot", "It's 3 metres high", "It is impossible to cross them, neither walking, nor running, nor jumping."],
+                   gettable=False)
+    item_4 = Item("Guitar",
+                  ["A classic guitar with 6 strings", "It sounds great"])
+
+    puzzle_1 = Puzzle("Puzzle",
+                      ["A strong magic is generating an impassable wall", "Magically, as you get closer, some blue letters appear explaining what the riddle to solve is."],
+                      "You have to whisper the name of the river located on the southern coast of the Banda Oriental", "Rio de la Plata")
+
+    place_1 = Location ("Clearing in the woods",
+                        ["A clearing in a eucalyptus forest near the Uruguay River", "You can hear the sound of the animals that live in the trees of this forest."],
+                        items = [item_1, item_2])
+    place_2 = Location("Silent zone",
+                       ["The forest continues in this part", "Unlike the previous area, this area is very silent and not even the slightest sound can be heard."])
+    place_2.connecting_locations = [place_1]
+    place_1.connecting_locations = [place_2]
+    place_1.block_passage(place_2, item_3)
+
+    place_3 = Location("Cell",
+                       ["A square cell of two square meters", "The interior is full of plants that grew outside"])
+    place_3.connecting_locations = [place_2]
+    place_2.connecting_locations = [place_3]
+    place_2.block_passage(place_3,puzzle_1)
+
+    npc = Character("José Artigas",
+                       ["Uruguay's national hero", "He is very weak after being locked up for so long."],
+                       inventory = [],
+                       location = place_3)
+    
+    player = Character("Venancio",
+                        ["A Uruguayan gaucho in his 40s", "He belongs to the Artigas army", "He has the magical power to summon a giant wave of water with which he can put out fires or moisten the ground."],
+                        inventory = [item_4],
+                        location= place_1)
+
+    the_world = World(player)
+    the_world.add_locations([place_1,place_2,place_3])
+    the_world.add_items([item_1,item_2,item_3])
+    the_world.add_character(npc)
+    the_world.set_objective(player,npc)
+
     return the_world

models.py

@@ -1,11 +1,10 @@
 """Load models to use them as a narrator and a common-sense oracle in the PAYADOR pipeline."""
 import google.generativeai as genai
 import requests
-import os
 
 
 class GeminiModel():
-    def __init__ (self, api_key_file:str, model_name:str = "gemini-pro") -> None:
+    def __init__ (self, api_key_file:str, model_name:str = "gemini-1.0-pro") -> None:
         """"Initialize the Gemini model using an API key."""
         self.safety_settings = [
             {
@@ -29,7 +28,7 @@ class GeminiModel():
                 "threshold": "BLOCK_NONE",
             },
         ]
-        genai.configure(api_key=os.getenv(api_key_file))
+        genai.configure(api_key=get_api_key(api_key_file))
         self.model = genai.GenerativeModel(model_name)
 
     def prompt_model(self,prompt: str) -> str:

prompts.py

@@ -20,6 +20,8 @@ def prompt_describe_objective_english (objective) -> str:
         prompt+= f'"<{objective[0].name}> has to get the item <{objective[1].name}>."'
     elif first_component_class == "Item" and second_component_class == "Location":
         prompt+= f'"You have to leave item <{objective[0].name}> in place <{objective[1].name}>."'
+    elif first_component_class == "Character" and second_component_class == "Character":
+        prompt+= f'"<{objective[0].name}> has to find <{objective[1].name}>."'
 
     prompt+="\nPut your generated narration between # characters. For example: # You have to get the <key> # or # You have to reach the <castle> #"