#W# Confict: Fixed BaseCreature git merge conflict.
This commit is contained in:
commit
ad38314ca7
112 changed files with 5397 additions and 616 deletions
|
|
@ -218,7 +218,7 @@ public partial class TrophyAddon : Item, IAddon
|
|||
{
|
||||
base.GetProperties(list);
|
||||
|
||||
if (_animalWeight >= 20)
|
||||
if (Core.SE && _animalWeight >= 20)
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(_hunter))
|
||||
{
|
||||
|
|
@ -346,7 +346,7 @@ public partial class TrophyDeed : Item
|
|||
{
|
||||
base.GetProperties(list);
|
||||
|
||||
if (_animalWeight >= 20)
|
||||
if (Core.SE && _animalWeight >= 20)
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(_hunter))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ public partial class MessageInABottle : Item
|
|||
|
||||
public static int GetRandomLevel()
|
||||
{
|
||||
if (Core.AOS && Utility.Random(25) < 1)
|
||||
if (Core.AOS && Utility.Random(Core.SE ? 25 : 40) < 1)
|
||||
{
|
||||
return 4; // ancient
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue