[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Adonthell-commits] CVS: wastesedge/scripts/schedules/mapcharacters bja
From: |
Kai Sterker <address@hidden> |
Subject: |
[Adonthell-commits] CVS: wastesedge/scripts/schedules/mapcharacters bjarn.py,1.6,1.7 extro.py,1.21,1.22 to_cellar.py,1.8,1.9 |
Date: |
Mon, 27 Jan 2003 14:53:43 -0500 |
Update of /cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters
In directory subversions:/tmp/cvs-serv32617/schedules/mapcharacters
Modified Files:
bjarn.py extro.py to_cellar.py
Log Message:
FIXED extro
Index: bjarn.py
===================================================================
RCS file:
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/bjarn.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** bjarn.py 21 Aug 2002 15:34:50 -0000 1.6
--- bjarn.py 27 Jan 2003 19:53:41 -0000 1.7
***************
*** 43,47 ****
# and at the end of the game.
def await_player (self):
! self.myself.jump_to (self.myself.submap (), 3, 6)
self.myself.stand_west ()
--- 43,47 ----
# and at the end of the game.
def await_player (self):
! self.myself.jump_to (7, 3, 6)
self.myself.stand_west ()
Index: extro.py
===================================================================
RCS file:
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/extro.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** extro.py 2 Sep 2002 10:59:50 -0000 1.21
--- extro.py 27 Jan 2003 19:53:41 -0000 1.22
***************
*** 1,4 ****
#
! # (C) Copyright 2001 Kai Sterker <address@hidden>
# Part of the Adonthell Project http://adonthell.linuxgames.com
#
--- 1,4 ----
#
! # (C) Copyright 2001/2003 Kai Sterker <address@hidden>
# Part of the Adonthell Project http://adonthell.linuxgames.com
#
***************
*** 31,43 ****
jelom = adonthell.gamedata_get_character ("Jelom Rasgar")
talan = adonthell.gamedata_get_character ("Talan Wendth")
- talan.set_schedule_active (0)
silverhair = adonthell.gamedata_get_character ("Imoen Silverhair")
player = adonthell.gamedata_player ()
# -- init the bubble texts
# (character, text)
self.text = [(bjarn, N_("There is no denying it. Yes, I feigned the
theft. ")), \
(erek, N_("But Master? How could you do such an infamous deed?
")), \
! (jelom, N_("That I would know as well! And where are
the gems then? ")), \
(bjarn, N_("What? Haven't I made myself clear already? ")), \
(bjarn, N_("I despise those Elves and their uncanny ways. ")), \
--- 31,44 ----
jelom = adonthell.gamedata_get_character ("Jelom Rasgar")
talan = adonthell.gamedata_get_character ("Talan Wendth")
silverhair = adonthell.gamedata_get_character ("Imoen Silverhair")
player = adonthell.gamedata_player ()
+ talan.pause ()
+
# -- init the bubble texts
# (character, text)
self.text = [(bjarn, N_("There is no denying it. Yes, I feigned the
theft. ")), \
(erek, N_("But Master? How could you do such an infamous deed?
")), \
! (jelom, N_("That I would know as well! And where are the gems
then? ")), \
(bjarn, N_("What? Haven't I made myself clear already? ")), \
(bjarn, N_("I despise those Elves and their uncanny ways. ")), \
***************
*** 50,54 ****
(bjarn, N_("Had she been convicted, they might have chosen to
cease trading with her likes. ")), \
(bjarn, N_("It might have been years before any Elf got his
filthy hands on our beloved gems again! ")), \
! (silverhair, N_("I feared as much and I feared
the consequences.")), \
(silverhair, N_("Without the arcane arts my kind would soon
succumb to the human tides. ")), \
(silverhair, N_("But without gems and ores purchased from the
small folk we cannot create magic. ")), \
--- 51,55 ----
(bjarn, N_("Had she been convicted, they might have chosen to
cease trading with her likes. ")), \
(bjarn, N_("It might have been years before any Elf got his
filthy hands on our beloved gems again! ")), \
! (silverhair, N_("I feared as much and I feared the
consequences.")), \
(silverhair, N_("Without the arcane arts my kind would soon
succumb to the human tides. ")), \
(silverhair, N_("But without gems and ores purchased from the
small folk we cannot create magic. ")), \
***************
*** 226,230 ****
bjarn = self.text[3][0]
if self.done == 0:
- bjarn.set_schedule_active (0)
bjarn.set_goal (7, 3, adonthell.STAND_NORTH)
self.done = 1
--- 227,230 ----
***************
*** 243,247 ****
bjarn.go_south ()
bjarn.load ('bjarn_crying.mchar')
- bjarn.pause ()
talan = adonthell.gamedata_get_character ('Talan Wendth')
--- 243,246 ----
***************
*** 577,581 ****
self.alek_run.update ()
self.x[2] = self.update_wood (self.wood3, self.x[2])
!
if self.anim % 4 == 0:
self.x[0] = self.update_wood (self.wood1, self.x[0])
--- 576,580 ----
self.alek_run.update ()
self.x[2] = self.update_wood (self.wood3, self.x[2])
!
if self.anim % 4 == 0:
self.x[0] = self.update_wood (self.wood1, self.x[0])
Index: to_cellar.py
===================================================================
RCS file:
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/to_cellar.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** to_cellar.py 15 Sep 2002 23:52:33 -0000 1.8
--- to_cellar.py 27 Jan 2003 19:53:41 -0000 1.9
***************
*** 1,4 ****
#
! # (C) Copyright 2001/2002 Kai Sterker <address@hidden>
# Part of the Adonthell Project http://adonthell.linuxgames.com
#
--- 1,4 ----
#
! # (C) Copyright 2001/2002/2003 Kai Sterker <address@hidden>
# Part of the Adonthell Project http://adonthell.linuxgames.com
#
***************
*** 84,87 ****
--- 84,88 ----
bjarn = adonthell.gamedata_get_character ("Bjarn Fingolson")
bjarn.set_dialogue ("dialogues.extro")
+ bjarn.pause ()
bjarn.launch_action (self.myself)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Adonthell-commits] CVS: wastesedge/scripts/schedules/mapcharacters bjarn.py,1.6,1.7 extro.py,1.21,1.22 to_cellar.py,1.8,1.9,
Kai Sterker <address@hidden> <=