flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Leather Armor can now be dyed.

Browse Source 
* Created new color class to handle dye-related coloring
This commit is contained in:
Samuel Barney
2015-07-13 18:15:37 -06:00
parent 118aec1198
commit 561296f269
10 changed files with 420 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Item.cpp
View File

@@ -142,6 +142,13 @@ void cItem::GetJson(Json::Value & a_OutValue) const
a_OutValue["Lore"] = m_Lore;
}
if (m_ItemColor.IsValid())
{
a_OutValue["Color_Red"] = m_ItemColor.GetRed();
a_OutValue["Color_Green"] = m_ItemColor.GetGreen();
a_OutValue["Color_Blue"] = m_ItemColor.GetBlue();
}
if ((m_ItemType == E_ITEM_FIREWORK_ROCKET) || (m_ItemType == E_ITEM_FIREWORK_STAR))
{
a_OutValue["Flicker"] = m_FireworkItem.m_HasFlicker;
@@ -172,6 +179,18 @@ void cItem::FromJson(const Json::Value & a_Value)
m_CustomName = a_Value.get("Name", "").asString();
m_Lore = a_Value.get("Lore", "").asString();
int red = a_Value.get("Color_Red", -1).asInt();
int green = a_Value.get("Color_Green", -1).asInt();
int blue = a_Value.get("Color_Blue", -1).asInt();
if ((red > -1) && (red < static_cast<int>(cColor::COLOR_LIMIT)) && (green > -1) && (green < static_cast<int>(cColor::COLOR_LIMIT)) && (blue > -1) && (blue < static_cast<int>(cColor::COLOR_LIMIT)))
{
m_ItemColor.SetColor(static_cast<unsigned char>(red), static_cast<unsigned char>(green), static_cast<unsigned char>(blue));
}
else if ((red != -1) || (blue != -1) || (green != -1))
{
LOGWARNING("Item with invalid red, green, and blue values read in from json file.");
}
if ((m_ItemType == E_ITEM_FIREWORK_ROCKET) || (m_ItemType == E_ITEM_FIREWORK_STAR))
{
m_FireworkItem.m_HasFlicker = a_Value.get("Flicker", false).asBool();