From 67a8569ecd43ba5ac3c25be13e748d50e7708f3c Mon Sep 17 00:00:00 2001 From: xavier Date: Tue, 20 Sep 2011 00:40:22 +0000 Subject: [PATCH] ethereal reptalon and hiryus added to vet rewards, NPC scroll buying restored to something rational. --- .../Engines/VeteranRewards/RewardSystem.cs | 28 +++++++++------ Scripts/Mobiles/Animals/Mounts/Ethereals.cs | 2 +- Scripts/Mobiles/Vendors/SBInfo/SBMage.cs | 36 +++++++++---------- 3 files changed, 37 insertions(+), 29 deletions(-) diff --git a/Scripts/Engines/VeteranRewards/RewardSystem.cs b/Scripts/Engines/VeteranRewards/RewardSystem.cs index cb1944e23..1f9341762 100644 --- a/Scripts/Engines/VeteranRewards/RewardSystem.cs +++ b/Scripts/Engines/VeteranRewards/RewardSystem.cs @@ -37,7 +37,7 @@ namespace Server.Engines.VeteranRewards public static bool Enabled = true; // change to true to enable vet rewards public static bool SkillCapRewards = true; // assuming vet rewards are enabled, should total skill cap bonuses be awarded? (720 skills total at 4th level) - public static TimeSpan RewardInterval = TimeSpan.FromDays( 30.0 ); + public static TimeSpan RewardInterval = TimeSpan.FromMinutes( 1 ); public static bool HasAccess( Mobile mob, RewardCategory category ) { @@ -248,11 +248,9 @@ namespace Server.Engines.VeteranRewards public static int GetRewardYearLabel( Item item, object[] args ) { - int level = GetRewardYear( item, args ); - int cliloc = 1076216 + level; - if( level > 9 ) - cliloc += 4231; - return cliloc; + int level = GetRewardYear( item, args ); + + return 1076216 + ( ( level < 10 ) ? level : ( level < 12 ) ? (( level - 9 ) + 4240 ) : (( level - 11 ) + 37585 ) ); } public static int GetRewardYear( Item item, object[] args ) @@ -327,7 +325,7 @@ namespace Server.Engines.VeteranRewards const int Crimson = 0x485; m_Lists = new RewardList[] - { + { new RewardList( RewardInterval, 1, new RewardEntry[] { new RewardEntry( specialDyeTubs, 1006008, typeof( RewardBlackDyeTub ) ), @@ -397,6 +395,7 @@ namespace Server.Engines.VeteranRewards new RewardEntry( cloaksAndRobes, 1049727, typeof( RewardCloak ), IceGreen, 1049759 ), new RewardEntry( cloaksAndRobes, 1049728, typeof( RewardRobe ), IceGreen, 1049758 ), new RewardEntry( cloaksAndRobes, 1080372, typeof( RewardDress ), Expansion.ML, IceGreen, 1080372 ), + new RewardEntry( cloaksAndRobes, 1049729, typeof( RewardCloak ), IceBlue, 1049761 ), new RewardEntry( cloaksAndRobes, 1049730, typeof( RewardRobe ), IceBlue, 1049760 ), new RewardEntry( cloaksAndRobes, 1080373, typeof( RewardDress ), Expansion.ML, IceBlue, 1080373 ), @@ -466,10 +465,19 @@ namespace Server.Engines.VeteranRewards new RewardEntry( houseAddOns, 1080548, typeof( MiningCartDeed ), Expansion.ML ), new RewardEntry( houseAddOns, 1080397, typeof( AnkhOfSacrificeDeed ), Expansion.ML ) - } ) - }; - } + } ), + new RewardList( RewardInterval, 11, new RewardEntry[] + { + new RewardEntry( etherealSteeds, 1113908, typeof( EtherealReptalon ), Expansion.ML ), + } ), + + new RewardList( RewardInterval, 12, new RewardEntry[] + { + new RewardEntry( etherealSteeds, 1113813, typeof( EtherealHiryu ), Expansion.ML ), + } ), + }; + } public static void Initialize() { if ( Enabled ) diff --git a/Scripts/Mobiles/Animals/Mounts/Ethereals.cs b/Scripts/Mobiles/Animals/Mounts/Ethereals.cs index c910a2190..4f03b94d8 100644 --- a/Scripts/Mobiles/Animals/Mounts/Ethereals.cs +++ b/Scripts/Mobiles/Animals/Mounts/Ethereals.cs @@ -796,7 +796,7 @@ namespace Server.Mobiles public class EtherealReptalon : EtherealMount { - public override int LabelNumber { get { return 1113908; } } // reptalon statuette + public override int LabelNumber { get { return 1113813; } } // reptalon statuette [Constructable] public EtherealReptalon() diff --git a/Scripts/Mobiles/Vendors/SBInfo/SBMage.cs b/Scripts/Mobiles/Vendors/SBInfo/SBMage.cs index d3c762f7c..b4dccbe17 100644 --- a/Scripts/Mobiles/Vendors/SBInfo/SBMage.cs +++ b/Scripts/Mobiles/Vendors/SBInfo/SBMage.cs @@ -107,28 +107,28 @@ namespace Server.Mobiles Type[] types = Loot.RegularScrollTypes; for ( int i = 0; i < types.Length; ++i ) - Add(types[i], i + 3 + (i / 4)); // This is NOT 100% OSI accurate. Two spells per circle will be off by 1gp, as OSI's math is slightly different. + Add( types[i], ((i / 8) + 2) * 2 ); if ( Core.SE ) { - Add( typeof( ExorcismScroll ), 1 ); - Add( typeof( AnimateDeadScroll ), 26 ); - Add( typeof( BloodOathScroll ), 26 ); - Add( typeof( CorpseSkinScroll ), 26 ); - Add( typeof( CurseWeaponScroll ), 26 ); - Add( typeof( EvilOmenScroll ), 26 ); - Add( typeof( PainSpikeScroll ), 26 ); - Add( typeof( SummonFamiliarScroll ), 26 ); - Add( typeof( HorrificBeastScroll ), 27 ); - Add( typeof( MindRotScroll ), 39 ); - Add( typeof( PoisonStrikeScroll ), 39 ); - Add( typeof( WraithFormScroll ), 51 ); - Add( typeof( LichFormScroll ), 64 ); - Add( typeof( StrangleScroll ), 64 ); - Add( typeof( WitherScroll ), 64 ); - Add( typeof( VampiricEmbraceScroll ), 101 ); - Add( typeof( VengefulSpiritScroll ), 114 ); + Add( typeof( ExorcismScroll ), 3 ); + Add( typeof( AnimateDeadScroll ), 8 ); + Add( typeof( BloodOathScroll ), 8 ); + Add( typeof( CorpseSkinScroll ), 8 ); + Add( typeof( CurseWeaponScroll ), 8 ); + Add( typeof( EvilOmenScroll ), 8 ); + Add( typeof( PainSpikeScroll ), 8 ); + Add( typeof( SummonFamiliarScroll ), 8 ); + Add( typeof( HorrificBeastScroll ), 8 ); + Add( typeof( MindRotScroll ), 10 ); + Add( typeof( PoisonStrikeScroll ), 10 ); + Add( typeof( WraithFormScroll ), 15 ); + Add( typeof( LichFormScroll ), 16 ); + Add( typeof( StrangleScroll ), 16 ); + Add( typeof( WitherScroll ), 16 ); + Add( typeof( VampiricEmbraceScroll ), 20 ); + Add( typeof( VengefulSpiritScroll ), 20 ); } }