Implemented Mersenne Twister RNG.

Crawler/Crawler.cpp

@@ -216,7 +216,7 @@ bool Crawler::OnUserCreate(){
 	Inventory::AddItem("Wooden Sword");
 	Inventory::AddItem("Laser Sword");
 	Inventory::AddItem("Shell Sword");
-	Inventory::AddItem("Ring of the Slime King");
+	Inventory::AddItem("Ring of the Slime King",4);
 
 	LoadLevel(LEVEL_NAMES["starting_map"_S]);
 	ChangePlayerClass(WARRIOR);

Crawler/Item.cpp

@@ -380,11 +380,11 @@ Item::Item(uint32_t amt,IT item,uint8_t enhancementLevel)
 void Inventory::AddItem(IT it,uint32_t amt,bool monsterDrop){
 	if(!ITEM_DATA.count(it))ERR("Item "<<std::quoted(it)<<" does not exist in Item Database!");
 
-	std::shared_ptr<Item>newItem=(*_inventory.insert({it,std::make_shared<Item>(amt,it)})).second;
-	newItem->RandomizeStats();
 
 	if(ITEM_DATA[it].IsEquippable()){ //Do not stack equips!
 		for(uint32_t i=0;i<amt;i++){
+			std::shared_ptr<Item>newItem=(*_inventory.insert({it,std::make_shared<Item>(amt,it)})).second;
+			newItem->RandomizeStats();
 			InsertIntoSortedInv(newItem);
 		}
 		goto SkipAddingStackableItem;
@@ -392,7 +392,7 @@ void Inventory::AddItem(IT it,uint32_t amt,bool monsterDrop){
 	else
 	//There are two places to manipulate items in (Both the sorted inventory and the actual inventory)
 	if(!_inventory.count(it)){
-		InsertIntoSortedInv(newItem);
+		InsertIntoSortedInv((*_inventory.insert({it,std::make_shared<Item>(amt,it)})).second);
 	}else{
 		auto inventory=_inventory.equal_range(it);
 		if(std::accumulate(inventory.first,inventory.second,0,
@@ -564,7 +564,11 @@ const bool Item::IsEquippable()const{
 }
 const std::string Item::Description(CompactText compact)const{
 	std::string description=it->Description();
-	if(IsArmor()||IsWeapon()){
+	if(IsEquippable()){
+		if(HasRandomizedStats()){
+			description+='\n';
+			description+=randomizedStats.GetStatsString();
+		}
 		description+='\n';
 		description+=GetStats().GetStatsString(compact);
 		if(ItemSet()){
@@ -791,7 +795,7 @@ void ItemInfo::InitializeSets(){
 	}
 }
 
-const Stats&ItemInfo::GetStats(int enhancementLevel)const{
+const Stats ItemInfo::GetStats(int enhancementLevel)const{
 	if(enhancement.size()<=enhancementLevel){
 		return {};
 	}
@@ -1074,4 +1078,8 @@ Stats ItemInfo::RandomizeStats(){
 		}
 	}
 	return randomRolls;
+}
+
+const bool Item::HasRandomizedStats()const{
+	return randomizedStats.size()>0;
 }

Crawler/Item.h

@@ -102,6 +102,9 @@ public:
 	auto end()const{
 		return attributes.end();
 	}
+	const size_t size()const{
+		return attributes.size();
+	}
 	const std::string GetStatsString(CompactText compact=NON_COMPACT)const;
 };
 
@@ -203,6 +206,7 @@ public:
 	const bool CanBePurchased()const;
 	const Stats&RandomStats()const;
 	void RandomizeStats();
+	const bool HasRandomizedStats()const;
 	const EnhancementInfo&GetEnhancementInfo()const;
 	//Use ISBLANK macro instead!! This should not be called directly!!
 	static bool IsBlank(std::shared_ptr<Item>item);
@@ -305,7 +309,7 @@ public:
 	For the useFunc, return true if the item can be used, false otherwise.
 	*/
 	const ItemScript&OnUseAction()const;
-	const Stats&GetStats(int enhancementLevel)const;
+	const Stats GetStats(int enhancementLevel)const;
 	const float CastTime()const;
 	const float CooldownTime()const;
 	const EquipSlot Slot()const;

Crawler/LightningBolt.cpp

@@ -56,7 +56,7 @@ void LightningBolt::Update(float fElapsedTime){
 	if(lastParticleSpawn==0){
 		lastParticleSpawn="Wizard.Ability 2.ParticleFrequency"_F;
 		uint8_t brightness=uint8_t("Wizard.Ability 2.ParticleColorRange"_FRange);
-		switch(rand()%4){
+		switch(util::random()%4){
 			case 0:{
 				game->AddEffect(std::make_unique<Effect>(pos+vf2d{"Wizard.Ability 2.ParticleSpawnRadiusRange"_FRange,"Wizard.Ability 2.ParticleSpawnRadiusRange"_FRange},"Wizard.Ability 2.ParticleLifetimeRange"_FRange,"lightning_bolt_part1.png",upperLevel,"Wizard.Ability 2.ParticleSizeRange"_FRange,"Wizard.Ability 2.ParticleFadeoutTime"_F,vel*"Wizard.Ability 2.ParticleSpeedMultRange"_FRange,Pixel{brightness,brightness,brightness}));
 			}break;

Crawler/LightningBoltEmitter.cpp

@@ -56,7 +56,7 @@ void LightningBoltEmitter::DrawLightningBolt(){
 	const int MAX_ITERATIONS=100;
 	geom2d::line<float>lineToTarget=geom2d::line<float>(startPos,endPos);
 	float targetAngle=atan2(lineToTarget.vector().y,lineToTarget.vector().x);
-	float targetDist=lineToTarget.length()*util::random(0.5);
+	float targetDist=lineToTarget.length()*util::random(0.5f);
 	targetAngle+=util::random((PI/2))-PI/4;
 	geom2d::line<float>lightningLine=geom2d::line<float>(currentPos,currentPos+vf2d{cos(targetAngle)*targetDist,sin(targetAngle)*targetDist});
 	game->AddEffect(std::make_unique<Effect>(lightningLine.upoint(0),0,"chain_lightning.png",upperLevel,vf2d{lightningLine.length(),0.2f},0.2f,vf2d{},WHITE,targetAngle,0,true));
@@ -65,7 +65,7 @@ void LightningBoltEmitter::DrawLightningBolt(){
 	while(iterations<MAX_ITERATIONS&&geom2d::line<float>(currentPos,endPos).length()>1){
 		geom2d::line<float>lineToTarget=geom2d::line<float>(currentPos,endPos);
 		float targetAngle=atan2(lineToTarget.vector().y,lineToTarget.vector().x);
-		float targetDist=lineToTarget.length()*util::random(0.5);
+		float targetDist=lineToTarget.length()*util::random(0.5f);
 		targetAngle+=util::random((PI/2))-PI/4;
 		geom2d::line<float>lightningLine=geom2d::line<float>(currentPos,currentPos+vf2d{cos(targetAngle)*targetDist,sin(targetAngle)*targetDist});
 		game->AddEffect(std::make_unique<Effect>(lightningLine.upoint(0),0,"chain_lightning.png",upperLevel,vf2d{lightningLine.length(),0.2f},0.2f,vf2d{},WHITE,targetAngle,0,true));

Crawler/Merchant.cpp

@@ -39,6 +39,7 @@ All rights reserved.
 #include "Menu.h"
 #include "Merchant.h"
 #include "Crawler.h"
+#include "util.h"
 
 INCLUDE_game
 INCLUDE_ITEM_CATEGORIES
@@ -50,7 +51,7 @@ MerchantFunctionPrimingData Merchant::sellFunctionPrimed("CanSellItem()");
 Merchant Merchant::travelingMerchant;
 
 const Merchant&Merchant::GetRandomMerchant(Chapter chapter){
-	const Merchant&newMerchant=merchants[chapter][rand()%(merchants[chapter].size()-1)];
+	const Merchant&newMerchant=merchants[chapter][util::random()%(merchants[chapter].size()-1)];
 	return newMerchant;
 }
 

Crawler/Monster.cpp

@@ -72,7 +72,7 @@ Monster::Monster(vf2d pos,MonsterData data,bool upperLevel,bool bossMob):
 	stats.A("Health")=data.GetHealth();
 	stats.A("Attack")=data.GetAttack();
 	stats.A("Move Spd %")=data.GetMoveSpdMult();
-	randomFrameOffset=(rand()%1000)/1000.f;
+	randomFrameOffset=(util::random()%1000)/1000.f;
 }
 vf2d&Monster::GetPos(){
 	return pos;

Crawler/SlimeKing.cpp

@@ -256,7 +256,7 @@ void Monster::STRATEGY::SLIMEKING(Monster&m,float fElapsedTime,std::string strat
 				m.F(A::SHOOT_RING_DELAY)=ConfigFloat("Phase1.ShootRingDelay");
 				ShootBulletRing(m.F(A::SHOOT_RING_OFFSET));
 				m.F(A::SHOOT_RING_TIMER)=ConfigFloat("Phase1.ShootRepeatTime");
-				m.B(A::SHOOT_RING_RIGHT)=bool(rand()%2);
+				m.B(A::SHOOT_RING_RIGHT)=bool(util::random()%2);
 				m.I(A::PATTERN_REPEAT_COUNT)++;
 			}
 			if(m.I(A::SHOOT_RING_COUNTER)>0){

Crawler/Version.h

@@ -39,7 +39,7 @@ All rights reserved.
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 2
 #define VERSION_PATCH 1
-#define VERSION_BUILD 5122
+#define VERSION_BUILD 5140
 
 #define stringify(a) stringify_(a)
 #define stringify_(a) #a

Crawler/util.cpp

@@ -39,8 +39,17 @@ All rights reserved.
 #include "olcPixelGameEngine.h"
 #include "olcPGEX_TTF.h"
 
+std::random_device rd;
+std::mt19937 rng(rd());
+
 float util::random(float range){
-	return float(rand())/RAND_MAX*range;
+	static std::uniform_real_distribution<float>distrib(0,1);
+	return distrib(rng)*range;
+}
+
+int util::random(){
+	static std::uniform_int_distribution<int>distrib(0,32767);
+	return distrib(rng);
 }
 
 vf2d util::pointTo(vf2d posFrom,vf2d posTo){

Crawler/util.h

@@ -38,10 +38,13 @@ All rights reserved.
 #pragma once
 #include <stdlib.h>
 #include "olcUTIL_Geometry2D.h"
+#include <random>
 
 namespace olc::util{
 	//Returns 0-range (as a float).
 	float random(float range);
+	//Returns 0-32767 (as an int).
+	int random();
 	//Returns a normalized vector pointing from posFrom towards posTo.
 	vf2d pointTo(vf2d posFrom,vf2d posTo);
 	//Returns the angle (in radians) pointing from posFrom towards posTo.