[Moeng-cvs] BBRpg/data/scripts BBRpgLang.lua,1.30.2.2,1.30.2.3 BBRpgLangDutch.lua,1.5.2.3,1.5.2.4 City.lua,1.18.2.1,1.18.2.2 MainMenu.lua,1.33.2.4,1.33.2.5 MessPile.lua,1.9.2.4,1.9.2.5 SubcityObjects.lua,1.37.2.1,1.37.2.2

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

Update of /cvsroot/moeng/BBRpg/data/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv666/scripts

Modified Files:
      Tag: bbrpg
	BBRpgLang.lua BBRpgLangDutch.lua City.lua MainMenu.lua 
	MessPile.lua SubcityObjects.lua 
Log Message:
- Added more natural boundaries to the city area.
- Corrected a spellingmistake

Index: BBRpgLang.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/BBRpgLang.lua,v
retrieving revision 1.30.2.2
retrieving revision 1.30.2.3
diff -C2 -d -r1.30.2.2 -r1.30.2.3
*** BBRpgLang.lua	9 Jan 2004 19:03:32 -0000	1.30.2.2
--- BBRpgLang.lua	13 Jan 2004 00:16:41 -0000	1.30.2.3
***************
*** 296,299 ****
--- 296,302 ----
  			{"{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.5.2.3
retrieving revision 1.5.2.4
diff -C2 -d -r1.5.2.3 -r1.5.2.4
*** BBRpgLangDutch.lua	10 Jan 2004 21:30:28 -0000	1.5.2.3
--- BBRpgLangDutch.lua	13 Jan 2004 00:16:41 -0000	1.5.2.4
***************
*** 110,114 ****
  		},
  		FindKeyFob = {
! 			{"{PLAYER}", "Daar ligt ie! I zie de sleutelbos!"},
  			{"Jake", "We hebben mijn gelukssleutelbos!"},
  			{"Elwood", "Dus je probeert me duidelijk te maken dat dit allemaal was om jouw tentakelsleutelbos te vinden?"},
--- 110,114 ----
  		},
  		FindKeyFob = {
! 			{"{PLAYER}", "Daar ligt ie! Ik zie de sleutelbos!"},
  			{"Jake", "We hebben mijn gelukssleutelbos!"},
  			{"Elwood", "Dus je probeert me duidelijk te maken dat dit allemaal was om jouw tentakelsleutelbos te vinden?"},
***************
*** 285,288 ****
--- 285,291 ----
  			{"{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: City.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/City.lua,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -C2 -d -r1.18.2.1 -r1.18.2.2
*** City.lua	6 Jan 2004 23:19:56 -0000	1.18.2.1
--- City.lua	13 Jan 2004 00:16:41 -0000	1.18.2.2
***************
*** 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
  

Index: MainMenu.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MainMenu.lua,v
retrieving revision 1.33.2.4
retrieving revision 1.33.2.5
diff -C2 -d -r1.33.2.4 -r1.33.2.5
*** MainMenu.lua	10 Jan 2004 20:23:19 -0000	1.33.2.4
--- MainMenu.lua	13 Jan 2004 00:16:41 -0000	1.33.2.5
***************
*** 24,27 ****
--- 24,28 ----
  			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),

Index: MessPile.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/MessPile.lua,v
retrieving revision 1.9.2.4
retrieving revision 1.9.2.5
diff -C2 -d -r1.9.2.4 -r1.9.2.5
*** MessPile.lua	10 Jan 2004 20:31:21 -0000	1.9.2.4
--- MessPile.lua	13 Jan 2004 00:16:41 -0000	1.9.2.5
***************
*** 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,

Index: SubcityObjects.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/SubcityObjects.lua,v
retrieving revision 1.37.2.1
retrieving revision 1.37.2.2
diff -C2 -d -r1.37.2.1 -r1.37.2.2
*** SubcityObjects.lua	8 Jan 2004 23:57:53 -0000	1.37.2.1
--- SubcityObjects.lua	13 Jan 2004 00:16:41 -0000	1.37.2.2
***************
*** 717,720 ****
--- 717,744 ----
  }
  
+ 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
  {