hedgewars: comparison share/hedgewars/Data/Scripts/Multiplayer/HedgeEditor.lua

equal deleted inserted replaced

-:c8c8f856e236
+:b1de2f84e130
 		placedCount = placedCount + 1
 	end
 end
-function CallPlaceSprite(pID)
+function CallPlaceSprite(pID, silent)
+	if silent == nil then
+		silent = false
+	end
 	if landType == lfIce then
 		placedLandFlags[pID] = "lfIce"
 		placedTint[pID] = 250 + (250*0x100) + (250*0x10000) + (0*0x1000000) -- A BGR
 	elseif landType == lfIndestructible then
 	local actualDisplayedImage = placedFrame[pID]
 	if (placedSprite[pID] == sprAMAmmos or placedSprite[pID] == sprAMAmmosBW) and (actualDisplayedImage == (amAirAttack - 1)) then
 		actualDisplayedImage = ammoFrameAirAttack
 	end
-	return PlaceSprite(placedX[pID], placedY[pID], placedSprite[pID], actualDisplayedImage,
+	local success = PlaceSprite(placedX[pID], placedY[pID], placedSprite[pID], actualDisplayedImage,
 		placedTint[pID],
 		nil, -- overrite existing land
 		nil, nil, -- this stuff specifies flipping
 		landType)
+	if not silent then
+		if success then
+			PlaySound(sndPlaced)
+		else
+			PlaySound(sndDenied)
+		end
+	end
+	return success
 end
 function SelectClosestSprite()
 nil, -- only erase the provided land flags. don't touch other land flags or LandPixels
 nil, -- flip sprite horizontally
 nil, -- flip sprite vertically
 placedLandFlags[closestSpriteID])
+PlaySound(sndBump)
 		placedX[closestSpriteID] = nil
 		placedY[closestSpriteID] = nil
 		placedSpec[closestSpriteID] = nil
 		placedType[closestSpriteID] = nil
 		placedTint[closestSpriteID] = nil
 		placedSprite[closestSpriteID] = nil
 		placedFrame[closestSpriteID] = nil
 		placedLandFlags[closestSpriteID] = nil
 		closestSpriteID = nil
 		SetVisualGearValues(sSprite, 0, 0, 0, 0, 0, 1, 10000, sprAmGirder, 10000, 0x00000000 )
+	else
+		PlaySound(sndDenied)
 	end
 end
 -- work this into the above two functions and edit them, later
 function EraseClosestWaypoint()
 	closestDist = 999999999
 	closestSpriteID = nil -- just in case
 	for i = 0, (placedCount-1) do
 		if (placedType[i] == loc("Waypoint Editing Mode")) then
-				q = placedX[i] - placedX[placedCount]
+			local q = placedX[i] - placedX[placedCount]
-				w = placedY[i] - placedY[placedCount]
+			local w = placedY[i] - placedY[placedCount]
-				d = ( (q*q) + (w*w) )
+			local d = ( (q*q) + (w*w) )
-				if d < closestDist then
+			if d < closestDist then
-					closestDist = d
+				closestDist = d
-					closestSpriteID = i
+				closestSpriteID = i
-					SetVisualGearValues(sSprite, placedX[i], placedY[i], 0, 0, nil, placedFrame[i], 10000, placedSprite[i], 10000, newTint )
+				SetVisualGearValues(sSprite, placedX[i], placedY[i], 0, 0, nil, placedFrame[i], 10000, placedSprite[i], 10000, newTint )
+			end
-				end
 		end
 	end
 	if closestSpriteID ~= nil then
 		DeleteVisualGear(placedSpec[closestSpriteID])
 		placedSprite[closestSpriteID] = nil
 		placedFrame[closestSpriteID] = nil
 		placedLandFlags[closestSpriteID] = nil
 		closestSpriteID = nil
 		SetVisualGearValues(sSprite, 0, 0, 0, 0, 0, 1, 10000, sprAmGirder, 10000, 0x00000000 )
+		PlaySound(sndBump)
+	else
+		PlaySound(sndDenied)
 	end
 end
 -- essentially called when user clicks the mouse
 				if CGR == 0 then placedHWMapFlag[placedCount] = 124
 				elseif CGR == 1 then placedHWMapFlag[placedCount] = 125
 				elseif CGR == 2 then placedHWMapFlag[placedCount] = 126
 				elseif CGR == 3 then placedHWMapFlag[placedCount] = 127
 				end
+				PlaySound(sndPlaced)
 			else
 				placedType[placedCount] = "bogus"
+				PlaySound(sndDenied)
 			end
 		else
 			placedType[placedCount] = "bogus"
 			SelectClosestSprite()
 			EraseClosestSprite()
 		SetGearValues(gear, nil, nil, pMode[pIndex])
 	elseif cat[cIndex] == loc("Repositioning Mode") then
 		if pMode[pIndex] == loc("Selection Mode") then
 			sGear = GetClosestGear()
+			if sGear ~= nil then
+				PlaySound(sndPortalSwitch)
+			end
 		elseif pMode[pIndex] == loc("Placement Mode") then
 			if sGear ~= nil then
 				SetGearPosition(sGear, x, y)
+				PlaySound(sndWarp)
 			end
 		elseif pMode[pIndex] == loc("Deletion Mode") then
 			sGear = GetClosestGear()
 			if (sGear == nil) then
 				AddCaption(loc("Please click on a gear."), colorErrorMessage, capgrpVolume)
+				PlaySound(sndDenied)
 			elseif (GetGearType(sGear) == gtHedgehog) then
 				AddCaption(loc("Hedgehogs can not be deleted."), colorErrorMessage, capgrpVolume)
+				PlaySound(sndDenied)
 			else
 				DeleteGear(sGear)
+				PlaySound(sndBump)
 			end
 			sGear = nil
 		end
 	elseif (cat[cIndex] == loc("Hog Identity Mode")) or (cat[cIndex] == loc("Team Identity Mode")) then
 			if (cat[cIndex] == loc("Hog Identity Mode")) then
 				SetHogProfile(sGear, pMode[pIndex])
 			else -- set for the whole team
 				SetTeamIdentity(sGear)
 			end
+			PlaySound(sndHello, sGear)
 		else
 			AddCaption(loc("Please click on a hedgehog."), colorErrorMessage, capgrpVolume)
+			PlaySound(sndDenied)
 		end
 	elseif cat[cIndex] == loc("Health Modification Mode") then
 		sGear = GetClosestGear()
 		local gt = GetGearType(sGear)
 		if gt == gtHedgehog or gt == gtExplosives or (gt == gtCase and GetGearPos(sGear) == 0x2) then
+			local oldHealth, hDiff = GetHealth(sGear)
 			if pMode[pIndex][2] == "set" then
 				SetHealth(sGear, pMode[pIndex][1])
+				hDiff = pMode[pIndex][1] - oldHealth
 			elseif pMode[pIndex][2] == "mod" then
 				local min
 				if gt == gtCase then min = 0 else min = 1 end
 				local newHealth = math.max(min, GetHealth(sGear) + tonumber(pMode[pIndex][1]))
 				SetHealth(sGear, newHealth)
+				hDiff = newHealth - oldHealth
+			end
+			PlaySound(sndPortalSwitch)
+			if gt == gtHedgehog and hDiff < 0 then
+				local snd = { sndOw1, sndOw2, sndOw3 }
+				PlaySound(snd[math.random(1, #snd)], sGear)
 			end
 		elseif gt == gtMine and GetHealth(sGear) == 0 then
 			local newHealth
 			if pMode[pIndex][2] == "set" then
 				newHealth =  pMode[pIndex][1]
 				oldHealth = 36 - oldHealth
 				newHealth = math.max(1, oldHealth + tonumber(pMode[pIndex][1]))
 			end
 			if newHealth ~= nil then
 				SetGearValues(sGear, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, 36 - newHealth)
+				PlaySound(sndPortalSwitch)
 			end
 		else
 			AddCaption(loc("Please click on a hedgehog, barrel, health crate or dud mine."), colorErrorMessage, capgrpVolume)
+			PlaySound(sndDenied)
 		end
 	elseif cat[cIndex] == loc("Sprite Modification Mode") then
 		SelectClosestSprite()
 		if closestSpriteID ~= nil then
 			if pMode[pIndex] == loc("LandFlag Modification Mode") then
 				EraseSprite(placedX[closestSpriteID], placedY[closestSpriteID], placedSprite[closestSpriteID], placedFrame[closestSpriteID], nil, nil, nil, nil, placedLandFlags[closestSpriteID])
-				placementSucceeded = CallPlaceSprite(closestSpriteID)
+				placementSucceeded = CallPlaceSprite(closestSpriteID, true)
 				if placementSucceeded then
 					closestSpriteID = nil
 					SetVisualGearValues(sSprite, 0, 0, 0, 0, 0, 1, 10000, sprAmGirder, 10000, 0x00000000 )
+					PlaySound(sndPortalSwitch)
+				else
+					PlaySound(sndDenied)
 				end
 			elseif pMode[pIndex] == loc("Sprite Erasure Mode") then
 				EraseClosestSprite()
 			end
+		else
+			PlaySound(sndDenied)
 		end
 	elseif cat[cIndex] == loc("Goal Definition Mode") then
 			if getGearValue(sGear,"tag") == nil then
 				if pMode[pIndex] == loc("Victory Condition: Collect") then
 					if GetGearType(sGear) == gtCase then
 						setGearValue(sGear, "tag","collection")
+						PlaySound(sndPortalSwitch)
 					else
 						AddCaption(loc("Please click on a crate."), colorErrorMessage, capgrpVolume)
+						PlaySound(sndDenied)
 					end
 				else
 					if pMode[pIndex] == loc("Victory Condition: Destroy") then
 						setGearValue(sGear, "tag","victory")
+						PlaySound(sndPortalSwitch)
 					elseif pMode[pIndex] == loc("Losing Condition: Destroy") then
 						setGearValue(sGear, "tag","failure")
+						PlaySound(sndPortalSwitch)
 					end
 				end
 			else
 				-- remove tag and delete circ
 				setGearValue(sGear, "tag", nil)
 				DeleteVisualGear(getGearValue(sGear,"tCirc"))
 				setGearValue(sGear, "tCirc", nil)
+				PlaySound(sndBump)
 			end
 		end
 		if superDelete == false then
 			placedFrame[placedCount] = sFrame
 			placedSprite[placedCount] = reducedSpriteIDArray[pIndex]
 			placementSucceeded = CallPlaceSprite(placedCount)
-			if placementSucceeded then
-				PlaySound(sndPlaced)
-			end
 		else
 			placedType[placedCount] = "bogus"
 			SelectClosestSprite()
 			EraseClosestSprite()
 		end
 		tempFrame = 0
 		xDisplacement = 42
 		yDisplacement = 42
 		if (curWep == amCMGearPlacementTool) then
+			SetSoundMask(sndIncoming, true)
 			--wowaweewa, holyeeeee shite this is badly hacked (please rewrite when less lazy/morefeatures)
 			dCol = 0xFFFFFFFF
 			dFrame = 0
 			dAngle = 0
 					tempFrame = tArr[pIndex][1] - 1
 				end
 			end
 		else
+			SetSoundMask(sndIncoming, false)
 			if CG ~= nil then
 				SetVisualGearValues(CG, 0, 0, 0, 0, 0, 0, 1000, sprArrow, 1000, 0xFFFFFF00)
 			end
 		end
 				cIndex = 3 -- was 2
 				RedefineSubset()
 			elseif (cIndex == 2) and (curWep ~= amRubber) then
 				cIndex = 3 --new
 				RedefineSubset()
+			end
+			if curWep == amGirder or curWep == amRubber then
+				SetSoundMask(sndDenied, true)
+			else
+				SetSoundMask(sndDenied, false)
 			end
 			-- update display selection criteria
 			if (curWep == amGirder) or (curWep == amRubber) or (curWep == amCMGearPlacementTool) then
 				AddCaption(cat[cIndex], colorPlaceMode1, capgrpMessage)

changeset 13126	b1de2f84e130
parent 13125	c8c8f856e236
child 13127	a7b67247784d