complete fluidsdescription

This commit is contained in:
Henrique Santiago 2012-01-24 22:00:09 -02:00
parent 3b583bf331
commit dd457b2b2f
2 changed files with 36 additions and 29 deletions

View File

@ -139,16 +139,24 @@ namespace Otc
}; };
enum FluidsType { enum FluidsType {
FluidWater = 1, FluidNone = 0,
FluidMana = 2, FluidWater,
FluidBeer = 3, FluidMana,
FluidBlood = 5, FluidBeer,
FluidSlime = 6, FluidOil,
FluidLemonade = 8, FluidBlood,
FluidMilk = 9, FluidSlime,
FluidWine = 10, FluidMud,
FluidHealth = 11, FluidLemonade,
FluidCoconutMilk = 15 FluidMilk,
FluidWine,
FluidHealth,
FluidUrine,
FluidRum,
FluidFruidJuice,
FluidCoconutMilk,
FluidTea,
FluidMead
}; };
enum FightModes { enum FightModes {

View File

@ -92,11 +92,10 @@ void Item::setData(int data)
} }
} }
else if(m_type->properties[ThingType::IsFluid] || m_type->properties[ThingType::IsFluidContainer]) { else if(m_type->properties[ThingType::IsFluid] || m_type->properties[ThingType::IsFluidContainer]) {
int color = 0; int color = Otc::FluidTransparent;
// TODO: find out what the heck does it mean 4, 7, 12, 13, 14, 16, 17. options are already there
switch(data) { switch(data) {
case 0: case Otc::FluidNone:
color = 0; color = Otc::FluidTransparent;
break; break;
case Otc::FluidWater: case Otc::FluidWater:
color = Otc::FluidBlue; color = Otc::FluidBlue;
@ -107,8 +106,8 @@ void Item::setData(int data)
case Otc::FluidBeer: case Otc::FluidBeer:
color = Otc::FluidBrown; color = Otc::FluidBrown;
break; break;
case 4: case Otc::FluidOil:
color = Otc::FluidBrown; // oil, mud, mead, rum, tea color = Otc::FluidBrown;
break; break;
case Otc::FluidBlood: case Otc::FluidBlood:
color = Otc::FluidRed; color = Otc::FluidRed;
@ -116,8 +115,8 @@ void Item::setData(int data)
case Otc::FluidSlime: case Otc::FluidSlime:
color = Otc::FluidGreen; color = Otc::FluidGreen;
break; break;
case 7: case Otc::FluidMud:
color = Otc::FluidBrown; // oil, mud, mead, rum, tea color = Otc::FluidBrown;
break; break;
case Otc::FluidLemonade: case Otc::FluidLemonade:
color = Otc::FluidYellow; color = Otc::FluidYellow;
@ -131,26 +130,26 @@ void Item::setData(int data)
case Otc::FluidHealth: case Otc::FluidHealth:
color = Otc::FluidRed; color = Otc::FluidRed;
break; break;
case 12: case Otc::FluidUrine:
color = Otc::FluidYellow; // urine, fruit juice color = Otc::FluidYellow;
break; break;
case 13: case Otc::FluidRum:
color = Otc::FluidBrown; // oil, mud, mead, rum, tea color = Otc::FluidBrown;
break; break;
case 14: case Otc::FluidFruidJuice:
color = Otc::FluidYellow; // urine, fruit juice color = Otc::FluidYellow;
break; break;
case Otc::FluidCoconutMilk: case Otc::FluidCoconutMilk:
color = Otc::FluidWhite; color = Otc::FluidWhite;
break; break;
case 16: case Otc::FluidTea:
color = Otc::FluidBrown; // oil, mud, mead, rum, tea color = Otc::FluidBrown;
break; break;
case 17: case Otc::FluidMead:
color = Otc::FluidBrown; // oil, mud, mead, rum, tea color = Otc::FluidBrown;
break; break;
default: default:
color = 1; color = Otc::FluidTransparent;
break; break;
} }