[adonthell-wastesedge-commits] Release_0-3-1 a49adb1 102/237: Now getting the_player, characters and quests via the proper API functions

[Kai Sterker]

tag: Release_0-3-1
commit a49adb111ca17a7241dc986d36514bdcc4012ebf
Author: adondev <adondev>
Commit: adondev <adondev>

    Now getting the_player, characters and quests via the proper API functions
---
 scripts/dialogues/jelom_start.py          |    2 +-
 scripts/events/cellar_to_bjarn.py         |    2 +-
 scripts/events/fst_to_silverhair.py       |    2 +-
 scripts/init.py                           |   22 +++++++++++-----------
 scripts/schedules/mapcharacters/erek.py   |    5 +++--
 scripts/schedules/mapcharacters/oliver.py |    4 ++--
 6 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/scripts/dialogues/jelom_start.py b/scripts/dialogues/jelom_start.py
index b56009e..27db5a7 100644
--- a/scripts/dialogues/jelom_start.py
+++ b/scripts/dialogues/jelom_start.py
@@ -36,7 +36,7 @@ class jelom_start:
                self.dialogue[answer]()
 
        def start (self):
-               if the_player.get_val ("at_silverhairs_door") == 1 and 
adonthell.gamedata_get_quest("demo").get_val ("know_jelom") != 2:
+               if self.the_player.get_val ("at_silverhairs_door") == 1 and 
adonthell.gamedata_get_quest("demo").get_val ("know_jelom") != 2:
                
 
                        self.color = self.the_npc.get_color()
diff --git a/scripts/events/cellar_to_bjarn.py 
b/scripts/events/cellar_to_bjarn.py
index 3795f38..0465671 100644
--- a/scripts/events/cellar_to_bjarn.py
+++ b/scripts/events/cellar_to_bjarn.py
@@ -34,7 +34,7 @@ class cellar_to_bjarn:
     def run (self, submap, x, y, dir, name):
         p = adonthell.gamedata_get_character (name)
         # -- bjarn's door closed?
-        open = adonthell.quests["demo"].get_val("bjarn_door_open")
+        open = adonthell.gamedata_get_quest ("demo").get_val("bjarn_door_open")
         if open == 0 or open == 1:
             if p.get_name () == adonthell.gamedata_player ().get_name ():
                 adonthell.gamedata_get_character ("Bjarn 
Fingolson").launch_action (p)
diff --git a/scripts/events/fst_to_silverhair.py 
b/scripts/events/fst_to_silverhair.py
index cc1a84d..d69ad28 100644
--- a/scripts/events/fst_to_silverhair.py
+++ b/scripts/events/fst_to_silverhair.py
@@ -34,7 +34,7 @@ class fst_to_silverhair:
     def run (self, submap, x, y, dir, name):
         p = adonthell.gamedata_get_character (name)
 
-        free = adonthell.quests["demo"].get_val("silverhair_free")
+        free = adonthell.gamedata_get_quest ("demo").get_val("silverhair_free")
 
         # -- Jelom not convinced of Silverhair's innocence
         if not free and p.get_name () == adonthell.gamedata_player ().get_name 
():
diff --git a/scripts/init.py b/scripts/init.py
index c5c816e..54c8f16 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -775,7 +775,7 @@ class title_screen:
                 lm.add_event (ev)
 
                 # Now setup the characters
-                lucia = characters ["Lucia Redwyne"]
+                lucia = gamedata_get_character ("Lucia Redwyne")
                 lucia.set_dialogue ("dialogues/lucia_start")
                 lucia.load ("lucia.mchar")
                 lucia.set_map (map_engine.get_landmap ())
@@ -783,7 +783,7 @@ class title_screen:
                 lucia.set_action ("talk")
                 lucia.stand_south ()
 
-                orloth = characters ["Orloth Redwyne"]
+                orloth = gamedata_get_character ("Orloth Redwyne")
                 orloth.set_dialogue ("dialogues/orloth_start")
                 orloth.load ("orloth.mchar")
                 orloth.set_map (map_engine.get_landmap ())
@@ -792,7 +792,7 @@ class title_screen:
                 orloth.stand_south ()
                 orloth.set_schedule ("orloth")
 
-                erek = characters ["Erek Stonebreaker"]
+                erek = gamedata_get_character ("Erek Stonebreaker")
                 erek.set_dialogue ("dialogues/erek_start")
                 erek.load ("erek.mchar")
                 erek.set_map (map_engine.get_landmap ())
@@ -814,7 +814,7 @@ class title_screen:
                 talan.set_schedule ("talan")
                 talan.set_portrait ("talan.pnm")
 
-                jelom = characters ["Jelom Rasgar"]
+                jelom = gamedata_get_character ("Jelom Rasgar")
                 jelom.set_dialogue ("dialogues/jelom_start")
                 jelom.load ("jelom.mchar")
                 jelom.set_map (map_engine.get_landmap ())
@@ -824,7 +824,7 @@ class title_screen:
                 jelom.set_schedule ("jelom")
                 jelom.set_portrait ("jelom.pnm")
 
-                alek = characters ["Alek Endhelm"]
+                alek = gamedata_get_character ("Alek Endhelm")
                 alek.set_dialogue ("dialogues/alek_start")
                 alek.load ("alek.mchar")
                 alek.set_map (map_engine.get_landmap ())
@@ -833,7 +833,7 @@ class title_screen:
                 alek.stand_south ()
                 alek.set_schedule ("alek")
 
-                oliver = characters ["Oliver Redwyne"]
+                oliver = gamedata_get_character ("Oliver Redwyne")
                 oliver.set_dialogue ("dialogues/oliver_start")
                 oliver.load ("oliver.mchar")
                 oliver.set_map (map_engine.get_landmap ())
@@ -842,7 +842,7 @@ class title_screen:
                 oliver.stand_west ()
                 oliver.set_schedule ("oliver")
 
-                frostbloom = characters ["Rhayne Frostbloom"]
+                frostbloom = gamedata_get_character ("Rhayne Frostbloom")
                 frostbloom.set_dialogue ("dialogues/frostbloom_start")
                 frostbloom.load ("frostbloom.mchar")
                 frostbloom.set_map (map_engine.get_landmap ())
@@ -851,7 +851,7 @@ class title_screen:
                 frostbloom.stand_north ()
                 frostbloom.set_schedule ("frostbloom")
 
-                bjarn = characters ["Bjarn Fingolson"]
+                bjarn = gamedata_get_character ("Bjarn Fingolson")
                 bjarn.set_dialogue ("dialogues/bjarn_start")
                 bjarn.load ("bjarn.mchar")
                 bjarn.set_map (map_engine.get_landmap ())
@@ -859,7 +859,7 @@ class title_screen:
                 bjarn.set_action ("talk")
                 bjarn.stand_west ()
 
-                silverhair = characters ["Imoen Silverhair"]
+                silverhair = gamedata_get_character ("Imoen Silverhair")
                 silverhair.load ("silverhair.mchar")
                 silverhair.set_map (map_engine.get_landmap ())
                 silverhair.jump_to (13, 4, 4)
@@ -867,7 +867,7 @@ class title_screen:
                 silverhair.stand_south ()
                 silverhair.set_schedule ("silverhair")
 
-                sarin = characters ["Sarin Trailfollower"]
+                sarin = gamedata_get_character ("Sarin Trailfollower")
                 sarin.set_dialogue ("dialogues/sarin_start")
                 sarin.load ("servant2.mchar")
                 sarin.set_map (map_engine.get_landmap ())
@@ -876,7 +876,7 @@ class title_screen:
                 sarin.stand_west ()
                 sarin.set_schedule ("sarin")
 
-                janesta = characters ["Janesta Skywind"]
+                janesta = gamedata_get_character ("Janesta Skywind")
                 janesta.set_dialogue ("dialogues/janesta_start")
                 janesta.load ("servant1.mchar")
                 janesta.set_map (map_engine.get_landmap ())
diff --git a/scripts/schedules/mapcharacters/erek.py 
b/scripts/schedules/mapcharacters/erek.py
index 827d2df..20c3307 100755
--- a/scripts/schedules/mapcharacters/erek.py
+++ b/scripts/schedules/mapcharacters/erek.py
@@ -38,10 +38,11 @@ class erek:
         myself = self.myself
         
         # -- lead the player into bjarn's room
-        if adonthell.quests["demo"].get_val ("bjarn_door_open") == 2:
+        if adonthell.gamedata_get_quest ("demo").get_val ("bjarn_door_open") 
== 2:
             myself.set_schedule_active (0)
             # -- start Bjanr's conversation with the player and Erek
-            adonthell.characters["Bjarn Fingolson"].launch_action 
(adonthell.the_player)
+            fingolson = adonthell.gamedata_get_character ("Bjarn Fingolson")
+            fingolson.launch_action (adonthell.gamedata_player ())
 
         # -- leave cellar again
         elif myself.get_val ("leave_bjarn") == 1:
diff --git a/scripts/schedules/mapcharacters/oliver.py 
b/scripts/schedules/mapcharacters/oliver.py
index 622f08d..a9b374c 100755
--- a/scripts/schedules/mapcharacters/oliver.py
+++ b/scripts/schedules/mapcharacters/oliver.py
@@ -42,7 +42,7 @@ class oliver:
 
             # -- find a free spot near Orloth and the player
             i = 0
-            orloth = adonthell.characters ["Orloth Redwyne"]
+            orloth = adonthell.gamedata_get_character ("Orloth Redwyne")
             while i < 7:
                 x, y = self.offsets[i][:2]
                 x = x + orloth.posx ()
@@ -56,7 +56,7 @@ class oliver:
         # -- in the player's room
         elif myself.get_val ("goto_players_room") == 3:
             # -- start talking to the player
-            myself.launch_action (adonthell.the_player)
+            myself.launch_action (adonthell.gamedata_player ())
 
         # -- leave the player's room and goto the barn
         elif myself.get_val ("goto_barn") == 1: