[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Adonthell-commits] CVS: wastesedge/scripts/dialogues oliver_start.py,1.
From: |
Kai Sterker <address@hidden> |
Subject: |
[Adonthell-commits] CVS: wastesedge/scripts/dialogues oliver_start.py,1.6,1.7 orloth_start.py,1.22,1.23 |
Date: |
Sun, 18 Aug 2002 15:55:21 -0400 |
Update of /cvsroot/adonthell/wastesedge/scripts/dialogues
In directory subversions:/tmp/cvs-serv1023/scripts/dialogues
Modified Files:
oliver_start.py orloth_start.py
Log Message:
UPDATED schedules once again for new event system - still not all done though
Index: oliver_start.py
===================================================================
RCS file: /cvsroot/adonthell/wastesedge/scripts/dialogues/oliver_start.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** oliver_start.py 6 May 2002 13:47:18 -0000 1.6
--- oliver_start.py 18 Aug 2002 19:55:19 -0000 1.7
***************
*** 46,55 ****
cond = [\
"self.the_npc.get_val (\"talked_to\") == 0\n",\
! "self.the_npc.get_val (\"goto_players_room\") == 3\n"]
code = [\
"self.the_npc.set_val (\"talked_to\" , 1)\n",\
"adonthell.gamedata_get_quest(\"demo\").set_val
(\"know_olivers_noise\" , 1)\n",\
! "self.the_npc.set_val (\"goto_players_room\" ,
0)\nself.the_npc.set_val (\"talked_to\" , 1)\nself.the_npc.set_val
(\"goto_barn\" , 1)\n"]
# -- (speaker, code, ((text, operation, condition), ...))
--- 46,55 ----
cond = [\
"self.the_npc.get_val (\"talked_to\") == 0\n",\
! "adonthell.gamedata_get_character (\"Oliver Redwyne\").submap
() == 12\n"]
code = [\
"self.the_npc.set_val (\"talked_to\" , 1)\n",\
"adonthell.gamedata_get_quest(\"demo\").set_val
(\"know_olivers_noise\" , 1)\n",\
! "self.the_npc.set_val (\"talked_to\" , 1)\nself.the_npc.set_val
(\"goto_barn\" , 1)\n"]
# -- (speaker, code, ((text, operation, condition), ...))
***************
*** 98,99 ****
--- 98,104 ----
self.the_player = p
self.the_npc = n
+
+ def __del__(self):
+ if self.the_npc.get_val ("goto_barn") == 1:
+ adonthell.gamedata_get_character("Oliver Redwyne").do_stuff
("goto_barn")
+
Index: orloth_start.py
===================================================================
RCS file: /cvsroot/adonthell/wastesedge/scripts/dialogues/orloth_start.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** orloth_start.py 6 May 2002 13:47:18 -0000 1.22
--- orloth_start.py 18 Aug 2002 19:55:19 -0000 1.23
***************
*** 166,170 ****
"adonthell.gamedata_get_quest(\"demo\").set_val
(\"know_bjarns_insult\" , 1)\n",\
"self.the_npc.set_val (\"told_about_shair\", 1)\n\nmyvar =
adonthell.gamedata_get_quest(\"demo\").get_val (\"work_4_shair\")\nmyvar =
myvar | 1\nadonthell.gamedata_get_quest(\"demo\").set_val (\"work_4_shair\" ,
myvar)\n\n",\
! "adonthell.gamedata_get_character(\"Oliver Redwyne\").set_val
(\"goto_players_room\" , 1)\n",\
"self.the_npc.set_val (\"explain_events\" , 1)\n",\
"adonthell.gamedata_get_quest(\"demo\").set_val
(\"know_argument\" , 1)\n",\
--- 166,170 ----
"adonthell.gamedata_get_quest(\"demo\").set_val
(\"know_bjarns_insult\" , 1)\n",\
"self.the_npc.set_val (\"told_about_shair\", 1)\n\nmyvar =
adonthell.gamedata_get_quest(\"demo\").get_val (\"work_4_shair\")\nmyvar =
myvar | 1\nadonthell.gamedata_get_quest(\"demo\").set_val (\"work_4_shair\" ,
myvar)\n\n",\
! "adonthell.gamedata_get_character(\"Oliver Redwyne\").do_stuff
(\"goto_common_room\")\nself.goto_players_room = 1\n",\
"self.the_npc.set_val (\"explain_events\" , 1)\n",\
"adonthell.gamedata_get_quest(\"demo\").set_val
(\"know_argument\" , 1)\n",\
***************
*** 317,326 ****
def __del__(self):
oliver = adonthell.gamedata_get_character ("Oliver Redwyne")
! if oliver.get_val ("goto_players_room") == 2:
import events
events.switch_submap (self.the_player, 12, 5, 3, 1)
oliver.set_offset (0, 0)
- oliver.set_val ("goto_players_room", 3)
- oliver.set_val ("todo", 0)
events.switch_submap (oliver, 12, 5, 4, 0)
--- 317,325 ----
def __del__(self):
oliver = adonthell.gamedata_get_character ("Oliver Redwyne")
! if self.goto_players_room == 1:
import events
events.switch_submap (self.the_player, 12, 5, 3, 1)
+ oliver.stop_moving ()
oliver.set_offset (0, 0)
events.switch_submap (oliver, 12, 5, 4, 0)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Adonthell-commits] CVS: wastesedge/scripts/dialogues oliver_start.py,1.6,1.7 orloth_start.py,1.22,1.23,
Kai Sterker <address@hidden> <=
- Prev by Date:
[Adonthell-commits] CVS: wastesedge/scripts/game_events Makefile.am,1.1,1.2 silverhair_to_brn.py,1.1,1.2
- Next by Date:
[Adonthell-commits] CVS: wastesedge/scripts/schedules/mapcharacters Makefile.am,1.12,1.13 alek.py,1.4,1.5 fellnir.py,1.5,1.6 frostbloom.py,1.5,1.6 janesta.py,1.4,1.5 jelom.py,1.4,1.5 lucia.py,1.6,1.7 oliver.py,1.6,1.7 orloth.py,1.5,1.6 sarin.py,1.5,1.6 schedule.py,1.1,1.2 silverhair.py,1.4,1.5 talan.py,1.4,1.5 tristan.py,1.5,1.6
- Previous by thread:
[Adonthell-commits] CVS: wastesedge/scripts/game_events Makefile.am,1.1,1.2 silverhair_to_brn.py,1.1,1.2
- Next by thread:
[Adonthell-commits] CVS: wastesedge/scripts/schedules/mapcharacters Makefile.am,1.12,1.13 alek.py,1.4,1.5 fellnir.py,1.5,1.6 frostbloom.py,1.5,1.6 janesta.py,1.4,1.5 jelom.py,1.4,1.5 lucia.py,1.6,1.7 oliver.py,1.6,1.7 orloth.py,1.5,1.6 sarin.py,1.5,1.6 schedule.py,1.1,1.2 silverhair.py,1.4,1.5 talan.py,1.4,1.5 tristan.py,1.5,1.6
- Index(es):