[Moeng-cvs] BBRpg/data/scripts AdvAIRandom.lua,1.6,1.7 BBRpg.lua,1.26,1.27 BBRpgLang.lua,1.31,1.32 B
Status: Alpha
Brought to you by:
b_lindeijer
Menu
▾
▴
[Moeng-cvs] BBRpg/data/scripts AdvAIRandom.lua,1.6,1.7 BBRpg.lua,1.26,1.27 BBRpgLang.lua,1.31,1.32 BBRpgLangDutch.lua,1.6,1.7 Cells.lua,1.15,1.16 CellsObjects.lua,1.17,1.18 City.lua,1.18,1.19 ConversationWindow.lua,1.3,1.4 Crocodile.lua,1.10,1.11 Effects.lua,1.1.1.1,1.2 ElecDoor.lua,1.8,1.9 EnemyGuard.lua,1.7,1.8 JakesPlace.lua,1.5,1.6 Junk.lua,1.3,1.4 LeesPlace.lua,1.3,1.4 MainMenu.lua,1.33,1.34 MessPile.lua,1.9,1.10 Pawn.lua,1.10,1.11 Player.lua,1.11,1.12 Punk.lua,1.4,1.5 Rat.lua,1.14,1.15 RestPlace.lua,1.4,1.5 Sewers.lua,1.16,1.17 SubcityObjects.lua,1.38,1.39 Boss.lua,1.1.1.1,NONE Cave1.lua,1.1.1.1,NONE Cave2.lua,1.1.1.1,NONE Cave3.lua,1.1.1.1,NONE CaveAdventure.lua,1.3,NONE CaveLang.lua,1.3,NONE CaveTriggers.lua,1.1.1.1,NONE Caveman.lua,1.3,NONE DgeMapSwitches.lua,1.1.1.1,NONE EnemySpider.lua,1.2,NONE Fence.lua,1.1.1.1,NONE Radio.lua,1.4,NONE Spring.lua,1.2,NONE Torch.lua,1.2,NONE Z.lua,1.1.1.1,NONE
Update of /cvsroot/moeng/BBRpg/data/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv20640/data/scripts
Modified Files:
AdvAIRandom.lua BBRpg.lua BBRpgLang.lua BBRpgLangDutch.lua
Cells.lua CellsObjects.lua City.lua ConversationWindow.lua
Crocodile.lua Effects.lua ElecDoor.lua EnemyGuard.lua
JakesPlace.lua Junk.lua LeesPlace.lua MainMenu.lua
MessPile.lua Pawn.lua Player.lua Punk.lua Rat.lua
RestPlace.lua Sewers.lua SubcityObjects.lua
Removed Files:
Boss.lua Cave1.lua Cave2.lua Cave3.lua CaveAdventure.lua
CaveLang.lua CaveTriggers.lua Caveman.lua DgeMapSwitches.lua
EnemySpider.lua Fence.lua Radio.lua Spring.lua Torch.lua Z.lua
Log Message:
Merged bbrpg branch.
Index: AdvAIRandom.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/AdvAIRandom.lua,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AdvAIRandom.lua 1 Jan 2004 22:39:55 -0000 1.6
--- AdvAIRandom.lua 13 Jan 2004 16:32:35 -0000 1.7
***************
*** 42,47 ****
end;
notifyWalkFinished = function(self)
! if (self.distanceToWalk <= 0 and self.pawn.bAttacking == false) then
! -- Reached his goal, pause and choose new goal.
if (self.target or self.scaring) then
-- korte wachttijd, anders staat ie na elke tile even (te lang) stil
--- 42,47 ----
end;
notifyWalkFinished = function(self)
! if (self.distanceToWalk <= 0 and self.pawn.bAttacking == false) then
! -- Reached his goal, pause and choose new goal.
if (self.target or self.scaring) then
-- korte wachttijd, anders staat ie na elke tile even (te lang) stil
***************
*** 93,96 ****
--- 93,97 ----
tick = function(self)
if (self.pawn.bDead) then return end
+ if (self.target and self.target.bDead) then self.target = nil end
if (self.pawn.charging > 0) then self.pawn.charging = self.pawn.charging - 1 end
Index: BBRpg.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpg.lua,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** BBRpg.lua 4 Jan 2004 00:43:11 -0000 1.26
--- BBRpg.lua 13 Jan 2004 16:32:35 -0000 1.27
***************
*** 63,75 ****
-- Call superfunction
- Game.init(self)
-
gameCameraTarget = CameraTarget() -- GLOBAL!?
self.playerSwitcher = PlayerSwitcher(playerController, gameCameraTarget)
playerSwitcher = self.playerSwitcher -- Can't do without this global var for the moment
self.viewPort.target = gameCameraTarget
self.playerSwitcher:addPlayerHost(elwood)
! self.playerSwitcher:addPlayerHost(jake)
--self.playerSwitcher:addPlayerHost(brian)
--- 63,75 ----
-- Call superfunction
gameCameraTarget = CameraTarget() -- GLOBAL!?
self.playerSwitcher = PlayerSwitcher(playerController, gameCameraTarget)
playerSwitcher = self.playerSwitcher -- Can't do without this global var for the moment
+ Game.init(self)
+
self.viewPort.target = gameCameraTarget
self.playerSwitcher:addPlayerHost(elwood)
! --self.playerSwitcher:addPlayerHost(jake)
--self.playerSwitcher:addPlayerHost(brian)
***************
*** 77,81 ****
self.hud:setPlayerSwitcher(self.playerSwitcher)
-
-- Show startup screen
show_main_menu = 1
--- 77,80 ----
***************
*** 88,92 ****
ActionController:addSequence{
ActionExModeOn(),
! ActionPlaySong("data/music/3.ogg", 100),
ActionTweenVariable(main_menu_bg, "alpha", 100, 255),
ActionCallFunction(self.interactionMaster.addInteraction, self.interactionMaster, self.playerSwitcher),
--- 87,91 ----
ActionController:addSequence{
ActionExModeOn(),
! ActionPlaySong("data/music/mainmenu.ogg", 100),
ActionTweenVariable(main_menu_bg, "alpha", 100, 255),
ActionCallFunction(self.interactionMaster.addInteraction, self.interactionMaster, self.playerSwitcher),
Index: BBRpgLang.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpgLang.lua,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** BBRpgLang.lua 4 Jan 2004 19:13:30 -0000 1.31
--- BBRpgLang.lua 13 Jan 2004 16:32:35 -0000 1.32
***************
*** 213,217 ****
{"Jake", "Good plan."},
{"Elw00t", "Why don't the three of us start a band?"},
! },
WallAndTubeElwood = {
{"{PLAYER}", "I can't get in the tube. It's to damn small!"},
--- 213,220 ----
{"Jake", "Good plan."},
{"Elw00t", "Why don't the three of us start a band?"},
! },
! NotYetFightGuards = {
! {"{PLAYER}","There are guards inside. Before I come back here, I'd better make sure I'm strong enough to defeat them."},
! },
WallAndTubeElwood = {
{"{PLAYER}", "I can't get in the tube. It's to damn small!"},
***************
*** 290,293 ****
--- 293,302 ----
{"{PLAYER}", "Damn, these levers are rusty. I can't pull them... Maybe Elwood can."},
},
+ InventoryFullAtRockets = {
+ {"{PLAYER}", "Ah, there are the mini-rocket engines! But alas, I am already carrying all I can."},
+ },
+ LeaveTown = {
+ {"{PLAYER}", "There is no point in leaving the town."},
+ },
-- Conversation tables. Used for random events.
Index: BBRpgLangDutch.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpgLangDutch.lua,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** BBRpgLangDutch.lua 4 Jan 2004 19:13:30 -0000 1.6
--- BBRpgLangDutch.lua 13 Jan 2004 16:32:35 -0000 1.7
***************
*** 74,82 ****
{"Elwood", "Je bedoelt dat jij het altijd al geweten hebt?"},
{"Jake", "Ja, maar laat je me nou eindelijk een keer uitspreken?!"},
! {"Jake", "Goed, onze broer Brian, ook wel bekend als The Brain, is twee weken geleden gearresteerd terwijl hij met een gestolen creditcard mini-raket motoren in een hobbywinkel kocht voor zijn mini versie van de Columbia Ruimteveer met schaal een op honderd, gemaakt van alleen maar mini-raket motoren, ducktape, gebruikte walkmans, oude houten ijsstokjes, fietsen en een autoband."},
{"Elwood", "Een op 100? That is nog behoorlijk groot."},
{"Jake", "Ja, ik weet het. Maar goed, we moeten hem bevrijden! De wereldvrede staat hier op het spel!"},
{"Elwood", "Ik vrees dat ik het belang hiervan nog niet zo in de gaten heb..."},
! {"Jake", "Kijk, Brian, alias The Brain, is lid van de Internationale Schaak Club. Een vriend van hem, ook lid van deze Schaak Club, wil met deze miniversie van de Columbia ruimteveer een miniatuur aanvalssateliet lanceren om de Chinese aanvalssateliet die gericht is op Washington aan te vallen, en op deze manier de Vierde Werelde Oorlog voorkomen."},
{"Elwood", "Derde. De Derde Wereld Oorlog. Er zijn er maar twee geweest Jake."},
{"Jake", "O ja? En hoe zit het dan met al die kroegengevechten die we hebben mee gemaakt? Alleen maar buitenlanders daar."},
--- 74,82 ----
{"Elwood", "Je bedoelt dat jij het altijd al geweten hebt?"},
{"Jake", "Ja, maar laat je me nou eindelijk een keer uitspreken?!"},
! {"Jake", "Goed, onze broer Brian, ook wel bekend als Het Brein, is twee weken geleden gearresteerd terwijl hij met een gestolen creditcard mini-raket motoren in een hobbywinkel kocht voor zijn mini versie van de Columbia Ruimteveer met schaal een op honderd, gemaakt van alleen maar mini-raket motoren, ducktape, gebruikte walkmans, oude houten ijsstokjes, fietsen en een autoband."},
{"Elwood", "Een op 100? That is nog behoorlijk groot."},
{"Jake", "Ja, ik weet het. Maar goed, we moeten hem bevrijden! De wereldvrede staat hier op het spel!"},
{"Elwood", "Ik vrees dat ik het belang hiervan nog niet zo in de gaten heb..."},
! {"Jake", "Kijk, Brian, alias Het Brein, is lid van de Internationale Schaak Club. Een vriend van hem, ook lid van deze Schaak Club, wil met deze miniversie van de Columbia ruimteveer een miniatuur aanvalssateliet lanceren om de Chinese aanvalssateliet die gericht is op Washington aan te vallen, en op deze manier de Vierde Werelde Oorlog voorkomen."},
{"Elwood", "Derde. De Derde Wereld Oorlog. Er zijn er maar twee geweest Jake."},
{"Jake", "O ja? En hoe zit het dan met al die kroegengevechten die we hebben mee gemaakt? Alleen maar buitenlanders daar."},
***************
*** 173,177 ****
{"Elwood", "Ach natuurlijk, Lee!"},
{"Jake", "Aha, en waar zijn de mini-raket motoren?"},
! {"Brian", "Ehm, ja, dat is misschien een probleempje. Die heb ik verstop in een bult rotzooi vlak voordat ik opgepakt werd door de politie..."},
{"Elwood", "Nou dat is weer geweldig. En hoe gaan we die dan terug vinden?"},
{"Brian", "Ik denk dat we maar eens moeten gaan zoeken."}
--- 173,177 ----
{"Elwood", "Ach natuurlijk, Lee!"},
{"Jake", "Aha, en waar zijn de mini-raket motoren?"},
! {"Brian", "Ehm, ja, dat is misschien een probleempje. Die heb ik verstopt in een bult rotzooi vlak voordat ik opgepakt werd door de politie..."},
{"Elwood", "Nou dat is weer geweldig. En hoe gaan we die dan terug vinden?"},
{"Brian", "Ik denk dat we maar eens moeten gaan zoeken."}
***************
*** 188,192 ****
{"Elwood", "Dit is Lee?"},
{"Jake", "Aangezien Brian de man kent, en dat Brian hem Lee noemt zit het er dik in dat het Lee is."},
! {"Lee", "Inderdaad, ik ben degene die Lee genoemd wordt."},
{"Brian", "We hebben de mini-raket motoren voor de miniversie van de Columbia ruimteveer die een miniaanval gaat uitvoeren en daarmee de Vierde Wereld Oorlog gaat voorkomen! Alstjeblieft!"},
},
--- 188,192 ----
{"Elwood", "Dit is Lee?"},
{"Jake", "Aangezien Brian de man kent, en dat Brian hem Lee noemt zit het er dik in dat het Lee is."},
! {"Lee", "Juist, ik ben degene die Lee genoemd wordt."},
{"Brian", "We hebben de mini-raket motoren voor de miniversie van de Columbia ruimteveer die een miniaanval gaat uitvoeren en daarmee de Vierde Wereld Oorlog gaat voorkomen! Alstjeblieft!"},
},
***************
*** 202,205 ****
--- 202,208 ----
{"Elw00t", "Waarom beginnen we niet met zijn drieen een band?"},
},
+ NotYetFightGuards = {
+ {"{PLAYER}","Daar binnen zitten gevangenisbewaarders. Voordat ik hier terugkom kan ik maar beter zorgen dat ik sterk genoeg ben om ze te verslaan."},
+ },
WallAndTubeElwood = {
{"{PLAYER}", "Ik pas niet in deze buis. Hij is veel te smal!"},
***************
*** 226,230 ****
{"Jake", "Ja, wat anders? Klop jij liever aan bij de hoofdingang?"},
{"Elwood", "Waarom niet, ik doe alles om mijn grote broer te bevrijden, die ik in mijn hele leven nog nooit gezien heb, en waarvan ik denk dat hij gestoord is omdat hij een miniversie van de Columbia ruimteveer gebouwd heeft."},
! {"Jake", "Ja, zo mag ik het horen. Laten we Brian the Brain bevrijden!"},
},
JakesDoorLocked = {
--- 229,233 ----
{"Jake", "Ja, wat anders? Klop jij liever aan bij de hoofdingang?"},
{"Elwood", "Waarom niet, ik doe alles om mijn grote broer te bevrijden, die ik in mijn hele leven nog nooit gezien heb, en waarvan ik denk dat hij gestoord is omdat hij een miniversie van de Columbia ruimteveer gebouwd heeft."},
! {"Jake", "Ja, zo mag ik het horen. Laten we Brian het Brein bevrijden!"},
},
JakesDoorLocked = {
***************
*** 279,282 ****
--- 282,291 ----
{"{PLAYER}", "Aargh, deze hendel is roestig. Ik krijg hem niet om. Misschien lukt Elwood dit."},
},
+ InventoryFullAtRockets = {
+ {"{PLAYER}", "Ah, daar zijn de mini-raket motoren! Maar helaas, ik heb al teveel bij me."},
+ },
+ LeaveTown = {
+ {"{PLAYER}", "Het heeft geen zin om de stad te verlaten."},
+ },
-- Conversation tables. Used for random events.
Index: Cells.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Cells.lua,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Cells.lua 2 Jan 2004 23:06:55 -0000 1.15
--- Cells.lua 13 Jan 2004 16:32:35 -0000 1.16
***************
*** 192,196 ****
defaultproperties = {
mapNameBitmap = m_get_bitmap("prison.tga"),
! musicFilename = "data/music/1.ogg",
}
}
--- 192,196 ----
defaultproperties = {
mapNameBitmap = m_get_bitmap("prison.tga"),
! musicFilename = "data/music/cells.ogg",
}
}
Index: CellsObjects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/CellsObjects.lua,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** CellsObjects.lua 3 Jan 2004 22:41:02 -0000 1.17
--- CellsObjects.lua 13 Jan 2004 16:32:35 -0000 1.18
***************
*** 204,208 ****
w = 1,
offset_x = 0,
! offset_y = 0,
draw_mode = DM_MASKED,
bitmap = m_get_bitmap("sewagedrain.bmp"),
--- 204,209 ----
w = 1,
offset_x = 0,
! offset_y = -24,
! offset_z = -24,
draw_mode = DM_MASKED,
bitmap = m_get_bitmap("sewagedrain.bmp"),
***************
*** 350,356 ****
ActionSetPosition(jake, 14, 18, DIR_RIGHT, jakesMap),
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,357 ----
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),
ActionPlaySong(jakesMap.musicFilename, 100),
ActionFadeInMap(100),
***************
*** 377,383 ****
ActionSetPosition(jake, 14, 18, DIR_RIGHT, jakesMap),
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,384 ----
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),
ActionPlaySong(jakesMap.musicFilename, 100),
ActionFadeInMap(100),
Index: City.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/City.lua,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** City.lua 2 Jan 2004 23:06:55 -0000 1.18
--- City.lua 13 Jan 2004 16:32:35 -0000 1.19
***************
*** 10,13 ****
--- 10,15 ----
init = function(self)
+ local obj;
+
Map.init(self, "data/maps/city1.map")
***************
*** 18,25 ****
self:spawn(KeyFob, 66, 42)
! -- No go areas.
self:spawn(TooDangerous, 63, 80)
self:spawn(TooDangerous2, 93, 36)
!
-- Litter the city with stuff
--- 20,30 ----
self:spawn(KeyFob, 66, 42)
! -- No go areas
self:spawn(TooDangerous, 63, 80)
self:spawn(TooDangerous2, 93, 36)
! obj = self:spawn(LeaveTown, 52, 113); obj.w = 6; obj.walkBack = "U1"
! obj = self:spawn(LeaveTown, 18, 17); obj.h = 7; obj.walkBack = "R1"
! obj = self:spawn(LeaveTown, 121, 17); obj.h = 7; obj.walkBack = "L1"
!
-- Litter the city with stuff
***************
*** 82,86 ****
defaultproperties = {
mapNameBitmap = m_get_bitmap("suburbs.tga"),
! musicFilename = "data/music/4.ogg",
}
}
--- 87,91 ----
defaultproperties = {
mapNameBitmap = m_get_bitmap("suburbs.tga"),
! musicFilename = "data/music/city.ogg",
}
}
Index: ConversationWindow.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/ConversationWindow.lua,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ConversationWindow.lua 25 Dec 2003 20:50:41 -0000 1.3
--- ConversationWindow.lua 13 Jan 2004 16:32:35 -0000 1.4
***************
*** 206,209 ****
--- 206,210 ----
m_set_font(self.font)
+ --[[
if (self.state ~= CB_SCALING) then
-- Draw the shadow of the text
***************
*** 219,222 ****
--- 220,224 ----
end
end
+ ]]
-- Draw the box
Index: Crocodile.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Crocodile.lua,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Crocodile.lua 2 Jan 2004 07:06:44 -0000 1.10
--- Crocodile.lua 13 Jan 2004 16:32:35 -0000 1.11
***************
*** 4,9 ****
-- Temporarily blindly copied from Hedde Bosman's rat by Georg Muntingh!
! import("Player.lua")
! import("AdvAIRandom")
Crocodile = Enemy:subclass
--- 4,9 ----
-- Temporarily blindly copied from Hedde Bosman's rat by Georg Muntingh!
! import("Enemy.lua")
! import("AdvAIRandom.lua")
Crocodile = Enemy:subclass
Index: Effects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Effects.lua,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Effects.lua 7 Dec 2003 02:17:18 -0000 1.1.1.1
--- Effects.lua 13 Jan 2004 16:32:35 -0000 1.2
***************
*** 78,82 ****
--
! PoisonProjectile = Actor:subclass
{
name = "PoisonProjectile";
--- 78,82 ----
--
! --[[PoisonProjectile = Actor:subclass
{
name = "PoisonProjectile";
***************
*** 95,96 ****
--- 95,97 ----
};
}
+ ]]
\ No newline at end of file
Index: ElecDoor.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/ElecDoor.lua,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ElecDoor.lua 2 Jan 2004 04:31:18 -0000 1.8
--- ElecDoor.lua 13 Jan 2004 16:32:35 -0000 1.9
***************
*** 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;
***************
*** 109,117 ****
event_bumped_into = function(self, obj)
! if (not self.isLocked2) then
ElecDoor.event_bumped_into(self, obj)
end
! if (self.firstTime) then
ActionController:addSequence{
ActionExModeOn(),
--- 111,128 ----
event_bumped_into = function(self, obj)
! if (not (self.firstTime == 0) and not self.isLocked2) then
ElecDoor.event_bumped_into(self, obj)
end
! if (self.firstTime == 0) then
! ActionController:addSequence{
! ActionSequence{
! ActionExModeOn(),
! ActionConversation(lang:getConv("NotYetFightGuards")),
! ActionExModeOff(),
! },
! };
! self.firstTime = 1
! elseif (self.firstTime == 1) then
ActionController:addSequence{
ActionExModeOn(),
***************
*** 137,146 ****
};
! self.firstTime = false
end
end;
defaultproperties = {
! firstTime = true,
bCenterOnTile = false,
bCenterBitmap = false,
--- 148,157 ----
};
! self.firstTime = 2
end
end;
defaultproperties = {
! firstTime = 0,
bCenterOnTile = false,
bCenterBitmap = false,
Index: EnemyGuard.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/EnemyGuard.lua,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** EnemyGuard.lua 2 Jan 2004 08:05:43 -0000 1.7
--- EnemyGuard.lua 13 Jan 2004 16:32:35 -0000 1.8
***************
*** 17,22 ****
charging = 0,
attackMinDam = 0,
! attackMaxDam = 5,
! maxHealth = 70,
bDead = false,
--- 17,22 ----
charging = 0,
attackMinDam = 0,
! attackMaxDam = 4,
! maxHealth = 50,
bDead = false,
***************
*** 42,47 ****
charging = 0,
attackMinDam = 0,
! attackMaxDam = 5,
! maxHealth = 70,
bDead = false,
--- 42,47 ----
charging = 0,
attackMinDam = 0,
! attackMaxDam = 4,
! maxHealth = 50,
bDead = false,
Index: JakesPlace.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/JakesPlace.lua,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** JakesPlace.lua 3 Jan 2004 00:16:32 -0000 1.5
--- JakesPlace.lua 13 Jan 2004 16:32:35 -0000 1.6
***************
*** 31,35 ****
defaultproperties = {
mapNameBitmap = m_get_bitmap("jakesplace.tga"),
! musicFilename = "data/music/4.ogg",
};
}
--- 31,35 ----
defaultproperties = {
mapNameBitmap = m_get_bitmap("jakesplace.tga"),
! musicFilename = "data/music/city.ogg",
};
}
Index: Junk.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Junk.lua,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Junk.lua 2 Jan 2004 17:46:12 -0000 1.3
--- Junk.lua 13 Jan 2004 16:32:35 -0000 1.4
***************
*** 8,12 ****
defaultproperties = {
! speed = 2,
experience = 40,
draw_mode = DM_MASKED,
--- 8,13 ----
defaultproperties = {
! speed = 2,
! maxHealth = 130,
experience = 40,
draw_mode = DM_MASKED,
Index: LeesPlace.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/LeesPlace.lua,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LeesPlace.lua 2 Jan 2004 04:49:53 -0000 1.3
--- LeesPlace.lua 13 Jan 2004 16:32:35 -0000 1.4
***************
*** 28,31 ****
--- 28,32 ----
defaultproperties = {
mapNameBitmap = m_get_bitmap("leesplace.tga"),
+ musicFilename = "data/music/city.ogg",
}
}
Index: MainMenu.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MainMenu.lua,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** MainMenu.lua 4 Jan 2004 00:55:48 -0000 1.33
--- MainMenu.lua 13 Jan 2004 16:32:35 -0000 1.34
***************
*** 20,28 ****
--- 20,32 ----
ActionWait(50),
ActionSetVariable(_G, "show_main_menu", nil),
+ ActionCallFunction(playerSwitcher.addPlayerHost, playerSwitcher, jake),
ActionCallFunction(jake.addToInventory, jake, cityMap.walkieTalkie),
ActionCallFunction(elwood.addToInventory, elwood, cityMap.walkieTalkie),
ActionSetPosition(elwood, 94, 73, DIR_UP, cityMap),
+ -- ActionSetPosition(elwood, 37, 12, DIR_UP, cityMap),
+ -- ActionSetPosition(elwood, 34, 65, DIR_UP, cellsMap),
ActionSetPosition(jake, 93, 73, DIR_UP, cityMap),
ActionSetCameraTarget(elwood, false),
+ ActionSetPosition(copcar, 88, 77),
ActionPlaySong(cityMap.musicFilename, 100),
ActionFadeInMap(100),
***************
*** 34,40 ****
ActionFadeOutMap(50),
ActionWait(50),
- ActionCallFunction(jake.addToInventory, jake, cityMap.walkieTalkie),
ActionSetVariable(_G, "show_main_menu", nil),
! ActionPlaySong("data/music/2.ogg", 100),
ActionFadeInMap(100),
ActionShowMapName(m_get_bitmap("prison.tga")),
--- 38,43 ----
ActionFadeOutMap(50),
ActionWait(50),
ActionSetVariable(_G, "show_main_menu", nil),
! ActionPlaySong("data/music/intro.ogg", 100),
ActionFadeInMap(100),
ActionShowMapName(m_get_bitmap("prison.tga")),
***************
*** 81,84 ****
--- 84,89 ----
ActionWalkPath(elwood, "D"),
ActionSetVariable(elwood, "dir", DIR_LEFT),
+ ActionCallFunction(playerSwitcher.addPlayerHost, playerSwitcher, jake),
+ ActionCallFunction(jake.addToInventory, jake, cityMap.walkieTalkie),
ActionConversation(lang:getConv("Intro5")),
ActionAddSequence{
Index: MessPile.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MessPile.lua,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MessPile.lua 4 Jan 2004 00:43:14 -0000 1.9
--- MessPile.lua 13 Jan 2004 16:32:35 -0000 1.10
***************
*** 9,13 ****
defaultproperties = {
offset_x = -6,
! offset_y = 6,
w = 2,
h = 2,
--- 9,13 ----
defaultproperties = {
offset_x = -6,
! offset_y = 4,
w = 2,
h = 2,
***************
*** 26,30 ****
bPlaceable = true;
activatedBy = function(self, obj)
! if self.containsEngines then
ActionController:addSequence{
ActionExModeOn(),
--- 26,37 ----
bPlaceable = true;
activatedBy = function(self, obj)
! if (self.containsEngines) then
! if (table.getn(obj.inventory) >= 3) then
! ActionController:addSequence{
! ActionConversation(lang:getConv("InventoryFullAtRockets")),
! }
! return
! end
!
ActionController:addSequence{
ActionExModeOn(),
***************
*** 39,45 ****
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")),
***************
*** 54,58 ****
ActionSetVariable(main_menu_bg, "drawMode", DM_ALPHA),
ActionSetVariable(main_menu_bg, "bm", m_get_bitmap("theend.tga")),
! ActionPlaySong("data/music/6.ogg", 10),
}
else
--- 61,65 ----
ActionSetVariable(main_menu_bg, "drawMode", DM_ALPHA),
ActionSetVariable(main_menu_bg, "bm", m_get_bitmap("theend.tga")),
! ActionPlaySong("data/music/enddemo.ogg", 10),
}
else
Index: Pawn.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Pawn.lua,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Pawn.lua 3 Jan 2004 21:56:19 -0000 1.10
--- Pawn.lua 13 Jan 2004 16:32:35 -0000 1.11
***************
*** 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: Player.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Player.lua,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Player.lua 2 Jan 2004 02:49:56 -0000 1.11
--- Player.lua 13 Jan 2004 16:32:35 -0000 1.12
***************
*** 140,144 ****
travel = 1, -- Player can travel to other maps
! charAnim = extr_char_anim(m_get_bitmap("frode.tga")),
};
}
--- 140,144 ----
travel = 1, -- Player can travel to other maps
! charAnim = extr_char_anim(m_get_bitmap("brian.bmp")),
};
}
Index: Punk.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Punk.lua,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Punk.lua 2 Jan 2004 17:46:12 -0000 1.4
--- Punk.lua 13 Jan 2004 16:32:35 -0000 1.5
***************
*** 8,12 ****
defaultproperties = {
! speed = 2.5,
experience = 50,
draw_mode = DM_MASKED,
--- 8,13 ----
defaultproperties = {
! speed = 2.5,
! maxHealth = 160,
experience = 50,
draw_mode = DM_MASKED,
Index: Rat.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Rat.lua,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Rat.lua 2 Jan 2004 17:46:12 -0000 1.14
--- Rat.lua 13 Jan 2004 16:32:35 -0000 1.15
***************
*** 4,8 ****
-- bodged by Hedde Bosman
! import("Player.lua")
import("AdvAIRandom.lua")
import("Shadow.lua")
--- 4,8 ----
-- bodged by Hedde Bosman
! import("Enemy.lua")
import("AdvAIRandom.lua")
import("Shadow.lua")
Index: RestPlace.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/RestPlace.lua,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RestPlace.lua 3 Jan 2004 18:50:44 -0000 1.4
--- RestPlace.lua 13 Jan 2004 16:32:35 -0000 1.5
***************
*** 27,31 ****
defaultproperties = {
mapNameBitmap = m_get_bitmap("restplace.tga"),
! musicFilename = "data/music/4.ogg",
}
}
--- 27,31 ----
defaultproperties = {
mapNameBitmap = m_get_bitmap("restplace.tga"),
! musicFilename = "data/music/city.ogg",
}
}
Index: Sewers.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Sewers.lua,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Sewers.lua 2 Jan 2004 23:06:55 -0000 1.16
--- Sewers.lua 13 Jan 2004 16:32:35 -0000 1.17
***************
*** 57,61 ****
defaultproperties = {
mapNameBitmap = m_get_bitmap("sewers.tga"),
! musicFilename = "data/music/5.ogg",
}
}
--- 57,61 ----
defaultproperties = {
mapNameBitmap = m_get_bitmap("sewers.tga"),
! musicFilename = "data/music/sewers.ogg",
}
}
Index: SubcityObjects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/SubcityObjects.lua,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** SubcityObjects.lua 4 Jan 2004 19:13:30 -0000 1.38
--- SubcityObjects.lua 13 Jan 2004 16:32:35 -0000 1.39
***************
*** 178,182 ****
activatedBy = function(self, obj)
local bitmapje = self.bitmap
- local schaduwtje = obj.shadow.bitmap
if (obj.health == obj.maxHealth) then
--- 178,181 ----
***************
*** 188,206 ****
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),
--- 187,199 ----
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),
***************
*** 733,736 ****
--- 726,753 ----
}
+ LeaveTown = Actor:subclass
+ {
+ name = "LeaveTown";
+
+ event_stand_on = function(self, obj)
+ if ((obj == brian) or (obj == elwood) or (obj == jake)) then
+ ActionController:addSequence{
+ ActionExModeOn(),
+ ActionConversation(lang:getConv("LeaveTown")),
+ ActionWalkPath(obj, self.walkBack),
+ ActionExModeOff(),
+ }
+ end
+ end;
+
+ defaultproperties = {
+ bCanActivate = true,
+ walkBack = "R1",
+ obstacle = 0,
+ w = 1,
+ h = 1,
+ }
+ }
+
WalkieTalkie = Actor:subclass
{
--- Boss.lua DELETED ---
--- Cave1.lua DELETED ---
--- Cave2.lua DELETED ---
--- Cave3.lua DELETED ---
--- CaveAdventure.lua DELETED ---
--- CaveLang.lua DELETED ---
--- CaveTriggers.lua DELETED ---
--- Caveman.lua DELETED ---
--- DgeMapSwitches.lua DELETED ---
--- EnemySpider.lua DELETED ---
--- Fence.lua DELETED ---
--- Radio.lua DELETED ---
--- Spring.lua DELETED ---
--- Torch.lua DELETED ---
--- Z.lua DELETED ---
|
