mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-07-17 16:48:08 +00:00
chore: format Minecraft.World
This commit is contained in:
Tropical
@@ -17,356 +17,350 @@ const std::wstring PotionItem::THROWABLE_ICON = L"potion_splash";
|
||||
const std::wstring PotionItem::CONTENTS_ICON = L"potion_contents";
|
||||
|
||||
// 4J Added
|
||||
std::vector<std::pair<int, int> > PotionItem::s_uniquePotionValues;
|
||||
std::vector<std::pair<int, int> > PotionItem::s_uniquePotionValues;
|
||||
|
||||
PotionItem::PotionItem(int id) : Item(id)
|
||||
{
|
||||
setMaxStackSize(1);
|
||||
setStackedByData(true);
|
||||
setMaxDamage(0);
|
||||
PotionItem::PotionItem(int id) : Item(id) {
|
||||
setMaxStackSize(1);
|
||||
setStackedByData(true);
|
||||
setMaxDamage(0);
|
||||
|
||||
iconThrowable = NULL;
|
||||
iconDrinkable = NULL;
|
||||
iconOverlay = NULL;
|
||||
iconThrowable = NULL;
|
||||
iconDrinkable = NULL;
|
||||
iconOverlay = NULL;
|
||||
}
|
||||
|
||||
std::vector<MobEffectInstance *> *PotionItem::getMobEffects(std::shared_ptr<ItemInstance> potion)
|
||||
{
|
||||
return getMobEffects(potion->getAuxValue());
|
||||
std::vector<MobEffectInstance*>* PotionItem::getMobEffects(
|
||||
std::shared_ptr<ItemInstance> potion) {
|
||||
return getMobEffects(potion->getAuxValue());
|
||||
}
|
||||
|
||||
std::vector<MobEffectInstance *> *PotionItem::getMobEffects(int auxValue)
|
||||
{
|
||||
std::vector<MobEffectInstance *> *effects = NULL;
|
||||
AUTO_VAR(it, cachedMobEffects.find(auxValue));
|
||||
if(it != cachedMobEffects.end()) effects = it->second;
|
||||
if (effects == NULL)
|
||||
{
|
||||
effects = PotionBrewing::getEffects(auxValue, false);
|
||||
if(effects != NULL) cachedMobEffects.insert( std::pair<int, std::vector<MobEffectInstance *> *>(auxValue, effects) );
|
||||
}
|
||||
return effects;
|
||||
std::vector<MobEffectInstance*>* PotionItem::getMobEffects(int auxValue) {
|
||||
std::vector<MobEffectInstance*>* effects = NULL;
|
||||
AUTO_VAR(it, cachedMobEffects.find(auxValue));
|
||||
if (it != cachedMobEffects.end()) effects = it->second;
|
||||
if (effects == NULL) {
|
||||
effects = PotionBrewing::getEffects(auxValue, false);
|
||||
if (effects != NULL)
|
||||
cachedMobEffects.insert(
|
||||
std::pair<int, std::vector<MobEffectInstance*>*>(auxValue,
|
||||
effects));
|
||||
}
|
||||
return effects;
|
||||
}
|
||||
|
||||
std::shared_ptr<ItemInstance> PotionItem::useTimeDepleted(std::shared_ptr<ItemInstance> instance, Level *level, std::shared_ptr<Player> player)
|
||||
{
|
||||
if (!player->abilities.instabuild) instance->count--;
|
||||
std::shared_ptr<ItemInstance> PotionItem::useTimeDepleted(
|
||||
std::shared_ptr<ItemInstance> instance, Level* level,
|
||||
std::shared_ptr<Player> player) {
|
||||
if (!player->abilities.instabuild) instance->count--;
|
||||
|
||||
if (!level->isClientSide)
|
||||
{
|
||||
std::vector<MobEffectInstance *> *effects = getMobEffects(instance);
|
||||
if (effects != NULL)
|
||||
{
|
||||
//for (MobEffectInstance effect : effects)
|
||||
for(AUTO_VAR(it, effects->begin()); it != effects->end(); ++it)
|
||||
{
|
||||
player->addEffect(new MobEffectInstance(*it));
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!player->abilities.instabuild)
|
||||
{
|
||||
if (instance->count <= 0)
|
||||
{
|
||||
return std::shared_ptr<ItemInstance>( new ItemInstance(Item::glassBottle) );
|
||||
}
|
||||
else
|
||||
{
|
||||
player->inventory->add( std::shared_ptr<ItemInstance>( new ItemInstance(Item::glassBottle) ) );
|
||||
}
|
||||
}
|
||||
if (!level->isClientSide) {
|
||||
std::vector<MobEffectInstance*>* effects = getMobEffects(instance);
|
||||
if (effects != NULL) {
|
||||
// for (MobEffectInstance effect : effects)
|
||||
for (AUTO_VAR(it, effects->begin()); it != effects->end(); ++it) {
|
||||
player->addEffect(new MobEffectInstance(*it));
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!player->abilities.instabuild) {
|
||||
if (instance->count <= 0) {
|
||||
return std::shared_ptr<ItemInstance>(
|
||||
new ItemInstance(Item::glassBottle));
|
||||
} else {
|
||||
player->inventory->add(std::shared_ptr<ItemInstance>(
|
||||
new ItemInstance(Item::glassBottle)));
|
||||
}
|
||||
}
|
||||
|
||||
return instance;
|
||||
return instance;
|
||||
}
|
||||
|
||||
int PotionItem::getUseDuration(std::shared_ptr<ItemInstance> itemInstance)
|
||||
{
|
||||
return DRINK_DURATION;
|
||||
int PotionItem::getUseDuration(std::shared_ptr<ItemInstance> itemInstance) {
|
||||
return DRINK_DURATION;
|
||||
}
|
||||
|
||||
UseAnim PotionItem::getUseAnimation(std::shared_ptr<ItemInstance> itemInstance)
|
||||
{
|
||||
return UseAnim_drink;
|
||||
UseAnim PotionItem::getUseAnimation(
|
||||
std::shared_ptr<ItemInstance> itemInstance) {
|
||||
return UseAnim_drink;
|
||||
}
|
||||
|
||||
bool PotionItem::TestUse(Level *level, std::shared_ptr<Player> player)
|
||||
{
|
||||
return true;
|
||||
bool PotionItem::TestUse(Level* level, std::shared_ptr<Player> player) {
|
||||
return true;
|
||||
}
|
||||
|
||||
std::shared_ptr<ItemInstance> PotionItem::use(std::shared_ptr<ItemInstance> instance, Level *level, std::shared_ptr<Player> player)
|
||||
{
|
||||
if (isThrowable(instance->getAuxValue()))
|
||||
{
|
||||
if (!player->abilities.instabuild) instance->count--;
|
||||
level->playSound(player, eSoundType_RANDOM_BOW, 0.5f, 0.4f / (random->nextFloat() * 0.4f + 0.8f));
|
||||
if (!level->isClientSide) level->addEntity(std::shared_ptr<ThrownPotion>( new ThrownPotion(level, player, instance->getAuxValue()) ));
|
||||
return instance;
|
||||
}
|
||||
player->startUsingItem(instance, getUseDuration(instance));
|
||||
return instance;
|
||||
std::shared_ptr<ItemInstance> PotionItem::use(
|
||||
std::shared_ptr<ItemInstance> instance, Level* level,
|
||||
std::shared_ptr<Player> player) {
|
||||
if (isThrowable(instance->getAuxValue())) {
|
||||
if (!player->abilities.instabuild) instance->count--;
|
||||
level->playSound(player, eSoundType_RANDOM_BOW, 0.5f,
|
||||
0.4f / (random->nextFloat() * 0.4f + 0.8f));
|
||||
if (!level->isClientSide)
|
||||
level->addEntity(std::shared_ptr<ThrownPotion>(
|
||||
new ThrownPotion(level, player, instance->getAuxValue())));
|
||||
return instance;
|
||||
}
|
||||
player->startUsingItem(instance, getUseDuration(instance));
|
||||
return instance;
|
||||
}
|
||||
|
||||
bool PotionItem::useOn(std::shared_ptr<ItemInstance> itemInstance, std::shared_ptr<Player> player, Level *level, int x, int y, int z, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly)
|
||||
{
|
||||
return false;
|
||||
bool PotionItem::useOn(std::shared_ptr<ItemInstance> itemInstance,
|
||||
std::shared_ptr<Player> player, Level* level, int x,
|
||||
int y, int z, int face, float clickX, float clickY,
|
||||
float clickZ, bool bTestUseOnOnly) {
|
||||
return false;
|
||||
}
|
||||
|
||||
Icon *PotionItem::getIcon(int auxValue)
|
||||
{
|
||||
if (isThrowable(auxValue))
|
||||
{
|
||||
return iconThrowable;
|
||||
}
|
||||
return iconDrinkable;
|
||||
Icon* PotionItem::getIcon(int auxValue) {
|
||||
if (isThrowable(auxValue)) {
|
||||
return iconThrowable;
|
||||
}
|
||||
return iconDrinkable;
|
||||
}
|
||||
|
||||
Icon *PotionItem::getLayerIcon(int auxValue, int spriteLayer)
|
||||
{
|
||||
if (spriteLayer == 0)
|
||||
{
|
||||
return iconOverlay;
|
||||
}
|
||||
return Item::getLayerIcon(auxValue, spriteLayer);
|
||||
Icon* PotionItem::getLayerIcon(int auxValue, int spriteLayer) {
|
||||
if (spriteLayer == 0) {
|
||||
return iconOverlay;
|
||||
}
|
||||
return Item::getLayerIcon(auxValue, spriteLayer);
|
||||
}
|
||||
|
||||
bool PotionItem::isThrowable(int auxValue)
|
||||
{
|
||||
return ((auxValue & PotionBrewing::THROWABLE_MASK) != 0);
|
||||
bool PotionItem::isThrowable(int auxValue) {
|
||||
return ((auxValue & PotionBrewing::THROWABLE_MASK) != 0);
|
||||
}
|
||||
|
||||
int PotionItem::getColor(int data)
|
||||
{
|
||||
return PotionBrewing::getColorValue(data, false);
|
||||
int PotionItem::getColor(int data) {
|
||||
return PotionBrewing::getColorValue(data, false);
|
||||
}
|
||||
|
||||
int PotionItem::getColor(std::shared_ptr<ItemInstance> item, int spriteLayer)
|
||||
{
|
||||
if (spriteLayer > 0)
|
||||
{
|
||||
return 0xffffff;
|
||||
}
|
||||
return PotionBrewing::getColorValue(item->getAuxValue(), false);
|
||||
int PotionItem::getColor(std::shared_ptr<ItemInstance> item, int spriteLayer) {
|
||||
if (spriteLayer > 0) {
|
||||
return 0xffffff;
|
||||
}
|
||||
return PotionBrewing::getColorValue(item->getAuxValue(), false);
|
||||
}
|
||||
|
||||
bool PotionItem::hasMultipleSpriteLayers()
|
||||
{
|
||||
return true;
|
||||
bool PotionItem::hasMultipleSpriteLayers() { return true; }
|
||||
|
||||
bool PotionItem::hasInstantenousEffects(int itemAuxValue) {
|
||||
std::vector<MobEffectInstance*>* mobEffects = getMobEffects(itemAuxValue);
|
||||
if (mobEffects == NULL || mobEffects->empty()) {
|
||||
return false;
|
||||
}
|
||||
// for (MobEffectInstance effect : mobEffects) {
|
||||
for (AUTO_VAR(it, mobEffects->begin()); it != mobEffects->end(); ++it) {
|
||||
MobEffectInstance* effect = *it;
|
||||
if (MobEffect::effects[effect->getId()]->isInstantenous()) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool PotionItem::hasInstantenousEffects(int itemAuxValue)
|
||||
{
|
||||
std::vector<MobEffectInstance *> *mobEffects = getMobEffects(itemAuxValue);
|
||||
if (mobEffects == NULL || mobEffects->empty())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
//for (MobEffectInstance effect : mobEffects) {
|
||||
for(AUTO_VAR(it, mobEffects->begin()); it != mobEffects->end(); ++it)
|
||||
{
|
||||
MobEffectInstance *effect = *it;
|
||||
if (MobEffect::effects[effect->getId()]->isInstantenous())
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
std::wstring PotionItem::getHoverName(
|
||||
std::shared_ptr<ItemInstance> itemInstance) {
|
||||
if (itemInstance->getAuxValue() == 0) {
|
||||
return app.GetString(
|
||||
IDS_ITEM_WATER_BOTTLE); // I18n.get("item.emptyPotion.name").trim();
|
||||
}
|
||||
|
||||
std::wstring elementName = Item::getHoverName(itemInstance);
|
||||
if (isThrowable(itemInstance->getAuxValue())) {
|
||||
// elementName = I18n.get("potion.prefix.grenade").trim() + " " +
|
||||
// elementName;
|
||||
elementName = replaceAll(elementName, L"{*splash*}",
|
||||
app.GetString(IDS_POTION_PREFIX_GRENADE));
|
||||
} else {
|
||||
elementName = replaceAll(elementName, L"{*splash*}", L"");
|
||||
}
|
||||
|
||||
std::vector<MobEffectInstance*>* effects =
|
||||
((PotionItem*)Item::potion)->getMobEffects(itemInstance);
|
||||
if (effects != NULL && !effects->empty()) {
|
||||
// String postfixString = effects.get(0).getDescriptionId();
|
||||
// postfixString += ".postfix";
|
||||
// return elementName + " " + I18n.get(postfixString).trim();
|
||||
|
||||
elementName = replaceAll(elementName, L"{*prefix*}", L"");
|
||||
elementName = replaceAll(
|
||||
elementName, L"{*postfix*}",
|
||||
app.GetString(effects->at(0)->getPostfixDescriptionId()));
|
||||
} else {
|
||||
// String appearanceName =
|
||||
// PotionBrewing.getAppearanceName(itemInstance.getAuxValue()); return
|
||||
// I18n.get(appearanceName).trim() + " " + elementName;
|
||||
|
||||
elementName = replaceAll(elementName, L"{*prefix*}",
|
||||
app.GetString(PotionBrewing::getAppearanceName(
|
||||
itemInstance->getAuxValue())));
|
||||
elementName = replaceAll(elementName, L"{*postfix*}", L"");
|
||||
}
|
||||
return elementName;
|
||||
}
|
||||
|
||||
std::wstring PotionItem::getHoverName(std::shared_ptr<ItemInstance> itemInstance)
|
||||
{
|
||||
if (itemInstance->getAuxValue() == 0)
|
||||
{
|
||||
return app.GetString(IDS_ITEM_WATER_BOTTLE); // I18n.get("item.emptyPotion.name").trim();
|
||||
}
|
||||
|
||||
std::wstring elementName = Item::getHoverName(itemInstance);
|
||||
if (isThrowable(itemInstance->getAuxValue()))
|
||||
{
|
||||
//elementName = I18n.get("potion.prefix.grenade").trim() + " " + elementName;
|
||||
elementName = replaceAll(elementName,L"{*splash*}",app.GetString(IDS_POTION_PREFIX_GRENADE));
|
||||
}
|
||||
else
|
||||
{
|
||||
elementName = replaceAll(elementName,L"{*splash*}",L"");
|
||||
}
|
||||
|
||||
std::vector<MobEffectInstance *> *effects = ((PotionItem *) Item::potion)->getMobEffects(itemInstance);
|
||||
if (effects != NULL && !effects->empty())
|
||||
{
|
||||
//String postfixString = effects.get(0).getDescriptionId();
|
||||
//postfixString += ".postfix";
|
||||
//return elementName + " " + I18n.get(postfixString).trim();
|
||||
|
||||
elementName = replaceAll(elementName,L"{*prefix*}",L"");
|
||||
elementName = replaceAll(elementName,L"{*postfix*}",app.GetString(effects->at(0)->getPostfixDescriptionId()));
|
||||
}
|
||||
else
|
||||
{
|
||||
//String appearanceName = PotionBrewing.getAppearanceName(itemInstance.getAuxValue());
|
||||
//return I18n.get(appearanceName).trim() + " " + elementName;
|
||||
|
||||
elementName = replaceAll(elementName,L"{*prefix*}",app.GetString( PotionBrewing::getAppearanceName(itemInstance->getAuxValue())));
|
||||
elementName = replaceAll(elementName,L"{*postfix*}",L"");
|
||||
}
|
||||
return elementName;
|
||||
void PotionItem::appendHoverText(
|
||||
std::shared_ptr<ItemInstance> itemInstance, std::shared_ptr<Player> player,
|
||||
std::vector<std::wstring>* lines, bool advanced,
|
||||
std::vector<std::wstring>& unformattedStrings) {
|
||||
if (itemInstance->getAuxValue() == 0) {
|
||||
return;
|
||||
}
|
||||
std::vector<MobEffectInstance*>* effects =
|
||||
((PotionItem*)Item::potion)->getMobEffects(itemInstance);
|
||||
if (effects != NULL && !effects->empty()) {
|
||||
// for (MobEffectInstance effect : effects)
|
||||
for (AUTO_VAR(it, effects->begin()); it != effects->end(); ++it) {
|
||||
MobEffectInstance* effect = *it;
|
||||
std::wstring effectString = app.GetString(
|
||||
effect
|
||||
->getDescriptionId()); // I18n.get(effect.getDescriptionId()).trim();
|
||||
if (effect->getAmplifier() > 0) {
|
||||
std::wstring potencyString = L"";
|
||||
switch (effect->getAmplifier()) {
|
||||
case 1:
|
||||
potencyString = L" ";
|
||||
potencyString += app.GetString(IDS_POTION_POTENCY_1);
|
||||
break;
|
||||
case 2:
|
||||
potencyString = L" ";
|
||||
potencyString += app.GetString(IDS_POTION_POTENCY_2);
|
||||
break;
|
||||
case 3:
|
||||
potencyString = L" ";
|
||||
potencyString += app.GetString(IDS_POTION_POTENCY_3);
|
||||
break;
|
||||
default:
|
||||
potencyString = app.GetString(IDS_POTION_POTENCY_0);
|
||||
break;
|
||||
}
|
||||
effectString +=
|
||||
potencyString; // + I18n.get("potion.potency." +
|
||||
// effect.getAmplifier()).trim();
|
||||
}
|
||||
if (effect->getDuration() > SharedConstants::TICKS_PER_SECOND) {
|
||||
effectString +=
|
||||
L" (" + MobEffect::formatDuration(effect) + L")";
|
||||
}
|
||||
unformattedStrings.push_back(effectString);
|
||||
wchar_t formatted[256];
|
||||
ZeroMemory(formatted, 256 * sizeof(wchar_t));
|
||||
eMinecraftColour colour = eMinecraftColour_NOT_SET;
|
||||
if (MobEffect::effects[effect->getId()]->isHarmful()) {
|
||||
colour = eHTMLColor_c;
|
||||
// lines->push_back(L"<22>c + effectString); //"<22>c"
|
||||
} else {
|
||||
colour = eHTMLColor_7;
|
||||
// lines->push_back(L"<22>7" + effectString); //"<22>7"
|
||||
}
|
||||
swprintf(formatted, 256, L"<font color=\"#%08x\">%ls</font>",
|
||||
app.GetHTMLColour(colour), effectString.c_str());
|
||||
lines->push_back(formatted);
|
||||
}
|
||||
} else {
|
||||
std::wstring effectString = app.GetString(
|
||||
IDS_POTION_EMPTY); // I18n.get("potion.empty").trim();
|
||||
// eHTMLColor_7
|
||||
wchar_t formatted[256];
|
||||
swprintf(formatted, 256, L"<font color=\"#%08x\">%ls</font>",
|
||||
app.GetHTMLColour(eHTMLColor_7), effectString.c_str());
|
||||
lines->push_back(formatted); //"<22>7"
|
||||
}
|
||||
}
|
||||
|
||||
void PotionItem::appendHoverText(std::shared_ptr<ItemInstance> itemInstance, std::shared_ptr<Player> player, std::vector<std::wstring> *lines, bool advanced, std::vector<std::wstring> &unformattedStrings)
|
||||
{
|
||||
if (itemInstance->getAuxValue() == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
std::vector<MobEffectInstance *> *effects = ((PotionItem *) Item::potion)->getMobEffects(itemInstance);
|
||||
if (effects != NULL && !effects->empty())
|
||||
{
|
||||
//for (MobEffectInstance effect : effects)
|
||||
for(AUTO_VAR(it, effects->begin()); it != effects->end(); ++it)
|
||||
{
|
||||
MobEffectInstance *effect = *it;
|
||||
std::wstring effectString = app.GetString( effect->getDescriptionId() );//I18n.get(effect.getDescriptionId()).trim();
|
||||
if (effect->getAmplifier() > 0)
|
||||
{
|
||||
std::wstring potencyString = L"";
|
||||
switch(effect->getAmplifier())
|
||||
{
|
||||
case 1:
|
||||
potencyString = L" ";
|
||||
potencyString += app.GetString( IDS_POTION_POTENCY_1 );
|
||||
break;
|
||||
case 2:
|
||||
potencyString = L" ";
|
||||
potencyString += app.GetString( IDS_POTION_POTENCY_2 );
|
||||
break;
|
||||
case 3:
|
||||
potencyString = L" ";
|
||||
potencyString += app.GetString( IDS_POTION_POTENCY_3 );
|
||||
break;
|
||||
default:
|
||||
potencyString = app.GetString( IDS_POTION_POTENCY_0 );
|
||||
break;
|
||||
}
|
||||
effectString += potencyString;// + I18n.get("potion.potency." + effect.getAmplifier()).trim();
|
||||
}
|
||||
if (effect->getDuration() > SharedConstants::TICKS_PER_SECOND)
|
||||
{
|
||||
effectString += L" (" + MobEffect::formatDuration(effect) + L")";
|
||||
}
|
||||
unformattedStrings.push_back(effectString);
|
||||
wchar_t formatted[256];
|
||||
ZeroMemory(formatted, 256 * sizeof(wchar_t));
|
||||
eMinecraftColour colour = eMinecraftColour_NOT_SET;
|
||||
if (MobEffect::effects[effect->getId()]->isHarmful())
|
||||
{
|
||||
colour = eHTMLColor_c;
|
||||
//lines->push_back(L"<22>c + effectString); //"<22>c"
|
||||
}
|
||||
else
|
||||
{
|
||||
colour = eHTMLColor_7;
|
||||
//lines->push_back(L"<22>7" + effectString); //"<22>7"
|
||||
}
|
||||
swprintf(formatted, 256, L"<font color=\"#%08x\">%ls</font>",app.GetHTMLColour(colour),effectString.c_str());
|
||||
lines->push_back(formatted);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
std::wstring effectString = app.GetString(IDS_POTION_EMPTY); //I18n.get("potion.empty").trim();
|
||||
//eHTMLColor_7
|
||||
wchar_t formatted[256];
|
||||
swprintf(formatted,256,L"<font color=\"#%08x\">%ls</font>",app.GetHTMLColour(eHTMLColor_7),effectString.c_str());
|
||||
lines->push_back(formatted); //"<22>7"
|
||||
}
|
||||
bool PotionItem::isFoil(std::shared_ptr<ItemInstance> itemInstance) {
|
||||
std::vector<MobEffectInstance*>* mobEffects = getMobEffects(itemInstance);
|
||||
return mobEffects != NULL && !mobEffects->empty();
|
||||
}
|
||||
|
||||
bool PotionItem::isFoil(std::shared_ptr<ItemInstance> itemInstance)
|
||||
{
|
||||
std::vector<MobEffectInstance *> *mobEffects = getMobEffects(itemInstance);
|
||||
return mobEffects != NULL && !mobEffects->empty();
|
||||
unsigned int PotionItem::getUseDescriptionId(
|
||||
std::shared_ptr<ItemInstance> instance) {
|
||||
int brew = instance->getAuxValue();
|
||||
|
||||
#define MACRO_POTION_IS_NIGHTVISION(aux) ((aux & 0x200F) == MASK_NIGHTVISION)
|
||||
#define MACRO_POTION_IS_INVISIBILITY(aux) ((aux & 0x200F) == MASK_INVISIBILITY)
|
||||
|
||||
if (brew == 0)
|
||||
return IDS_POTION_DESC_WATER_BOTTLE;
|
||||
else if (MACRO_POTION_IS_REGENERATION(brew))
|
||||
return IDS_POTION_DESC_REGENERATION;
|
||||
else if (MACRO_POTION_IS_SPEED(brew))
|
||||
return IDS_POTION_DESC_MOVESPEED;
|
||||
else if (MACRO_POTION_IS_FIRE_RESISTANCE(brew))
|
||||
return IDS_POTION_DESC_FIRERESISTANCE;
|
||||
else if (MACRO_POTION_IS_INSTANTHEALTH(brew))
|
||||
return IDS_POTION_DESC_HEAL;
|
||||
else if (MACRO_POTION_IS_NIGHTVISION(brew))
|
||||
return IDS_POTION_DESC_NIGHTVISION;
|
||||
else if (MACRO_POTION_IS_INVISIBILITY(brew))
|
||||
return IDS_POTION_DESC_INVISIBILITY;
|
||||
else if (MACRO_POTION_IS_WEAKNESS(brew))
|
||||
return IDS_POTION_DESC_WEAKNESS;
|
||||
else if (MACRO_POTION_IS_STRENGTH(brew))
|
||||
return IDS_POTION_DESC_DAMAGEBOOST;
|
||||
else if (MACRO_POTION_IS_SLOWNESS(brew))
|
||||
return IDS_POTION_DESC_MOVESLOWDOWN;
|
||||
else if (MACRO_POTION_IS_POISON(brew))
|
||||
return IDS_POTION_DESC_POISON;
|
||||
else if (MACRO_POTION_IS_INSTANTDAMAGE(brew))
|
||||
return IDS_POTION_DESC_HARM;
|
||||
return IDS_POTION_DESC_EMPTY;
|
||||
}
|
||||
|
||||
unsigned int PotionItem::getUseDescriptionId(std::shared_ptr<ItemInstance> instance)
|
||||
{
|
||||
int brew = instance->getAuxValue();
|
||||
|
||||
|
||||
#define MACRO_POTION_IS_NIGHTVISION(aux) ((aux & 0x200F) == MASK_NIGHTVISION)
|
||||
#define MACRO_POTION_IS_INVISIBILITY(aux) ((aux & 0x200F) == MASK_INVISIBILITY)
|
||||
|
||||
if(brew == 0) return IDS_POTION_DESC_WATER_BOTTLE;
|
||||
else if( MACRO_POTION_IS_REGENERATION(brew)) return IDS_POTION_DESC_REGENERATION;
|
||||
else if( MACRO_POTION_IS_SPEED(brew) ) return IDS_POTION_DESC_MOVESPEED;
|
||||
else if( MACRO_POTION_IS_FIRE_RESISTANCE(brew)) return IDS_POTION_DESC_FIRERESISTANCE;
|
||||
else if( MACRO_POTION_IS_INSTANTHEALTH(brew)) return IDS_POTION_DESC_HEAL;
|
||||
else if( MACRO_POTION_IS_NIGHTVISION(brew)) return IDS_POTION_DESC_NIGHTVISION;
|
||||
else if( MACRO_POTION_IS_INVISIBILITY(brew)) return IDS_POTION_DESC_INVISIBILITY;
|
||||
else if( MACRO_POTION_IS_WEAKNESS(brew)) return IDS_POTION_DESC_WEAKNESS;
|
||||
else if( MACRO_POTION_IS_STRENGTH(brew)) return IDS_POTION_DESC_DAMAGEBOOST;
|
||||
else if( MACRO_POTION_IS_SLOWNESS(brew)) return IDS_POTION_DESC_MOVESLOWDOWN;
|
||||
else if( MACRO_POTION_IS_POISON(brew)) return IDS_POTION_DESC_POISON;
|
||||
else if( MACRO_POTION_IS_INSTANTDAMAGE(brew)) return IDS_POTION_DESC_HARM;
|
||||
return IDS_POTION_DESC_EMPTY;
|
||||
void PotionItem::registerIcons(IconRegister* iconRegister) {
|
||||
iconDrinkable = iconRegister->registerIcon(DEFAULT_ICON);
|
||||
iconThrowable = iconRegister->registerIcon(THROWABLE_ICON);
|
||||
iconOverlay = iconRegister->registerIcon(CONTENTS_ICON);
|
||||
}
|
||||
|
||||
void PotionItem::registerIcons(IconRegister *iconRegister)
|
||||
{
|
||||
iconDrinkable = iconRegister->registerIcon(DEFAULT_ICON);
|
||||
iconThrowable = iconRegister->registerIcon(THROWABLE_ICON);
|
||||
iconOverlay = iconRegister->registerIcon(CONTENTS_ICON);
|
||||
Icon* PotionItem::getTexture(const std::wstring& name) {
|
||||
if (name.compare(DEFAULT_ICON) == 0) return Item::potion->iconDrinkable;
|
||||
if (name.compare(THROWABLE_ICON) == 0) return Item::potion->iconThrowable;
|
||||
if (name.compare(CONTENTS_ICON) == 0) return Item::potion->iconOverlay;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
Icon *PotionItem::getTexture(const std::wstring &name)
|
||||
{
|
||||
if (name.compare(DEFAULT_ICON) == 0) return Item::potion->iconDrinkable;
|
||||
if (name.compare(THROWABLE_ICON) == 0) return Item::potion->iconThrowable;
|
||||
if (name.compare(CONTENTS_ICON) == 0) return Item::potion->iconOverlay;
|
||||
return NULL;
|
||||
}
|
||||
// 4J Stu - Based loosely on a function that gets added in java much later on
|
||||
// (1.3)
|
||||
std::vector<std::pair<int, int> >* PotionItem::getUniquePotionValues() {
|
||||
if (s_uniquePotionValues.empty()) {
|
||||
for (int brew = 0; brew <= PotionBrewing::BREW_MASK; ++brew) {
|
||||
std::vector<MobEffectInstance*>* effects =
|
||||
PotionBrewing::getEffects(brew, false);
|
||||
|
||||
if (effects != NULL) {
|
||||
if (!effects->empty()) {
|
||||
// 4J Stu - Based on implementation of Java List.hashCode()
|
||||
// at
|
||||
// http://docs.oracle.com/javase/6/docs/api/java/util/List.html#hashCode()
|
||||
// and adding deleting to clear up as we go
|
||||
int effectsHashCode = 1;
|
||||
for (AUTO_VAR(it, effects->begin()); it != effects->end();
|
||||
++it) {
|
||||
MobEffectInstance* mei = *it;
|
||||
effectsHashCode = 31 * effectsHashCode +
|
||||
(mei == NULL ? 0 : mei->hashCode());
|
||||
delete (*it);
|
||||
}
|
||||
|
||||
// 4J Stu - Based loosely on a function that gets added in java much later on (1.3)
|
||||
std::vector<std::pair<int, int> > *PotionItem::getUniquePotionValues()
|
||||
{
|
||||
if (s_uniquePotionValues.empty())
|
||||
{
|
||||
for (int brew = 0; brew <= PotionBrewing::BREW_MASK; ++brew)
|
||||
{
|
||||
std::vector<MobEffectInstance *> *effects = PotionBrewing::getEffects(brew, false);
|
||||
|
||||
if (effects != NULL)
|
||||
{
|
||||
if(!effects->empty())
|
||||
{
|
||||
// 4J Stu - Based on implementation of Java List.hashCode() at http://docs.oracle.com/javase/6/docs/api/java/util/List.html#hashCode()
|
||||
// and adding deleting to clear up as we go
|
||||
int effectsHashCode = 1;
|
||||
for(AUTO_VAR(it, effects->begin()); it != effects->end(); ++it)
|
||||
{
|
||||
MobEffectInstance *mei = *it;
|
||||
effectsHashCode = 31*effectsHashCode + (mei==NULL ? 0 : mei->hashCode());
|
||||
delete (*it);
|
||||
}
|
||||
|
||||
bool toAdd = true;
|
||||
for(AUTO_VAR(it, s_uniquePotionValues.begin()); it != s_uniquePotionValues.end(); ++it)
|
||||
{
|
||||
// Some potions hash the same (identical effects) but are throwable so account for that
|
||||
if(it->first == effectsHashCode && !(!isThrowable(it->second) && isThrowable(brew)) )
|
||||
{
|
||||
toAdd = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if( toAdd )
|
||||
{
|
||||
s_uniquePotionValues.push_back(std::pair<int,int>(effectsHashCode, brew) );
|
||||
}
|
||||
}
|
||||
delete effects;
|
||||
}
|
||||
}
|
||||
}
|
||||
return &s_uniquePotionValues;
|
||||
bool toAdd = true;
|
||||
for (AUTO_VAR(it, s_uniquePotionValues.begin());
|
||||
it != s_uniquePotionValues.end(); ++it) {
|
||||
// Some potions hash the same (identical effects) but
|
||||
// are throwable so account for that
|
||||
if (it->first == effectsHashCode &&
|
||||
!(!isThrowable(it->second) && isThrowable(brew))) {
|
||||
toAdd = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (toAdd) {
|
||||
s_uniquePotionValues.push_back(
|
||||
std::pair<int, int>(effectsHashCode, brew));
|
||||
}
|
||||
}
|
||||
delete effects;
|
||||
}
|
||||
}
|
||||
}
|
||||
return &s_uniquePotionValues;
|
||||
}
|
||||
Reference in New Issue
Block a user