warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1 from runuo/master

Browse source 
Project Sync
This commit is contained in:
Vorspire 2015-08-20 09:20:23 +01:00
commit 3bd3949baa
5 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml Normal file
View file

@ -0,0 +1,2 @@
language: csharp
solution: RunUO.sln

4
README.md
View file

@ -1,6 +1,10 @@
runuo 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 RunUO Git Repository
Typical Windows Build Typical Windows Build

4
Scripts/Commands/GenTeleporter.cs
View file

@ -193,8 +193,8 @@ namespace Server.Commands
DestroyTeleporter( 5595, 1840, -14, map ); DestroyTeleporter( 5595, 1840, -14, map );
DestroyTeleporter( 5595, 1840, -14, map ); DestroyTeleporter( 5595, 1840, -14, map );
CreateTeleporter( 5594, 1840, -9, 5467, 1804, 7, map, false ); CreateTeleporter( 5594, 1840, -8, 5467, 1804, 7, map, false );
CreateTeleporter( 5594, 1841, -9, 5467, 1805, 7, map, false ); CreateTeleporter( 5594, 1841, -8, 5467, 1805, 7, map, false );
// Wrong // Wrong
CreateTeleporter( 5824, 631, 5, 2041, 215, 14, map, true ); CreateTeleporter( 5824, 631, 5, 2041, 215, 14, map, true );

12
Scripts/Items/Skill Items/Tools/BaseRunicTool.cs
View file

@ -1,5 +1,6 @@
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic;
namespace Server.Items 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 ) 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 ); List<SkillName> possibleSkills = new List<SkillName>( attrs.Owner is Spellbook ? m_PossibleSpellbookSkills : m_PossibleBonusSkills );
int count = ( Core.SE ? possibleSkills.Length : possibleSkills.Length - 2 ); int count = ( Core.SE ? possibleSkills.Count : possibleSkills.Count - 2 );
SkillName sk, check; SkillName sk, check;
double bonus; double bonus;
@ -190,11 +191,12 @@ namespace Server.Items
do do
{ {
found = false; found = false;
sk = possibleSkills[Utility.Random( count )]; sk = possibleSkills[Utility.Random( count-- )];
possibleSkills.Remove(sk);
for ( int i = 0; !found && i < 5; ++i ) for ( int i = 0; !found && i < 5; ++i )
found = ( attrs.GetValues( i, out check, out bonus ) && check == sk ); 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 ) ); attrs.SetValues( index, sk, Scale( min, max, low, high ) );
} }
@ -685,4 +687,4 @@ namespace Server.Items
} }
} }
} }
} }

4
Scripts/Spells/Fifth/MindBlast.cs
View file

@ -104,7 +104,7 @@ namespace Server.Spells.Fifth
if ( lowestStat > 150 ) if ( lowestStat > 150 )
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 ) if ( damage > 45 )
damage = 45; damage = 45;
@ -152,4 +152,4 @@ namespace Server.Spells.Fifth
} }
} }
} }
} }