[Adonthell-commits] CVS: wastesedge/scripts/dialogues bjarn_start.py,1.13,1.14 erek_start.py,1.31,1.32 jelom_2nd.py,1.16,1.17

[Kai Sterker <address@hidden>]

Update of /cvsroot/adonthell/wastesedge/scripts/dialogues
In directory subversions:/tmp/cvs-serv25088/scripts/dialogues

Modified Files:
        bjarn_start.py erek_start.py jelom_2nd.py 
Log Message:
UPDATED the last few schedules for the new event system
ADDED file with player text for i18n
FIXED a few bugs caused by the schedule rewrite (hope I got all!)


Index: bjarn_start.py
===================================================================
RCS file: /cvsroot/adonthell/wastesedge/scripts/dialogues/bjarn_start.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** bjarn_start.py      6 May 2002 13:47:17 -0000       1.13
--- bjarn_start.py      21 Aug 2002 15:34:50 -0000      1.14
***************
*** 74,78 ****
                "adonthell.gamedata_get_quest(\"demo\").set_val 
(\"bjarn_door_open\" , 1)\n",\
                "adonthell.gamedata_get_quest(\"demo\").set_val 
(\"bjarn_door_open\" , 3)\n",\
!               "adonthell.gamedata_get_character(\"Erek 
Stonebreaker\").set_val (\"leave_bjarn\" , 
1)\nadonthell.gamedata_get_character(\"Erek Stonebreaker\").set_schedule_active 
(1)\n",\
                "adonthell.gamedata_get_quest(\"demo\").set_val 
(\"ask_packed_gems\" , 3)\n",\
                "adonthell.gamedata_get_quest(\"demo\").set_val (\"bjarn_lies\" 
, 1)\n"]
--- 74,78 ----
                "adonthell.gamedata_get_quest(\"demo\").set_val 
(\"bjarn_door_open\" , 1)\n",\
                "adonthell.gamedata_get_quest(\"demo\").set_val 
(\"bjarn_door_open\" , 3)\n",\
!               "adonthell.gamedata_get_character(\"Erek 
Stonebreaker\").do_stuff 
(\"leave_bjarn\")\nadonthell.gamedata_get_character(\"Erek 
Stonebreaker\").resume ()\n",\
                "adonthell.gamedata_get_quest(\"demo\").set_val 
(\"ask_packed_gems\" , 3)\n",\
                "adonthell.gamedata_get_quest(\"demo\").set_val (\"bjarn_lies\" 
, 1)\n"]

Index: erek_start.py
===================================================================
RCS file: /cvsroot/adonthell/wastesedge/scripts/dialogues/erek_start.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** erek_start.py       6 May 2002 13:47:17 -0000       1.31
--- erek_start.py       21 Aug 2002 15:34:50 -0000      1.32
***************
*** 292,295 ****
--- 292,299 ----
                # -- 'teleport' to Bjarn's room
                if adonthell.gamedata_get_quest("demo").get_val 
("bjarn_door_open") == 2:
+                   bjarn = adonthell.gamedata_get_character ("Bjarn Fingolson")
+                   bjarn.do_stuff ("await_player")
+                   bjarn.time_callback_string ("1t", "start_talking")
+               
                    erek = adonthell.gamedata_get_character ("Erek 
Stonebreaker")
                    import events
***************
*** 300,303 ****
--- 304,311 ----
                # -- Teleport to Jelom
                if adonthell.gamedata_get_quest("demo").get_val 
("convince_jelom") == 2:
+                   jelom = adonthell.gamedata_get_character ("Jelom Rasgar")
+                   jelom.jump_to (9, 2, 3, 1)
+                   jelom.time_callback_string ("1t", "start_talking")
+               
                    erek = adonthell.gamedata_get_character ("Erek 
Stonebreaker")
                    erek.set_schedule_active (0)

Index: jelom_2nd.py
===================================================================
RCS file: /cvsroot/adonthell/wastesedge/scripts/dialogues/jelom_2nd.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** jelom_2nd.py        6 May 2002 13:47:18 -0000       1.16
--- jelom_2nd.py        21 Aug 2002 15:34:50 -0000      1.17
***************
*** 116,144 ****
        def __del__(self):
                if adonthell.gamedata_get_quest("demo").get_val ("the_end") == 
1:
                    # make all dudes go down to Bjarn
                    shair = adonthell.gamedata_get_character("Imoen Silverhair")
                    shair.set_schedule ("to_cellar")
!                   shair.set_val ("delay", 5)
                
                    jelom = adonthell.gamedata_get_character("Jelom Rasgar")
-                   jelom.set_val ("delay", 20)
                    jelom.set_schedule ("to_cellar")
                                
                    player = adonthell.gamedata_player ()
-                   player.set_val ("delay", 35)
                    player.set_schedule ("to_cellar")
                                
                    erek = adonthell.gamedata_get_character("Erek Stonebreaker")
!                   erek.set_schedule_active (1)
                    erek.set_schedule ("to_cellar")
!                   erek.set_val ("delay", 45)
                                
                    fnir = adonthell.gamedata_get_character("Fellnir Kezular")
                    fnir.set_schedule ("to_cellar")
!                   fnir.set_val ("delay", 130)
                                
                    illig = adonthell.gamedata_get_character("Tristan Illig")
                    illig.set_schedule ("to_cellar")
!                   illig.set_val ("delay", 300)
                
  
--- 116,147 ----
        def __del__(self):
                if adonthell.gamedata_get_quest("demo").get_val ("the_end") == 
1:
+                   bjarn = adonthell.gamedata_get_character("Bjarn Fingolson")
+                   bjarn.do_stuff ("await_player")
+               
                    # make all dudes go down to Bjarn
                    shair = adonthell.gamedata_get_character("Imoen Silverhair")
                    shair.set_schedule ("to_cellar")
!                   shair.time_callback_string ("2t", "walk")
                
                    jelom = adonthell.gamedata_get_character("Jelom Rasgar")
                    jelom.set_schedule ("to_cellar")
+                   jelom.time_callback_string ("1t", "walk")
                                
                    player = adonthell.gamedata_player ()
                    player.set_schedule ("to_cellar")
+                   player.time_callback_string ("2t", "walk")
                                
                    erek = adonthell.gamedata_get_character("Erek Stonebreaker")
!                   erek.resume ()
                    erek.set_schedule ("to_cellar")
!                   erek.time_callback_string ("3t", "walk")
                                
                    fnir = adonthell.gamedata_get_character("Fellnir Kezular")
                    fnir.set_schedule ("to_cellar")
!                   fnir.time_callback_string ("4t", "walk")
                                
                    illig = adonthell.gamedata_get_character("Tristan Illig")
                    illig.set_schedule ("to_cellar")
!                   illig.time_callback_string ("7t", "walk")