[Moeng-cvs] BBRpg/data/scripts Brian.lua,1.5,1.6 Elwood.lua,1.5,1.6 Jake.lua,1.4,1.5 Pawn.lua,1.8,1.9

[<b_l...@us...>]

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

Modified Files:
	Brian.lua Elwood.lua Jake.lua Pawn.lua 
Log Message:
Added some hit sounds (need more volume)

Index: Brian.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Brian.lua,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Brian.lua	2 Jan 2004 04:49:53 -0000	1.5
--- Brian.lua	3 Jan 2004 21:08:58 -0000	1.6
***************
*** 1,16 ****
! 
! import("Player.lua")
! 
! Brian = Player:subclass
! {
! 	name = "Brian";
! 
! 	defaultproperties = {
  		draw_mode = DM_MASKED,
  		talkieBitmap = m_get_bitmap("brian_talk.bmp"),
  		deathBitmap = m_get_bitmap("brian_dead.bmp"),
! 		sleepBitmap = m_get_bitmap("bed_brian.bmp"),
  		charAnim = extr_char_anim(m_get_bitmap("brian.bmp"), 23, 40),
! 		free = false,
! 	};
  }
--- 1,21 ----
! 
! import("Player.lua")
! 
! Brian = Player:subclass
! {
! 	name = "Brian";
! 
! 	defaultproperties = {
  		draw_mode = DM_MASKED,
  		talkieBitmap = m_get_bitmap("brian_talk.bmp"),
  		deathBitmap = m_get_bitmap("brian_dead.bmp"),
! 		sleepBitmap = m_get_bitmap("bed_brian.bmp"),
  		charAnim = extr_char_anim(m_get_bitmap("brian.bmp"), 23, 40),
! 		free = false,
! 		hitSounds = {
! 			"Guhgh.wav",
! 			"Au.wav",
! 			"Ah1.wav",
! 		},
! 	};
  }

Index: Elwood.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Elwood.lua,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Elwood.lua	1 Jan 2004 20:58:34 -0000	1.5
--- Elwood.lua	3 Jan 2004 21:08:58 -0000	1.6
***************
*** 12,15 ****
--- 12,22 ----
  		sleepBitmap  = m_get_bitmap("bed_elwood.bmp"),
  		charAnim = extr_char_anim(m_get_bitmap("elwood.bmp"), 23, 40),
+ 		hitSounds = {
+ 			"Au2.wav",
+ 			"Au2.wav",
+ 			"Ow1.wav",
+ 			"Ow1.wav",
+ 			"Huuuw.wav",
+ 		},
  	};
  }

Index: Jake.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Jake.lua,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Jake.lua	1 Jan 2004 20:58:34 -0000	1.4
--- Jake.lua	3 Jan 2004 21:08:58 -0000	1.5
***************
*** 1,15 ****
! 
! import("Player.lua")
! 
! Jake = Player:subclass
! {
! 	name = "Jake";
! 
! 	defaultproperties = {
! 		draw_mode = DM_MASKED,
  		charAnim = extr_char_anim(m_get_bitmap("jake.bmp"), 23, 43),
  		talkieBitmap = m_get_bitmap("jake_talk.bmp"),
  		deathBitmap = m_get_bitmap("jake_dead.bmp"),
! 		sleepBitmap = m_get_bitmap("bed_jake.bmp"),
! 	};
  }
--- 1,20 ----
! 
! import("Player.lua")
! 
! Jake = Player:subclass
! {
! 	name = "Jake";
! 
! 	defaultproperties = {
! 		draw_mode = DM_MASKED,
  		charAnim = extr_char_anim(m_get_bitmap("jake.bmp"), 23, 43),
  		talkieBitmap = m_get_bitmap("jake_talk.bmp"),
  		deathBitmap = m_get_bitmap("jake_dead.bmp"),
! 		sleepBitmap = m_get_bitmap("bed_jake.bmp"),
! 		hitSounds = {
! 			"Hoei.wav",
! 			"Hey.wav",
! 			"Heuw.wav",
! 		},
! 	};
  }

Index: Pawn.lua
===================================================================
RCS file: /cvsroot/moeng/BBRpg/data/scripts/Pawn.lua,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Pawn.lua	31 Dec 2003 17:05:55 -0000	1.8
--- Pawn.lua	3 Jan 2004 21:08:58 -0000	1.9
***************
*** 57,60 ****
--- 57,66 ----
  			end
  
+ 			-- A sample perhapt?
+ 			if (table.getn(self.hitSounds) > 0) then
+ 				local sampleFile = self.hitSounds[math.random(table.getn(self.hitSounds))]
+ 				m_play_sample(sampleFile)
+ 			end
+ 
  			if (self.health <= 0 and not self.bDead) then
  				-- Pawn died
***************
*** 153,156 ****
--- 159,163 ----
  		bCenterBitmap = true,
  
+ 		hitSounds = {},
  		hitEffectClass = BloodSplat,
  		hitEffectHeight = 24,