Merge pull request #46 from dave-tucker/boom

Implement Explosions!

Author: Adrien Duermael

world/Plugins/Docker/container.lua

@@ -52,6 +52,29 @@ end
 -- Container:destroy removes all blocks of the 
 -- container, it won't be visible on the map anymore
 function Container:destroy(running)
+	X = self.x+2
+	Y = GROUND_LEVEL+2
+	Z = self.z+2
+	LOG("Exploding at X:" .. X .. " Y:" .. Y .. " Z:" .. Z)
+	local World = cRoot:Get():GetDefaultWorld()
+	World:BroadcastSoundEffect("random.explode", X, Y, Z, 1, 1)
+	World:BroadcastParticleEffect("hugeexplosion",X, Y, Z, 0, 0, 0, 1, 1)
+
+	-- if a block is removed before it's button/lever/sign, that object will drop
+	-- and the player can collect it. Remove these first
+
+	-- lever
+	digBlock(UpdateQueue,self.x+1,GROUND_LEVEL+3,self.z+1)
+	-- signs
+	digBlock(UpdateQueue,self.x+3,GROUND_LEVEL+2,self.z-1)
+	digBlock(UpdateQueue,self.x,GROUND_LEVEL+2,self.z-1)
+	digBlock(UpdateQueue,self.x+1,GROUND_LEVEL+2,self.z-1)
+	-- torch
+	digBlock(UpdateQueue,self.x+1,GROUND_LEVEL+3,self.z+1)
+	--button
+	digBlock(UpdateQueue,self.x+2,GROUND_LEVEL+3,self.z+2)
+
+	-- rest of the blocks
 	for py = GROUND_LEVEL+1, GROUND_LEVEL+4
 	do
 		for px=self.x-1, self.x+4

world/Plugins/Docker/docker.lua

@@ -91,6 +91,7 @@ end
 -- destroyContainer looks for the first container having the given id,
 -- removes it from the Minecraft world and from the 'Containers' array
 function destroyContainer(id)
+	LOG("destroyContainer: " .. id)
 	-- loop over the containers and remove the first having the given id
 	for i=1, table.getn(Containers)
 	do
@@ -174,7 +175,7 @@ function updateContainer(id,name,imageRepo,imageTag,state)
 end
 
 --
-function WorldStarted()
+function WorldStarted(World)
 	y = GROUND_LEVEL
 	-- just enough to fit one container
 	-- then it should be dynamic
@@ -390,11 +391,12 @@ function OnPlayerFoodLevelChange(Player, NewFoodLevel)
 end
 
 function OnTakeDamage(Receiver, TDI)
-	-- Don't allow the player to take falling damage
-	dt_fall = 3
-	if Receiver:GetClass() == 'cPlayer' and TDI.DamageType == dt_fall
+	-- Don't allow the player to take falling or explosion damage
+	if Receiver:GetClass() == 'cPlayer'
 	then
-		return true, Receiver, TDI	
+		if TDI.DamageType == dtFall or TDI.DamageType == dtExplosion then
+			return true, Receiver, TDI
+		end
 	end
 	return false, Receiver, TDI
 end