public void MergeFrom(ItemSettings other)
{
if (other == null)
{
return;
}
if (other.ItemId != 0)
{
ItemId = other.ItemId;
}
if (other.ItemType != 0)
{
ItemType = other.ItemType;
}
if (other.Category != 0)
{
Category = other.Category;
}
if (other.DropFreq != 0F)
{
DropFreq = other.DropFreq;
}
if (other.DropTrainerLevel != 0)
{
DropTrainerLevel = other.DropTrainerLevel;
}
if (other.pokeball_ != null)
{
if (pokeball_ == null)
{
pokeball_ = new global::POGOProtos.Settings.Master.Item.PokeballAttributes();
}
Pokeball.MergeFrom(other.Pokeball);
}
if (other.potion_ != null)
{
if (potion_ == null)
{
potion_ = new global::POGOProtos.Settings.Master.Item.PotionAttributes();
}
Potion.MergeFrom(other.Potion);
}
if (other.revive_ != null)
{
if (revive_ == null)
{
revive_ = new global::POGOProtos.Settings.Master.Item.ReviveAttributes();
}
Revive.MergeFrom(other.Revive);
}
if (other.battle_ != null)
{
if (battle_ == null)
{
battle_ = new global::POGOProtos.Settings.Master.Item.BattleAttributes();
}
Battle.MergeFrom(other.Battle);
}
if (other.food_ != null)
{
if (food_ == null)
{
food_ = new global::POGOProtos.Settings.Master.Item.FoodAttributes();
}
Food.MergeFrom(other.Food);
}
if (other.inventoryUpgrade_ != null)
{
if (inventoryUpgrade_ == null)
{
inventoryUpgrade_ = new global::POGOProtos.Settings.Master.Item.InventoryUpgradeAttributes();
}
InventoryUpgrade.MergeFrom(other.InventoryUpgrade);
}
if (other.xpBoost_ != null)
{
if (xpBoost_ == null)
{
xpBoost_ = new global::POGOProtos.Settings.Master.Item.ExperienceBoostAttributes();
}
XpBoost.MergeFrom(other.XpBoost);
}
if (other.incense_ != null)
{
if (incense_ == null)
{
incense_ = new global::POGOProtos.Settings.Master.Item.IncenseAttributes();
}
Incense.MergeFrom(other.Incense);
}
if (other.eggIncubator_ != null)
{
if (eggIncubator_ == null)
{
eggIncubator_ = new global::POGOProtos.Settings.Master.Item.EggIncubatorAttributes();
}
EggIncubator.MergeFrom(other.EggIncubator);
}
if (other.fortModifier_ != null)
{
if (fortModifier_ == null)
{
fortModifier_ = new global::POGOProtos.Settings.Master.Item.FortModifierAttributes();
}
FortModifier.MergeFrom(other.FortModifier);
}
if (other.stardustBoost_ != null)
{
if (stardustBoost_ == null)
{
stardustBoost_ = new global::POGOProtos.Settings.Master.Item.StardustBoostAttributes();
}
StardustBoost.MergeFrom(other.StardustBoost);
}
_unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
}
public void MergeFrom(ItemSettings other)
{
if (other == null)
{
return;
}
if (other.ItemId != 0)
{
ItemId = other.ItemId;
}
if (other.ItemType != 0)
{
ItemType = other.ItemType;
}
if (other.Category != 0)
{
Category = other.Category;
}
if (other.DropFreq != 0F)
{
DropFreq = other.DropFreq;
}
if (other.DropTrainerLevel != 0)
{
DropTrainerLevel = other.DropTrainerLevel;
}
if (other.pokeball_ != null)
{
if (pokeball_ == null)
{
pokeball_ = new global::PokemonGoDesktop.API.Proto.PokeballAttributes();
}
Pokeball.MergeFrom(other.Pokeball);
}
if (other.potion_ != null)
{
if (potion_ == null)
{
potion_ = new global::PokemonGoDesktop.API.Proto.PotionAttributes();
}
Potion.MergeFrom(other.Potion);
}
if (other.revive_ != null)
{
if (revive_ == null)
{
revive_ = new global::PokemonGoDesktop.API.Proto.ReviveAttributes();
}
Revive.MergeFrom(other.Revive);
}
if (other.battle_ != null)
{
if (battle_ == null)
{
battle_ = new global::PokemonGoDesktop.API.Proto.BattleAttributes();
}
Battle.MergeFrom(other.Battle);
}
if (other.food_ != null)
{
if (food_ == null)
{
food_ = new global::PokemonGoDesktop.API.Proto.FoodAttributes();
}
Food.MergeFrom(other.Food);
}
if (other.inventoryUpgrade_ != null)
{
if (inventoryUpgrade_ == null)
{
inventoryUpgrade_ = new global::PokemonGoDesktop.API.Proto.InventoryUpgradeAttributes();
}
InventoryUpgrade.MergeFrom(other.InventoryUpgrade);
}
if (other.xpBoost_ != null)
{
if (xpBoost_ == null)
{
xpBoost_ = new global::PokemonGoDesktop.API.Proto.ExperienceBoostAttributes();
}
XpBoost.MergeFrom(other.XpBoost);
}
if (other.incense_ != null)
{
if (incense_ == null)
{
incense_ = new global::PokemonGoDesktop.API.Proto.IncenseAttributes();
}
Incense.MergeFrom(other.Incense);
}
if (other.eggIncubator_ != null)
{
if (eggIncubator_ == null)
{
eggIncubator_ = new global::PokemonGoDesktop.API.Proto.EggIncubatorAttributes();
}
EggIncubator.MergeFrom(other.EggIncubator);
}
if (other.fortModifier_ != null)
{
if (fortModifier_ == null)
{
fortModifier_ = new global::PokemonGoDesktop.API.Proto.FortModifierAttributes();
}
FortModifier.MergeFrom(other.FortModifier);
}
}