IsleHorse/HISP
1
0
Fork 0
mirror of https://github.com/islehorse/HISP.git synced 2025-04-12 07:59:48 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix properly

Browse source
This commit is contained in:
SilicaAndPina 2021-06-27 21:22:57 +12:00
parent 6652b0804b
commit bbd715a464
2 changed files with 18 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Horse Isle Server/HorseIsleServer/Game/Horse/HorseInfo.cs
View file

@ -454,12 +454,13 @@ namespace HISP.Game.Horse
set set
{ {
// Lol turns out pinto forgot to do this and u can have negative mood :D // Lol turns out pinto forgot to do this and u can have negative mood :D
/*
if (value > 1000) if (value > 1000)
value = 1000; value = 1000;
if (value < 0) /*if (value < 0)
value = 0; value = 0;
*/ */
mood = value; mood = value;
Database.SetHorseMood(baseHorse.RandomId, value); Database.SetHorseMood(baseHorse.RandomId, value);
} }

49
Horse Isle Server/HorseIsleServer/Server/GameServer.cs
View file

@ -878,21 +878,14 @@ namespace HISP.Server
{ {
msgs += Messages.HorsePetTooHappy; msgs += Messages.HorsePetTooHappy;
} }
else
{
horsePetInst.BasicStats.Mood += randMoodAddition;
}
if (horsePetInst.BasicStats.Tiredness - randTiredMinus <= 0) if (horsePetInst.BasicStats.Tiredness - randTiredMinus <= 0)
{ {
msgs += Messages.HorsePetTooTired; msgs += Messages.HorsePetTooTired;
} }
else
{ horsePetInst.BasicStats.Tiredness -= randTiredMinus;
horsePetInst.BasicStats.Tiredness -= randTiredMinus; horsePetInst.BasicStats.Mood += randMoodAddition;
}
byte[] petMessagePacket = PacketBuilder.CreateChat(Messages.FormatHorsePetMessage(msgs,randMoodAddition, randTiredMinus), PacketBuilder.CHAT_BOTTOM_RIGHT); byte[] petMessagePacket = PacketBuilder.CreateChat(Messages.FormatHorsePetMessage(msgs,randMoodAddition, randTiredMinus), PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(petMessagePacket); sender.SendPacket(petMessagePacket);
@ -1468,58 +1461,46 @@ namespace HISP.Server
case "HEALTH": case "HEALTH":
if (horseInstance.BasicStats.Health + effect.EffectAmount > 1000) if (horseInstance.BasicStats.Health + effect.EffectAmount > 1000)
tooMuch = true; tooMuch = true;
else horseInstance.BasicStats.Health += effect.EffectAmount;
horseInstance.BasicStats.Health += effect.EffectAmount;
break; break;
case "HUNGER": case "HUNGER":
if (horseInstance.BasicStats.Hunger + effect.EffectAmount > 1000) if (horseInstance.BasicStats.Hunger + effect.EffectAmount > 1000)
tooMuch = true; tooMuch = true;
else horseInstance.BasicStats.Hunger += effect.EffectAmount;
horseInstance.BasicStats.Hunger += effect.EffectAmount;
break; break;
case "MOOD": case "MOOD":
if (horseInstance.BasicStats.Mood + effect.EffectAmount > 1000) if (horseInstance.BasicStats.Mood + effect.EffectAmount > 1000)
tooMuch = true; tooMuch = true;
else horseInstance.BasicStats.Mood += effect.EffectAmount;
horseInstance.BasicStats.Mood += effect.EffectAmount;
break; break;
case "GROOM": case "GROOM":
if (horseInstance.BasicStats.Groom + effect.EffectAmount > 1000) if (horseInstance.BasicStats.Groom + effect.EffectAmount > 1000)
tooMuch = true; tooMuch = true;
else horseInstance.BasicStats.Groom += effect.EffectAmount;
horseInstance.BasicStats.Groom += effect.EffectAmount;
break; break;
case "SHOES": case "SHOES":
if (horseInstance.BasicStats.Shoes + effect.EffectAmount > 1000) if (horseInstance.BasicStats.Shoes + effect.EffectAmount > 1000)
tooMuch = true; tooMuch = true;
else horseInstance.BasicStats.Shoes += effect.EffectAmount;
horseInstance.BasicStats.Shoes += effect.EffectAmount;
break; break;
case "THIRST": case "THIRST":
if (horseInstance.BasicStats.Thirst + effect.EffectAmount > 1000) if (horseInstance.BasicStats.Thirst + effect.EffectAmount > 1000)
tooMuch = true; tooMuch = true;
else horseInstance.BasicStats.Thirst += effect.EffectAmount;
horseInstance.BasicStats.Thirst += effect.EffectAmount;
break; break;
case "TIREDNESS": case "TIREDNESS":
if (horseInstance.BasicStats.Tiredness + effect.EffectAmount > 1000) if (horseInstance.BasicStats.Tiredness + effect.EffectAmount > 1000)
tooMuch = true; tooMuch = true;
else horseInstance.BasicStats.Tiredness += effect.EffectAmount;
horseInstance.BasicStats.Tiredness += effect.EffectAmount;
break; break;
case "INTELLIGENCEOFFSET": case "INTELLIGENCEOFFSET":
if (horseInstance.AdvancedStats.Inteligence + effect.EffectAmount < horseInstance.Breed.BaseStats.Inteligence * 2) horseInstance.AdvancedStats.Inteligence += effect.EffectAmount;
{ changeInteligence = true;
horseInstance.AdvancedStats.Inteligence += effect.EffectAmount;
changeInteligence = true;
}
break; break;
case "PERSONALITYOFFSET": case "PERSONALITYOFFSET":
if (horseInstance.AdvancedStats.Personality + effect.EffectAmount < horseInstance.Breed.BaseStats.Personality * 2) horseInstance.AdvancedStats.Personality += effect.EffectAmount;
{ changePersonality = true;
horseInstance.AdvancedStats.Personality += effect.EffectAmount;
changePersonality = true;
}
break; break;
case "SPOILED": case "SPOILED":
horseInstance.Spoiled += effect.EffectAmount; horseInstance.Spoiled += effect.EffectAmount;