[Moeng-cvs] BBRpg/data/scripts BloodSplat.lua,1.1.1.1,1.2 Cells.lua,1.16,1.17 City.lua,1.19,1.20 Con
Status: Alpha
Brought to you by:
b_lindeijer
Menu
▾
▴
[Moeng-cvs] BBRpg/data/scripts BloodSplat.lua,1.1.1.1,1.2 Cells.lua,1.16,1.17 City.lua,1.19,1.20 ConversationWindow.lua,1.4,1.5 GuiTheme.lua,1.6,1.7 Jail.lua,1.7,1.8 JakesPlace.lua,1.7,1.8 LanguageMenu.lua,1.2,1.3 LeesPlace.lua,1.4,1.5 RestPlace.lua,1.5,1.6 Sewers.lua,1.18,1.19
|
From: Bj?rn L. <b_l...@us...> - 2004-04-13 12:40:08
|
Update of /cvsroot/moeng/BBRpg/data/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15068/data/scripts Modified Files: BloodSplat.lua Cells.lua City.lua ConversationWindow.lua GuiTheme.lua Jail.lua JakesPlace.lua LanguageMenu.lua LeesPlace.lua RestPlace.lua Sewers.lua Log Message: Commiting engine changes to our beloved BBRpg on SourceForge. Index: City.lua =================================================================== RCS file: /cvsroot/moeng/BBRpg/data/scripts/City.lua,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** City.lua 13 Jan 2004 16:32:35 -0000 1.19 --- City.lua 13 Apr 2004 12:26:08 -0000 1.20 *************** *** 12,16 **** local obj; ! Map.init(self, "data/maps/city1.map") -- Spawn the walkie talkie. Needed by the addToInventory function. --- 12,16 ---- local obj; ! Map.init(self, "city1.map") -- Spawn the walkie talkie. Needed by the addToInventory function. Index: Cells.lua =================================================================== RCS file: /cvsroot/moeng/BBRpg/data/scripts/Cells.lua,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Cells.lua 13 Jan 2004 16:32:35 -0000 1.16 --- Cells.lua 13 Apr 2004 12:26:08 -0000 1.17 *************** *** 12,16 **** local obj ! Map.init(self, "data/maps/cells.map") -- Dummy used for the cameratarget in the arena. --- 12,16 ---- local obj ! Map.init(self, "cells.map") -- Dummy used for the cameratarget in the arena. Index: Sewers.lua =================================================================== RCS file: /cvsroot/moeng/BBRpg/data/scripts/Sewers.lua,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Sewers.lua 7 Feb 2004 18:30:01 -0000 1.18 --- Sewers.lua 13 Apr 2004 12:26:08 -0000 1.19 *************** *** 13,17 **** local obj; ! Map.init(self, "data/maps/sewers1.map") self:spawn(WallAndTube, 54, 47); --- 13,17 ---- local obj; ! Map.init(self, "sewers1.map") self:spawn(WallAndTube, 54, 47); Index: ConversationWindow.lua =================================================================== RCS file: /cvsroot/moeng/BBRpg/data/scripts/ConversationWindow.lua,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ConversationWindow.lua 13 Jan 2004 16:32:35 -0000 1.4 --- ConversationWindow.lua 13 Apr 2004 12:26:08 -0000 1.5 *************** *** 157,160 **** --- 157,164 ---- local length = string.len(current_string) + if (self.quickFinish) then + self.curr_char = length + end + if (self.curr_char < length) then self.curr_char = self.curr_char + 0.5 *************** *** 165,168 **** --- 169,173 ---- self.state = CB_READY else + self.quickFinish = self.defaultproperties.quickFinish self:set_state(CB_WAITING) end *************** *** 188,199 **** keyType = function(self, key) ! if (key == "action" and self.state == CB_WAITING) then ! if (self.continue) then ! -- Scroll up ! self.state = CB_SCROLLING ! else ! self.state = CB_READY end - return true end return false --- 193,209 ---- keyType = function(self, key) ! if (key == "action") then ! if (self.state == CB_WAITING) then ! if (self.continue) then ! -- Scroll up ! self.state = CB_SCROLLING ! else ! self.state = CB_READY ! end ! return true ! end ! if (self.state == CB_WRITING) then ! self.quickFinish = true end end return false *************** *** 282,285 **** --- 292,296 ---- height = 0, appear_time = 15, + quickFinish = true, }; } Index: Jail.lua =================================================================== RCS file: /cvsroot/moeng/BBRpg/data/scripts/Jail.lua,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Jail.lua 2 Jan 2004 04:49:53 -0000 1.7 --- Jail.lua 13 Apr 2004 12:26:08 -0000 1.8 *************** *** 12,16 **** local obj ! Map.init(self, "data/maps/jail.map") self:spawn(Table, 22, 16); --- 12,16 ---- local obj ! Map.init(self, "jail.map") self:spawn(Table, 22, 16); Index: RestPlace.lua =================================================================== RCS file: /cvsroot/moeng/BBRpg/data/scripts/RestPlace.lua,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RestPlace.lua 13 Jan 2004 16:32:35 -0000 1.5 --- RestPlace.lua 13 Apr 2004 12:26:08 -0000 1.6 *************** *** 10,14 **** init = function(self) ! Map.init(self, "data/maps/restplace.map") -- Spawn portals --- 10,14 ---- init = function(self) ! Map.init(self, "restplace.map") -- Spawn portals Index: JakesPlace.lua =================================================================== RCS file: /cvsroot/moeng/BBRpg/data/scripts/JakesPlace.lua,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** JakesPlace.lua 8 Feb 2004 14:53:59 -0000 1.7 --- JakesPlace.lua 13 Apr 2004 12:26:08 -0000 1.8 *************** *** 10,14 **** init = function(self) ! Map.init(self, "data/maps/jakesplace.map") -- Spawn portals --- 10,14 ---- init = function(self) ! Map.init(self, "jakesplace.map") -- Spawn portals Index: BloodSplat.lua =================================================================== RCS file: /cvsroot/moeng/BBRpg/data/scripts/BloodSplat.lua,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** BloodSplat.lua 7 Dec 2003 02:17:16 -0000 1.1.1.1 --- BloodSplat.lua 13 Apr 2004 12:26:08 -0000 1.2 *************** *** 3,6 **** --- 3,10 ---- -- + import("Actor.lua") + import("AnimationFunctions.lua") + + BloodSplat = Actor:subclass { Index: LeesPlace.lua =================================================================== RCS file: /cvsroot/moeng/BBRpg/data/scripts/LeesPlace.lua,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** LeesPlace.lua 13 Jan 2004 16:32:35 -0000 1.4 --- LeesPlace.lua 13 Apr 2004 12:26:08 -0000 1.5 *************** *** 10,14 **** init = function(self) ! Map.init(self, "data/maps/leesplace.map") -- Spawn portals --- 10,14 ---- init = function(self) ! Map.init(self, "leesplace.map") -- Spawn portals Index: GuiTheme.lua =================================================================== RCS file: /cvsroot/moeng/BBRpg/data/scripts/GuiTheme.lua,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GuiTheme.lua 2 Jan 2004 02:49:56 -0000 1.6 --- GuiTheme.lua 13 Apr 2004 12:26:08 -0000 1.7 *************** *** 45,49 **** -- The actual box ! m_set_alpha(128) self:drawBoxEx( self.bg, --- 45,49 ---- -- The actual box ! m_set_alpha(192) self:drawBoxEx( self.bg, *************** *** 59,63 **** self.canvas:setDrawMode(DM_TRANS) ! local alpha = m_set_alpha(128) self:drawBoxEx( self.bg, --- 59,63 ---- self.canvas:setDrawMode(DM_TRANS) ! local alpha = m_set_alpha(192) self:drawBoxEx( self.bg, Index: LanguageMenu.lua =================================================================== RCS file: /cvsroot/moeng/BBRpg/data/scripts/LanguageMenu.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** LanguageMenu.lua 3 Jan 2004 20:08:34 -0000 1.2 --- LanguageMenu.lua 13 Apr 2004 12:26:08 -0000 1.3 *************** *** 1,4 **** --- 1,7 ---- -- A menu to choose your language + import("GuiMenu.lua") + + LanguageMenu = GuiMenu:subclass { *************** *** 35,37 **** defaultproperties = { }; ! } \ No newline at end of file --- 38,40 ---- defaultproperties = { }; ! } |
