moeng-cvs Mailing List for Moonlight Engine (Page 9)
Status: Alpha
Brought to you by:
b_lindeijer
Menu
▾
▴
moeng-cvs — CVS commits will be send to this list.
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(145) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(226) |
Feb
(13) |
Mar
(5) |
Apr
(13) |
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(3) |
Nov
|
Dec
(3) |
| 2007 |
Jan
(4) |
Feb
(27) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <geo...@us...> - 2004-01-02 06:54:05
|
Update of /cvsroot/moeng/BBRpg/data/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv10389/scripts
Modified Files:
BBRpg.lua SewerObjects.lua Sewers.lua
Log Message:
Started with the implementation of the map restPlace.
Index: BBRpg.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpg.lua,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** BBRpg.lua 2 Jan 2004 06:30:03 -0000 1.21
--- BBRpg.lua 2 Jan 2004 06:54:00 -0000 1.22
***************
*** 28,31 ****
--- 28,32 ----
jakesMap = JakesPlace()
cellsMap = Cells()
+ restMap = RestPlace()
-- Links between portals
Index: SewerObjects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/SewerObjects.lua,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SewerObjects.lua 2 Jan 2004 02:45:26 -0000 1.4
--- SewerObjects.lua 2 Jan 2004 06:54:00 -0000 1.5
***************
*** 122,125 ****
--- 122,139 ----
}
}
+
+ Ladder3 = Decoration:subclass
+ {
+ name = "Ladder3";
+
+ defaultproperties = {
+ bCenterBitmap = false,
+ bCenterOnTile = false,
+ offset_y = 0,
+ obstacle = 0,
+ draw_mode = DM_MASKED,
+ bitmap = m_get_bitmap("ladder.bmp"),
+ }
+ }
WallAndTube = Actor:subclass
Index: Sewers.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Sewers.lua,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Sewers.lua 2 Jan 2004 05:57:34 -0000 1.13
--- Sewers.lua 2 Jan 2004 06:54:00 -0000 1.14
***************
*** 18,21 ****
--- 18,23 ----
self:spawn(Ladder1, 73, 37);
self:spawn(Ladder2, 152, 10);
+ self:spawn(Ladder2, 44, 47);
+
self:spawn(FenceH5, 131, 47);
self:spawn(FenceH3, 136, 98);
|
|
From: <geo...@us...> - 2004-01-02 06:54:05
|
Update of /cvsroot/moeng/BBRpg/data/maps In directory sc8-pr-cvs1:/tmp/cvs-serv10389/maps Modified Files: restplace.map sewers1.map Log Message: Started with the implementation of the map restPlace. Index: restplace.map =================================================================== RCS file: /cvsroot/moeng/BBRpg/data/maps/restplace.map,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs5tqQEt and /tmp/cvsq7vz2M differ Index: sewers1.map =================================================================== RCS file: /cvsroot/moeng/BBRpg/data/maps/sewers1.map,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 Binary files /tmp/cvs61QZmv and /tmp/cvs0UmvIS differ |
|
From: <mod...@us...> - 2004-01-02 06:48:57
|
Update of /cvsroot/moeng/BBRpg/data/bitmaps In directory sc8-pr-cvs1:/tmp/cvs-serv9708 Modified Files: jake_dead.bmp Added Files: restplace.tga Log Message: restplace.tga (level titel) en roze pixel bij Jakes lijk weg --- NEW FILE: restplace.tga --- (This appears to be a binary file; contents omitted.) Index: jake_dead.bmp =================================================================== RCS file: /cvsroot/moeng/BBRpg/data/bitmaps/jake_dead.bmp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsjguOGh and /tmp/cvs41Dlbp differ |
|
From: <b_l...@us...> - 2004-01-02 06:41:07
|
Update of /cvsroot/moeng/BBRpg/data/bitmaps In directory sc8-pr-cvs1:/tmp/cvs-serv8661/data/bitmaps Modified Files: lee.bmp Log Message: Lee roze? Nou ja. Index: lee.bmp =================================================================== RCS file: /cvsroot/moeng/BBRpg/data/bitmaps/lee.bmp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvs4YCczj and /tmp/cvsAvYoWs differ |
|
From: <b_l...@us...> - 2004-01-02 06:41:07
|
Update of /cvsroot/moeng/BBRpg/data/scripts In directory sc8-pr-cvs1:/tmp/cvs-serv8661/data/scripts Modified Files: SubcityObjects.lua Log Message: Lee roze? Nou ja. Index: SubcityObjects.lua =================================================================== RCS file: /cvsroot/moeng/BBRpg/data/scripts/SubcityObjects.lua,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** SubcityObjects.lua 2 Jan 2004 06:30:03 -0000 1.35 --- SubcityObjects.lua 2 Jan 2004 06:41:03 -0000 1.36 *************** *** 754,756 **** obstacle = 0, } ! } \ No newline at end of file --- 754,756 ---- obstacle = 0, } ! } |
|
From: <mod...@us...> - 2004-01-02 06:34:23
|
Update of /cvsroot/moeng/BBRpg/data/maps In directory sc8-pr-cvs1:/tmp/cvs-serv7826 Added Files: restplace.map Log Message: Chill-out huis map toegevoegd --- NEW FILE: restplace.map --- (This appears to be a binary file; contents omitted.) |
|
From: <b_l...@us...> - 2004-01-02 06:30:08
|
Update of /cvsroot/moeng/BBRpg/data/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv7220/data/scripts
Modified Files:
BBRpg.lua CellsObjects.lua MainMenu.lua SubcityObjects.lua
Log Message:
After-sleep no-shadow fix and now Brian can be saved.
Index: BBRpg.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpg.lua,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** BBRpg.lua 2 Jan 2004 04:49:53 -0000 1.20
--- BBRpg.lua 2 Jan 2004 06:30:03 -0000 1.21
***************
*** 64,68 ****
self.playerSwitcher:addPlayerHost(elwood)
self.playerSwitcher:addPlayerHost(jake)
! self.playerSwitcher:addPlayerHost(brian)
-- Tell the HUD about the playerSwitcher
--- 64,68 ----
self.playerSwitcher:addPlayerHost(elwood)
self.playerSwitcher:addPlayerHost(jake)
! --self.playerSwitcher:addPlayerHost(brian)
-- Tell the HUD about the playerSwitcher
Index: CellsObjects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/CellsObjects.lua,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** CellsObjects.lua 2 Jan 2004 06:24:18 -0000 1.14
--- CellsObjects.lua 2 Jan 2004 06:30:03 -0000 1.15
***************
*** 332,336 ****
event_stand_on = function(self, obj)
! if (firstTime == true) then
if (obj == elwood) then
ActionController:addSequence{
--- 332,336 ----
event_stand_on = function(self, obj)
! if (self.firstTime == true) then
if (obj == elwood) then
ActionController:addSequence{
***************
*** 338,341 ****
--- 338,342 ----
ActionSetVariable(brian, "free", true),
ActionWalkPath(obj,"U3"),
+ ActionCallFunction(playerSwitcher.addPlayerHost, playerSwitcher, brian),
ActionConversation(lang:getConv("FindBrian1Elwood")),
ActionCallFunction(brian.addToInventory, brian, cityMap.walkieTalkie),
***************
*** 346,355 ****
ActionSetVariable(brian, "bWalkieTalkie", false),
ActionFadeOutMap(100),
! ActionCallFunction(elwood.setMap, elwood, jakesMap),
! ActionCallFunction( jake.setMap, jake, jakesMap),
! ActionCallFunction( brian.setMap, brian, jakesMap),
! ActionSetPosition(jake, 14, 18, DIR_RIGHT),
! ActionSetPosition(brian, 15, 19, DIR_UP),
! ActionSetPosition(elwood, 16, 19, DIR_UP),
ActionFadeInMap(100),
ActionShowMapName(m_get_bitmap("jakesplace.tga")),
--- 347,353 ----
ActionSetVariable(brian, "bWalkieTalkie", false),
ActionFadeOutMap(100),
! ActionSetPosition(jake, 14, 18, DIR_RIGHT, jakesMap),
! ActionSetPosition(brian, 15, 19, DIR_UP, jakesMap),
! ActionSetPosition(elwood, 16, 19, DIR_UP, jakesMap),
ActionFadeInMap(100),
ActionShowMapName(m_get_bitmap("jakesplace.tga")),
***************
*** 357,361 ****
ActionExModeOff(),
}
! firstTime = false
else
ActionController:addSequence{
--- 355,359 ----
ActionExModeOff(),
}
! self.firstTime = false
else
ActionController:addSequence{
***************
*** 371,380 ****
ActionSetVariable(brian, "bWalkieTalkie", false),
ActionFadeOutMap(100),
! ActionCallFunction(elwood.setMap, elwood, jakesMap),
! ActionCallFunction( jake.setMap, jake, jakesMap),
! ActionCallFunction( brian.setMap, brian, jakesMap),
! ActionSetPosition(jake, 14, 18, DIR_RIGHT),
! ActionSetPosition(brian, 15, 19, DIR_UP),
! ActionSetPosition(elwood, 16, 19, DIR_UP),
ActionFadeInMap(100),
ActionShowMapName(m_get_bitmap("jakesplace.tga")),
--- 369,375 ----
ActionSetVariable(brian, "bWalkieTalkie", false),
ActionFadeOutMap(100),
! ActionSetPosition(jake, 14, 18, DIR_RIGHT, jakesMap),
! ActionSetPosition(brian, 15, 19, DIR_UP, jakesMap),
! ActionSetPosition(elwood, 16, 19, DIR_UP, jakesMap),
ActionFadeInMap(100),
ActionShowMapName(m_get_bitmap("jakesplace.tga")),
***************
*** 382,386 ****
ActionExModeOff(),
}
! firstTime = false
end
end
--- 377,381 ----
ActionExModeOff(),
}
! self.firstTime = false
end
end
***************
*** 392,394 ****
bitmap = nil,
}
! }
\ No newline at end of file
--- 387,389 ----
bitmap = nil,
}
! }
Index: MainMenu.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MainMenu.lua,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** MainMenu.lua 2 Jan 2004 06:04:22 -0000 1.22
--- MainMenu.lua 2 Jan 2004 06:30:03 -0000 1.23
***************
*** 19,23 ****
ActionSetVariable(_G, "show_main_menu", nil),
ActionCallFunction(jake.addToInventory, jake, cityMap.walkieTalkie),
! ActionSetPosition(elwood, 23, 17, DIR_UP, cityMap),
ActionFadeInMap(50),
ActionExModeOff(),
--- 19,23 ----
ActionSetVariable(_G, "show_main_menu", nil),
ActionCallFunction(jake.addToInventory, jake, cityMap.walkieTalkie),
! ActionSetPosition(elwood, 34, 66, DIR_UP, cellsMap),
ActionFadeInMap(50),
ActionExModeOff(),
Index: SubcityObjects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/SubcityObjects.lua,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** SubcityObjects.lua 2 Jan 2004 05:57:34 -0000 1.34
--- SubcityObjects.lua 2 Jan 2004 06:30:03 -0000 1.35
***************
*** 177,180 ****
--- 177,181 ----
activatedBy = function(self, obj)
local bitmapje = self.bitmap
+ local schaduwtje = obj.shadow.bitmap
if (obj.health == obj.maxHealth) then
***************
*** 200,204 ****
ActionSetVariable(obj, "dir", DIR_DOWN),
ActionChangeBitmap(self, bitmapje),
! ActionChangeBitmap(obj.shadow, obj.shadow.bitmap),
ActionConversation(lang:getConv("BedTiredAfter")),
ActionSetVariable(obj, "obstacle", 1),
--- 201,205 ----
ActionSetVariable(obj, "dir", DIR_DOWN),
ActionChangeBitmap(self, bitmapje),
! ActionChangeBitmap(obj.shadow, schaduwtje),
ActionConversation(lang:getConv("BedTiredAfter")),
ActionSetVariable(obj, "obstacle", 1),
|
|
From: <geo...@us...> - 2004-01-02 06:24:23
|
Update of /cvsroot/moeng/BBRpg/data/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv6540/scripts
Modified Files:
CellsObjects.lua Character.lua
Log Message:
- Added two showmapnames in the script
Index: CellsObjects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/CellsObjects.lua,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CellsObjects.lua 2 Jan 2004 05:42:13 -0000 1.13
--- CellsObjects.lua 2 Jan 2004 06:24:18 -0000 1.14
***************
*** 353,356 ****
--- 353,357 ----
ActionSetPosition(elwood, 16, 19, DIR_UP),
ActionFadeInMap(100),
+ ActionShowMapName(m_get_bitmap("jakesplace.tga")),
ActionConversation(lang:getConv("EscapedInAppartment")),
ActionExModeOff(),
***************
*** 377,380 ****
--- 378,382 ----
ActionSetPosition(elwood, 16, 19, DIR_UP),
ActionFadeInMap(100),
+ ActionShowMapName(m_get_bitmap("jakesplace.tga")),
ActionConversation(lang:getConv("EscapedInAppartment")),
ActionExModeOff(),
Index: Character.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Character.lua,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Character.lua 2 Jan 2004 05:57:34 -0000 1.18
--- Character.lua 2 Jan 2004 06:24:18 -0000 1.19
***************
*** 73,77 ****
Pawn.tick(self)
if (self.bSleeping and self.health < self.maxHealth) then
! self.health = math.min(self.health + 0.00002 * self.maxHealth, self.maxHealth)
end
self:updateBitmap()
--- 73,77 ----
Pawn.tick(self)
if (self.bSleeping and self.health < self.maxHealth) then
! self.health = math.min(self.health + 0.0001 * self.maxHealth, self.maxHealth)
end
self:updateBitmap()
|
|
From: <b_l...@us...> - 2004-01-02 06:04:26
|
Update of /cvsroot/moeng/BBRpg/data/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv3664
Modified Files:
Cells.lua MainMenu.lua
Log Message:
Remove additional PrisonDoor2
Index: Cells.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Cells.lua,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Cells.lua 2 Jan 2004 04:31:18 -0000 1.13
--- Cells.lua 2 Jan 2004 06:04:22 -0000 1.14
***************
*** 183,187 ****
button2.door = brians_door
- self:spawn(PrisonDoor2, 37, 19)
self:spawn(TriggerFreeBrian, 37, 18)
--- 183,186 ----
Index: MainMenu.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MainMenu.lua,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** MainMenu.lua 2 Jan 2004 05:57:34 -0000 1.21
--- MainMenu.lua 2 Jan 2004 06:04:22 -0000 1.22
***************
*** 24,28 ****
}
! --[[ local startSequence = {
ActionFadeOutMap(50),
ActionCallFunction(jake.addToInventory, jake, cityMap.walkieTalkie),
--- 24,29 ----
}
! --[[
! local startSequence = {
ActionFadeOutMap(50),
ActionCallFunction(jake.addToInventory, jake, cityMap.walkieTalkie),
|
|
From: <geo...@us...> - 2004-01-02 05:57:38
|
Update of /cvsroot/moeng/BBRpg/data/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv2411/scripts
Modified Files:
BBRpgLang.lua Character.lua MainMenu.lua MessPile.lua
Sewers.lua SubcityObjects.lua
Log Message:
- Changed the background color of lee.bmp to (255,0,255)
- Made the sleepingtime needed for full recovery independent of the maxHealth
- Changed the rusty lever to the essential lever needed to get to the prison
- Tested the final part from messPile2 to the end
Index: BBRpgLang.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpgLang.lua,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** BBRpgLang.lua 2 Jan 2004 04:49:53 -0000 1.19
--- BBRpgLang.lua 2 Jan 2004 05:57:34 -0000 1.20
***************
*** 259,263 ****
},
BedOccupied = {
! {"{PLAYER}", "Hmm, it seems that somebody is sleeping in this bed."},
},
PrisonDoorLocked = {
--- 259,263 ----
},
BedOccupied = {
! {"{PLAYER}", "I'm not going to sleep together with him in one bed!"},
},
PrisonDoorLocked = {
***************
*** 274,281 ****
},
PrisonDoorButtonOpen = {
! {"{PLAYER}", "*PUSH* Now I have opened the door through which I entered."},
},
PrisonDoorButtonClose = {
! {"{PLAYER}", "*PUSH* Now I have closed the door through which I entered."},
},
BrianDoorButtonOpen = {
--- 274,281 ----
},
PrisonDoorButtonOpen = {
! {"{PLAYER}", "*PUSH* Now I have unlocked the door through which I entered."},
},
PrisonDoorButtonClose = {
! {"{PLAYER}", "*PUSH* Now I have locked the door through which I entered."},
},
BrianDoorButtonOpen = {
Index: Character.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Character.lua,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Character.lua 2 Jan 2004 02:12:18 -0000 1.17
--- Character.lua 2 Jan 2004 05:57:34 -0000 1.18
***************
*** 73,77 ****
Pawn.tick(self)
if (self.bSleeping and self.health < self.maxHealth) then
! self.health = math.min(self.health + 0.002, self.maxHealth)
end
self:updateBitmap()
--- 73,77 ----
Pawn.tick(self)
if (self.bSleeping and self.health < self.maxHealth) then
! self.health = math.min(self.health + 0.00002 * self.maxHealth, self.maxHealth)
end
self:updateBitmap()
Index: MainMenu.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MainMenu.lua,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** MainMenu.lua 2 Jan 2004 05:49:29 -0000 1.20
--- MainMenu.lua 2 Jan 2004 05:57:34 -0000 1.21
***************
*** 19,28 ****
ActionSetVariable(_G, "show_main_menu", nil),
ActionCallFunction(jake.addToInventory, jake, cityMap.walkieTalkie),
! -- ActionSetPosition(elwood, 23, 17, DIR_UP, jailMap),
ActionFadeInMap(50),
ActionExModeOff(),
}
! local startSequence = {
ActionFadeOutMap(50),
ActionCallFunction(jake.addToInventory, jake, cityMap.walkieTalkie),
--- 19,28 ----
ActionSetVariable(_G, "show_main_menu", nil),
ActionCallFunction(jake.addToInventory, jake, cityMap.walkieTalkie),
! ActionSetPosition(elwood, 23, 17, DIR_UP, cityMap),
ActionFadeInMap(50),
ActionExModeOff(),
}
! --[[ local startSequence = {
ActionFadeOutMap(50),
ActionCallFunction(jake.addToInventory, jake, cityMap.walkieTalkie),
***************
*** 31,40 ****
ActionShowMapName(m_get_bitmap("prison.tga")),
ActionWait(300),
! ActionConversation(lang:getConv("Intro1")),
ActionWalkPath(jailMap.guard, "DLD"),
ActionSetVariable(elwood, "dir", DIR_DOWN),
ActionWait(25),
ActionSetVariable(jailMap.guard, "dir", DIR_UP),
! ActionConversation(lang:getConv("Intro2")),
ActionWalkPath(jailMap.guard, "D2"),
ActionCallFunction(door1.event_bumped_into, door1),
--- 31,40 ----
ActionShowMapName(m_get_bitmap("prison.tga")),
ActionWait(300),
! -- ActionConversation(lang:getConv("Intro1")),
ActionWalkPath(jailMap.guard, "DLD"),
ActionSetVariable(elwood, "dir", DIR_DOWN),
ActionWait(25),
ActionSetVariable(jailMap.guard, "dir", DIR_UP),
! -- ActionConversation(lang:getConv("Intro2")),
ActionWalkPath(jailMap.guard, "D2"),
ActionCallFunction(door1.event_bumped_into, door1),
***************
*** 49,53 ****
ActionSetVariable(jailMap.guard, "dir", DIR_LEFT),
ActionWait(50),
! ActionConversation(lang:getConv("Intro3")),
ActionWalkPath(elwood, "D5"),
ActionAddSequence{
--- 49,53 ----
ActionSetVariable(jailMap.guard, "dir", DIR_LEFT),
ActionWait(50),
! -- ActionConversation(lang:getConv("Intro3")),
ActionWalkPath(elwood, "D5"),
ActionAddSequence{
***************
*** 61,65 ****
},
ActionWalkPath(elwood, "D3"),
! ActionConversation(lang:getConv("Intro4")),
ActionSetCameraTarget(dummy, false),
ActionTweenVariable(dummy, "y", 200, 114.5),
--- 61,65 ----
},
ActionWalkPath(elwood, "D3"),
! -- ActionConversation(lang:getConv("Intro4")),
ActionSetCameraTarget(dummy, false),
ActionTweenVariable(dummy, "y", 200, 114.5),
***************
*** 71,75 ****
ActionWalkPath(elwood, "D"),
ActionSetVariable(elwood, "dir", DIR_LEFT),
! ActionConversation(lang:getConv("Intro5")),
ActionAddSequence{
ActionWalkPath(elwood, "D5L5"),
--- 71,75 ----
ActionWalkPath(elwood, "D"),
ActionSetVariable(elwood, "dir", DIR_LEFT),
! -- ActionConversation(lang:getConv("Intro5")),
ActionAddSequence{
ActionWalkPath(elwood, "D5L5"),
***************
*** 85,91 ****
ActionSetPosition(jake, 114, 108, DIR_DOWN),
ActionWait(180),
! ActionConversation(lang:getConv("Intro5a")),
ActionCallFunction(elwood.addToInventory, elwood, cityMap.walkieTalkie),
! ActionConversation(lang:getConv("Intro6")),
ActionSetVariable(copcar, "tick_time", 5),
ActionTweenVariable(copcar, "x", 250, 118, function(from, to, perc)
--- 85,91 ----
ActionSetPosition(jake, 114, 108, DIR_DOWN),
ActionWait(180),
! -- ActionConversation(lang:getConv("Intro5a")),
ActionCallFunction(elwood.addToInventory, elwood, cityMap.walkieTalkie),
! -- ActionConversation(lang:getConv("Intro6")),
ActionSetVariable(copcar, "tick_time", 5),
ActionTweenVariable(copcar, "x", 250, 118, function(from, to, perc)
***************
*** 112,116 ****
ActionWait(10),
ActionSetPosition(jake, 90, 76, DIR_RIGHT),
! ActionConversation(lang:getConv("Intro7")),
ActionSetCameraTarget(jake, false),
ActionParallel{
--- 112,116 ----
ActionWait(10),
ActionSetPosition(jake, 90, 76, DIR_RIGHT),
! -- ActionConversation(lang:getConv("Intro7")),
ActionSetCameraTarget(jake, false),
ActionParallel{
***************
*** 125,129 ****
ActionWait(30),
ActionSetVariable(elwood, "dir", DIR_LEFT),
! ActionConversation(lang:getConv("WhereKeys")),
ActionSetPosition(dummy, 93.5, 72.5),
ActionSetCameraTarget(dummy, false),
--- 125,129 ----
ActionWait(30),
ActionSetVariable(elwood, "dir", DIR_LEFT),
! -- ActionConversation(lang:getConv("WhereKeys")),
ActionSetPosition(dummy, 93.5, 72.5),
ActionSetCameraTarget(dummy, false),
***************
*** 132,136 ****
ActionExModeOff(),
}
!
self:addMenuItem(GuiMenuItem(lang:getVar("PLAY"), function() self.master:removeInteraction(self); ActionController:addSequence(startSequence); end))
self:addMenuItem(GuiMenuItem(lang:getVar("CREDITS"), function() self.master:removeInteraction(self); m_quit_game() end))
--- 132,136 ----
ActionExModeOff(),
}
! ]]
self:addMenuItem(GuiMenuItem(lang:getVar("PLAY"), function() self.master:removeInteraction(self); ActionController:addSequence(startSequence); end))
self:addMenuItem(GuiMenuItem(lang:getVar("CREDITS"), function() self.master:removeInteraction(self); m_quit_game() end))
Index: MessPile.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MessPile.lua,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MessPile.lua 2 Jan 2004 04:49:53 -0000 1.6
--- MessPile.lua 2 Jan 2004 05:57:34 -0000 1.7
***************
*** 43,46 ****
--- 43,47 ----
ActionFadeInMap(100),
ActionShowMapName(m_get_bitmap("leesplace.tga")),
+ ActionWait(250),
ActionConversation(lang:getConv("Ending1")),
ActionCallFunction(obj.removeFromInventory, obj, cityMap.engines),
Index: Sewers.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Sewers.lua,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Sewers.lua 2 Jan 2004 04:49:53 -0000 1.12
--- Sewers.lua 2 Jan 2004 05:57:34 -0000 1.13
***************
*** 35,40 ****
self.lever1 = self:spawn(Lever , 21, 21);
self.lever2 = self:spawn(Lever , 48, 70);
! self.lever3 = self:spawn(Lever , 49, 70);
! self.lever4 = self:spawn(Lever2 , 50, 70);
-- Make a reference in lever N to fence N, where N is in {1,2,3,4}.
--- 35,40 ----
self.lever1 = self:spawn(Lever , 21, 21);
self.lever2 = self:spawn(Lever , 48, 70);
! self.lever3 = self:spawn(Lever2 , 49, 70);
! self.lever4 = self:spawn(Lever , 50, 70);
-- Make a reference in lever N to fence N, where N is in {1,2,3,4}.
Index: SubcityObjects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/SubcityObjects.lua,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** SubcityObjects.lua 2 Jan 2004 05:42:14 -0000 1.33
--- SubcityObjects.lua 2 Jan 2004 05:57:34 -0000 1.34
***************
*** 63,68 ****
ActionController:addSequence{
ActionSetVariable(self, "snowfalling", true),
! ActionTweenVariable(self.snowTop, "offset_z", 20, -6),
! ActionSetVariable(self.snowTop, "offset_z", 14),
ActionChangeBitmap(self.snowTop, m_get_bitmap("dustbin_snow3.bmp")),
ActionTweenVariable(self.snowTop, "alpha", 300, 0),
--- 63,68 ----
ActionController:addSequence{
ActionSetVariable(self, "snowfalling", true),
! ActionTweenVariable(self.snowTop, "offset_z", 20, 4),
! ActionSetVariable(self.snowTop, "offset_z", 24),
ActionChangeBitmap(self.snowTop, m_get_bitmap("dustbin_snow3.bmp")),
ActionTweenVariable(self.snowTop, "alpha", 300, 0),
***************
*** 91,96 ****
defaultproperties = {
! offset_z = 14,
! offset_y = 10,
offset_x = -7,
alpha = 255,
--- 91,96 ----
defaultproperties = {
! offset_z = 24,
! offset_y = 20,
offset_x = -7,
alpha = 255,
***************
*** 749,752 ****
--- 749,753 ----
defaultproperties = {
+ draw_mode = DM_MASKED,
bitmap = m_get_bitmap("lee.bmp"),
obstacle = 0,
|
|
From: <geo...@us...> - 2004-01-02 05:57:38
|
Update of /cvsroot/moeng/BBRpg/data/bitmaps In directory sc8-pr-cvs1:/tmp/cvs-serv2411/bitmaps Modified Files: lee.bmp Log Message: - Changed the background color of lee.bmp to (255,0,255) - Made the sleepingtime needed for full recovery independent of the maxHealth - Changed the rusty lever to the essential lever needed to get to the prison - Tested the final part from messPile2 to the end Index: lee.bmp =================================================================== RCS file: /cvsroot/moeng/BBRpg/data/bitmaps/lee.bmp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsHgIxJM and /tmp/cvs6SIqgp differ |
|
From: <b_l...@us...> - 2004-01-02 05:49:33
|
Update of /cvsroot/moeng/BBRpg In directory sc8-pr-cvs1:/tmp/cvs-serv1502 Modified Files: TODO Log Message: Fixed wheels of copcar Index: TODO =================================================================== RCS file: /cvsroot/moeng/BBRpg/TODO,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** TODO 2 Jan 2004 04:51:18 -0000 1.35 --- TODO 2 Jan 2004 05:49:28 -0000 1.36 *************** *** 15,19 **** Bjorn: ! Experience/levelup afmaken - - Naam van area weergeven bij naartoe gaan Georg: --- 15,18 ---- |
|
From: <b_l...@us...> - 2004-01-02 05:49:33
|
Update of /cvsroot/moeng/BBRpg/data/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv1502/data/scripts
Modified Files:
MainMenu.lua
Log Message:
Fixed wheels of copcar
Index: MainMenu.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MainMenu.lua,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** MainMenu.lua 2 Jan 2004 05:42:13 -0000 1.19
--- MainMenu.lua 2 Jan 2004 05:49:29 -0000 1.20
***************
*** 88,91 ****
--- 88,92 ----
ActionCallFunction(elwood.addToInventory, elwood, cityMap.walkieTalkie),
ActionConversation(lang:getConv("Intro6")),
+ ActionSetVariable(copcar, "tick_time", 5),
ActionTweenVariable(copcar, "x", 250, 118, function(from, to, perc)
perc = 1 - math.sin(perc * 0.5 * math.pi + 0.5 * math.pi)
***************
*** 101,104 ****
--- 102,106 ----
return from + (to - from) * perc
end),
+ ActionSetVariable(copcar, "tick_time", 0),
ActionWait(50),
|
|
From: <b_l...@us...> - 2004-01-02 05:42:17
|
Update of /cvsroot/moeng/BBRpg/data/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv548/scripts
Modified Files:
Action.lua CellsObjects.lua City.lua MainMenu.lua Shadow.lua
SubcityObjects.lua
Log Message:
Array of small fixes
Index: Action.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Action.lua,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Action.lua 2 Jan 2004 03:20:03 -0000 1.6
--- Action.lua 2 Jan 2004 05:42:13 -0000 1.7
***************
*** 597,601 ****
ActionCallFunction(interactionMaster.addInteraction, interactionMaster, mapInt),
ActionTweenVariable(mapInt, "perc", 50, 1, 0),
! ActionWait(100),
ActionTweenVariable(mapInt, "perc", 50, 0, 1),
ActionCallFunction(interactionMaster.removeInteraction, interactionMaster, mapInt),
--- 597,601 ----
ActionCallFunction(interactionMaster.addInteraction, interactionMaster, mapInt),
ActionTweenVariable(mapInt, "perc", 50, 1, 0),
! ActionWait(150),
ActionTweenVariable(mapInt, "perc", 50, 0, 1),
ActionCallFunction(interactionMaster.removeInteraction, interactionMaster, mapInt),
Index: CellsObjects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/CellsObjects.lua,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CellsObjects.lua 2 Jan 2004 04:49:53 -0000 1.12
--- CellsObjects.lua 2 Jan 2004 05:42:13 -0000 1.13
***************
*** 135,139 ****
w = 3,
offset_x = 0,
! offset_y = -12,
draw_mode = DM_ALPHA,
bitmap = m_get_bitmap("bed2.tga"),
--- 135,139 ----
w = 3,
offset_x = 0,
! offset_y = 0,
draw_mode = DM_ALPHA,
bitmap = m_get_bitmap("bed2.tga"),
Index: City.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/City.lua,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** City.lua 2 Jan 2004 04:49:53 -0000 1.15
--- City.lua 2 Jan 2004 05:42:13 -0000 1.16
***************
*** 74,81 ****
copcar = self:spawn(CopCar, 106, 123);
- -- Wheel1 = self:spawn(Wheel, 107, 123);
- -- Wheel1.offset_x = 5;
- -- Wheel2 = self:spawn(Wheel, 110, 123);
- -- Wheel2.offset_x = -7;
end;
--- 74,77 ----
Index: MainMenu.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MainMenu.lua,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** MainMenu.lua 2 Jan 2004 04:49:53 -0000 1.18
--- MainMenu.lua 2 Jan 2004 05:42:13 -0000 1.19
***************
*** 19,24 ****
ActionSetVariable(_G, "show_main_menu", nil),
ActionCallFunction(jake.addToInventory, jake, cityMap.walkieTalkie),
! -- ActionCallFunction(elwood.setMap, elwood, jailMap),
! -- ActionSetPosition(elwood, 23, 17, DIR_UP),
ActionFadeInMap(50),
ActionExModeOff(),
--- 19,23 ----
ActionSetVariable(_G, "show_main_menu", nil),
ActionCallFunction(jake.addToInventory, jake, cityMap.walkieTalkie),
! -- ActionSetPosition(elwood, 23, 17, DIR_UP, jailMap),
ActionFadeInMap(50),
ActionExModeOff(),
Index: Shadow.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Shadow.lua,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Shadow.lua 1 Jan 2004 22:39:55 -0000 1.3
--- Shadow.lua 2 Jan 2004 05:42:14 -0000 1.4
***************
*** 17,20 ****
--- 17,24 ----
--self.offset_y = self.owner.offset_y
self.alpha = self.owner.alpha
+
+ if (self.myMap ~= self.owner.myMap) then
+ self:setMap(self.owner.myMap)
+ end
end
end;
Index: SubcityObjects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/SubcityObjects.lua,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** SubcityObjects.lua 2 Jan 2004 04:49:53 -0000 1.32
--- SubcityObjects.lua 2 Jan 2004 05:42:14 -0000 1.33
***************
*** 253,257 ****
Decoration.init(self)
! self.tick_time = 5
self.bitmap = self.animSeq[1]
self:loopAnim(LinearAnimation(self.animSeq))
--- 253,257 ----
Decoration.init(self)
! self.tick_time = 0
self.bitmap = self.animSeq[1]
self:loopAnim(LinearAnimation(self.animSeq))
***************
*** 366,370 ****
draw_mode = DM_MASKED,
bitmap = m_get_bitmap("keyfob.bmp"),
! inventoryBitmap = m_get_bitmap("keyfob.bmp"),
}
}
--- 366,370 ----
draw_mode = DM_MASKED,
bitmap = m_get_bitmap("keyfob.bmp"),
! inventoryBitmap = m_get_bitmap("keyfob_inv.bmp"),
}
}
|
|
From: <geo...@us...> - 2004-01-02 04:51:24
|
Update of /cvsroot/moeng/BBRpg In directory sc8-pr-cvs1:/tmp/cvs-serv26099 Modified Files: TODO Log Message: Kleine aanpassing Index: TODO =================================================================== RCS file: /cvsroot/moeng/BBRpg/TODO,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** TODO 2 Jan 2004 02:49:56 -0000 1.34 --- TODO 2 Jan 2004 04:51:18 -0000 1.35 *************** *** 18,22 **** Georg: - - Scripts schrijven bij ontmoeten Brian ? Witte lijntjes in Jake's optrekje wegwerken --- 18,21 ---- |
|
From: <b_l...@us...> - 2004-01-02 04:44:49
|
Update of /cvsroot/moeng/BBRpg/data/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv25302
Modified Files:
BBRpgHud.lua Portal.lua
Log Message:
Better practice on minimap check
Index: BBRpgHud.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpgHud.lua,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** BBRpgHud.lua 2 Jan 2004 02:49:56 -0000 1.7
--- BBRpgHud.lua 2 Jan 2004 04:44:44 -0000 1.8
***************
*** 13,17 ****
local player = self.playerSwitcher:getCurrentHost()
if (player) then
! if (player.map == sewersMap.map) then
-- Draw map icon in top right
guiTheme:drawBox(320 - 50 - 18, 14, 54, 54)
--- 13,17 ----
local player = self.playerSwitcher:getCurrentHost()
if (player) then
! if (player.myMap:instanceOf(Sewers)) then
-- Draw map icon in top right
guiTheme:drawBox(320 - 50 - 18, 14, 54, 54)
Index: Portal.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Portal.lua,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Portal.lua 2 Jan 2004 02:49:56 -0000 1.3
--- Portal.lua 2 Jan 2004 04:44:44 -0000 1.4
***************
*** 21,25 ****
ActionFadeOutMap(100 / actor.speed),
},
! ActionCallFunction(actor.setMap, actor, self.linkedPortal.map),
ActionSetPosition(actor, self.linkedPortal.x, self.linkedPortal.y),
ActionParallel{
--- 21,25 ----
ActionFadeOutMap(100 / actor.speed),
},
! ActionCallFunction(actor.setMap, actor, self.linkedPortal.myMap),
ActionSetPosition(actor, self.linkedPortal.x, self.linkedPortal.y),
ActionParallel{
|
|
From: <mod...@us...> - 2004-01-02 04:44:49
|
Update of /cvsroot/moeng/BBRpg/data/bitmaps In directory sc8-pr-cvs1:/tmp/cvs-serv25301 Modified Files: car.bmp car2.bmp Log Message: Besneeuwde auto's Index: car.bmp =================================================================== RCS file: /cvsroot/moeng/BBRpg/data/bitmaps/car.bmp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsvzKTJf and /tmp/cvsKPfmfl differ Index: car2.bmp =================================================================== RCS file: /cvsroot/moeng/BBRpg/data/bitmaps/car2.bmp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsQ4ABLg and /tmp/cvsgxtcin differ |
|
From: <b_l...@us...> - 2004-01-02 04:39:23
|
Update of /cvsroot/moeng/BBRpg/data/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv24583
Modified Files:
SubcityObjects.lua
Log Message:
Snow on shoulders fix
Index: SubcityObjects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/SubcityObjects.lua,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** SubcityObjects.lua 2 Jan 2004 02:45:26 -0000 1.30
--- SubcityObjects.lua 2 Jan 2004 04:39:18 -0000 1.31
***************
*** 63,68 ****
ActionController:addSequence{
ActionSetVariable(self, "snowfalling", true),
! ActionTweenVariable(self.snowTop, "offset_z", 20, 4),
! ActionSetVariable(self.snowTop, "offset_z", 24),
ActionChangeBitmap(self.snowTop, m_get_bitmap("dustbin_snow3.bmp")),
ActionTweenVariable(self.snowTop, "alpha", 300, 0),
--- 63,68 ----
ActionController:addSequence{
ActionSetVariable(self, "snowfalling", true),
! ActionTweenVariable(self.snowTop, "offset_z", 20, -6),
! ActionSetVariable(self.snowTop, "offset_z", 14),
ActionChangeBitmap(self.snowTop, m_get_bitmap("dustbin_snow3.bmp")),
ActionTweenVariable(self.snowTop, "alpha", 300, 0),
***************
*** 91,96 ****
defaultproperties = {
! offset_z = 24,
! offset_y = 20,
offset_x = -7,
alpha = 255,
--- 91,96 ----
defaultproperties = {
! offset_z = 14,
! offset_y = 10,
offset_x = -7,
alpha = 255,
|
Update of /cvsroot/moeng/BBRpg/data/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv23388/scripts
Modified Files:
BBRpgLang.lua Cells.lua CellsObjects.lua Crocodile.lua
ElecDoor.lua EnemyGuard.lua Jail.lua MainMenu.lua Turtle.lua
Log Message:
Some bodies and the doors stuff in cells.
Index: BBRpgLang.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpgLang.lua,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** BBRpgLang.lua 2 Jan 2004 03:13:18 -0000 1.17
--- BBRpgLang.lua 2 Jan 2004 04:31:18 -0000 1.18
***************
*** 270,273 ****
--- 270,288 ----
{"{PLAYER}", "Let's push this button."},
},
+ ButtonOutOfReach = {
+ {"{PLAYER}", "I cannot reach the buttons from this side of the control panel."},
+ },
+ PrisonDoorButtonOpen = {
+ {"{PLAYER}", "*PUSH* Now I have opened the door through which I entered."},
+ },
+ PrisonDoorButtonClose = {
+ {"{PLAYER}", "*PUSH* Now I have closed the door through which I entered."},
+ },
+ BrianDoorButtonOpen = {
+ {"{PLAYER}", "*PUSH* The lights seem to indicate I've just opened Brian's door."},
+ },
+ BrianDoorButtonClose = {
+ {"{PLAYER}", "*PUSH* The lights seem to indicate I've just closed Brian's door."},
+ },
LeverElwood = {
{"{PLAYER}", "One, two, three!"},
Index: Cells.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Cells.lua,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Cells.lua 2 Jan 2004 02:49:56 -0000 1.12
--- Cells.lua 2 Jan 2004 04:31:18 -0000 1.13
***************
*** 162,165 ****
--- 162,169 ----
local button1 = self:spawn(Button, 32, 57)
local button2 = self:spawn(Button, 33, 58)
+ button1.acceptDir = DIR_LEFT
+ button2.acceptDir = DIR_DOWN
+ button1.convKeyword = "PrisonDoorButton"
+ button2.convKeyword = "BrianDoorButton"
-- Evil guards
Index: CellsObjects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/CellsObjects.lua,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CellsObjects.lua 2 Jan 2004 02:12:18 -0000 1.10
--- CellsObjects.lua 2 Jan 2004 04:31:18 -0000 1.11
***************
*** 243,254 ****
activatedBy = function(self, obj)
! ActionController:addSequence{
! ActionConversation(lang:getConv("PushButton")),
! }
self.isPushed = not self.isPushed
if (self.door) then
self.door:switch()
end
end;
--- 243,276 ----
activatedBy = function(self, obj)
! if (self.acceptDir and obj.dir ~= self.acceptDir) then
! ActionController:addSequence{
! ActionConversation(lang:getConv("ButtonOutOfReach")),
! }
! return
! end
self.isPushed = not self.isPushed
+
+ local append = ""
if (self.door) then
self.door:switch()
+
+ if ((self.door:instanceOf(ElecDoorPrison) and not self.door.isLocked2) or
+ (self.door:instanceOf(PrisonDoor2) and self.door.obstacle == 0)) then
+ append = "Open"
+ else
+ append = "Close"
+ end
+ end
+
+ if (self.convKeyword) then
+ ActionController:addSequence{
+ ActionConversation(lang:getConv(self.convKeyword .. append)),
+ }
+ else
+ ActionController:addSequence{
+ ActionConversation(lang:getConv("PushButton")),
+ }
end
end;
Index: Crocodile.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Crocodile.lua,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Crocodile.lua 2 Jan 2004 02:12:18 -0000 1.7
--- Crocodile.lua 2 Jan 2004 04:31:18 -0000 1.8
***************
*** 13,18 ****
defaultproperties = {
! attackMinDam = 3,
! attackMaxDam = 6,
maxHealth = 50,
speed = 3,
--- 13,18 ----
defaultproperties = {
! attackMinDam = 3,
! attackMaxDam = 6,
maxHealth = 50,
speed = 3,
Index: ElecDoor.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/ElecDoor.lua,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ElecDoor.lua 2 Jan 2004 03:13:18 -0000 1.7
--- ElecDoor.lua 2 Jan 2004 04:31:18 -0000 1.8
***************
*** 106,110 ****
switch = function(self, obj)
self.isLocked2 = not self.isLocked2
-
end;
--- 106,109 ----
Index: EnemyGuard.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/EnemyGuard.lua,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EnemyGuard.lua 2 Jan 2004 02:45:26 -0000 1.5
--- EnemyGuard.lua 2 Jan 2004 04:31:18 -0000 1.6
***************
*** 82,86 ****
bAttacking = false,
! deathBitmap = m_get_bitmap("cop_dead.bmp"),
};
}
--- 82,86 ----
bAttacking = false,
! deathBitmap = m_get_bitmap("cop3_dead.bmp"),
};
}
Index: Jail.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Jail.lua,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Jail.lua 2 Jan 2004 02:49:56 -0000 1.5
--- Jail.lua 2 Jan 2004 04:31:18 -0000 1.6
***************
*** 53,62 ****
guard = self:spawn(Guard, 37, 17);
-
- -- This is not the right place to add this sequence
- --ActionController:addSequence{
- -- ActionWait(50),
- -- ActionShowMapName(m_get_bitmap("bb_title_prison.bmp")),
- --}
end;
--- 53,56 ----
Index: MainMenu.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MainMenu.lua,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** MainMenu.lua 2 Jan 2004 03:20:03 -0000 1.16
--- MainMenu.lua 2 Jan 2004 04:31:18 -0000 1.17
***************
*** 19,29 ****
ActionSetVariable(_G, "show_main_menu", nil),
ActionCallFunction(jake.addToInventory, jake, cityMap.walkieTalkie),
! -- ActionSetPosition(elwood, 145, 11, DIR_RIGHT),
! -- ActionSetPosition(jake, 143, 11, DIR_RIGHT),
-- ActionSetPosition(elwood, 102, 75, DIR_RIGHT),
-- ActionSetPosition(elwood, 145, 11, DIR_RIGHT),
-- ActionSetPosition(jake, 46, 43, DIR_RIGHT),
! ActionSetPosition(elwood, 102, 75, DIR_RIGHT, cityMap),
! ActionSetPosition(jake, 104, 75, DIR_RIGHT, cityMap),
-- ActionSetPosition(jake, 73, 38, DIR_RIGHT),
-- ActionSetPosition(jake, 26, 25, DIR_UP),
--- 19,29 ----
ActionSetVariable(_G, "show_main_menu", nil),
ActionCallFunction(jake.addToInventory, jake, cityMap.walkieTalkie),
! ActionSetPosition(elwood, 45, 65, DIR_RIGHT, cellsMap),
! ActionSetPosition(jake, 143, 11, DIR_RIGHT, sewersMap),
-- ActionSetPosition(elwood, 102, 75, DIR_RIGHT),
-- ActionSetPosition(elwood, 145, 11, DIR_RIGHT),
-- ActionSetPosition(jake, 46, 43, DIR_RIGHT),
! -- ActionSetPosition(elwood, 102, 75, DIR_RIGHT, cityMap),
! -- ActionSetPosition(jake, 104, 75, DIR_RIGHT, cityMap),
-- ActionSetPosition(jake, 73, 38, DIR_RIGHT),
-- ActionSetPosition(jake, 26, 25, DIR_UP),
Index: Turtle.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Turtle.lua,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Turtle.lua 2 Jan 2004 03:59:17 -0000 1.1
--- Turtle.lua 2 Jan 2004 04:31:18 -0000 1.2
***************
*** 16,20 ****
draw_mode = DM_MASKED,
charAnim = extr_char_anim(m_get_bitmap("turtle.bmp"), 26, 14),
! --deathBitmap = m_get_bitmap("turtle_dead.bmp"),
nature = AGGRESSIVE,
controllerClass = AdvAIRandom,
--- 16,20 ----
draw_mode = DM_MASKED,
charAnim = extr_char_anim(m_get_bitmap("turtle.bmp"), 26, 14),
! deathBitmap = m_get_bitmap("turtle_dead.bmp"),
nature = AGGRESSIVE,
controllerClass = AdvAIRandom,
***************
*** 22,24 ****
hitEffectHeight = 0,
};
! }
\ No newline at end of file
--- 22,24 ----
hitEffectHeight = 0,
};
! }
|
|
From: <mod...@us...> - 2004-01-02 04:21:31
|
Update of /cvsroot/moeng/BBRpg/data/bitmaps In directory sc8-pr-cvs1:/tmp/cvs-serv20394 Added Files: cop3_dead.bmp Log Message: Ook die zwarten kunnen dood... dus hebben ze een lijk nodig. --- NEW FILE: cop3_dead.bmp --- (This appears to be a binary file; contents omitted.) |
|
From: <mod...@us...> - 2004-01-02 04:05:22
|
Update of /cvsroot/moeng/BBRpg/data/bitmaps In directory sc8-pr-cvs1:/tmp/cvs-serv19036 Added Files: turtle_dead.bmp Log Message: Dead turtle --- NEW FILE: turtle_dead.bmp --- (This appears to be a binary file; contents omitted.) |
|
From: <b_l...@us...> - 2004-01-02 03:59:21
|
Update of /cvsroot/moeng/BBRpg/data/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv17923/data/scripts
Added Files:
Turtle.lua
Log Message:
Turtle script
--- NEW FILE: Turtle.lua ---
-- Turtle
Turtle = Enemy:subclass
{
name = "Turtle";
bPlaceable = true;
defaultproperties = {
attackMinDam = 2,
attackMaxDam = 4,
maxHealth = 40,
speed = 1,
experience = 10,
offset_y = 4,
draw_mode = DM_MASKED,
charAnim = extr_char_anim(m_get_bitmap("turtle.bmp"), 26, 14),
--deathBitmap = m_get_bitmap("turtle_dead.bmp"),
nature = AGGRESSIVE,
controllerClass = AdvAIRandom,
hitEffectHeight = 0,
};
}
|
|
From: <mod...@us...> - 2004-01-02 03:57:29
|
Update of /cvsroot/moeng/BBRpg/data/bitmaps In directory sc8-pr-cvs1:/tmp/cvs-serv17623 Added Files: turtle.bmp Log Message: Een huis, tuin en keuken killer-turtel erbij. --- NEW FILE: turtle.bmp --- (This appears to be a binary file; contents omitted.) |
|
From: <b_l...@us...> - 2004-01-02 03:20:08
|
Update of /cvsroot/moeng/BBRpg/data/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv11978
Modified Files:
Action.lua MainMenu.lua
Log Message:
Map as 5th argument of ActionSetPosition possible.
Index: Action.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Action.lua,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Action.lua 2 Jan 2004 02:49:56 -0000 1.5
--- Action.lua 2 Jan 2004 03:20:03 -0000 1.6
***************
*** 31,35 ****
-- ActionFadeOutMap(time)
-- ActionSetState(object, state)
! -- ActionSetPosition(actor, x, y [, dir])
-- ActionDestroyObject(object)
-- ActionAddObject({name|class}, x, y)
--- 31,35 ----
-- ActionFadeOutMap(time)
-- ActionSetState(object, state)
! -- ActionSetPosition(actor, x, y [,dir[,map]])
-- ActionDestroyObject(object)
-- ActionAddObject({name|class}, x, y)
***************
*** 398,406 ****
name = "ActionSetPosition";
! init = function(self, obj, x, y, dir)
self.x = x
self.y = y
self.dir = dir
self.obj = obj
end;
--- 398,407 ----
name = "ActionSetPosition";
! init = function(self, obj, x, y, dir, map)
self.x = x
self.y = y
self.dir = dir
self.obj = obj
+ self.map = map
end;
***************
*** 408,413 ****
self.obj:setPosition(self.x, self.y)
! if self.dir ~= nil then
self.obj.dir = self.dir
end
--- 409,417 ----
self.obj:setPosition(self.x, self.y)
! if (self.dir) then
self.obj.dir = self.dir
+ if (self.map) then
+ self.obj:setMap(self.map)
+ end
end
Index: MainMenu.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MainMenu.lua,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** MainMenu.lua 2 Jan 2004 02:12:18 -0000 1.15
--- MainMenu.lua 2 Jan 2004 03:20:03 -0000 1.16
***************
*** 19,24 ****
ActionSetVariable(_G, "show_main_menu", nil),
ActionCallFunction(jake.addToInventory, jake, cityMap.walkieTalkie),
- ActionCallFunction(elwood.setMap, elwood, cityMap),
- ActionCallFunction(jake.setMap, jake, cityMap),
-- ActionSetPosition(elwood, 145, 11, DIR_RIGHT),
-- ActionSetPosition(jake, 143, 11, DIR_RIGHT),
--- 19,22 ----
***************
*** 26,31 ****
-- ActionSetPosition(elwood, 145, 11, DIR_RIGHT),
-- ActionSetPosition(jake, 46, 43, DIR_RIGHT),
! ActionSetPosition(elwood, 102, 75, DIR_RIGHT),
! ActionSetPosition(jake, 104, 75, DIR_RIGHT),
-- ActionSetPosition(jake, 73, 38, DIR_RIGHT),
-- ActionSetPosition(jake, 26, 25, DIR_UP),
--- 24,29 ----
-- ActionSetPosition(elwood, 145, 11, DIR_RIGHT),
-- ActionSetPosition(jake, 46, 43, DIR_RIGHT),
! ActionSetPosition(elwood, 102, 75, DIR_RIGHT, cityMap),
! ActionSetPosition(jake, 104, 75, DIR_RIGHT, cityMap),
-- ActionSetPosition(jake, 73, 38, DIR_RIGHT),
-- ActionSetPosition(jake, 26, 25, DIR_UP),
|
|
From: <b_l...@us...> - 2004-01-02 03:13:22
|
Update of /cvsroot/moeng/BBRpg/data/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv10962
Modified Files:
BBRpgLang.lua ElecDoor.lua
Log Message:
Fixes for paintings and ElecDoor
Index: BBRpgLang.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpgLang.lua,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** BBRpgLang.lua 2 Jan 2004 02:45:25 -0000 1.16
--- BBRpgLang.lua 2 Jan 2004 03:13:18 -0000 1.17
***************
*** 334,339 ****
},
Sunflower2 = {
! {{"{Player}", "Another Sunflower of van Gogh?!"}},
! {{"{Player}", "This is weird..."}},
},
MessPile = {
--- 334,339 ----
},
Sunflower2 = {
! {{"{PLAYER}", "Another Sunflower of van Gogh?!"}},
! {{"{PLAYER}", "This is weird..."}},
},
MessPile = {
Index: ElecDoor.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/ElecDoor.lua,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ElecDoor.lua 2 Jan 2004 00:51:04 -0000 1.6
--- ElecDoor.lua 2 Jan 2004 03:13:18 -0000 1.7
***************
*** 26,30 ****
if (self.closeTimer <= 0) then
self.closeTimer = 1
! if (table.getn(m_get_objects_at(self.x, self.y, self.map)) == 1) then
self.closeTimer = 0
self.toStatus = 0
--- 26,30 ----
if (self.closeTimer <= 0) then
self.closeTimer = 1
! if (table.getn(m_get_objects_at(self.x + 0.5, self.y - 0.5, self.map)) == 1) then
self.closeTimer = 0
self.toStatus = 0
|
3 messages has been excluded from this view by a project administrator.
