Update of /cvsroot/moeng/BBRpg/data/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv7942/data/scripts
Modified Files:
Tag: bbrpg
CellsObjects.lua ElecDoor.lua
Log Message:
- Fixed bug activating guards door in prison
- Made more natural talkpositions when returning in Jake's place with Brian
Index: CellsObjects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/CellsObjects.lua,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -C2 -d -r1.17.2.2 -r1.17.2.3
*** CellsObjects.lua 9 Jan 2004 19:03:32 -0000 1.17.2.2
--- CellsObjects.lua 11 Jan 2004 23:50:00 -0000 1.17.2.3
***************
*** 351,355 ****
ActionSetPosition(jake, 14, 18, DIR_RIGHT, jakesMap),
ActionSetPosition(brian, 15, 19, DIR_UP, jakesMap),
! ActionSetPosition(elwood, 16, 19, DIR_UP, jakesMap),
ActionCallFunction(jake.setSleeping, jake, false),
ActionCallFunction(elwood.setSleeping, elwood, false),
--- 351,355 ----
ActionSetPosition(jake, 14, 18, DIR_RIGHT, jakesMap),
ActionSetPosition(brian, 15, 19, DIR_UP, jakesMap),
! ActionSetPosition(elwood, 16, 18, DIR_LEFT, jakesMap),
ActionCallFunction(jake.setSleeping, jake, false),
ActionCallFunction(elwood.setSleeping, elwood, false),
***************
*** 378,382 ****
ActionSetPosition(jake, 14, 18, DIR_RIGHT, jakesMap),
ActionSetPosition(brian, 15, 19, DIR_UP, jakesMap),
! ActionSetPosition(elwood, 16, 19, DIR_UP, jakesMap),
ActionCallFunction(jake.setSleeping, jake, false),
ActionCallFunction(elwood.setSleeping, elwood, false),
--- 378,382 ----
ActionSetPosition(jake, 14, 18, DIR_RIGHT, jakesMap),
ActionSetPosition(brian, 15, 19, DIR_UP, jakesMap),
! ActionSetPosition(elwood, 16, 18, DIR_LEFT, jakesMap),
ActionCallFunction(jake.setSleeping, jake, false),
ActionCallFunction(elwood.setSleeping, elwood, false),
Index: ElecDoor.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/ElecDoor.lua,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C2 -d -r1.8.2.1 -r1.8.2.2
*** ElecDoor.lua 9 Jan 2004 19:03:32 -0000 1.8.2.1
--- ElecDoor.lua 11 Jan 2004 23:50:00 -0000 1.8.2.2
***************
*** 95,104 ****
activatedBy = function(self, obj)
! if self.isLocked2 then
! ActionController:addSequence{
! ActionConversation(lang:getConv("PrisonDoorLocked")),
! }
! else
! ElecDoor.activatedBy(self, obj)
end
end;
--- 95,106 ----
activatedBy = function(self, obj)
! if (self.firstime == 2) then
! if self.isLocked2 then
! ActionController:addSequence{
! ActionConversation(lang:getConv("PrisonDoorLocked")),
! }
! else
! ElecDoor.activatedBy(self, obj)
! end
end
end;
|
