Set TotalTreasureCollected to 0 to auto-weight treasure count

Author: deathkiller

Docs/Snippets/ServerConfiguration.json

@@ -51,7 +51,7 @@
 	"SpawnInvulnerableSecs": 4,
 	"TotalKills": 10,
 	"TotalLaps": 3,
-	"TotalTreasureCollected": 100,
+	"TotalTreasureCollected": 0,
 
 	/* Playlist can contain unlimited number of entries */
 	"Playlist":
@@ -66,7 +66,7 @@
 			"SpawnInvulnerableSecs": 4,
 			"TotalKills": 10,
 			"TotalLaps": 3,
-			"TotalTreasureCollected": 100
+			"TotalTreasureCollected": 0
 		},
 		{
 			"LevelName": "battle1",
@@ -78,7 +78,7 @@
 			"SpawnInvulnerableSecs": 4,
 			"TotalKills": 10,
 			"TotalLaps": 3,
-			"TotalTreasureCollected": 100
+			"TotalTreasureCollected": 0
 		}
 	],
 

Sources/Jazz2/Actors/Collectibles/GemGiant.cpp

@@ -59,7 +59,7 @@ namespace Jazz2::Actors::Collectibles
 
 		PlaySfx("Break"_s);
 
-		std::int32_t count = Random().Next(5, 16);
+		std::int32_t count = Random().Next(5, 12);
 		for (int i = 0; i < count; i++) {
 			float fx = Random().NextFloat(-16.0f, 16.0f);
 			float fy = Random().NextFloat(-2.0f, 2.0f);

Sources/Jazz2/Actors/Collectibles/GemRing.cpp

@@ -22,7 +22,7 @@ namespace Jazz2::Actors::Collectibles
 	{
 		async_await CollectibleBase::OnActivatedAsync(details);
 
-		int length = (details.Params[0] > 0 ? details.Params[0] : 8);
+		std::int32_t length = (details.Params[0] > 0 ? details.Params[0] : 8);
 		_speed = (details.Params[1] > 0 ? details.Params[1] : 8) * 0.00625f;
 		_untouched = false;
 
@@ -32,7 +32,7 @@ namespace Jazz2::Actors::Collectibles
 
 		auto& resolver = ContentResolver::Get();
 		if (!resolver.IsHeadless()) {
-			for (int i = 0; i < length; i++) {
+			for (std::int32_t i = 0; i < length; i++) {
 				ChainPiece& piece = _pieces.emplace_back();
 				piece.Scale = 0.8f;
 				piece.Command = std::make_unique<RenderCommand>(RenderCommand::Type::Sprite);
@@ -98,12 +98,12 @@ namespace Jazz2::Actors::Collectibles
 			if (res != nullptr && res->Base->TextureDiffuse != nullptr) {
 				Vector2i texSize = res->Base->TextureDiffuse->size();
 
-				for (int i = 0; i < _pieces.size(); i++) {
+				for (std::int32_t i = 0; i < _pieces.size(); i++) {
 					auto command = _pieces[i].Command.get();
 
-					int curAnimFrame = res->FrameOffset + (i % res->FrameCount);
-					int col = curAnimFrame % res->Base->FrameConfiguration.X;
-					int row = curAnimFrame / res->Base->FrameConfiguration.X;
+					std::int32_t curAnimFrame = res->FrameOffset + (i % res->FrameCount);
+					std::int32_t col = curAnimFrame % res->Base->FrameConfiguration.X;
+					std::int32_t row = curAnimFrame / res->Base->FrameConfiguration.X;
 					float texScaleX = (float(res->Base->FrameDimensions.X) / float(texSize.X));
 					float texBiasX = (float(res->Base->FrameDimensions.X * col) / float(texSize.X));
 					float texScaleY = (float(res->Base->FrameDimensions.Y) / float(texSize.Y));

Sources/Jazz2/Actors/Solid/GemBarrel.cpp

@@ -21,7 +21,7 @@ namespace Jazz2::Actors::Solid
 	{
 		Movable = true;
 
-		uint8_t eventParam = 0;
+		std::uint8_t eventParam = 0;
 		AddContent(EventType::Gem, details.Params[0], &eventParam, sizeof(eventParam));
 		eventParam = 1;
 		AddContent(EventType::Gem, details.Params[1], &eventParam, sizeof(eventParam));

Sources/Jazz2/Actors/Solid/GemCrate.cpp

@@ -21,7 +21,7 @@ namespace Jazz2::Actors::Solid
 	{
 		Movable = true;
 
-		uint8_t eventParam = 0;
+		std::uint8_t eventParam = 0;
 		AddContent(EventType::Gem, details.Params[0], &eventParam, sizeof(eventParam));
 		eventParam = 1;
 		AddContent(EventType::Gem, details.Params[1], &eventParam, sizeof(eventParam));

Sources/Jazz2/Events/EventMap.cpp

@@ -270,12 +270,12 @@ namespace Jazz2::Events
 			_eventLayout[x + y * _layoutSize.X].Event != EventType::Empty);
 	}
 
-	void EventMap::ForEachEvent(EventType eventType, Function<bool(EventTile&, std::int32_t, std::int32_t)>&& forEachCallback) const
+	void EventMap::ForEachEvent(Function<bool(EventTile&, std::int32_t, std::int32_t)>&& forEachCallback) const
 	{
 		for (std::int32_t y = 0; y < _layoutSize.Y; y++) {
 			for (std::int32_t x = 0; x < _layoutSize.X; x++) {
 				auto& event = _eventLayout[x + y * _layoutSize.X];
-				if (event.Event == eventType && !forEachCallback(event, x, y)) {
+				if (event.Event != EventType::Empty && !forEachCallback(event, x, y)) {
 					return;
 				}
 			}

Sources/Jazz2/Events/EventMap.h

@@ -72,8 +72,8 @@ namespace Jazz2::Events
 		EventType GetEventByPosition(std::int32_t x, std::int32_t y, std::uint8_t** eventParams);
 		/** @brief Returns `true` if specified tile position contains an event */
 		bool HasEventByPosition(std::int32_t x, std::int32_t y) const;
-		/** @brief Calls specified callback function for each event found by type */
-		void ForEachEvent(EventType eventType, Function<bool(EventTile&, std::int32_t, std::int32_t)>&& forEachCallback) const;
+		/** @brief Calls specified callback function for each event */
+		void ForEachEvent(Function<bool(EventTile&, std::int32_t, std::int32_t)>&& forEachCallback) const;
 		/** @brief Returns `true` if specified position contains hurt event */
 		bool IsHurting(float x, float y, Direction dir);
 		/** @overload */