diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..2b8f00f6f --- /dev/null +++ b/.travis.yml @@ -0,0 +1,2 @@ +language: csharp +solution: RunUO.sln diff --git a/README.md b/README.md index e4a5ff7fe..dc44b627e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,10 @@ runuo ===== +[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/4tjo91e4qotjtsgq?svg=true)](https://ci.appveyor.com/project/ms/runuo) [![Travis Build Status](https://travis-ci.org/runuo/runuo.svg)](https://travis-ci.org/runuo/runuo) + +[![Join the chat at https://gitter.im/runuo/runuo](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/runuo/runuo?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + RunUO Git Repository Typical Windows Build diff --git a/Scripts/Commands/GenTeleporter.cs b/Scripts/Commands/GenTeleporter.cs index 3d66f8118..94e4abf31 100644 --- a/Scripts/Commands/GenTeleporter.cs +++ b/Scripts/Commands/GenTeleporter.cs @@ -193,8 +193,8 @@ namespace Server.Commands DestroyTeleporter( 5595, 1840, -14, map ); DestroyTeleporter( 5595, 1840, -14, map ); - CreateTeleporter( 5594, 1840, -9, 5467, 1804, 7, map, false ); - CreateTeleporter( 5594, 1841, -9, 5467, 1805, 7, map, false ); + CreateTeleporter( 5594, 1840, -8, 5467, 1804, 7, map, false ); + CreateTeleporter( 5594, 1841, -8, 5467, 1805, 7, map, false ); // Wrong CreateTeleporter( 5824, 631, 5, 2041, 215, 14, map, true ); diff --git a/Scripts/Items/Skill Items/Tools/BaseRunicTool.cs b/Scripts/Items/Skill Items/Tools/BaseRunicTool.cs index ba258ffa5..b18a0b75c 100644 --- a/Scripts/Items/Skill Items/Tools/BaseRunicTool.cs +++ b/Scripts/Items/Skill Items/Tools/BaseRunicTool.cs @@ -1,5 +1,6 @@ using System; using System.Collections; +using System.Collections.Generic; namespace Server.Items { @@ -180,8 +181,8 @@ namespace Server.Items private static void ApplySkillBonus( AosSkillBonuses attrs, int min, int max, int index, int low, int high ) { - SkillName[] possibleSkills = ( attrs.Owner is Spellbook ? m_PossibleSpellbookSkills : m_PossibleBonusSkills ); - int count = ( Core.SE ? possibleSkills.Length : possibleSkills.Length - 2 ); + List possibleSkills = new List( attrs.Owner is Spellbook ? m_PossibleSpellbookSkills : m_PossibleBonusSkills ); + int count = ( Core.SE ? possibleSkills.Count : possibleSkills.Count - 2 ); SkillName sk, check; double bonus; @@ -190,11 +191,12 @@ namespace Server.Items do { found = false; - sk = possibleSkills[Utility.Random( count )]; + sk = possibleSkills[Utility.Random( count-- )]; + possibleSkills.Remove(sk); for ( int i = 0; !found && i < 5; ++i ) found = ( attrs.GetValues( i, out check, out bonus ) && check == sk ); - } while ( found ); + } while ( found && count > 0 ); attrs.SetValues( index, sk, Scale( min, max, low, high ) ); } @@ -685,4 +687,4 @@ namespace Server.Items } } } -} \ No newline at end of file +} diff --git a/Scripts/Spells/Fifth/MindBlast.cs b/Scripts/Spells/Fifth/MindBlast.cs index 5a2a19ea5..3243408b6 100644 --- a/Scripts/Spells/Fifth/MindBlast.cs +++ b/Scripts/Spells/Fifth/MindBlast.cs @@ -104,7 +104,7 @@ namespace Server.Spells.Fifth if ( lowestStat > 150 ) lowestStat = 150; - double damage = GetDamageScalar(m)*(highestStat - lowestStat) / 4;//less damage + double damage = GetDamageScalar(m)*(highestStat - lowestStat) / 2; // Many users prefer 3 or 4 if ( damage > 45 ) damage = 45; @@ -152,4 +152,4 @@ namespace Server.Spells.Fifth } } } -} \ No newline at end of file +}