[Moeng-cvs] BBRpg/data/scripts CellsObjects.lua,1.17,1.17.2.1 MessPile.lua,1.9.2.2,1.9.2.3 Pawn.lua,
Status: Alpha
Brought to you by:
b_lindeijer
Menu
▾
▴
[Moeng-cvs] BBRpg/data/scripts CellsObjects.lua,1.17,1.17.2.1 MessPile.lua,1.9.2.2,1.9.2.3 Pawn.lua,1.10,1.10.2.1 SubcityObjects.lua,1.37,1.37.2.1
|
From: <b_l...@us...> - 2004-01-08 23:57:57
|
Update of /cvsroot/moeng/BBRpg/data/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv12294/data/scripts
Modified Files:
Tag: bbrpg
CellsObjects.lua MessPile.lua Pawn.lua SubcityObjects.lua
Log Message:
Fix most critical aspect of sleeping problem.
Index: CellsObjects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/CellsObjects.lua,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -C2 -d -r1.17 -r1.17.2.1
*** CellsObjects.lua 3 Jan 2004 22:41:02 -0000 1.17
--- CellsObjects.lua 8 Jan 2004 23:57:53 -0000 1.17.2.1
***************
*** 351,356 ****
ActionSetPosition(brian, 15, 19, DIR_UP, jakesMap),
ActionSetPosition(elwood, 16, 19, DIR_UP, jakesMap),
! ActionSetVariable(jake, "bSleeping", false),
! ActionSetVariable(elwood, "bSleeping", false),
ActionPlaySong(jakesMap.musicFilename, 100),
ActionFadeInMap(100),
--- 351,356 ----
ActionSetPosition(brian, 15, 19, DIR_UP, jakesMap),
ActionSetPosition(elwood, 16, 19, DIR_UP, jakesMap),
! ActionCallFunction(jake.setSleeping, jake, false),
! ActionCallFunction(elwood.setSleeping, elwood, false),
ActionPlaySong(jakesMap.musicFilename, 100),
ActionFadeInMap(100),
***************
*** 378,383 ****
ActionSetPosition(brian, 15, 19, DIR_UP, jakesMap),
ActionSetPosition(elwood, 16, 19, DIR_UP, jakesMap),
! ActionSetVariable(jake, "bSleeping", false),
! ActionSetVariable(elwood, "bSleeping", false),
ActionPlaySong(jakesMap.musicFilename, 100),
ActionFadeInMap(100),
--- 378,383 ----
ActionSetPosition(brian, 15, 19, DIR_UP, jakesMap),
ActionSetPosition(elwood, 16, 19, DIR_UP, jakesMap),
! ActionCallFunction(jake.setSleeping, jake, false),
! ActionCallFunction(elwood.setSleeping, elwood, false),
ActionPlaySong(jakesMap.musicFilename, 100),
ActionFadeInMap(100),
Index: MessPile.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MessPile.lua,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -C2 -d -r1.9.2.2 -r1.9.2.3
*** MessPile.lua 8 Jan 2004 23:43:23 -0000 1.9.2.2
--- MessPile.lua 8 Jan 2004 23:57:53 -0000 1.9.2.3
***************
*** 46,52 ****
ActionSetPosition(jake, 31, 20, DIR_UP, leesMap),
ActionSetPosition(elwood, 32, 20, DIR_UP, leesMap),
! ActionSetVariable(jake, "bSleeping", false),
! ActionSetVariable(elwood, "bSleeping", false),
! ActionSetVariable(brian, "bSleeping", false),
ActionFadeInMap(100),
ActionShowMapName(m_get_bitmap("leesplace.tga")),
--- 46,52 ----
ActionSetPosition(jake, 31, 20, DIR_UP, leesMap),
ActionSetPosition(elwood, 32, 20, DIR_UP, leesMap),
! ActionCallFunction(jake.setSleeping, jake, false),
! ActionCallFunction(elwood.setSleeping, elwood, false),
! ActionCallFunction(brian.setSleeping, brian, false),
ActionFadeInMap(100),
ActionShowMapName(m_get_bitmap("leesplace.tga")),
Index: Pawn.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Pawn.lua,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** Pawn.lua 3 Jan 2004 21:56:19 -0000 1.10
--- Pawn.lua 8 Jan 2004 23:57:53 -0000 1.10.2.1
***************
*** 105,108 ****
--- 105,127 ----
end;
+ setSleeping = function(self, sleeping)
+ self.bSleeping = sleeping
+ if (self.bSleeping) then
+ self.shadow.bitmap = nil
+ self.alpha = 0
+ self.prevBitmap = self.bitmap
+ self.bitmap = nil
+ self.obstacle = 0
+ else
+ self.shadow.bitmap = self.shadow.defaultproperties.bitmap
+ self.alpha = 255
+ if (self.prevBitmap) then
+ self.bitmap = self.prevBitmap
+ self.prevBitmap = nil
+ end
+ self.obstacle = 1
+ end
+ end;
+
attack = function(self)
Index: SubcityObjects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/SubcityObjects.lua,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -C2 -d -r1.37 -r1.37.2.1
*** SubcityObjects.lua 2 Jan 2004 23:06:55 -0000 1.37
--- SubcityObjects.lua 8 Jan 2004 23:57:53 -0000 1.37.2.1
***************
*** 177,181 ****
activatedBy = function(self, obj)
local bitmapje = self.bitmap
- local schaduwtje = obj.shadow.bitmap
if (obj.health == obj.maxHealth) then
--- 177,180 ----
***************
*** 187,205 ****
ActionSetVariable(self, "bOccupied", true),
ActionConversation(lang:getConv("BedTiredBefore")),
! ActionSetVariable(obj, "bSleeping", true),
ActionChangeBitmap(self, obj.sleepBitmap),
- ActionChangeBitmap(obj.shadow, nil),
- ActionSetVariable(obj, "alpha", 0),
- ActionSetVariable(obj, "bitmap"),
- ActionSetVariable(obj, "obstacle", 0),
ActionSetVariable(obj, "onActivate",
function(self2)
- self2.bSleeping = false
self2.onActivate = nil
ActionController:addSequence{
! ActionSetVariable(obj, "alpha", 255),
ActionSetVariable(obj, "dir", DIR_DOWN),
ActionChangeBitmap(self, bitmapje),
- ActionChangeBitmap(obj.shadow, schaduwtje),
ActionConversation(lang:getConv("BedTiredAfter")),
ActionSetVariable(obj, "obstacle", 1),
--- 186,198 ----
ActionSetVariable(self, "bOccupied", true),
ActionConversation(lang:getConv("BedTiredBefore")),
! ActionCallFunction(obj.setSleeping, obj, true),
ActionChangeBitmap(self, obj.sleepBitmap),
ActionSetVariable(obj, "onActivate",
function(self2)
self2.onActivate = nil
ActionController:addSequence{
! ActionCallFunction(obj.setSleeping, obj, false),
ActionSetVariable(obj, "dir", DIR_DOWN),
ActionChangeBitmap(self, bitmapje),
ActionConversation(lang:getConv("BedTiredAfter")),
ActionSetVariable(obj, "obstacle", 1),
|
