[Moeng-cvs] BBRpg/data/scripts BBRpgLang.lua,1.33,1.34 BBRpgLangDutch.lua,1.8,1.9 JakesPlace.lua,1.6,1.7 SubcityObjects.lua,1.39,1.40

[<geo...@us...>]

Update of /cvsroot/moeng/BBRpg/data/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29928/data/scripts

Modified Files:
	BBRpgLang.lua BBRpgLangDutch.lua JakesPlace.lua 
	SubcityObjects.lua 
Log Message:
- removed white lines in tha houses
- corrected mistakes in the map in the restplace (needed some extra tiles)
- corrected some spellingmistakes
- now different things are said when leaving the bed, corresponding to the player health (still buggy)

Index: BBRpgLang.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpgLang.lua,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** BBRpgLang.lua	7 Feb 2004 18:30:00 -0000	1.33
--- BBRpgLang.lua	8 Feb 2004 14:53:59 -0000	1.34
***************
*** 381,385 ****
  		},
  		Lamppost = {
! 			{{"{PLAYER}", "Het is een lantaarnpaal."}},
  		},
        FenceToCells = {
--- 381,385 ----
  		},
  		Lamppost = {
! 			{{"{PLAYER}", "It's a lamppost."}},
  		},
        FenceToCells = {
***************
*** 389,392 ****
--- 389,397 ----
  			{{"{PLAYER}", "According to the map there should be some levers on the other side of this fence."}},
  		},
+ 		BedTiredAfterTable = {
+ 			{{"{PLAYER}", "I'm feeling kind of tired."}},
+ 			{{"{PLAYER}", "I'm feeling not to bad."}},
+ 			{{"{PLAYER}", "Ah, I'm feeling great!"}},
+ 		},
  	};
  

Index: BBRpgLangDutch.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpgLangDutch.lua,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** BBRpgLangDutch.lua	7 Feb 2004 18:30:01 -0000	1.8
--- BBRpgLangDutch.lua	8 Feb 2004 14:53:59 -0000	1.9
***************
*** 376,379 ****
--- 376,385 ----
  			{{"{PLAYER}", "Volgens de kaart zouden er aan de andere kant van dit hek hendels moeten zijn."}},
  		},
+ 		BedTiredAfterTable = {
+ 			{{"{PLAYER}", "Ik voel me nog steeds moe."}},
+ 			{{"{PLAYER}", "Ik voel me redelijk."}},
+ 			{{"{PLAYER}", "Ah, ik voel me geweldig!"}},
+ 		},
+ 
  	};
  

Index: JakesPlace.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/JakesPlace.lua,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** JakesPlace.lua	13 Jan 2004 16:32:35 -0000	1.6
--- JakesPlace.lua	8 Feb 2004 14:53:59 -0000	1.7
***************
*** 16,20 ****
  		self.doorPortal:setOutDir(DIR_UP)
  
! 		self:spawn(WallJakesPlace, 5, 21);
  		self:spawn(Keyboard, 10, 17);
  		self:spawn(Onderstel, 10, 17);
--- 16,20 ----
  		self.doorPortal:setOutDir(DIR_UP)
  
! 		--self:spawn(WallJakesPlace, 5, 21);
  		self:spawn(Keyboard, 10, 17);
  		self:spawn(Onderstel, 10, 17);

Index: SubcityObjects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/SubcityObjects.lua,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** SubcityObjects.lua	13 Jan 2004 16:32:35 -0000	1.39
--- SubcityObjects.lua	8 Feb 2004 14:53:59 -0000	1.40
***************
*** 196,204 ****
  							ActionSetVariable(obj, "dir", DIR_DOWN),
  							ActionChangeBitmap(self, bitmapje),
! 							ActionConversation(lang:getConv("BedTiredAfter")),
  							ActionSetVariable(obj, "obstacle", 1),
  							ActionSetVariable(self, "bOccupied", false),
  						}
! 					end),
  			}
  		else
--- 196,204 ----
  							ActionSetVariable(obj, "dir", DIR_DOWN),
  							ActionChangeBitmap(self, bitmapje),
! 							ActionConversation(lang:getConv("BedTiredAfterTable")[math.floor(table.getn(lang:getConv("BedTiredAfterTable")) * obj.health / obj.maxHealth) + 1]),
  							ActionSetVariable(obj, "obstacle", 1),
  							ActionSetVariable(self, "bOccupied", false),
  						}
! 					end),get_new_n(self.prev_random, table.getn(self.convTable))
  			}
  		else