diff --git a/conf/individualProgression.conf.dist b/conf/individualProgression.conf.dist index 2118503..c867d44 100644 --- a/conf/individualProgression.conf.dist +++ b/conf/individualProgression.conf.dist @@ -36,6 +36,17 @@ IndividualProgression.EnforceGroupRules = 1 IndividualProgression.VanillaPowerAdjustment = 0.6 # # +# IndividualProgression.VanillaHealingAdjustment +# Description: Adjustment to player's healing power before completing Vanilla content +# This is meant to provide a more accurate Vanilla feeling in Vanilla content +# Applied linearly per level between levels 11 and 60 +# Set to 1 (100% of regular damage) to disable +# +# Default: 0.5 - 50% of regular healing +# +IndividualProgression.VanillaHealingAdjustmnet = 0.5 +# +# # IndividualProgression.VanillaHealthAdjustmnet # Description: Adjustment to player's max HP before completing Vanilla content # This is meant to provide a more accurate Vanilla feeling in Vanilla content @@ -57,6 +68,16 @@ IndividualProgression.VanillaHealthAdjustment = 0.5 # IndividualProgression.TBCPowerAdjustment = 0.6 # +# IndividualProgression.TBCHealingAdjustment +# Description: Adjustment to player's healing power before completing TBC content +# This is meant to provide a more accurate TBC feeling in TBC content +# Unlike Vanilla adjustment, a flat value is always used +# Set to 1 (100% of regular damage) to disable +# +# Default: 0.5 - 50% of regular healing +# +IndividualProgression.TBCHealingAdjustment = 0.5 +# # # IndividualProgression.TBCHealthAdjustment # Description: Adjustment to player's max HP before completing TBC content diff --git a/sql/world/base/adjustment_auras.sql b/sql/world/base/adjustment_auras.sql new file mode 100644 index 0000000..1b57406 --- /dev/null +++ b/sql/world/base/adjustment_auras.sql @@ -0,0 +1,13 @@ +DELETE FROM `spell_dbc` WHERE `ID` IN (89501,89502,89503,89504,89505,89506); + +INSERT INTO `spell_dbc`(`ID`,`Category`,`DispelType`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`AttributesEx6`,`AttributesEx7`,`ShapeshiftMask`,`unk_320_2`,`ShapeshiftExclude`,`unk_320_3`,`Targets`,`TargetCreatureType`,`RequiresSpellFocus`,`FacingCasterFlags`,`CasterAuraState`,`TargetAuraState`,`ExcludeCasterAuraState`,`ExcludeTargetAuraState`,`CasterAuraSpell`,`TargetAuraSpell`,`ExcludeCasterAuraSpell`,`ExcludeTargetAuraSpell`,`CastingTimeIndex`,`RecoveryTime`,`CategoryRecoveryTime`,`InterruptFlags`,`AuraInterruptFlags`,`ChannelInterruptFlags`,`ProcTypeMask`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`PowerType`,`ManaCost`,`ManaCostPerLevel`,`ManaPerSecond`,`ManaPerSecondPerLevel`,`RangeIndex`,`Speed`,`ModalNextSpell`,`CumulativeAura`,`Totem_1`,`Totem_2`,`Reagent_1`,`Reagent_2`,`Reagent_3`,`Reagent_4`,`Reagent_5`,`Reagent_6`,`Reagent_7`,`Reagent_8`,`ReagentCount_1`,`ReagentCount_2`,`ReagentCount_3`,`ReagentCount_4`,`ReagentCount_5`,`ReagentCount_6`,`ReagentCount_7`,`ReagentCount_8`,`EquippedItemClass`,`EquippedItemSubclass`,`EquippedItemInvTypes`,`Effect_1`,`Effect_2`,`Effect_3`,`EffectDieSides_1`,`EffectDieSides_2`,`EffectDieSides_3`,`EffectRealPointsPerLevel_1`,`EffectRealPointsPerLevel_2`,`EffectRealPointsPerLevel_3`,`EffectBasePoints_1`,`EffectBasePoints_2`,`EffectBasePoints_3`,`EffectMechanic_1`,`EffectMechanic_2`,`EffectMechanic_3`,`ImplicitTargetA_1`,`ImplicitTargetA_2`,`ImplicitTargetA_3`,`ImplicitTargetB_1`,`ImplicitTargetB_2`,`ImplicitTargetB_3`,`EffectRadiusIndex_1`,`EffectRadiusIndex_2`,`EffectRadiusIndex_3`,`EffectAura_1`,`EffectAura_2`,`EffectAura_3`,`EffectAuraPeriod_1`,`EffectAuraPeriod_2`,`EffectAuraPeriod_3`,`EffectMultipleValue_1`,`EffectMultipleValue_2`,`EffectMultipleValue_3`,`EffectChainTargets_1`,`EffectChainTargets_2`,`EffectChainTargets_3`,`EffectItemType_1`,`EffectItemType_2`,`EffectItemType_3`,`EffectMiscValue_1`,`EffectMiscValue_2`,`EffectMiscValue_3`,`EffectMiscValueB_1`,`EffectMiscValueB_2`,`EffectMiscValueB_3`,`EffectTriggerSpell_1`,`EffectTriggerSpell_2`,`EffectTriggerSpell_3`,`EffectPointsPerCombo_1`,`EffectPointsPerCombo_2`,`EffectPointsPerCombo_3`,`EffectSpellClassMaskA_1`,`EffectSpellClassMaskA_2`,`EffectSpellClassMaskA_3`,`EffectSpellClassMaskB_1`,`EffectSpellClassMaskB_2`,`EffectSpellClassMaskB_3`,`EffectSpellClassMaskC_1`,`EffectSpellClassMaskC_2`,`EffectSpellClassMaskC_3`,`SpellVisualID_1`,`SpellVisualID_2`,`SpellIconID`,`ActiveIconID`,`SpellPriority`,`Name_Lang_enUS`,`Name_Lang_enGB`,`Name_Lang_koKR`,`Name_Lang_frFR`,`Name_Lang_deDE`,`Name_Lang_enCN`,`Name_Lang_zhCN`,`Name_Lang_enTW`,`Name_Lang_zhTW`,`Name_Lang_esES`,`Name_Lang_esMX`,`Name_Lang_ruRU`,`Name_Lang_ptPT`,`Name_Lang_ptBR`,`Name_Lang_itIT`,`Name_Lang_Unk`,`Name_Lang_Mask`,`NameSubtext_Lang_enUS`,`NameSubtext_Lang_enGB`,`NameSubtext_Lang_koKR`,`NameSubtext_Lang_frFR`,`NameSubtext_Lang_deDE`,`NameSubtext_Lang_enCN`,`NameSubtext_Lang_zhCN`,`NameSubtext_Lang_enTW`,`NameSubtext_Lang_zhTW`,`NameSubtext_Lang_esES`,`NameSubtext_Lang_esMX`,`NameSubtext_Lang_ruRU`,`NameSubtext_Lang_ptPT`,`NameSubtext_Lang_ptBR`,`NameSubtext_Lang_itIT`,`NameSubtext_Lang_Unk`,`NameSubtext_Lang_Mask`,`Description_Lang_enUS`,`Description_Lang_enGB`,`Description_Lang_koKR`,`Description_Lang_frFR`,`Description_Lang_deDE`,`Description_Lang_enCN`,`Description_Lang_zhCN`,`Description_Lang_enTW`,`Description_Lang_zhTW`,`Description_Lang_esES`,`Description_Lang_esMX`,`Description_Lang_ruRU`,`Description_Lang_ptPT`,`Description_Lang_ptBR`,`Description_Lang_itIT`,`Description_Lang_Unk`,`Description_Lang_Mask`,`AuraDescription_Lang_enUS`,`AuraDescription_Lang_enGB`,`AuraDescription_Lang_koKR`,`AuraDescription_Lang_frFR`,`AuraDescription_Lang_deDE`,`AuraDescription_Lang_enCN`,`AuraDescription_Lang_zhCN`,`AuraDescription_Lang_enTW`,`AuraDescription_Lang_zhTW`,`AuraDescription_Lang_esES`,`AuraDescription_Lang_esMX`,`AuraDescription_Lang_ruRU`,`AuraDescription_Lang_ptPT`,`AuraDescription_Lang_ptBR`,`AuraDescription_Lang_itIT`,`AuraDescription_Lang_Unk`,`AuraDescription_Lang_Mask`,`ManaCostPct`,`StartRecoveryCategory`,`StartRecoveryTime`,`MaxTargetLevel`,`SpellClassSet`,`SpellClassMask_1`,`SpellClassMask_2`,`SpellClassMask_3`,`MaxTargets`,`DefenseType`,`PreventionType`,`StanceBarOrder`,`EffectChainAmplitude_1`,`EffectChainAmplitude_2`,`EffectChainAmplitude_3`,`MinFactionID`,`MinReputation`,`RequiredAuraVision`,`RequiredTotemCategoryID_1`,`RequiredTotemCategoryID_2`,`RequiredAreasID`,`SchoolMask`,`RuneCostID`,`SpellMissileID`,`PowerDisplayID`,`EffectBonusMultiplier_1`,`EffectBonusMultiplier_2`,`EffectBonusMultiplier_3`,`SpellDescriptionVariableID`,`SpellDifficultyID`) VALUES +(89501,0,0,0,128,268435456,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,101,0,0,0,1,21,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,6,0,3,1,0,1,0,0,0,19,0,29,0,0,0,1,0,0,0,0,0,0,0,0,133,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,207,0,50,'Increased Health','','','','','','','','',0,0,0,0,0,0,0,16712190,'','','','','','','','','',0,0,0,0,0,0,0,16712172,'','','','','','','','','',0,0,0,0,0,0,0,16712188,'$s1% increased health.','','','','','','','','',0,0,0,0,0,0,0,16712190,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0), +(89502,0,0,0,67108944,0,0,0,64,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,101,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,6,6,0,1,1,0,0,0,0,99,-51,0,0,0,0,1,1,0,0,0,0,0,0,0,87,79,0,0,0,0,0,0,0,0,0,0,0,0,0,127,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1761,0,0,'Hallucinatory Creature','','','','','','','','',0,0,0,0,0,0,0,16712190,'','','','','','','','','',0,0,0,0,0,0,0,16712190,'Damage taken increased by $s1%.\r\nDamage dealt reduced by $s2%.','','','','','','','','',0,0,0,0,0,0,0,16712190,'Damage taken increased by $s1%.\r\nDamage dealt reduced by $s2%.','','','','','','','','',0,0,0,0,0,0,0,16712190,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0), +(89503,0,0,0,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,101,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,6,6,6,1,1,1,0,0,0,7,7,7,0,0,0,1,1,0,0,0,0,0,0,0,137,166,167,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3783,0,0,'Shirt of Uber Aura','','','','','','','','',0,0,0,0,0,0,0,16712190,'','','','','','','','','',0,0,0,0,0,0,0,16712188,'Increases all statistics by 8% and all ratings by 130.','','','','','','','','',0,0,0,0,0,0,0,16712190,'','','','','','','','','',0,0,0,0,0,0,0,16712188,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0), +(89504,0,0,0,464,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,101,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,6,0,0,1,0,0,0,0,0,24,0,0,0,0,0,1,0,0,0,0,0,0,0,0,213,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1962,0,0,'Endless Rage','','','','','','','','',0,0,0,0,0,0,0,16712190,'','','','','','','','','',0,0,0,0,0,0,0,16712190,'You generate $s1% more rage from damage dealt.','','','','','','','','',0,0,0,0,0,0,0,16712190,'','','','','','','','','',0,0,0,0,0,0,0,16712190,0,0,0,0,4,1048576,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0); + +INSERT INTO `spell_dbc` (`ID`,`Category`,`DispelType`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`AttributesEx6`,`AttributesEx7`,`ShapeshiftMask`,`unk_320_2`,`ShapeshiftExclude`,`unk_320_3`,`Targets`,`TargetCreatureType`,`RequiresSpellFocus`,`FacingCasterFlags`,`CasterAuraState`,`TargetAuraState`,`ExcludeCasterAuraState`,`ExcludeTargetAuraState`,`CasterAuraSpell`,`TargetAuraSpell`,`ExcludeCasterAuraSpell`,`ExcludeTargetAuraSpell`,`CastingTimeIndex`,`RecoveryTime`,`CategoryRecoveryTime`,`InterruptFlags`,`AuraInterruptFlags`,`ChannelInterruptFlags`,`ProcTypeMask`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`PowerType`,`ManaCost`,`ManaCostPerLevel`,`ManaPerSecond`,`ManaPerSecondPerLevel`,`RangeIndex`,`Speed`,`ModalNextSpell`,`CumulativeAura`,`Totem_1`,`Totem_2`,`Reagent_1`,`Reagent_2`,`Reagent_3`,`Reagent_4`,`Reagent_5`,`Reagent_6`,`Reagent_7`,`Reagent_8`,`ReagentCount_1`,`ReagentCount_2`,`ReagentCount_3`,`ReagentCount_4`,`ReagentCount_5`,`ReagentCount_6`,`ReagentCount_7`,`ReagentCount_8`,`EquippedItemClass`,`EquippedItemSubclass`,`EquippedItemInvTypes`,`Effect_1`,`Effect_2`,`Effect_3`,`EffectDieSides_1`,`EffectDieSides_2`,`EffectDieSides_3`,`EffectRealPointsPerLevel_1`,`EffectRealPointsPerLevel_2`,`EffectRealPointsPerLevel_3`,`EffectBasePoints_1`,`EffectBasePoints_2`,`EffectBasePoints_3`,`EffectMechanic_1`,`EffectMechanic_2`,`EffectMechanic_3`,`ImplicitTargetA_1`,`ImplicitTargetA_2`,`ImplicitTargetA_3`,`ImplicitTargetB_1`,`ImplicitTargetB_2`,`ImplicitTargetB_3`,`EffectRadiusIndex_1`,`EffectRadiusIndex_2`,`EffectRadiusIndex_3`,`EffectAura_1`,`EffectAura_2`,`EffectAura_3`,`EffectAuraPeriod_1`,`EffectAuraPeriod_2`,`EffectAuraPeriod_3`,`EffectMultipleValue_1`,`EffectMultipleValue_2`,`EffectMultipleValue_3`,`EffectChainTargets_1`,`EffectChainTargets_2`,`EffectChainTargets_3`,`EffectItemType_1`,`EffectItemType_2`,`EffectItemType_3`,`EffectMiscValue_1`,`EffectMiscValue_2`,`EffectMiscValue_3`,`EffectMiscValueB_1`,`EffectMiscValueB_2`,`EffectMiscValueB_3`,`EffectTriggerSpell_1`,`EffectTriggerSpell_2`,`EffectTriggerSpell_3`,`EffectPointsPerCombo_1`,`EffectPointsPerCombo_2`,`EffectPointsPerCombo_3`,`EffectSpellClassMaskA_1`,`EffectSpellClassMaskA_2`,`EffectSpellClassMaskA_3`,`EffectSpellClassMaskB_1`,`EffectSpellClassMaskB_2`,`EffectSpellClassMaskB_3`,`EffectSpellClassMaskC_1`,`EffectSpellClassMaskC_2`,`EffectSpellClassMaskC_3`,`SpellVisualID_1`,`SpellVisualID_2`,`SpellIconID`,`ActiveIconID`,`SpellPriority`,`Name_Lang_enUS`,`Name_Lang_enGB`,`Name_Lang_koKR`,`Name_Lang_frFR`,`Name_Lang_deDE`,`Name_Lang_enCN`,`Name_Lang_zhCN`,`Name_Lang_enTW`,`Name_Lang_zhTW`,`Name_Lang_esES`,`Name_Lang_esMX`,`Name_Lang_ruRU`,`Name_Lang_ptPT`,`Name_Lang_ptBR`,`Name_Lang_itIT`,`Name_Lang_Unk`,`Name_Lang_Mask`,`NameSubtext_Lang_enUS`,`NameSubtext_Lang_enGB`,`NameSubtext_Lang_koKR`,`NameSubtext_Lang_frFR`,`NameSubtext_Lang_deDE`,`NameSubtext_Lang_enCN`,`NameSubtext_Lang_zhCN`,`NameSubtext_Lang_enTW`,`NameSubtext_Lang_zhTW`,`NameSubtext_Lang_esES`,`NameSubtext_Lang_esMX`,`NameSubtext_Lang_ruRU`,`NameSubtext_Lang_ptPT`,`NameSubtext_Lang_ptBR`,`NameSubtext_Lang_itIT`,`NameSubtext_Lang_Unk`,`NameSubtext_Lang_Mask`,`Description_Lang_enUS`,`Description_Lang_enGB`,`Description_Lang_koKR`,`Description_Lang_frFR`,`Description_Lang_deDE`,`Description_Lang_enCN`,`Description_Lang_zhCN`,`Description_Lang_enTW`,`Description_Lang_zhTW`,`Description_Lang_esES`,`Description_Lang_esMX`,`Description_Lang_ruRU`,`Description_Lang_ptPT`,`Description_Lang_ptBR`,`Description_Lang_itIT`,`Description_Lang_Unk`,`Description_Lang_Mask`,`AuraDescription_Lang_enUS`,`AuraDescription_Lang_enGB`,`AuraDescription_Lang_koKR`,`AuraDescription_Lang_frFR`,`AuraDescription_Lang_deDE`,`AuraDescription_Lang_enCN`,`AuraDescription_Lang_zhCN`,`AuraDescription_Lang_enTW`,`AuraDescription_Lang_zhTW`,`AuraDescription_Lang_esES`,`AuraDescription_Lang_esMX`,`AuraDescription_Lang_ruRU`,`AuraDescription_Lang_ptPT`,`AuraDescription_Lang_ptBR`,`AuraDescription_Lang_itIT`,`AuraDescription_Lang_Unk`,`AuraDescription_Lang_Mask`,`ManaCostPct`,`StartRecoveryCategory`,`StartRecoveryTime`,`MaxTargetLevel`,`SpellClassSet`,`SpellClassMask_1`,`SpellClassMask_2`,`SpellClassMask_3`,`MaxTargets`,`DefenseType`,`PreventionType`,`StanceBarOrder`,`EffectChainAmplitude_1`,`EffectChainAmplitude_2`,`EffectChainAmplitude_3`,`MinFactionID`,`MinReputation`,`RequiredAuraVision`,`RequiredTotemCategoryID_1`,`RequiredTotemCategoryID_2`,`RequiredAreasID`,`SchoolMask`,`RuneCostID`,`SpellMissileID`,`PowerDisplayID`,`EffectBonusMultiplier_1`,`EffectBonusMultiplier_2`,`EffectBonusMultiplier_3`,`SpellDescriptionVariableID`,`SpellDifficultyID`) VALUES +(89505,0,0,0,746586496,136,0,1048576,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,21,0,0,0,0,0,1,0.0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-1,0,0,6,0,0,0,0,0,0.0,0.0,0.0,-1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,108,0,0,0,0,0,-1.0,0.0,0.0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'ZoneDebuff SPELL_AURA_MOD_TARGET_ABSORB_SCHOOL pct',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0,0,0,0,0,0,127,0,0,0,0.0,0.0,0.0,0,0); + +INSERT INTO `spell_dbc` (`ID`,`DispelType`,`Mechanic`,`Attributes`,`AttributesEx`,`AttributesEx2`,`AttributesEx3`,`AttributesEx4`,`AttributesEx5`,`AttributesEx6`,`AttributesEx7`,`ShapeshiftMask`,`ShapeshiftExclude`,`Targets`,`CastingTimeIndex`,`AuraInterruptFlags`,`ProcTypeMask`,`ProcChance`,`ProcCharges`,`MaxLevel`,`BaseLevel`,`SpellLevel`,`DurationIndex`,`RangeIndex`,`CumulativeAura`,`EquippedItemClass`,`EquippedItemSubclass`,`EquippedItemInvTypes`,`Effect_1`,`Effect_2`,`Effect_3`,`EffectDieSides_1`,`EffectDieSides_2`,`EffectDieSides_3`,`EffectRealPointsPerLevel_1`,`EffectRealPointsPerLevel_2`,`EffectRealPointsPerLevel_3`,`EffectBasePoints_1`,`EffectBasePoints_2`,`EffectBasePoints_3`,`EffectMechanic_1`,`EffectMechanic_2`,`EffectMechanic_3`,`ImplicitTargetA_1`,`ImplicitTargetA_2`,`ImplicitTargetA_3`,`ImplicitTargetB_1`,`ImplicitTargetB_2`,`ImplicitTargetB_3`,`EffectRadiusIndex_1`,`EffectRadiusIndex_2`,`EffectRadiusIndex_3`,`EffectAura_1`,`EffectAura_2`,`EffectAura_3`,`EffectAuraPeriod_1`,`EffectAuraPeriod_2`,`EffectAuraPeriod_3`,`EffectMultipleValue_1`,`EffectMultipleValue_2`,`EffectMultipleValue_3`,`EffectItemType_1`,`EffectItemType_2`,`EffectItemType_3`,`EffectMiscValue_1`,`EffectMiscValue_2`,`EffectMiscValue_3`,`EffectMiscValueB_1`,`EffectMiscValueB_2`,`EffectMiscValueB_3`,`EffectTriggerSpell_1`,`EffectTriggerSpell_2`,`EffectTriggerSpell_3`,`EffectSpellClassMaskA_1`,`EffectSpellClassMaskA_2`,`EffectSpellClassMaskA_3`,`EffectSpellClassMaskB_1`,`EffectSpellClassMaskB_2`,`EffectSpellClassMaskB_3`,`EffectSpellClassMaskC_1`,`EffectSpellClassMaskC_2`,`EffectSpellClassMaskC_3`,`MaxTargetLevel`,`SpellClassSet`,`SpellClassMask_1`,`SpellClassMask_2`,`SpellClassMask_3`,`MaxTargets`,`DefenseType`,`PreventionType`,`EffectChainAmplitude_1`,`EffectChainAmplitude_2`,`EffectChainAmplitude_3`,`RequiredAreasID`,`SchoolMask`,`Name_Lang_enUS`) VALUES +(89506,0,0,746586496,136,0,1048576,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,21,1,100,-1,0,0,6,0,0,0,0,0,0.0,0.0,0.0,-1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,118,0,0,0,0,0,-1.0,0.0,0.0,0,0,0,127,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0.0,0.0,0.0,0,127,'ZoneDebuff SPELL_AURA_MOD_HEALING_PCT pct'); diff --git a/sql/world/base/quest_missing_diplomat.sql b/sql/world/base/quest_missing_diplomat.sql index 0397869..54281d0 100644 --- a/sql/world/base/quest_missing_diplomat.sql +++ b/sql/world/base/quest_missing_diplomat.sql @@ -14,12 +14,12 @@ DELETE FROM creature_questender WHERE id = 4968 and quest = 11223; INSERT INTO creature_questender(id, quest) VALUES (1748, 11222); INSERT INTO creature_questender(id, quest) VALUES (4968, 11223); -UPDATE creature_questender SET id=1748 WHERE quest=396; +# UPDATE creature_questender SET id=1748 WHERE quest=396; UPDATE creature_questender SET id=1748 WHERE quest=6186; UPDATE creature_questender SET id=1748 WHERE quest=6187; UPDATE creature_questender SET id=1748 WHERE quest=7781; -UPDATE creature_queststarter SET id=1748 WHERE quest=396; -UPDATE creature_queststarter SET id=1748 WHERE quest=6182; +# UPDATE creature_queststarter SET id=1748 WHERE quest=396; +# UPDATE creature_queststarter SET id=1748 WHERE quest=6182; UPDATE creature_queststarter SET id=1748 WHERE quest=6187; -UPDATE creature_queststarter SET id=1748 WHERE quest=7782; +# UPDATE creature_queststarter SET id=1748 WHERE quest=7782; diff --git a/sql/world/base/quest_xp_table.sql b/sql/world/base/quest_xp_table.sql new file mode 100644 index 0000000..8d818a8 --- /dev/null +++ b/sql/world/base/quest_xp_table.sql @@ -0,0 +1,5672 @@ +DROP TABLE IF EXISTS `custom_quest_xp`; +CREATE TABLE IF NOT EXISTS `custom_quest_xp` ( + `entry` int(9) unsigned NOT NULL, + `xpValue` int(9) unsigned NOT NULL, + PRIMARY KEY (`entry`) +) ENGINE=InnoDB DEFAULT CHARSET=latin0; + + +INSERT INTO `custom_quest_xp` (`entry`, `xpValue`) VALUES +(4, 390), +(5, 335), +(6, 170), +(7, 110), +(8, 1050), +(9, 4400), +(10, 840), +(11, 910), +(12, 980), +(13, 1600), +(14, 250), +(15, 0), +(16, 3450), +(17, 355), +(18, 2550), +(19, 1650), +(20, 450), +(21, 910), +(22, 1950), +(23, 2200), +(24, 2000), +(31, 5450), +(32, 170), +(33, 1950), +(34, 420), +(35, 420), +(36, 210), +(37, 910), +(38, 1050), +(39, 85), +(44, 420), +(45, 840), +(46, 630), +(47, 3750), +(48, 4650), +(49, 4650), +(50, 4650), +(51, 630), +(52, 5600), +(53, 225), +(54, 3850), +(55, 1450), +(56, 2100), +(57, 2450), +(58, 210), +(59, 475), +(60, 790), +(61, 475), +(63, 910), +(64, 1350), +(65, 230), +(66, 1150), +(67, 1700), +(68, 570), +(69, 1700), +(70, 210), +(71, 230), +(73, 1150), +(74, 1150), +(75, 840), +(76, 4400), +(77, 570), +(78, 230), +(79, 230), +(80, 4400), +(81, 3150), +(82, 780), +(83, 135), +(84, 135), +(85, 405), +(86, 880), +(87, 780), +(88, 1550), +(89, 2000), +(90, 1850), +(91, 1350), +(92, 780), +(93, 1250), +(94, 1000), +(96, 230), +(97, 4100), +(98, 1350), +(100, 2550), +(101, 980), +(102, 1150), +(103, 1550), +(104, 8300), +(105, 135), +(106, 135), +(108, 630), +(109, 440), +(110, 135), +(111, 315), +(112, 440), +(113, 790), +(114, 2300), +(115, 1050), +(116, 0), +(117, 340), +(118, 680), +(119, 490), +(120, 245), +(121, 1700), +(122, 210), +(123, 1150), +(124, 880), +(125, 2000), +(126, 1250), +(127, 2000), +(128, 540), +(129, 270), +(130, 270), +(131, 680), +(132, 1650), +(133, 1200), +(134, 680), +(135, 580), +(137, 580), +(138, 580), +(139, 1150), +(140, 340), +(141, 1350), +(142, 490), +(143, 245), +(144, 1000), +(145, 340), +(146, 840), +(147, 485), +(148, 485), +(149, 1550), +(150, 1250), +(151, 1450), +(152, 1050), +(153, 195), +(154, 1700), +(155, 970), +(156, 1450), +(157, 485), +(158, 970), +(159, 610), +(160, 1350), +(161, 5700), +(162, 390), +(163, 920), +(164, 1000), +(165, 2600), +(166, 1550), +(167, 1350), +(168, 2650), +(169, 170), +(172, 1150), +(173, 2000), +(174, 1000), +(175, 880), +(176, 1500), +(177, 1400), +(178, 80), +(179, 2650), +(180, 2450), +(181, 355), +(182, 250), +(183, 590), +(184, 1250), +(185, 1300), +(186, 2050), +(187, 2850), +(188, 2050), +(189, 1250), +(190, 1300), +(191, 2150), +(192, 3150), +(193, 1350), +(194, 1400), +(195, 2450), +(196, 3600), +(197, 640), +(198, 1350), +(199, 1350), +(200, 255), +(201, 3150), +(202, 1950), +(203, 2700), +(204, 3150), +(205, 5050), +(206, 3550), +(207, 5350), +(208, 3450), +(209, 1400), +(210, 8300), +(211, 4700), +(212, 2800), +(213, 1250), +(214, 1300), +(215, 1950), +(216, 1600), +(217, 560), +(218, 2550), +(220, 1750), +(221, 1900), +(222, 3150), +(223, 910), +(224, 690), +(225, 1250), +(226, 275), +(227, 2050), +(228, 275), +(229, 1000), +(230, 1350), +(231, 390), +(232, 190), +(233, 270), +(234, 155), +(236, 1050), +(237, 390), +(238, 210), +(239, 780), +(242, 2000), +(243, 290), +(244, 1250), +(245, 950), +(246, 3050), +(247, 1300), +(248, 2750), +(249, 680), +(250, 245), +(251, 245), +(252, 3650), +(253, 0), +(254, 1800), +(255, 1750), +(256, 880), +(257, 950), +(260, 3000), +(261, 510), +(262, 1050), +(263, 540), +(264, 200), +(265, 200), +(266, 910), +(267, 510), +(268, 590), +(269, 1200), +(270, 780), +(272, 270), +(273, 340), +(274, 2650), +(275, 1250), +(276, 1850), +(277, 1350), +(278, 1750), +(279, 680), +(280, 510), +(281, 335), +(282, 1950), +(283, 510), +(284, 1000), +(285, 1500), +(286, 590), +(287, 220), +(288, 1750), +(289, 1200), +(290, 420), +(291, 1200), +(292, 2450), +(293, 1950), +(294, 2200), +(295, 2950), +(296, 1350), +(297, 270), +(298, 2300), +(300, 540), +(301, 270), +(302, 2450), +(303, 3350), +(304, 970), +(305, 485), +(306, 1350), +(307, 0), +(308, 1050), +(309, 135), +(310, 630), +(311, 910), +(312, 630), +(313, 910), +(314, 780), +(316, 680), +(317, 160), +(318, 530), +(319, 880), +(320, 590), +(321, 1200), +(322, 2300), +(323, 1750), +(324, 590), +(327, 1400), +(328, 1400), +(329, 285), +(330, 2850), +(331, 130), +(332, 85), +(333, 130), +(334, 2450), +(335, 2450), +(336, 1500), +(337, 4700), +(338, 780), +(339, 780), +(340, 780), +(341, 780), +(342, 195), +(343, 485), +(344, 485), +(345, 1950), +(346, 970), +(347, 5850), +(349, 250), +(350, 4400), +(352, 1050), +(353, 880), +(354, 85), +(355, 660), +(356, 530), +(357, 700), +(358, 195), +(359, 390), +(360, 475), +(361, 420), +(362, 40), +(363, 170), +(364, 630), +(365, 350), +(366, 540), +(367, 780), +(368, 220), +(369, 780), +(370, 840), +(371, 910), +(372, 870), +(373, 630), +(374, 700), +(375, 170), +(376, 2100), +(377, 2750), +(378, 3050), +(379, 355), +(380, 355), +(381, 670), +(382, 335), +(383, 630), +(384, 1050), +(385, 2000), +(386, 2650), +(387, 2650), +(388, 435), +(390, 2350), +(391, 590), +(392, 590), +(393, 250), +(394, 630), +(395, 3750), +(396, 245), +(397, 840), +(398, 1050), +(399, 110), +(400, 1850), +(402, 0), +(403, 405), +(404, 175), +(406, 160), +(407, 910), +(408, 680), +(409, 0), +(410, 910), +(411, 840), +(412, 420), +(413, 630), +(414, 85), +(415, 880), +(416, 660), +(417, 880), +(418, 420), +(419, 335), +(420, 840), +(421, 880), +(422, 980), +(423, 1050), +(424, 680), +(425, 880), +(426, 700), +(427, 225), +(428, 440), +(429, 660), +(430, 0), +(431, 590), +(432, 660), +(433, 1900), +(434, 880), +(435, 340), +(436, 980), +(437, 880), +(438, 290), +(439, 580), +(440, 580), +(441, 1950), +(442, 1250), +(443, 315), +(444, 630), +(445, 290), +(446, 910), +(447, 580), +(448, 440), +(449, 1350), +(450, 2050), +(451, 1350), +(452, 1000), +(453, 105), +(454, 1250), +(455, 170), +(456, 250), +(457, 40), +(458, 250), +(459, 630), +(460, 680), +(462, 830), +(463, 2300), +(464, 1900), +(465, 1750), +(466, 460), +(467, 165), +(468, 830), +(469, 2400), +(470, 2100), +(471, 1000), +(472, 230), +(473, 2550), +(474, 270), +(475, 540), +(476, 980), +(477, 740), +(478, 1150), +(479, 1750), +(480, 100), +(481, 100), +(482, 780), +(483, 1750), +(484, 4400), +(485, 1150), +(486, 700), +(487, 450), +(488, 630), +(490, 1700), +(491, 880), +(492, 1150), +(493, 780), +(494, 300), +(495, 175), +(497, 2200), +(498, 1750), +(499, 3500), +(500, 1950), +(501, 1450), +(502, 2800), +(503, 4700), +(504, 1950), +(505, 2100), +(506, 4300), +(507, 3900), +(508, 2300), +(509, 1350), +(510, 1350), +(511, 2800), +(512, 1150), +(513, 1350), +(514, 3050), +(515, 1250), +(516, 1200), +(517, 2250), +(518, 3300), +(519, 4450), +(520, 3600), +(521, 710), +(522, 3900), +(523, 3650), +(524, 1350), +(525, 1750), +(526, 1950), +(527, 2000), +(528, 2100), +(529, 1550), +(530, 1550), +(531, 2100), +(532, 2700), +(534, 270), +(535, 1850), +(536, 3150), +(537, 710), +(538, 2300), +(539, 3550), +(540, 2450), +(541, 3550), +(542, 4700), +(543, 3350), +(544, 2050), +(545, 2550), +(546, 3050), +(548, 1750), +(549, 2550), +(550, 780), +(551, 2650), +(552, 3300), +(553, 1550), +(554, 2500), +(555, 2550), +(556, 2700), +(558, 2550), +(559, 255), +(560, 255), +(561, 1950), +(562, 3200), +(563, 2700), +(564, 2700), +(565, 3150), +(566, 2300), +(567, 2800), +(568, 2850), +(569, 2150), +(570, 2450), +(571, 2450), +(572, 4650), +(573, 2850), +(574, 1250), +(575, 2550), +(576, 1400), +(577, 2850), +(578, 0), +(579, 4700), +(580, 2000), +(581, 2100), +(582, 245), +(583, 3300), +(584, 2350), +(585, 4050), +(586, 1650), +(587, 390), +(588, 3900), +(589, 110), +(590, 5050), +(591, 5050), +(592, 0), +(593, 2900), +(594, 2450), +(595, 2100), +(596, 2450), +(597, 3450), +(598, 820), +(599, 3300), +(600, 2850), +(601, 1400), +(602, 1400), +(603, 3600), +(604, 2750), +(605, 820), +(606, 2450), +(607, 4850), +(608, 3750), +(609, 2250), +(610, 3150), +(612, 4650), +(614, 470), +(615, 285), +(616, 3600), +(617, 7100), +(618, 0), +(620, 3750), +(621, 2850), +(622, 2700), +(623, 3600), +(624, 3600), +(625, 6100), +(626, 2100), +(627, 2850), +(628, 2850), +(629, 7350), +(630, 2500), +(631, 2500), +(632, 2500), +(633, 1250), +(634, 275), +(635, 275), +(636, 2450), +(637, 710), +(638, 2850), +(639, 3150), +(640, 315), +(641, 2850), +(642, 3300), +(643, 3450), +(644, 860), +(645, 4300), +(646, 3050), +(647, 5450), +(648, 440), +(649, 4400), +(650, 2850), +(651, 3450), +(652, 2350), +(653, 4050), +(654, 270), +(655, 7100), +(656, 0), +(657, 2800), +(658, 1300), +(659, 2850), +(660, 3550), +(661, 3150), +(662, 690), +(663, 3150), +(664, 3150), +(665, 3900), +(666, 4650), +(667, 1550), +(668, 3150), +(669, 3150), +(670, 2650), +(671, 2700), +(672, 3150), +(673, 270), +(674, 270), +(675, 2550), +(676, 2550), +(677, 2850), +(678, 3150), +(679, 3900), +(680, 2500), +(681, 3550), +(682, 1200), +(683, 3750), +(684, 3900), +(685, 1200), +(686, 1550), +(687, 2350), +(688, 2500), +(689, 1950), +(690, 3500), +(691, 3300), +(692, 3000), +(693, 3000), +(694, 300), +(695, 3000), +(696, 3750), +(697, 3150), +(698, 3450), +(699, 2500), +(700, 2850), +(701, 285), +(702, 2350), +(703, 2850), +(704, 3550), +(705, 3900), +(706, 710), +(707, 2350), +(708, 3150), +(709, 2850), +(710, 3000), +(711, 3450), +(712, 2850), +(713, 2850), +(714, 2100), +(715, 2550), +(716, 5900), +(717, 2150), +(718, 2750), +(719, 1350), +(720, 2750), +(721, 3150), +(722, 2350), +(723, 3150), +(724, 1550), +(725, 2350), +(726, 780), +(727, 780), +(728, 1150), +(729, 490), +(730, 1950), +(731, 3600), +(732, 3150), +(733, 0), +(734, 5600), +(735, 5600), +(736, 2350), +(737, 1450), +(738, 3450), +(740, 1150), +(741, 155), +(742, 700), +(743, 880), +(744, 540), +(745, 700), +(746, 170), +(747, 450), +(748, 530), +(749, 250), +(750, 530), +(751, 85), +(752, 250), +(753, 540), +(754, 250), +(755, 630), +(756, 445), +(757, 700), +(758, 840), +(759, 1050), +(760, 680), +(761, 4650), +(762, 335), +(763, 630), +(764, 910), +(765, 700), +(766, 55), +(767, 880), +(768, 420), +(769, 910), +(770, 630), +(771, 475), +(772, 840), +(774, 420), +(775, 1250), +(776, 0), +(777, 4850), +(778, 0), +(779, 445), +(780, 355), +(781, 3600), +(782, 40), +(783, 630), +(785, 700), +(786, 40), +(787, 170), +(788, 250), +(789, 450), +(790, 630), +(791, 445), +(792, 5900), +(793, 670), +(794, 0), +(803, 110), +(804, 225), +(805, 910), +(807, 780), +(808, 455), +(811, 980), +(812, 0), +(814, 700), +(815, 880), +(816, 700), +(817, 630), +(818, 1050), +(820, 1350), +(821, 970), +(822, 315), +(823, 2200), +(824, 700), +(825, 840), +(826, 910), +(827, 90), +(828, 455), +(829, 630), +(830, 630), +(831, 680), +(832, 630), +(833, 780), +(834, 880), +(835, 5450), +(836, 630), +(837, 560), +(839, 455), +(840, 0), +(841, 910), +(842, 1850), +(843, 910), +(844, 910), +(845, 2100), +(846, 2850), +(847, 1050), +(848, 2100), +(849, 880), +(850, 1000), +(851, 1100), +(852, 800), +(853, 225), +(854, 1250), +(856, 2450), +(857, 1350), +(859, 85), +(860, 840), +(861, 1850), +(862, 1700), +(863, 5050), +(864, 1350), +(865, 1150), +(866, 1050), +(867, 1750), +(868, 910), +(869, 680), +(870, 910), +(871, 1050), +(872, 2750), +(873, 550), +(874, 1150), +(875, 1950), +(876, 1150), +(877, 1650), +(878, 1500), +(879, 1150), +(880, 1450), +(881, 1800), +(882, 1300), +(883, 1450), +(884, 1500), +(885, 85), +(886, 740), +(887, 1150), +(888, 0), +(889, 100), +(890, 1550), +(891, 100), +(892, 1950), +(893, 740), +(894, 1150), +(895, 1700), +(896, 2400), +(897, 1950), +(898, 1950), +(899, 490), +(900, 740), +(901, 1150), +(902, 1050), +(904, 1250), +(905, 3050), +(906, 1700), +(907, 2750), +(908, 3050), +(912, 1950), +(913, 2200), +(915, 355), +(916, 560), +(917, 630), +(918, 790), +(919, 45), +(920, 335), +(921, 315), +(922, 980), +(925, 0), +(926, 455), +(927, 225), +(928, 335), +(929, 840), +(930, 840), +(931, 630), +(932, 780), +(933, 660), +(934, 1100), +(935, 470), +(936, 440), +(937, 910), +(938, 5450), +(939, 440), +(940, 910), +(941, 1550), +(942, 2400), +(943, 630), +(944, 1350), +(946, 1250), +(947, 630), +(948, 1250), +(949, 950), +(950, 1950), +(951, 880), +(952, 910), +(953, 680), +(954, 910), +(955, 910), +(956, 680), +(957, 910), +(958, 1350), +(959, 0), +(960, 0), +(961, 1700), +(962, 880), +(963, 4500), +(964, 680), +(965, 1350), +(966, 1000), +(967, 1950), +(968, 6600), +(969, 1650), +(970, 2750), +(972, 1950), +(973, 5650), +(974, 0), +(975, 2900), +(976, 4650), +(977, 5650), +(978, 3000), +(979, 2800), +(980, 2500), +(981, 1250), +(982, 840), +(983, 740), +(984, 980), +(985, 1550), +(989, 365), +(990, 1450), +(991, 3050), +(993, 1750), +(994, 780), +(995, 560), +(996, 225), +(997, 560), +(1000, 1150), +(1001, 980), +(1002, 1150), +(1006, 1150), +(1007, 1450), +(1008, 2550), +(1009, 780), +(1010, 2350), +(1011, 3200), +(1012, 2100), +(1013, 3300), +(1015, 1950), +(1016, 2550), +(1019, 1950), +(1020, 2550), +(1021, 2450), +(1022, 1250), +(1023, 830), +(1024, 1950), +(1025, 2200), +(1026, 2300), +(1027, 1700), +(1028, 230), +(1029, 1700), +(1030, 2550), +(1031, 2550), +(1032, 1750), +(1033, 1850), +(1034, 3050), +(1035, 650), +(1036, 610), +(1037, 610), +(1038, 1200), +(1039, 610), +(1040, 1200), +(1041, 245), +(1042, 2450), +(1043, 3050), +(1044, 2450), +(1045, 3050), +(1047, 5150), +(1048, 3550), +(1049, 3550), +(1050, 3300), +(1051, 1550), +(1052, 4700), +(1053, 2000), +(1054, 230), +(1055, 680), +(1056, 2200), +(1057, 2100), +(1058, 2200), +(1059, 1550), +(1060, 315), +(1061, 1450), +(1062, 680), +(1063, 340), +(1064, 1350), +(1065, 1850), +(1066, 1400), +(1067, 1850), +(1068, 1950), +(1069, 830), +(1070, 1650), +(1071, 830), +(1072, 1650), +(1073, 830), +(1074, 830), +(1075, 1650), +(1076, 830), +(1077, 2100), +(1078, 2200), +(1079, 2200), +(1080, 3400), +(1081, 870), +(1082, 2100), +(1083, 2300), +(1084, 165), +(1085, 2300), +(1086, 1500), +(1087, 2350), +(1088, 2950), +(1089, 2200), +(1090, 175), +(1091, 1300), +(1092, 1650), +(1093, 830), +(1094, 1100), +(1095, 2200), +(1096, 105), +(1097, 2000), +(1099, 1350), +(1100, 3350), +(1101, 4050), +(1103, 1850), +(1104, 2450), +(1105, 1350), +(1106, 3450), +(1107, 3000), +(1108, 3300), +(1109, 2500), +(1110, 1400), +(1111, 1400), +(1112, 3300), +(1113, 700), +(1114, 1400), +(1115, 3500), +(1116, 3500), +(1117, 890), +(1118, 3750), +(1119, 375), +(1120, 375), +(1121, 1850), +(1126, 0), +(1129, 0), +(1130, 2450), +(1131, 780), +(1132, 0), +(1133, 1650), +(1134, 3650), +(1135, 4250), +(1136, 1450), +(1137, 1250), +(1138, 5850), +(1139, 2300), +(1140, 980), +(1141, 3050), +(1142, 2500), +(1143, 3050), +(1144, 1300), +(1145, 1950), +(1146, 2750), +(1147, 2750), +(1148, 1050), +(1149, 2450), +(1150, 3050), +(1151, 1200), +(1152, 2350), +(1153, 1850), +(1158, 1200), +(1159, 2100), +(1163, 2800), +(1165, 4450), +(1166, 570), +(1167, 3600), +(1168, 5350), +(1169, 360), +(1170, 360), +(1171, 4850), +(1172, 4850), +(1174, 2650), +(1175, 1850), +(1176, 2800), +(1177, 710), +(1178, 2450), +(1179, 710), +(1180, 285), +(1181, 2850), +(1182, 710), +(1183, 1350), +(1185, 285), +(1186, 3300), +(1187, 820), +(1188, 820), +(1189, 1650), +(1190, 0), +(1191, 0), +(1193, 1650), +(1194, 2550), +(1195, 590), +(1196, 2350), +(1197, 2400), +(1198, 2550), +(1199, 3300), +(1200, 2750), +(1201, 2750), +(1202, 3450), +(1203, 2850), +(1204, 3900), +(1205, 2750), +(1217, 1350), +(1218, 690), +(1219, 2750), +(1220, 2100), +(1221, 2850), +(1237, 2050), +(1238, 2050), +(1239, 2750), +(1240, 230), +(1241, 230), +(1242, 230), +(1243, 2450), +(1244, 245), +(1245, 250), +(1246, 250), +(1247, 660), +(1248, 1300), +(1249, 265), +(1250, 690), +(1251, 780), +(1252, 690), +(1257, 3150), +(1258, 315), +(1259, 710), +(1260, 3150), +(1261, 3150), +(1263, 1300), +(1264, 275), +(1265, 700), +(1266, 4300), +(1267, 1350), +(1268, 710), +(1269, 2850), +(1270, 0), +(1272, 3550), +(1273, 230), +(1274, 2400), +(1275, 1400), +(1281, 275), +(1283, 1350), +(1284, 285), +(1285, 2850), +(1286, 2850), +(1287, 285), +(1300, 690), +(1301, 690), +(1318, 275), +(1319, 1350), +(1320, 275), +(1321, 2850), +(1322, 1400), +(1323, 2150), +(1337, 980), +(1338, 540), +(1357, 1050), +(1358, 105), +(1359, 3600), +(1360, 640), +(1361, 640), +(1362, 330), +(1363, 3300), +(1364, 3450), +(1365, 3750), +(1366, 660), +(1367, 660), +(1368, 2650), +(1369, 1350), +(1370, 2050), +(1371, 345), +(1372, 2850), +(1373, 2850), +(1374, 2850), +(1379, 4300), +(1380, 4300), +(1381, 2050), +(1382, 4300), +(1383, 2550), +(1384, 2050), +(1385, 2550), +(1386, 3750), +(1387, 345), +(1388, 2750), +(1390, 2550), +(1391, 2250), +(1392, 2850), +(1393, 4200), +(1394, 2900), +(1395, 2850), +(1397, 3450), +(1417, 1350), +(1418, 3150), +(1419, 2350), +(1420, 2750), +(1421, 0), +(1422, 0), +(1423, 4450), +(1424, 2550), +(1425, 4450), +(1426, 3600), +(1427, 3900), +(1428, 3750), +(1429, 3750), +(1430, 610), +(1431, 1200), +(1432, 265), +(1433, 2650), +(1434, 2650), +(1435, 2650), +(1436, 1950), +(1437, 2650), +(1438, 2650), +(1439, 3300), +(1441, 435), +(1443, 3750), +(1444, 5900), +(1445, 6550), +(1446, 1250), +(1447, 3600), +(1448, 1800), +(1449, 890), +(1450, 1800), +(1451, 3600), +(1452, 1300), +(1453, 3000), +(1454, 1500), +(1455, 3000), +(1456, 2250), +(1457, 2650), +(1458, 2750), +(1464, 1950), +(1465, 3150), +(1466, 3150), +(1468, 2700), +(1474, 7100), +(1476, 970), +(1479, 1300), +(1480, 2650), +(1481, 2750), +(1482, 415), +(1483, 265), +(1485, 1600), +(1486, 2050), +(1487, 3900), +(1488, 290), +(1489, 115), +(1490, 1350), +(1491, 440), +(1501, 210), +(1502, 840), +(1513, 560), +(1515, 270), +(1516, 270), +(1517, 445), +(1518, 270), +(1519, 180), +(1520, 445), +(1558, 0), +(1559, 5900), +(1577, 910), +(1578, 455), +(1579, 910), +(1580, 700), +(1581, 1350), +(1617, 1150), +(1653, 870), +(1654, 435), +(1655, 110), +(1665, 420), +(1666, 840), +(1679, 90), +(1680, 660), +(1681, 630), +(1685, 840), +(1689, 3600), +(1690, 3750), +(1691, 420), +(1692, 630), +(1697, 155), +(1698, 1300), +(1699, 570), +(1700, 2300), +(1701, 435), +(1702, 1150), +(1703, 570), +(1704, 2300), +(1705, 3050), +(1706, 2800), +(1707, 1750), +(1708, 3050), +(1709, 1850), +(1710, 3050), +(1711, 2350), +(1712, 2350), +(1713, 0), +(1739, 2550), +(1781, 3400), +(1790, 245), +(1791, 3900), +(1795, 2500), +(1798, 3150), +(1805, 2200), +(1819, 210), +(1820, 660), +(1821, 880), +(1822, 155), +(1823, 1550), +(1824, 780), +(1837, 3650), +(1838, 1200), +(1839, 1200), +(1840, 1200), +(1841, 1200), +(1842, 1850), +(1843, 1200), +(1844, 1850), +(1845, 1200), +(1846, 1850), +(1847, 3050), +(1857, 455), +(1858, 210), +(1859, 420), +(1860, 840), +(1877, 375), +(1878, 85), +(1879, 840), +(1880, 85), +(1881, 840), +(1882, 85), +(1883, 840), +(1884, 210), +(1885, 680), +(1897, 230), +(1898, 230), +(1917, 550), +(1918, 105), +(1919, 1150), +(1920, 800), +(1937, 2300), +(1938, 1050), +(1939, 1600), +(1940, 1050), +(1941, 2100), +(1942, 210), +(1943, 2100), +(1944, 1600), +(1945, 2100), +(1946, 285), +(1947, 3150), +(1948, 1450), +(1949, 1850), +(1950, 3150), +(1951, 3150), +(1952, 315), +(1953, 2350), +(1954, 2350), +(1955, 3900), +(1956, 2350), +(1957, 3150), +(1958, 105), +(1959, 1150), +(1960, 800), +(1961, 1050), +(1962, 680), +(1977, 910), +(1997, 880), +(1998, 1550), +(2037, 1050), +(2038, 270), +(2039, 1550), +(2040, 270), +(2077, 1150), +(2097, 1550), +(2117, 980), +(2137, 1150), +(2138, 1350), +(2157, 110), +(2158, 110), +(2159, 110), +(2160, 110), +(2177, 910), +(2197, 3300), +(2198, 2450), +(2199, 2550), +(2200, 3600), +(2201, 3450), +(2202, 3750), +(2203, 930), +(2204, 210), +(2205, 840), +(2217, 420), +(2237, 840), +(2238, 840), +(2239, 3900), +(2240, 420), +(2241, 840), +(2257, 3000), +(2258, 115), +(2259, 580), +(2277, 4200), +(2278, 5250), +(2279, 5250), +(2280, 115), +(2281, 1550), +(2282, 2450), +(2283, 2450), +(2297, 115), +(2298, 115), +(2299, 115), +(2317, 3450), +(2337, 345), +(2338, 3750), +(2339, 1850), +(2340, 5600), +(2341, 3600), +(2357, 1800), +(2377, 115), +(2378, 0), +(2379, 115), +(2380, 1350), +(2381, 115), +(2382, 40), +(2397, 315), +(2398, 85), +(2417, 3500), +(2437, 405), +(2438, 420), +(2439, 420), +(2458, 880), +(2497, 80), +(2498, 980), +(2499, 3000), +(2500, 3750), +(2517, 1150), +(2518, 85), +(2519, 910), +(2520, 8450), +(2521, 5650), +(2522, 560), +(2540, 700), +(2560, 1050), +(2580, 4700), +(2581, 0), +(2582, 4700), +(2583, 0), +(2584, 4700), +(2585, 0), +(2600, 4700), +(2601, 0), +(2602, 4700), +(2603, 0), +(2604, 4550), +(2605, 455), +(2606, 0), +(2607, 155), +(2608, 1150), +(2620, 1200), +(2621, 1200), +(2622, 5650), +(2640, 4550), +(2660, 455), +(2661, 0), +(2680, 7550), +(2700, 6000), +(2701, 3000), +(2720, 6200), +(2740, 4200), +(2741, 4200), +(2742, 3300), +(2743, 6600), +(2744, 250), +(2745, 630), +(2746, 0), +(2747, 0), +(2748, 0), +(2749, 0), +(2750, 2550), +(2751, 2550), +(2752, 2800), +(2753, 2800), +(2754, 280), +(2755, 3150), +(2756, 1550), +(2757, 3150), +(2758, 1550), +(2759, 3150), +(2760, 3900), +(2761, 3900), +(2762, 3900), +(2763, 2900), +(2764, 3900), +(2765, 3900), +(2766, 4850), +(2767, 6300), +(2768, 405), +(2769, 7100), +(2770, 3900), +(2771, 3900), +(2772, 3900), +(2780, 5050), +(2781, 2100), +(2782, 4500), +(2783, 470), +(2800, 600), +(2820, 4050), +(2821, 4050), +(2840, 2750), +(2841, 275), +(2842, 0), +(2843, 3400), +(2844, 4550), +(2845, 6050), +(2846, 1950), +(2847, 2900), +(2848, 2900), +(2849, 2900), +(2850, 2900), +(2851, 2900), +(2852, 3900), +(2853, 1950), +(2854, 2900), +(2855, 2900), +(2856, 2900), +(2857, 2900), +(2858, 2900), +(2859, 3900), +(2860, 405), +(2861, 2550), +(2862, 2700), +(2863, 390), +(2864, 3900), +(2865, 2700), +(2866, 1800), +(2868, 2700), +(2869, 2900), +(2870, 3900), +(2871, 390), +(2872, 3900), +(2873, 3900), +(2874, 3900), +(2875, 4850), +(2876, 4400), +(2877, 560), +(2878, 4700), +(2879, 3900), +(2880, 390), +(2881, 0), +(2901, 1800), +(2902, 3600), +(2903, 2450), +(2921, 2650), +(2922, 210), +(2923, 3050), +(2924, 245), +(2925, 2200), +(2926, 220), +(2927, 2450), +(2928, 2750), +(2929, 3650), +(2930, 230), +(2931, 3450), +(2932, 3600), +(2933, 3900), +(2934, 2900), +(2935, 4850), +(2936, 8450), +(2937, 8450), +(2938, 420), +(2939, 420), +(2940, 1100), +(2941, 4700), +(2942, 3300), +(2943, 4400), +(2944, 2700), +(2945, 4700), +(2946, 2700), +(2947, 2750), +(2948, 2700), +(2949, 2750), +(2950, 0), +(2951, 2450), +(2952, 0), +(2953, 4700), +(2961, 2450), +(2962, 470), +(2963, 4700), +(2964, 470), +(2965, 4700), +(2966, 470), +(2967, 4700), +(2968, 3150), +(2969, 3150), +(2971, 5250), +(2972, 3900), +(2973, 3900), +(2974, 2700), +(2975, 4850), +(2976, 470), +(2977, 1800), +(2978, 4050), +(2979, 3750), +(2980, 890), +(2981, 3750), +(2986, 3600), +(2987, 3900), +(2988, 4400), +(2989, 2100), +(2990, 5250), +(2991, 1050), +(2992, 2100), +(2993, 7350), +(2994, 3150), +(3001, 2100), +(3021, 2100), +(3041, 3900), +(3061, 5900), +(3062, 3550), +(3064, 40), +(3081, 40), +(3084, 40), +(3085, 40), +(3086, 40), +(3089, 40), +(3090, 40), +(3091, 40), +(3092, 40), +(3093, 40), +(3094, 40), +(3095, 40), +(3096, 40), +(3097, 40), +(3098, 40), +(3099, 40), +(3100, 40), +(3101, 40), +(3102, 40), +(3103, 40), +(3104, 40), +(3105, 40), +(3106, 40), +(3107, 40), +(3108, 40), +(3109, 40), +(3111, 40), +(3112, 40), +(3113, 40), +(3114, 40), +(3115, 40), +(3116, 40), +(3117, 40), +(3118, 40), +(3119, 40), +(3120, 1950), +(3121, 970), +(3122, 4200), +(3123, 4200), +(3124, 3900), +(3125, 4700), +(3126, 4700), +(3127, 4700), +(3128, 4700), +(3129, 360), +(3140, 600), +(3160, 4400), +(3180, 5450), +(3181, 4400), +(3200, 4400), +(3220, 90), +(3260, 135), +(3280, 1350), +(3300, 1050), +(3320, 7100), +(3340, 4300), +(3360, 250), +(3361, 4700), +(3362, 560), +(3363, 225), +(3364, 450), +(3365, 2550), +(3366, 4400), +(3367, 4400), +(3368, 2000), +(3369, 2000), +(3370, 5650), +(3371, 5100), +(3372, 2800), +(3373, 560), +(3374, 0), +(3375, 670), +(3376, 470), +(3377, 5900), +(3378, 4700), +(3379, 3650), +(3380, 2200), +(3381, 600), +(3384, 4700), +(3401, 4700), +(3420, 0), +(3440, 440), +(3441, 4400), +(3442, 4400), +(3443, 4900), +(3444, 3650), +(3445, 4900), +(3446, 6100), +(3447, 510), +(3448, 2550), +(3449, 510), +(3450, 510), +(3451, 4700), +(3452, 470), +(3453, 4700), +(3460, 7600), +(3461, 470), +(3462, 7600), +(3480, 470), +(3482, 0), +(3500, 5650), +(3501, 0), +(3502, 0), +(3503, 2650), +(3504, 3950), +(3505, 4350), +(3506, 7300), +(3507, 3100), +(3508, 6200), +(3509, 6200), +(3510, 3100), +(3511, 4200), +(3512, 2550), +(3513, 2950), +(3516, 5100), +(3517, 2550), +(3518, 90), +(3519, 3750), +(3520, 355), +(3521, 445), +(3522, 285), +(3523, 680), +(3524, 4250), +(3526, 5250), +(3527, 7900), +(3540, 2550), +(3541, 2550), +(3560, 2550), +(3561, 3800), +(3562, 3800), +(3563, 3800), +(3564, 3800), +(3565, 7600), +(3566, 0), +(3567, 2550), +(3568, 510), +(3569, 5100), +(3600, 6550), +(3601, 7750), +(3620, 4650), +(3624, 620), +(3625, 1550), +(3626, 8300), +(3627, 9950), +(3635, 4300), +(3637, 420), +(3639, 420), +(3641, 420), +(3643, 0), +(3644, 0), +(3645, 0), +(3646, 0), +(3660, 4200), +(3700, 5450), +(3701, 540), +(3720, 7100), +(3740, 1350), +(3760, 4700), +(3761, 470), +(3762, 470), +(3763, 4700), +(3764, 1450), +(3780, 470), +(3781, 470), +(3782, 4350), +(3783, 470), +(3784, 4700), +(3785, 4700), +(3786, 1200), +(3787, 470), +(3788, 470), +(3789, 470), +(3790, 4700), +(3800, 510), +(3801, 5100), +(3791, 560), +(3820, 5100), +(3821, 5250), +(3822, 5100), +(3823, 5250), +(3824, 5250), +(3840, 1050), +(3841, 2100), +(3842, 4200), +(3843, 1250), +(3844, 5100), +(3860, 10), +(3880, 5250), +(3881, 4900), +(3882, 5100), +(3883, 3550), +(3900, 250), +(3901, 315), +(3902, 35), +(3903, 180), +(3904, 355), +(3905, 5100), +(3906, 7300), +(3907, 5100), +(3908, 5100), +(3911, 5100), +(3912, 2550), +(3913, 5100), +(3920, 490), +(3921, 1050), +(3922, 340), +(3923, 1800), +(3940, 1250), +(3941, 5450), +(3960, 2700), +(3961, 7300), +(3980, 5100), +(3981, 5450), +(4000, 6800), +(4001, 540), +(4002, 8050), +(4003, 9950), +(4004, 5450), +(4020, 1950), +(4021, 5450), +(4022, 5450), +(4023, 6200), +(4040, 0), +(4060, 5450), +(4061, 1350), +(4062, 6200), +(4080, 5100), +(4081, 5450), +(4082, 5650), +(4083, 5450), +(4100, 5650), +(4101, 5650), +(4102, 0), +(4103, 0), +(4104, 0), +(4105, 0), +(4106, 0), +(4107, 0), +(4108, 0), +(4109, 0), +(4110, 0), +(4111, 0), +(4112, 560), +(4113, 560), +(4114, 560), +(4115, 560), +(4116, 560), +(4117, 560), +(4118, 560), +(4119, 5100), +(4120, 7750), +(4121, 6200), +(4122, 5650), +(4123, 360), +(4124, 2700), +(4125, 7050), +(4126, 375), +(4127, 560), +(4128, 375), +(4129, 375), +(4130, 2800), +(4131, 7750), +(4132, 560), +(4133, 5650), +(4134, 3050), +(4135, 2650), +(4140, 5100), +(4141, 3800), +(4142, 5100), +(4143, 3950), +(4144, 5100), +(4145, 5100), +(4146, 2550), +(4147, 3950), +(4160, 630), +(4181, 5450), +(4182, 4100), +(4183, 4100), +(4184, 540), +(4185, 5450), +(4200, 5450), +(4220, 560), +(4221, 560), +(4222, 540), +(4223, 540), +(4240, 5450), +(4241, 5450), +(4242, 2650), +(4243, 3950), +(4244, 6550), +(4260, 7300), +(4261, 5100), +(4262, 5800), +(4263, 6200), +(4264, 4050), +(4265, 6050), +(4266, 405), +(4280, 2800), +(4281, 6200), +(4282, 5800), +(4283, 5250), +(4284, 3950), +(4285, 5800), +(4286, 3950), +(4287, 3950), +(4288, 5650), +(4289, 5250), +(4290, 5250), +(4291, 7300), +(4292, 5100), +(4293, 5800), +(4294, 0), +(4295, 2350), +(4296, 4200), +(4297, 440), +(4299, 5100), +(4300, 5650), +(4320, 530), +(4321, 7750), +(4323, 0), +(4340, 6400), +(4341, 1600), +(4342, 560), +(4360, 6400), +(4361, 8050), +(4362, 9650), +(4385, 0), +(4384, 0), +(4383, 0), +(4381, 0), +(4382, 0), +(4380, 0), +(4400, 560), +(4401, 380), +(4402, 560), +(4420, 5450), +(4440, 5450), +(4441, 5450), +(4442, 560), +(4443, 560), +(4444, 560), +(4445, 560), +(4446, 560), +(4447, 560), +(4448, 3900), +(4449, 5050), +(4450, 5250), +(4460, 560), +(4461, 560), +(4462, 0), +(4463, 560), +(4464, 560), +(4465, 560), +(4466, 0), +(4480, 0), +(4481, 0), +(4482, 0), +(4483, 0), +(4484, 315), +(4485, 315), +(4490, 5650), +(4491, 2800), +(4492, 530), +(4493, 530), +(4494, 270), +(4495, 5250), +(4500, 5650), +(4501, 5650), +(4502, 4900), +(4503, 5450), +(4504, 5450), +(4505, 5450), +(4506, 5450), +(4507, 540), +(4508, 540), +(4509, 8150), +(4510, 8150), +(4511, 6350), +(4512, 6800), +(4520, 5800), +(4541, 510), +(4560, 0), +(4580, 590), +(4600, 0), +(4601, 0), +(4602, 0), +(4603, 0), +(4604, 2450), +(4605, 2450), +(4620, 9950), +(4640, 40), +(4641, 7050), +(4660, 0), +(4680, 980), +(4700, 6400), +(4720, 6400), +(4721, 455), +(4722, 455), +(4723, 6400), +(4724, 540), +(4725, 5100), +(4726, 540), +(4727, 490), +(4728, 6400), +(4729, 580), +(4730, 730), +(4731, 730), +(4732, 730), +(4733, 8300), +(4734, 9950), +(4735, 630), +(4736, 630), +(4737, 630), +(4738, 630), +(4739, 1700), +(4740, 6200), +(4741, 8300), +(4742, 9950), +(4760, 105), +(4761, 800), +(4762, 1700), +(4763, 1650), +(4764, 6600), +(4765, 660), +(4766, 1750), +(4767, 8300), +(4768, 660), +(4769, 2350), +(4770, 9950), +(4780, 2000), +(4781, 1350), +(4782, 2850), +(4783, 2100), +(4784, 0), +(4785, 3550), +(4786, 5900), +(4787, 7750), +(4800, 0), +(4801, 0), +(4802, 0), +(4803, 0), +(4804, 0), +(4805, 0), +(4806, 0), +(4807, 2700), +(4808, 5450), +(4809, 2700), +(4810, 490), +(4811, 490), +(4812, 980), +(4820, 2100), +(4840, 2000), +(4841, 5800), +(4860, 3200), +(4861, 6400), +(4862, 3200), +(4863, 6400), +(4864, 1050), +(4865, 9950), +(4866, 9950), +(4880, 2300), +(4881, 3200), +(4882, 6400), +(4900, 4800), +(4901, 6000), +(4902, 8300), +(4903, 2350), +(4905, 5450), +(4906, 660), +(4920, 1150), +(4940, 6600), +(4960, 2350), +(4961, 2350), +(4962, 2350), +(4963, 3900), +(4964, 1350), +(4965, 2300), +(4966, 1350), +(4967, 1350), +(4968, 1350), +(4969, 0), +(4970, 5800), +(4971, 5800), +(4972, 580), +(4973, 9950), +(4974, 3900), +(4975, 1550), +(4980, 6400), +(4981, 6400), +(4982, 6400), +(4983, 4100), +(4984, 4350), +(4985, 5800), +(4986, 5800), +(5000, 6400), +(5001, 6400), +(5020, 2550), +(5021, 2550), +(5022, 2550), +(5040, 980), +(5041, 0), +(5042, 0), +(5043, 0), +(5044, 0), +(5045, 0), +(5046, 6600), +(5047, 5100), +(5048, 5100), +(5049, 2550), +(5050, 5450), +(5051, 1250), +(5053, 5800), +(5054, 6200), +(5055, 8300), +(5056, 3300), +(5057, 0), +(5058, 0), +(5059, 7050), +(5061, 2200), +(5062, 0), +(5063, 2300), +(5064, 7750), +(5065, 470), +(5066, 0), +(5067, 0), +(5080, 8300), +(5081, 5800), +(5082, 2900), +(5083, 4350), +(5084, 4350), +(5085, 5800), +(5086, 6000), +(5087, 2300), +(5088, 6600), +(5089, 470), +(5090, 470), +(5091, 5100), +(5092, 470), +(5093, 470), +(5094, 470), +(5095, 5250), +(5096, 5800), +(5097, 5800), +(5101, 9950), +(5102, 6600), +(5120, 6400), +(5121, 0), +(5122, 3200), +(5123, 8300), +(5124, 9950), +(5125, 660), +(5126, 8300), +(5127, 6400), +(5140, 4200), +(5141, 2800), +(5142, 4200), +(5143, 4200), +(5144, 4200), +(5145, 4200), +(5146, 2350), +(5147, 4200), +(5148, 2800), +(5149, 0), +(5150, 3050), +(5151, 2900), +(5152, 4350), +(5153, 5800), +(5154, 4900), +(5155, 6800), +(5156, 3800), +(5157, 2550), +(5158, 2700), +(5159, 6600), +(5160, 660), +(5161, 6600), +(5162, 7750), +(5163, 660), +(5164, 5650), +(5165, 9950), +(5166, 9950), +(5167, 5800), +(5180, 6000), +(5200, 0), +(5201, 5650), +(5202, 5650), +(5203, 4500), +(5205, 6600), +(5209, 2900), +(5210, 5650), +(5211, 6600), +(5212, 6600), +(5213, 8300), +(5214, 530), +(5215, 5250), +(5216, 2650), +(5218, 5650), +(5219, 2800), +(5221, 5650), +(5222, 2800), +(5224, 6200), +(5225, 3100), +(5227, 530), +(5228, 5250), +(5229, 2650), +(5230, 5650), +(5231, 2800), +(5232, 5650), +(5233, 2800), +(5234, 6200), +(5235, 3100), +(5237, 9300), +(5236, 9300), +(5240, 2900), +(5241, 9300), +(5242, 6600), +(5243, 580), +(5244, 5800), +(5245, 5800), +(5246, 6000), +(5247, 4650), +(5248, 580), +(5249, 580), +(5250, 8300), +(5251, 4650), +(5252, 6200), +(5260, 85), +(5261, 8300), +(5262, 8300), +(5263, 6600), +(5264, 9950), +(5280, 6600), +(5281, 8300), +(5282, 3150), +(5283, 3150), +(5300, 3150), +(5301, 3150), +(5304, 8300), +(5305, 8300), +(5306, 8300), +(5320, 1550), +(5340, 6600), +(5341, 8300), +(5342, 6600), +(5343, 8300), +(5360, 2050), +(5380, 2850), +(5381, 6600), +(5383, 8300), +(5384, 7550), +(5385, 2100), +(5502, 560), +(5401, 560), +(5402, 560), +(5403, 560), +(5404, 560), +(5405, 560), +(5406, 560), +(5407, 560), +(5420, 0), +(5440, 445), +(5460, 6600), +(5461, 4950), +(5462, 6600), +(5463, 8300), +(5464, 4950), +(5465, 9950), +(5480, 225), +(5481, 540), +(5500, 2250), +(5400, 560), +(5504, 9950), +(5507, 560), +(5508, 560), +(5509, 560), +(5510, 9950), +(5513, 600), +(5514, 6600), +(5521, 4950), +(5528, 6200), +(5530, 1650), +(5532, 560), +(5533, 6550), +(5534, 4200), +(5535, 4200), +(5536, 4500), +(5537, 600), +(5540, 540), +(5541, 5800), +(5542, 5800), +(5543, 5800), +(5544, 780), +(5560, 2000), +(5580, 3550), +(5581, 0), +(5600, 560), +(5620, 270), +(5621, 90), +(5622, 90), +(5623, 270), +(5624, 270), +(5625, 90), +(5647, 270), +(5648, 90), +(5649, 270), +(5650, 90), +(5712, 1050), +(5720, 8300), +(5721, 880), +(5722, 1050), +(5723, 1450), +(5724, 1450), +(5725, 910), +(5726, 455), +(5727, 1150), +(5728, 105), +(5729, 1450), +(5740, 2650), +(5741, 580), +(5760, 1150), +(5761, 1250), +(5762, 1250), +(5780, 6000), +(5800, 4500), +(5801, 4500), +(5802, 4950), +(5803, 4950), +(5804, 0), +(5820, 2750), +(5840, 0), +(5841, 0), +(5842, 0), +(5843, 0), +(5844, 6200), +(5845, 6200), +(5846, 0), +(5847, 6600), +(5860, 4950), +(5861, 6600), +(5862, 4550), +(5880, 1150), +(5881, 4200), +(5882, 4200), +(5883, 4200), +(5884, 4200), +(5885, 4200), +(5886, 4200), +(5887, 4200), +(5888, 4200), +(5889, 4200), +(5890, 4200), +(5900, 5650), +(5901, 2800), +(5902, 5650), +(5903, 2800), +(5940, 3300), +(5941, 9950), +(5942, 2850), +(5943, 9950), +(5960, 1450), +(5980, 0), +(6003, 5800), +(6020, 4200), +(6021, 6200), +(6022, 6000), +(6023, 6600), +(6024, 6200), +(6025, 6200), +(6026, 3550), +(6027, 2550), +(6028, 2550), +(6029, 2550), +(6030, 5650), +(6031, 5650), +(6040, 6200), +(6041, 6200), +(6131, 2250), +(6132, 6600), +(6133, 2250), +(6134, 6600), +(6135, 6600), +(6140, 300), +(6141, 2750), +(6142, 2800), +(6143, 660), +(6144, 6600), +(6145, 6600), +(6146, 3300), +(6147, 8300), +(6160, 2800), +(6161, 4900), +(6162, 6600), +(6163, 1400), +(6180, 210), +(6181, 660), +(6182, 660), +(6183, 4950), +(6184, 8300), +(6185, 6600), +(6186, 9950), +(6130, 0), +(6260, 210), +(6280, 420), +(6281, 2100), +(6282, 2100), +(6283, 1650), +(6284, 1050), +(6300, 1400), +(6320, 210), +(6321, 210), +(6322, 420), +(6323, 1050), +(6340, 210), +(6341, 420), +(6342, 1050), +(6343, 210), +(6360, 210), +(6361, 420), +(6362, 210), +(6363, 1050), +(6364, 210), +(6380, 2000), +(6381, 390), +(6382, 0), +(6383, 420), +(6384, 210), +(6385, 1050), +(6386, 210), +(6387, 210), +(6388, 5650), +(6389, 5650), +(6390, 420), +(6391, 1050), +(6392, 2000), +(6393, 445), +(6394, 450), +(6400, 1000), +(6401, 660), +(6402, 9950), +(6420, 1350), +(6440, 2100), +(6441, 1450), +(6460, 1450), +(6461, 1950), +(6480, 1550), +(6481, 2400), +(6500, 6600), +(6501, 8300), +(6502, 1950), +(6503, 3650), +(6520, 3500), +(6521, 2800), +(6522, 1350), +(6540, 145), +(6541, 145), +(6542, 1800), +(6543, 2400), +(6544, 0), +(6545, 0), +(6546, 0), +(6547, 1350), +(6560, 3300), +(6561, 435), +(6562, 1750), +(6563, 1300), +(6564, 2650), +(6565, 660), +(6566, 3300), +(6567, 4950), +(6568, 6600), +(6569, 4950), +(6570, 2750), +(6580, 0), +(6581, 6600), +(6582, 6600), +(6583, 6600), +(6584, 6600), +(6600, 4950), +(6601, 9950), +(6602, 580), +(6603, 640), +(6604, 540), +(6605, 660), +(6606, 3900), +(6607, 970), +(6608, 970), +(6609, 3900), +(6610, 970), +(6611, 970), +(6620, 2650), +(6624, 970), +(6622, 970), +(6625, 3450), +(6626, 245), +(6627, 245), +(6628, 1350), +(6640, 2300), +(6641, 0), +(6642, 0), +(6643, 0), +(6644, 0), +(6645, 0), +(6660, 910), +(6661, 90), +(6680, 1950), +(6700, 0), +(6803, 4350), +(6804, 6000), +(6820, 8300), +(6821, 9950), +(6822, 9950), +(6823, 9950), +(6920, 2750), +(6921, 3050), +(6980, 2650), +(7027, 5250), +(7028, 5250), +(7040, 5250), +(7043, 3400), +(7045, 5700), +(7063, 6100), +(7064, 6100), +(7065, 6100), +(7066, 5450), +(7067, 3450), +(7069, 3450), +(7200, 5450), +(7320, 2500), +(5226, 620), +(5223, 560), +(5217, 530), +(5220, 560), +(3088, 40), +(3087, 40), +(3083, 40), +(1462, 0), +(3082, 40), +(1461, 0), +(923, 1250), +(613, 3150), +(8551, 2350), +(8552, 470), +(8553, 7100), +(992, 780), +(1288, 290), +(1389, 100), +(2360, 5600), +(3481, 275), +(1, 2450), +(1155, 0), +(1156, 0), +(1157, 0), +(3110, 0), +(3580, 0), +(5999, 0), +(6164, 0), +(348, 0), +(6220, 0), +(235, 1250), +(6240, 0), +(3802, 560), +(3803, 560), +(999, 560), +(1003, 560), +(1014, 560), +(1017, 560), +(1018, 560), +(1046, 560), +(1122, 1400), +(1123, 2800), +(1124, 5650), +(1125, 6000), +(1184, 3000), +(1192, 0), +(1317, 8250), +(5503, 6600), +(5506, 6600), +(5512, 6600), +(5516, 8300), +(5517, 6600), +(5518, 0), +(5520, 8300), +(5523, 8300), +(5524, 6600), +(5525, 8300), +(5526, 6600), +(5527, 0), +(6760, 560), +(6761, 1400), +(6843, 3000), +(6844, 7550), +(7340, 0), +(7341, 0), +(7428, 0), +(7440, 7750), +(7460, 10250), +(7461, 650), +(7480, 8300), +(7481, 8300), +(7482, 1650), +(7483, 1650), +(7484, 1650), +(7485, 9950), +(7486, 6600), +(7487, 7550), +(7488, 7550), +(7489, 9950), +(7490, 9950), +(7491, 1500), +(7492, 0), +(7493, 1500), +(7494, 9950), +(7495, 9950), +(7496, 0), +(7505, 7050), +(7504, 7050), +(7503, 7050), +(7502, 7050), +(7501, 7050), +(7500, 7050), +(7499, 7050), +(7498, 7050), +(7497, 7050), +(7506, 9950), +(7507, 0), +(7508, 9950), +(7702, 8300), +(7876, 675), +(7479, 0), +(7477, 0), +(7478, 0), +(7382, 660), +(7667, 9950), +(7540, 1550), +(7603, 6600), +(7620, 0), +(7621, 9950), +(7631, 9950), +(7632, 0), +(7633, 9950), +(7634, 9950), +(7635, 9950), +(7648, 6600), +(7649, 6600), +(7650, 6600), +(7651, 0), +(7652, 0), +(7653, 0), +(7654, 0), +(7655, 0), +(7656, 0), +(7657, 0), +(7658, 0), +(7659, 0), +(7660, 0), +(7661, 0), +(7662, 0), +(7663, 0), +(7664, 0), +(7666, 4950), +(7670, 0), +(7671, 0), +(7672, 0), +(7673, 0), +(7674, 0), +(7675, 0), +(7676, 0), +(7677, 0), +(6846, 0), +(6847, 0), +(6860, 0), +(6861, 0), +(7002, 4400), +(7360, 6600), +(7361, 6600), +(7362, 6600), +(7363, 6600), +(7364, 6600), +(7365, 6600), +(7400, 6600), +(7401, 6600), +(7420, 1900), +(7421, 1900), +(7422, 1900), +(7423, 1900), +(7424, 1900), +(7425, 1900), +(7426, 1900), +(7427, 1900), +(7700, 4700), +(7720, 4400), +(7721, 4700), +(7722, 4550), +(7723, 4550), +(7724, 560), +(7725, 560), +(7726, 4550), +(7727, 4400), +(7728, 4400), +(7729, 3900), +(7730, 4200), +(7731, 4400), +(7732, 4400), +(7733, 4400), +(7734, 2200), +(7736, 0), +(7737, 440), +(7795, 0), +(7800, 0), +(7805, 0), +(7809, 560), +(7811, 0), +(7814, 4700), +(7815, 4400), +(7818, 0), +(7824, 0), +(7827, 4400), +(7828, 4400), +(7829, 4400), +(7836, 0), +(7831, 0), +(7837, 0), +(7838, 4400), +(7839, 4550), +(7840, 4400), +(7841, 5450), +(7842, 5900), +(7843, 4400), +(7844, 4900), +(7845, 6100), +(7846, 4900), +(7848, 5900), +(7849, 5900), +(7860, 6100), +(7861, 6100), +(7862, 270), +(7863, 380), +(7864, 650), +(7865, 270), +(7866, 380), +(7867, 650), +(7924, 0), +(7923, 0), +(7922, 0), +(7921, 0), +(7887, 0), +(7920, 0), +(7886, 0), +(7885, 0), +(7875, 5650), +(7874, 3900), +(7873, 2750), +(7735, 0), +(7872, 5650), +(7871, 3900), +(7870, 2750), +(7788, 2000), +(7787, 2000), +(7823, 6600), +(7793, 3300), +(7790, 660), +(7792, 1650), +(7835, 6600), +(7822, 6600), +(7797, 1650), +(7798, 3300), +(7791, 660), +(7817, 6600), +(7810, 6600), +(7803, 3300), +(7806, 660), +(7807, 1650), +(7804, 6600), +(7808, 3300), +(7799, 6600), +(7794, 6600), +(7816, 3300), +(7381, 0), +(7380, 0), +(7201, 9950), +(7180, 9950), +(7801, 660), +(7802, 1650), +(8290, 6600), +(8291, 0), +(8292, 0), +(8293, 6600), +(7812, 660), +(7819, 660), +(7825, 660), +(7832, 660), +(7813, 1650), +(7820, 1650), +(7826, 1650), +(7833, 1650), +(7821, 3300), +(7830, 3300), +(7834, 3300), +(7847, 6600), +(7520, 100), +(7760, 6600), +(7780, 9950), +(7781, 9950), +(7782, 9950), +(7783, 9950), +(7784, 0), +(7786, 10900), +(7785, 9950), +(8240, 0), +(8080, 0), +(8079, 5650), +(8000, 0), +(8040, 6600), +(8041, 6600), +(8042, 6600), +(8043, 6600), +(8044, 6600), +(8045, 6600), +(8046, 6600), +(8047, 6600), +(8048, 6600), +(8049, 6600), +(8050, 6600), +(8051, 6600), +(8065, 6600), +(8064, 6600), +(8063, 6600), +(8062, 6600), +(8061, 6600), +(8060, 6600), +(8059, 6600), +(8058, 6600), +(8057, 6600), +(8056, 6600), +(8055, 6600), +(8054, 6600), +(8053, 6600), +(8052, 6600), +(8100, 6600), +(8101, 6600), +(8102, 6600), +(8103, 6600), +(8105, 6600), +(8106, 6600), +(8107, 6600), +(8108, 6600), +(8109, 6600), +(8110, 6600), +(8111, 6600), +(8112, 6600), +(8113, 9950), +(8114, 9950), +(8115, 6600), +(8116, 6600), +(8117, 6600), +(8118, 6600), +(8120, 9950), +(8121, 9950), +(8140, 6600), +(8141, 6600), +(8142, 6600), +(8143, 6600), +(8144, 6600), +(8145, 6600), +(8146, 6600), +(8147, 6600), +(8150, 500), +(8152, 5100), +(8242, 0), +(8170, 2000), +(8180, 6200), +(8181, 9300), +(8182, 9950), +(8194, 0), +(8200, 9950), +(8226, 650), +(8230, 5100), +(8231, 6350), +(8232, 500), +(8233, 5100), +(8234, 5100), +(8235, 6350), +(8237, 0), +(8238, 0), +(8239, 6600), +(8241, 0), +(8249, 500), +(8250, 5100), +(8251, 5100), +(8252, 6350), +(8253, 500), +(8254, 5100), +(8255, 5100), +(8256, 6350), +(8257, 9950), +(8259, 270), +(8260, 380), +(8261, 650), +(8262, 270), +(8263, 380), +(8264, 650), +(8167, 2000), +(8168, 3900), +(8166, 2750), +(8165, 3900), +(8119, 5650), +(8104, 5650), +(8248, 0), +(8183, 0), +(8184, 0), +(8185, 0), +(8186, 0), +(8187, 0), +(8188, 0), +(8189, 0), +(8190, 0), +(8191, 0), +(8195, 0), +(8169, 2750), +(8245, 0), +(8122, 5650), +(8123, 0), +(8153, 3900), +(8154, 2000), +(8155, 2750), +(8156, 0), +(8157, 0), +(8158, 0), +(8159, 3900), +(8160, 2750), +(8161, 2000), +(8162, 0), +(8163, 0), +(8164, 0), +(8267, 660), +(8266, 0), +(8265, 660), +(8268, 0), +(8288, 0), +(8295, 0), +(8296, 6600), +(8297, 0), +(8298, 6600), +(8299, 0), +(8066, 6600), +(8067, 6600), +(8068, 6600), +(8069, 6600), +(8070, 6600), +(8071, 6600), +(8072, 6600), +(8073, 6600), +(8074, 6600), +(8075, 6600), +(8076, 6600), +(8077, 6600), +(8078, 6600), +(8433, 3200), +(8432, 2250), +(8431, 1500), +(8430, 1200), +(8429, 6600), +(8428, 6400), +(8427, 4550), +(8426, 3000), +(8425, 2350), +(8406, 3200), +(8407, 3300), +(8405, 2250), +(8404, 1500), +(8403, 1200), +(8402, 6600), +(8401, 6400), +(8400, 4550), +(8399, 3000), +(8398, 2350), +(8397, 3300), +(8396, 3200), +(8395, 6600), +(8394, 6400), +(8393, 4550), +(8392, 3000), +(8391, 2250), +(8390, 1500), +(8389, 1200), +(8388, 725), +(8386, 3300), +(8385, 725), +(8383, 1200), +(8382, 3300), +(8374, 8300), +(8373, 2350), +(8371, 1450), +(8369, 2350), +(8368, 8300), +(8367, 1450), +(8274, 2800), +(8275, 2800), +(8276, 5650), +(8277, 6000), +(8278, 8300), +(8279, 5650), +(8280, 6000), +(8281, 6200), +(8282, 8050), +(8283, 6200), +(8284, 4800), +(8286, 6600), +(8303, 6600), +(8305, 9950), +(8306, 3000), +(8307, 8300), +(8308, 8800), +(8309, 8300), +(8312, 6000), +(8313, 5300), +(8314, 9950), +(8316, 3000), +(8317, 6600), +(8318, 0), +(8319, 6600), +(8320, 6600), +(8322, 6400), +(8330, 650), +(8331, 6600), +(8340, 6600), +(8342, 650), +(8347, 8800), +(8348, 650), +(8350, 650), +(8351, 10550), +(8360, 6600), +(8364, 3900), +(8365, 3900), +(8409, 3800), +(8410, 3800), +(8411, 5100), +(8412, 6350), +(8413, 5100), +(8414, 500), +(8415, 2550), +(8416, 500), +(8417, 6350), +(8418, 3800), +(8419, 3800), +(8420, 5100), +(8421, 6350), +(8422, 5100), +(8423, 3150), +(8424, 6350), +(8445, 9950), +(8446, 0), +(8272, 4200), +(8315, 6600), +(8323, 0), +(8332, 6600), +(8341, 0), +(8361, 0), +(8362, 0), +(8363, 3500), +(8376, 6600), +(8375, 6600), +(8377, 6600), +(8378, 6600), +(8381, 6600), +(8379, 6600), +(8380, 6600), +(8434, 3300), +(8435, 3000), +(8436, 4550), +(8437, 6400), +(8438, 6600), +(8439, 1500), +(8440, 2250), +(8441, 3200), +(8442, 3300), +(8564, 0), +(8565, 0), +(8566, 0), +(8567, 0), +(8568, 0), +(8569, 0), +(8285, 6600), +(8287, 6600), +(8300, 6600), +(8301, 650), +(8302, 0), +(8304, 6600), +(8461, 560), +(8464, 560), +(8465, 560), +(8468, 580), +(8469, 5650), +(8470, 5800), +(8480, 6600), +(8483, 9950), +(8491, 0), +(8492, 0), +(8493, 0), +(8494, 0), +(8495, 650), +(8496, 650), +(8497, 650), +(8498, 0), +(8499, 0), +(8500, 650), +(8501, 650), +(8502, 0), +(8503, 0), +(8504, 0), +(8505, 0), +(8506, 0), +(8508, 0), +(8509, 0), +(8510, 0), +(8511, 0), +(8512, 0), +(8513, 0), +(8514, 0), +(8515, 0), +(8516, 0), +(8517, 0), +(8518, 6600), +(8519, 0), +(8520, 0), +(8521, 0), +(8522, 0), +(8523, 0), +(8524, 0), +(8525, 0), +(8526, 0), +(8527, 0), +(8528, 0), +(8531, 0), +(8532, 0), +(8533, 650), +(8534, 650), +(8535, 650), +(8536, 650), +(8537, 650), +(8538, 650), +(8539, 650), +(8540, 650), +(8541, 0), +(8542, 0), +(8543, 9950), +(8544, 0), +(8545, 0), +(8547, 3300), +(8548, 0), +(8549, 0), +(8711, 6600), +(8710, 6600), +(8709, 6600), +(8558, 9950), +(8559, 9950), +(8560, 9950), +(8561, 9950), +(8571, 3300), +(8572, 0), +(8576, 6600), +(8577, 8300), +(8578, 6500), +(8579, 0), +(8580, 0), +(8581, 0), +(8582, 0), +(8583, 650), +(8584, 6600), +(8585, 6600), +(8586, 6600), +(8587, 0), +(8588, 0), +(8589, 0), +(8590, 0), +(8591, 9950), +(8592, 9950), +(8593, 9950), +(8594, 0), +(8595, 9950), +(8596, 6600), +(8597, 3300), +(8599, 0), +(8600, 0), +(8601, 9950), +(8602, 9950), +(8603, 0), +(8604, 0), +(8605, 6600), +(8606, 0), +(8607, 0), +(8608, 0), +(8609, 0), +(8610, 0), +(8611, 0), +(8612, 0), +(8613, 0), +(8614, 0), +(8615, 0), +(8620, 9950), +(8621, 9950), +(8622, 9950), +(8623, 9950), +(8624, 9950), +(8625, 9950), +(8626, 9950), +(8627, 9950), +(8628, 9950), +(8629, 9950), +(8630, 9950), +(8631, 9950), +(8632, 9950), +(8633, 9950), +(8636, 9950), +(8637, 9950), +(8638, 9950), +(8639, 9950), +(8640, 9950), +(8654, 9950), +(8655, 9950), +(8656, 9950), +(8657, 9950), +(8658, 9950), +(8659, 9950), +(8660, 9950), +(8661, 9950), +(8662, 9950), +(8663, 9950), +(8664, 9950), +(8665, 9950), +(8666, 9950), +(8667, 9950), +(8668, 9950), +(8686, 650), +(8708, 6600), +(8707, 6600), +(8706, 6600), +(8705, 6600), +(8704, 6600), +(8703, 6600), +(8702, 6600), +(8701, 6600), +(8700, 6600), +(8699, 6600), +(8698, 6600), +(8697, 6600), +(8696, 6600), +(8695, 6600), +(8694, 6600), +(8693, 6600), +(8692, 6600), +(8691, 6600), +(8690, 6600), +(8689, 6600), +(8688, 6600), +(8557, 6600), +(8555, 6600), +(8556, 6600), +(8730, 0), +(8507, 0), +(8732, 6600), +(8733, 1650), +(8734, 6600), +(8735, 9950), +(8736, 650), +(8737, 650), +(8738, 650), +(8739, 650), +(8746, 6600), +(8769, 650), +(8770, 650), +(8771, 650), +(8772, 650), +(8773, 650), +(8774, 650), +(8775, 650), +(8776, 650), +(8777, 650), +(8778, 650), +(8779, 650), +(8780, 650), +(8781, 650), +(8782, 650), +(8783, 0), +(8784, 650), +(8785, 650), +(8786, 650), +(8788, 0), +(8789, 0), +(8790, 9950), +(8800, 9950), +(8801, 9950), +(8803, 650), +(8804, 650), +(8805, 650), +(8806, 650), +(8807, 650), +(8808, 650), +(8809, 650), +(8823, 0), +(8824, 0), +(8825, 0), +(8822, 0), +(8819, 0), +(8818, 0), +(8820, 0), +(8821, 0), +(8815, 0), +(8817, 0), +(8816, 0), +(8814, 0), +(8811, 0), +(8810, 0), +(8813, 0), +(8812, 0), +(8828, 650), +(8829, 0), +(8830, 0), +(8831, 0), +(8832, 0), +(8833, 0), +(8834, 0), +(8835, 0), +(8836, 0), +(8837, 0), +(8838, 0), +(8839, 0), +(8840, 0), +(8841, 0), +(8842, 0), +(8843, 0), +(8844, 0), +(8856, 9950), +(8857, 9950), +(8858, 9950), +(8892, 0), +(8791, 660), +(8792, 660), +(8793, 660), +(8845, 0), +(8747, 6600), +(8748, 6600), +(8749, 6600), +(8751, 6600), +(8752, 6600), +(8753, 6600), +(8754, 6600), +(8756, 6600), +(8757, 6600), +(8758, 6600), +(8759, 6600), +(8466, 560), +(8573, 3300), +(8575, 650), +(8727, 6600), +(8728, 9950), +(8740, 6600), +(8741, 9950), +(8742, 0), +(8744, 6600), +(8750, 9950), +(8755, 9950), +(8760, 9950), +(8763, 0), +(8764, 0), +(8765, 0), +(8794, 660), +(8797, 0), +(8799, 0), +(8846, 0), +(8847, 0), +(8848, 0), +(8849, 0), +(8484, 9950), +(8729, 9950), +(8850, 0), +(8851, 0), +(8852, 0), +(8853, 0), +(8854, 0), +(8460, 5650), +(8554, 650), +(8574, 6600), +(8598, 3300), +(8619, 6600), +(8795, 660), +(8796, 660), +(8550, 3150), +(8731, 0), +(8459, 4400), +(8463, 6200), +(8904, 6600), +(8905, 6600), +(8906, 6600), +(8907, 6600), +(8908, 6600), +(8909, 6600), +(8910, 6600), +(8911, 6600), +(8912, 6600), +(8913, 6600), +(8914, 6600), +(8915, 6600), +(8916, 6600), +(8917, 6600), +(8918, 6600), +(8919, 6600), +(8920, 6600), +(8921, 6600), +(8922, 6600), +(8923, 6600), +(8924, 6600), +(8925, 9950), +(8926, 9950), +(8927, 3300), +(8928, 6600), +(8929, 6600), +(8930, 9950), +(8931, 9950), +(8932, 9950), +(8933, 9950), +(8934, 9950), +(8935, 9950), +(8936, 9950), +(8937, 9950), +(8938, 9950), +(8939, 9950), +(8940, 9950), +(8941, 9950), +(8942, 9950), +(8943, 9950), +(8944, 8300), +(8945, 6600), +(8946, 6600), +(8947, 6600), +(8948, 6600), +(8949, 6600), +(8950, 9950), +(8951, 9950), +(8952, 9950), +(8953, 9950), +(8954, 9950), +(8955, 9950), +(8956, 9950), +(8957, 9950), +(8958, 9950), +(8959, 1650), +(8960, 6600), +(8961, 6600), +(8962, 6600), +(8963, 6600), +(8964, 6600), +(8965, 8300), +(8966, 8300), +(8967, 8300), +(8968, 8300), +(8969, 6600), +(8976, 6600), +(8977, 6600), +(8984, 6600), +(8985, 6600), +(8986, 6600), +(8987, 6600), +(8988, 8300), +(8989, 8300), +(8990, 8300), +(8991, 8300), +(8993, 6600), +(8994, 9950), +(8995, 650), +(8996, 650), +(8997, 650), +(8998, 1650), +(8999, 1650), +(9000, 1650), +(9001, 1650), +(9002, 1650), +(9003, 1650), +(9004, 1650), +(9005, 1650), +(9006, 1650), +(9007, 1650), +(9008, 1650), +(9009, 1650), +(9010, 1650), +(9011, 1650), +(9012, 1650), +(9013, 1650), +(9014, 6600), +(9015, 9950), +(9016, 9950), +(9017, 9950), +(9018, 9950), +(9019, 9950), +(9020, 9950), +(9021, 9950), +(9022, 6600), +(9050, 5100), +(9051, 5100), +(9052, 6350), +(9062, 500), +(9031, 1650), +(9032, 6600), +(9033, 0), +(9035, 0), +(9036, 0), +(9037, 0), +(9038, 0), +(9039, 0), +(9040, 0), +(9041, 0), +(9042, 0), +(9043, 0), +(9044, 0), +(9045, 0), +(9046, 0), +(9047, 0), +(9048, 0), +(9049, 0), +(9053, 0), +(9054, 0), +(9055, 0), +(9056, 0), +(9057, 0), +(9058, 0), +(9059, 0), +(9060, 0), +(9067, 0), +(9068, 0), +(9069, 0), +(9070, 0), +(9071, 0), +(9072, 0), +(9073, 0), +(9074, 0), +(9076, 0), +(9077, 0), +(9078, 0), +(9079, 0), +(9080, 0), +(9081, 0), +(9082, 0), +(9083, 0), +(9085, 0), +(9086, 0), +(9087, 0), +(9088, 0), +(9089, 0), +(9090, 0), +(9091, 0), +(9092, 0), +(9094, 0), +(9095, 0), +(9096, 0), +(9097, 0), +(9098, 0), +(9099, 0), +(9100, 0), +(9101, 0), +(9102, 0), +(9103, 0), +(9104, 0), +(9105, 0), +(9106, 0), +(9107, 0), +(9108, 0), +(9109, 0), +(9110, 0), +(9111, 0), +(9112, 0), +(9113, 0), +(9114, 0), +(9115, 0), +(9116, 0), +(9117, 0), +(9119, 9950), +(9120, 0), +(9121, 0), +(9122, 0), +(9123, 6600), +(9124, 0), +(9125, 6600), +(9126, 0), +(9127, 6600), +(9128, 0), +(9130, 6600), +(9131, 0), +(9135, 6600), +(9136, 0), +(9140, 3300), +(9177, 0), +(9178, 0), +(9180, 0), +(9181, 0), +(9182, 0), +(9183, 0), +(9184, 0), +(9185, 0), +(9186, 0), +(9187, 0), +(9189, 0), +(9190, 0), +(9193, 0), +(9194, 0), +(9195, 0), +(9196, 0), +(9197, 0), +(9199, 0), +(9200, 0), +(9201, 0), +(9202, 0), +(9203, 0), +(9204, 0), +(9205, 0), +(9207, 0), +(9208, 0), +(9209, 0), +(9210, 0), +(9220, 0), +(9221, 0), +(9222, 0), +(9223, 0), +(9224, 0), +(9225, 0), +(9226, 0), +(9227, 0), +(9228, 0), +(9229, 0), +(9231, 0), +(9232, 0), +(9233, 0), +(9234, 0), +(9235, 0), +(9236, 0), +(9237, 0), +(9238, 0), +(9239, 0), +(9240, 0), +(9241, 0), +(9242, 0), +(9243, 0), +(9244, 0), +(9245, 0), +(9247, 0), +(9249, 6600), +(9250, 6600), +(9268, 9950), +(9269, 9950), +(9270, 9950), +(9361, 6600), +(9164, 0), +(9141, 0), +(9212, 0), +(9271, 0), +(9337, 0), +(9264, 530), +(9263, 630), +(9262, 630), +(9261, 417), +(9260, 417), +(9259, 167), +(9256, 14300), +(9377, 0), +(9388, 0), +(9387, 0), +(9414, 0), +(9415, 0), +(9418, 6600), +(9421, 6600), +(9663, 6600), +(9664, 6600), +(0, 0), +(401, 0), +(619, 2400), +(784, 350), +(998, 0), +(1004, 0), +(1005, 0), +(1098, 0), +(1262, 0), +(1271, 0), +(1280, 0), +(1499, 0), +(1999, 300), +(2017, 900), +(2018, 300), +(3910, 7900), +(5100, 450), +(5382, 9550), +(6842, 0), +(7220, 9500), +(7221, 9500), +(7521, 0), +(7668, 0), +(7680, 200), +(7681, 200), +(7740, 9300), +(7796, 0), +(7905, 0), +(7907, 8250), +(7960, 0), +(8001, 0), +(8229, 0), +(8258, 0), +(8289, 1100), +(8294, 1100), +(8324, 100), +(8325, 250), +(8326, 0), +(8327, 50), +(8328, 50), +(8329, 350), +(8333, 350), +(8334, 550), +(8335, 350), +(8337, 350), +(8338, 0), +(8339, 0), +(8344, 350), +(8345, 250), +(8346, 50), +(8349, 100), +(8462, 450), +(8467, 550), +(8471, 450), +(8472, 800), +(8473, 850), +(8474, 550), +(8475, 850), +(8476, 850), +(8477, 400), +(8478, 900), +(8479, 650), +(8481, 700), +(8482, 800), +(8485, 550), +(8486, 800), +(8487, 800), +(8488, 550), +(8489, 850), +(8490, 650), +(8529, 0), +(8546, 0), +(8562, 50), +(8563, 50), +(8617, 0), +(8855, 0), +(8868, 11900), +(8883, 650), +(8884, 1000), +(8885, 700), +(8886, 700), +(8887, 100), +(8888, 650), +(8889, 850), +(8890, 850), +(8891, 650), +(8893, 850), +(8894, 150), +(8895, 0), +(9029, 9550), +(9034, 50), +(9061, 250), +(9063, 150), +(9064, 550), +(9065, 550), +(9066, 800), +(9075, 700), +(9118, 450), +(9129, 200), +(9132, 400), +(9133, 200), +(9134, 1100), +(9137, 850), +(9138, 900), +(9139, 1300), +(9142, 900), +(9143, 400), +(9144, 200), +(9145, 200), +(9146, 850), +(9147, 400), +(9148, 900), +(9149, 900), +(9150, 800), +(9151, 900), +(9154, 1000), +(9155, 2500), +(9156, 900), +(9157, 1000), +(9158, 1100), +(9159, 900), +(9160, 1200), +(9161, 1200), +(9162, 1000), +(9163, 2000), +(9165, 300), +(9166, 2500), +(9167, 2000), +(9168, 1500), +(9169, 2000), +(9170, 1100), +(9171, 1200), +(9172, 1100), +(9173, 1200), +(9174, 1100), +(9175, 1900), +(9176, 1400), +(9179, 1400), +(9188, 550), +(9191, 1000), +(9192, 1300), +(9198, 1300), +(9206, 1000), +(9211, 1300), +(9213, 1400), +(9214, 2000), +(9215, 1200), +(9216, 0), +(9217, 1400), +(9218, 0), +(9219, 2000), +(9251, 800), +(9252, 200), +(9253, 400), +(9254, 400), +(9255, 300), +(9257, 200), +(9273, 900), +(9274, 1500), +(9275, 1400), +(9276, 1500), +(9277, 0), +(9278, 50), +(9279, 100), +(9280, 1400), +(9281, 600), +(9282, 200), +(9283, 0), +(9284, 0), +(9285, 0), +(9286, 100), +(9287, 100), +(9288, 100), +(9289, 100), +(9290, 100), +(9292, 150), +(9293, 250), +(9302, 450), +(9304, 350), +(9308, 100), +(9310, 650), +(9311, 100), +(9312, 550), +(9313, 100), +(9314, 900), +(9326, 100), +(9327, 850), +(9328, 100), +(9339, 10000), +(9341, 49000), +(9343, 4375), +(9344, 9750), +(9345, 49000), +(9348, 9750), +(9350, 9750), +(9351, 550), +(9354, 9750), +(9355, 9750), +(9356, 50), +(9357, 100), +(9358, 100), +(9359, 900), +(9360, 9750), +(9362, 450), +(9365, 10000), +(9368, 100), +(9369, 10000), +(9370, 50), +(9371, 10416), +(9372, 9750), +(9373, 10000), +(9374, 10416), +(9375, 10416), +(9379, 49000), +(9380, 10416), +(9381, 17333), +(9382, 10416), +(9384, 10416), +(9386, 10416), +(9389, 2500), +(9390, 10000), +(9391, 50), +(9392, 50), +(9393, 100), +(9394, 100), +(9395, 10000), +(9396, 10000), +(9397, 10000), +(9398, 10416), +(9399, 10000), +(9400, 10000), +(9401, 200), +(9402, 850), +(9403, 850), +(9404, 5000), +(9405, 10000), +(9406, 2400), +(9407, 9500), +(9408, 50), +(9409, 10000), +(9416, 10416), +(9417, 10416), +(9419, 10000), +(9420, 100), +(9422, 2500), +(9423, 10416), +(9424, 800), +(9425, 10000), +(9426, 10000), +(9427, 800), +(9428, 800), +(9429, 10416), +(9430, 2300), +(9431, 800), +(9432, 2300), +(9433, 2300), +(9434, 2400), +(9435, 3100), +(9436, 3700), +(9437, 10000), +(9438, 4400), +(9439, 3900), +(9440, 10416), +(9441, 10416), +(9442, 9000), +(9443, 11500), +(9445, 11500), +(9446, 10416), +(9447, 3900), +(9451, 550), +(9452, 50), +(9453, 400), +(9454, 450), +(9455, 700), +(9456, 4400), +(9459, 900), +(9462, 550), +(9465, 12916), +(9468, 4300), +(9469, 5750), +(9470, 5250), +(9471, 12625), +(9472, 700), +(9473, 9000), +(9474, 7250), +(9475, 5750), +(9482, 0), +(9486, 1200), +(9487, 1200), +(9488, 450), +(9489, 12916), +(9490, 1400), +(9491, 12650), +(9492, 12650), +(9493, 12650), +(9494, 12650), +(9495, 25300), +(9497, 1000), +(9498, 1000), +(9504, 550), +(9505, 650), +(9509, 25125), +(9510, 0), +(9511, 450), +(9512, 700), +(9513, 50), +(9514, 850), +(9515, 2500), +(9516, 2300), +(9517, 2300), +(9518, 2200), +(9519, 1200), +(9520, 500), +(9521, 3400), +(9522, 700), +(9523, 19000), +(9524, 19000), +(9525, 2500), +(9526, 850), +(9527, 850), +(9529, 200), +(9530, 600), +(9531, 850), +(9532, 1000), +(9533, 2500), +(9534, 1200), +(9535, 3400), +(9536, 800), +(9537, 50), +(9538, 100), +(9539, 100), +(9540, 100), +(9541, 100), +(9542, 1041), +(9543, 1300), +(9544, 12916), +(9547, 1300), +(9548, 1300), +(9549, 1200), +(9555, 7150), +(9556, 1200), +(9557, 1000), +(9558, 200), +(9559, 850), +(9560, 0), +(9561, 850), +(9562, 10000), +(9563, 900), +(9564, 650), +(9565, 650), +(9566, 1000), +(9567, 1100), +(9568, 1400), +(9569, 1200), +(9570, 100), +(9571, 20125), +(9572, 900), +(9573, 1000), +(9574, 12625), +(9575, 900), +(9577, 1400), +(9578, 1400), +(9579, 1200), +(9580, 900), +(9581, 850), +(9583, 1000), +(9584, 1400), +(9585, 450), +(9586, 10000), +(9587, 20125), +(9588, 12916), +(9589, 20833), +(9593, 1000), +(9594, 900), +(9598, 900), +(9600, 750), +(9601, 200), +(9602, 400), +(9603, 400), +(9604, 400), +(9605, 850), +(9606, 12916), +(9607, 20833), +(9608, 900), +(9609, 6250), +(9611, 550), +(9615, 650), +(9617, 850), +(9619, 1000), +(9620, 850), +(9621, 650), +(9622, 100), +(9623, 900), +(9624, 200), +(9625, 1700), +(9626, 2500), +(9627, 1000), +(9628, 900), +(9629, 0), +(9630, 6250), +(9631, 800), +(9632, 1100), +(9633, 900), +(9634, 9500), +(9635, 9500), +(9636, 12650), +(9637, 1250), +(9638, 1250), +(9639, 12650), +(9640, 1100), +(9641, 0), +(9642, 1100), +(9643, 12650), +(9644, 12650), +(9645, 1300), +(9646, 1200), +(9647, 1000), +(9648, 1400), +(9662, 900), +(9665, 900), +(9666, 1200), +(9667, 100), +(9668, 1500), +(9669, 1500), +(9670, 0), +(9671, 350), +(9673, 1400), +(9675, 50), +(9679, 12650), +(9681, 1400), +(9682, 1500), +(9686, 1400), +(9687, 1500), +(9688, 1700), +(9691, 2800), +(9692, 100), +(9693, 1100), +(9695, 100), +(9696, 5250), +(9697, 1200), +(9698, 300), +(9699, 1200), +(9700, 10416), +(9701, 10750), +(9702, 1300), +(9703, 100), +(9704, 200), +(9705, 1000), +(9706, 900), +(9707, 10416), +(9708, 13375), +(9709, 0), +(9710, 1400), +(9712, 0), +(9713, 0), +(9714, 11000), +(9715, 10416), +(9716, 13750), +(9717, 7833), +(9718, 13750), +(9719, 13375), +(9723, 5375), +(9725, 10750), +(9726, 0), +(9727, 13375), +(9728, 13750), +(9729, 13375), +(9730, 10416), +(9731, 10416), +(9732, 6750), +(9733, 8750), +(9737, 22000), +(9738, 10416), +(9739, 1400), +(9740, 1000), +(9741, 0), +(9742, 10750), +(9743, 0), +(9745, 1400), +(9746, 10000), +(9747, 1400), +(9748, 1500), +(9749, 0), +(9750, 350), +(9751, 10416), +(9752, 150), +(9755, 1200), +(9757, 100), +(9758, 2400), +(9759, 400), +(9760, 2000), +(9761, 0), +(9762, 19000), +(9763, 12650), +(9764, 12650), +(9765, 0), +(9766, 12650), +(9768, 10000), +(9769, 10000), +(9770, 10000), +(9771, 10000), +(9772, 9750), +(9773, 10000), +(9774, 2500), +(9775, 2625), +(9776, 10000), +(9777, 1093), +(9778, 1200), +(9779, 10000), +(9780, 10000), +(9781, 10000), +(9782, 10000), +(9783, 0), +(9784, 5375), +(9785, 10000), +(9786, 10000), +(9787, 10000), +(9788, 11300), +(9789, 10000), +(9790, 10000), +(9791, 2625), +(9792, 2500), +(9793, 2700), +(9794, 2700), +(9795, 2500), +(9796, 2625), +(9797, 450), +(9798, 250), +(9799, 11000), +(9800, 10000), +(9801, 10416), +(9802, 12625), +(9803, 11000), +(9804, 11000), +(9805, 10750), +(9806, 0), +(9807, 10750), +(9808, 0), +(9809, 11300), +(9810, 850), +(9811, 850), +(9812, 1700), +(9813, 10750), +(9814, 11300), +(9815, 10750), +(9816, 12916), +(9817, 0), +(9818, 11000), +(9819, 13375), +(9820, 11300), +(9821, 10750), +(9822, 13375), +(9823, 12650), +(9824, 12650), +(9825, 6250), +(9826, 10000), +(9827, 10000), +(9828, 6250), +(9829, 10750), +(9830, 12650), +(9831, 25300), +(9832, 10750), +(9833, 10750), +(9834, 10750), +(9835, 15800), +(9836, 19000), +(9837, 6250), +(9838, 13375), +(9839, 12650), +(9840, 10750), +(9841, 10750), +(9842, 12650), +(9843, 12650), +(9844, 10750), +(9845, 10000), +(9846, 10750), +(9847, 10750), +(9848, 17450), +(9849, 11650), +(9850, 14600), +(9851, 17950), +(9852, 17450), +(9853, 11000), +(9854, 11650), +(9855, 14600), +(9856, 11000), +(9857, 11300), +(9858, 14150), +(9859, 19000), +(9860, 11650), +(9861, 11650), +(9862, 11300), +(9863, 2900), +(9864, 11650), +(9865, 0), +(9866, 11650), +(9867, 14600), +(9868, 2850), +(9869, 2850), +(9870, 11650), +(9871, 11650), +(9872, 11650), +(9873, 11650), +(9874, 0), +(9875, 1100), +(9876, 400), +(9877, 11650), +(9878, 14600), +(9881, 11300), +(9882, 0), +(9883, 0), +(9884, 0), +(9885, 0), +(9886, 0), +(9887, 2700), +(9888, 11000), +(9889, 1100), +(9890, 2700), +(9891, 0), +(9892, 11650), +(9893, 10000), +(9894, 12625), +(9895, 10000), +(9896, 11000), +(9897, 10000), +(9898, 10000), +(9899, 11650), +(9900, 10000), +(9901, 10750), +(9902, 10750), +(9903, 10750), +(9904, 10750), +(9905, 11000), +(9906, 14150), +(9909, 11000), +(9910, 10750), +(9911, 1000), +(9912, 1150), +(9913, 11300), +(9914, 0), +(9915, 11300), +(9916, 11000), +(9917, 11000), +(9918, 10750), +(9919, 0), +(9920, 11000), +(9921, 14150), +(9922, 11000), +(9923, 11300), +(9924, 11300), +(9925, 0), +(9926, 11300), +(9927, 11300), +(9928, 9416), +(9929, 9416), +(9930, 11300), +(9931, 11300), +(9932, 14150), +(9933, 14150), +(9934, 11300), +(9935, 11300), +(9936, 14600), +(9937, 14600), +(9938, 11300), +(9939, 11300), +(9940, 9416), +(9941, 9416), +(9942, 2375), +(9943, 1150), +(9944, 11650), +(9945, 14600), +(9946, 2375), +(9947, 11650), +(9948, 9750), +(9949, 9750), +(9950, 13375), +(9951, 2450), +(9952, 2700), +(9953, 11650), +(9954, 14600), +(9955, 11650), +(9956, 2583), +(9957, 7500), +(9958, 8250), +(9959, 2583), +(9960, 2583), +(9961, 11650), +(9962, 2700), +(9963, 2700), +(9964, 11000), +(9965, 11000), +(9966, 11650), +(9967, 10416), +(9968, 10000), +(9969, 14600), +(9970, 10416), +(9971, 14600), +(9972, 14600), +(9973, 10000), +(9974, 10000), +(9975, 7500), +(9976, 17950), +(9977, 10416), +(9978, 5250), +(9979, 15000), +(9980, 15000), +(9981, 1200), +(9982, 1200), +(9983, 10000), +(9984, 11000), +(9985, 10750), +(9986, 10750), +(9987, 10000), +(9988, 10000), +(9989, 10750), +(9990, 3050), +(9991, 10416), +(9992, 10416), +(9993, 5375), +(9994, 5375), +(9995, 10750), +(9996, 10750), +(9997, 10416), +(9998, 12000), +(9999, 10416), +(10000, 12000), +(10001, 10750), +(10002, 10750), +(10003, 12000), +(10004, 15583), +(10005, 15583), +(10006, 10750), +(10007, 10750), +(10008, 12000), +(10009, 6000), +(10010, 17950), +(10011, 10750), +(10012, 10750), +(10013, 9750), +(10014, 9750), +(10015, 10750), +(10016, 10750), +(10017, 10750), +(10018, 0), +(10019, 13375), +(10020, 10750), +(10021, 13375), +(10022, 13375), +(10023, 11000), +(10024, 0), +(10025, 10750), +(10026, 10750), +(10027, 10416), +(10028, 5500), +(10029, 11000), +(10030, 11000), +(10032, 11000), +(10033, 11000), +(10034, 13750), +(10035, 13750), +(10036, 10750), +(10037, 2625), +(10038, 2625), +(10039, 11000), +(10040, 11000), +(10041, 13750), +(10042, 13750), +(10043, 1200), +(10044, 14950), +(10045, 4750), +(10046, 9750), +(10047, 9750), +(10048, 9750), +(10049, 9750), +(10050, 13375), +(10051, 13375), +(10052, 49000), +(10053, 49000), +(10054, 9750), +(10055, 49000), +(10056, 9750), +(10057, 9750), +(10058, 49000), +(10059, 49000), +(10060, 49000), +(10061, 49000), +(10062, 300), +(10063, 150), +(10064, 1300), +(10065, 1700), +(10066, 1500), +(10067, 0), +(10068, 0), +(10069, 0), +(10070, 0), +(10071, 0), +(10072, 0), +(10073, 11650), +(10074, 0), +(10075, 11650), +(10076, 0), +(10077, 9750), +(10078, 9750), +(10080, 1200), +(10081, 12000), +(10083, 73500), +(10084, 12000), +(10085, 9750), +(10086, 9750), +(10087, 49000), +(10088, 61000), +(10089, 61000), +(10090, 15800), +(10091, 73500), +(10092, 2583), +(10093, 15800), +(10094, 19000), +(10095, 10000), +(10096, 15400), +(10097, 15400), +(10098, 9750), +(10099, 9000), +(10100, 12000), +(10101, 12000), +(10102, 2400), +(10103, 2500), +(10104, 2500), +(10105, 7250), +(10106, 8550), +(10107, 8550), +(10108, 11300), +(10109, 7250), +(10110, 14150), +(10111, 10750), +(10112, 1100), +(10113, 1100), +(10114, 10750), +(10115, 10750), +(10116, 10750), +(10117, 10750), +(10118, 2400), +(10119, 2400), +(10120, 950), +(10121, 49000), +(10122, 9750), +(10123, 950), +(10124, 25125), +(10125, 49000), +(10126, 25125), +(10127, 49000), +(10128, 12625), +(10129, 49000), +(10130, 49000), +(10131, 12916), +(10132, 31500), +(10133, 5250), +(10134, 2500), +(10135, 15583), +(10136, 49000), +(10137, 9000), +(10138, 31500), +(10139, 2400), +(10140, 950), +(10141, 9750), +(10142, 950), +(10143, 10000), +(10144, 25125), +(10145, 12625), +(10146, 31500), +(10147, 2500), +(10148, 25916), +(10149, 49000), +(10150, 49000), +(10151, 49000), +(10152, 49000), +(10153, 49000), +(10154, 49000), +(10155, 49000), +(10156, 31500), +(10157, 49000), +(10158, 10416), +(10159, 2400), +(10160, 9750), +(10161, 10000), +(10162, 10000), +(10163, 17450), +(10164, 22600), +(10165, 850), +(10166, 14950), +(10167, 14950), +(10168, 5500), +(10169, 1200), +(10170, 1200), +(10171, 3050), +(10172, 12000), +(10173, 3050), +(10174, 12000), +(10175, 12000), +(10176, 9500), +(10177, 25300), +(10178, 3050), +(10179, 3100), +(10181, 12000), +(10182, 3050), +(10183, 12000), +(10184, 12000), +(10185, 12000), +(10186, 3100), +(10187, 12300), +(10188, 12000), +(10189, 12000), +(10190, 14950), +(10191, 12300), +(10192, 12000), +(10193, 1200), +(10194, 1000), +(10195, 0), +(10196, 12000), +(10197, 9000), +(10198, 12000), +(10199, 1200), +(10200, 8250), +(10201, 6250), +(10202, 12300), +(10203, 12000), +(10204, 12300), +(10205, 12000), +(10206, 4875), +(10207, 10000), +(10208, 12300), +(10209, 5500), +(10210, 5500), +(10211, 0), +(10212, 2400), +(10213, 49000), +(10215, 14150), +(10217, 22600), +(10218, 0), +(10219, 9750), +(10220, 12000), +(10221, 12300), +(10222, 12300), +(10223, 12000), +(10224, 1200), +(10225, 12000), +(10226, 1150), +(10227, 2900), +(10228, 950), +(10229, 9750), +(10230, 11650), +(10231, 12300), +(10232, 12300), +(10233, 12300), +(10234, 12300), +(10235, 9750), +(10236, 3100), +(10237, 9750), +(10238, 12300), +(10239, 12300), +(10240, 12000), +(10241, 2400), +(10242, 12000), +(10243, 12300), +(10244, 12000), +(10245, 12000), +(10246, 1250), +(10247, 12300), +(10248, 18450), +(10249, 9750), +(10250, 5800), +(10251, 11650), +(10252, 17450), +(10253, 950), +(10254, 10416), +(10255, 12300), +(10256, 25300), +(10257, 9750), +(10258, 6500), +(10259, 3050), +(10260, 12000), +(10261, 12000), +(10262, 1200), +(10263, 1200), +(10264, 12300), +(10265, 3100), +(10266, 12300), +(10267, 6150), +(10268, 12300), +(10269, 12650), +(10270, 12650), +(10271, 12650), +(10272, 12650), +(10273, 15800), +(10274, 12650), +(10275, 12650), +(10276, 1200), +(10277, 9750), +(10278, 1150), +(10279, 19000), +(10280, 3150), +(10281, 1200), +(10282, 17950), +(10283, 17950), +(10284, 1200), +(10285, 7625), +(10286, 5000), +(10287, 2400), +(10288, 2400), +(10289, 12650), +(10290, 4800), +(10291, 12300), +(10292, 12300), +(10293, 9750), +(10294, 10416), +(10295, 1250), +(10296, 19000), +(10297, 1250), +(10298, 12000), +(10299, 12300), +(10300, 12300), +(10301, 150), +(10302, 350), +(10303, 200), +(10304, 12300), +(10305, 12300), +(10306, 12300), +(10307, 0), +(10308, 12000), +(10309, 15800), +(10310, 1250), +(10311, 12300), +(10312, 12000), +(10313, 12300), +(10314, 12650), +(10315, 12300), +(10316, 12650), +(10317, 12650), +(10318, 12300), +(10319, 15400), +(10320, 12300), +(10321, 12650), +(10322, 12650), +(10323, 550), +(10324, 11000), +(10325, 0), +(10326, 0), +(10327, 12650), +(10328, 12000), +(10329, 12300), +(10330, 12300), +(10331, 12300), +(10332, 1250), +(10333, 9250), +(10334, 12650), +(10335, 12650), +(10336, 12300), +(10337, 12650), +(10338, 12650), +(10339, 950), +(10340, 12650), +(10341, 12000), +(10342, 3100), +(10343, 950), +(10344, 12650), +(10345, 0), +(10346, 0), +(10347, 12300), +(10348, 1041), +(10349, 400), +(10350, 12916), +(10351, 950), +(10352, 12650), +(10353, 2400), +(10354, 10000), +(10355, 4750), +(10356, 9550), +(10357, 0), +(10358, 950), +(10359, 2400), +(10360, 4750), +(10361, 9550), +(10362, 0), +(10363, 100), +(10364, 12650), +(10366, 10000), +(10367, 10000), +(10368, 12625), +(10369, 0), +(10370, 150), +(10371, 100), +(10372, 700), +(10373, 700), +(10374, 0), +(10375, 0), +(10376, 0), +(10377, 0), +(10378, 0), +(10379, 12650), +(10380, 9500), +(10381, 950), +(10382, 0), +(10383, 6250), +(10384, 12650), +(10385, 4875), +(10386, 4875), +(10387, 950), +(10388, 9750), +(10389, 9750), +(10390, 9750), +(10391, 9750), +(10392, 4875), +(10393, 9750), +(10394, 4875), +(10395, 9750), +(10396, 9750), +(10397, 49000), +(10398, 9750), +(10399, 15583), +(10400, 25916), +(10402, 2500), +(10403, 15800), +(10404, 12650), +(10405, 12650), +(10406, 15800), +(10407, 19000), +(10408, 19000), +(10409, 9500), +(10410, 12650), +(10411, 11000), +(10412, 15800), +(10413, 0), +(10414, 0), +(10415, 15800), +(10416, 6000), +(10417, 12000), +(10418, 0), +(10419, 15800), +(10420, 0), +(10421, 12650), +(10422, 1250), +(10423, 9250), +(10424, 12650), +(10425, 12300), +(10426, 15400), +(10427, 400), +(10428, 12300), +(10429, 1250), +(10430, 3150), +(10431, 12650), +(10432, 12300), +(10433, 1250), +(10434, 12300), +(10435, 12300), +(10436, 12650), +(10437, 12650), +(10438, 19000), +(10439, 3100), +(10440, 1250), +(10441, 950), +(10442, 950), +(10443, 1093), +(10444, 19000), +(10445, 13750), +(10446, 13750), +(10447, 1093), +(10448, 2400), +(10449, 9500), +(10450, 15800), +(10453, 0), +(10454, 11300), +(10455, 11300), +(10456, 11300), +(10457, 12650), +(10458, 12650), +(10459, 12650), +(10460, 12650), +(10461, 12650), +(10462, 12650), +(10463, 15800), +(10464, 15800), +(10465, 15800), +(10466, 15800), +(10467, 15800), +(10468, 15800), +(10469, 15800), +(10470, 15800), +(10471, 15800), +(10472, 15800), +(10473, 15800), +(10474, 15800), +(10475, 11650), +(10476, 0), +(10477, 0), +(10478, 11650), +(10479, 12650), +(10480, 12650), +(10481, 9000), +(10482, 2300), +(10483, 9000), +(10484, 9500), +(10485, 11300), +(10486, 11300), +(10487, 11300), +(10488, 11300), +(10491, 6500), +(10492, 6500), +(10493, 14300), +(10494, 14300), +(10495, 14300), +(10496, 14300), +(10497, 2400), +(10498, 2400), +(10499, 9500), +(10500, 9500), +(10501, 11300), +(10502, 14150), +(10503, 11300), +(10504, 11300), +(10505, 11300), +(10506, 19000), +(10507, 15800), +(10508, 9500), +(10509, 11300), +(10510, 11300), +(10511, 11300), +(10512, 1250), +(10513, 12650), +(10514, 12650), +(10515, 11300), +(10516, 11650), +(10517, 14600), +(10518, 1250), +(10519, 700), +(10520, 1250), +(10521, 15800), +(10522, 3150), +(10523, 11300), +(10524, 8550), +(10525, 14600), +(10526, 6250), +(10527, 9500), +(10530, 8150), +(10531, 12650), +(10532, 0), +(10533, 100), +(10534, 12650), +(10535, 0), +(10536, 12650), +(10537, 9500), +(10538, 100), +(10539, 15800), +(10540, 6250), +(10541, 11300), +(10542, 11650), +(10543, 14150), +(10544, 11300), +(10545, 3150), +(10546, 12650), +(10547, 1400), +(10549, 3150), +(10550, 0), +(10551, 0), +(10552, 1100), +(10553, 1100), +(10554, 11300), +(10555, 8550), +(10556, 2625), +(10557, 12650), +(10558, 0), +(10559, 12650), +(10560, 12650), +(10561, 12300), +(10562, 12300), +(10563, 12300), +(10564, 5650), +(10565, 11300), +(10566, 11300), +(10567, 12650), +(10568, 12300), +(10569, 9500), +(10570, 12650), +(10571, 12300), +(10572, 1250), +(10573, 12650), +(10574, 6250), +(10575, 12650), +(10576, 9500), +(10577, 12650), +(10578, 6250), +(10579, 2900), +(10580, 2900), +(10581, 12300), +(10582, 12300), +(10583, 11650), +(10584, 12300), +(10585, 12300), +(10586, 12650), +(10587, 0), +(10588, 12300), +(10589, 7250), +(10591, 3700), +(10592, 11000), +(10593, 11650), +(10594, 12300), +(10595, 12300), +(10596, 12300), +(10597, 12300), +(10598, 1250), +(10599, 12300), +(10600, 12300), +(10601, 12300), +(10602, 12300), +(10603, 12300), +(10605, 12300), +(10606, 12000), +(10607, 11650), +(10608, 11650), +(10609, 0), +(10610, 12300), +(10611, 15400), +(10612, 15400), +(10613, 1150), +(10614, 2625), +(10616, 11300), +(10617, 11000), +(10618, 12650), +(10619, 11650), +(10620, 9250), +(10621, 0), +(10622, 9250), +(10623, 12300), +(10624, 12300), +(10625, 12300), +(10626, 12300), +(10627, 3150), +(10628, 9750), +(10629, 9750), +(10631, 11650), +(10632, 6250), +(10633, 15800), +(10634, 12650), +(10635, 12650), +(10636, 12650), +(10637, 100), +(10638, 0), +(10639, 6250), +(10640, 12650), +(10641, 12300), +(10642, 12300), +(10643, 6250), +(10644, 0), +(10645, 6250), +(10646, 15800), +(10647, 15800), +(10648, 15800), +(10649, 6250), +(10650, 19000), +(10651, 1250), +(10652, 12650), +(10653, 0), +(10654, 0), +(10655, 12650), +(10656, 11650), +(10657, 0), +(10658, 0), +(10659, 12300), +(10660, 12300), +(10661, 1250), +(10662, 1250), +(10663, 9250), +(10664, 12300), +(10665, 12300), +(10666, 12650), +(10667, 12650), +(10668, 12650), +(10669, 12650), +(10670, 11650), +(10671, 12300), +(10672, 12650), +(10673, 11650), +(10674, 14950), +(10675, 1250), +(10676, 12300), +(10677, 12650), +(10678, 15800), +(10679, 3150), +(10680, 3150), +(10681, 11650), +(10682, 12650), +(10683, 12650), +(10684, 12650), +(10685, 6250), +(10686, 12650), +(10687, 12650), +(10688, 6250), +(10689, 11300), +(10690, 6250), +(10691, 19000), +(10692, 0), +(10693, 0), +(10694, 0), +(10695, 0), +(10696, 0), +(10697, 0), +(10698, 0), +(10699, 0), +(10700, 12000), +(10701, 12300), +(10702, 12300), +(10703, 25300), +(10704, 25300), +(10705, 9500), +(10706, 19000), +(10707, 19000), +(10708, 2900), +(10709, 5375), +(10710, 5375), +(10711, 5375), +(10712, 11650), +(10713, 11650), +(10714, 11650), +(10715, 2375), +(10716, 11650), +(10717, 1150), +(10718, 1150), +(10719, 11650), +(10720, 11650), +(10721, 12000), +(10722, 12000), +(10723, 11650), +(10724, 15800), +(10725, 15800), +(10726, 15800), +(10727, 15800), +(10728, 12650), +(10729, 12650), +(10730, 12650), +(10731, 12650), +(10732, 15800), +(10733, 15800), +(10734, 15800), +(10735, 15800), +(10736, 15800), +(10737, 15800), +(10738, 15800), +(10739, 15800), +(10740, 15800), +(10741, 19000), +(10743, 15800), +(10744, 15800), +(10746, 12000), +(10747, 14950), +(10748, 1150), +(10749, 9500), +(10750, 15800), +(10751, 1200), +(10752, 8750), +(10753, 12650), +(10754, 12650), +(10755, 3150), +(10756, 12650), +(10757, 15800), +(10758, 1250), +(10759, 12300), +(10760, 1250), +(10761, 3150), +(10762, 12650), +(10763, 15800), +(10764, 15800), +(10765, 1250), +(10766, 1250), +(10767, 15800), +(10768, 19000), +(10769, 11650), +(10770, 11650), +(10771, 9500), +(10772, 15800), +(10773, 15800), +(10774, 15800), +(10775, 19000), +(10776, 12300), +(10777, 12300), +(10778, 100), +(10779, 12300), +(10780, 19000), +(10781, 12300), +(10782, 2900), +(10783, 11650), +(10784, 1150), +(10785, 14950), +(10790, 1093), +(10791, 9750), +(10792, 9500), +(10793, 200), +(10794, 11650), +(10795, 11650), +(10796, 1150), +(10797, 1150), +(10798, 11650), +(10799, 11650), +(10800, 1150), +(10801, 14950), +(10802, 12000), +(10803, 12650), +(10804, 14600), +(10805, 19000), +(10806, 12650), +(10807, 15400), +(10808, 9500), +(10809, 3050), +(10810, 3150), +(10811, 3050), +(10812, 5000), +(10813, 3150), +(10814, 9500), +(10815, 12650), +(10816, 12650), +(10817, 1150), +(10818, 12000), +(10819, 9000), +(10820, 12000), +(10821, 0), +(10822, 0), +(10823, 12650), +(10824, 1200), +(10825, 12650), +(10826, 0), +(10827, 0), +(10828, 1200), +(10829, 14950), +(10830, 9500), +(10831, 9500), +(10832, 9500), +(10833, 12625), +(10834, 2400), +(10835, 12650), +(10836, 12650), +(10837, 12250), +(10838, 10750), +(10839, 11000), +(10840, 0), +(10841, 13750), +(10842, 12000), +(10843, 12000), +(10844, 12000), +(10845, 11650), +(10846, 10000), +(10847, 10750), +(10848, 2583), +(10849, 0), +(10850, 11650), +(10851, 10750), +(10852, 11650), +(10853, 12650), +(10854, 12300), +(10855, 12300), +(10856, 15400), +(10857, 3150), +(10858, 11650), +(10859, 11650), +(10860, 10750), +(10861, 10416), +(10862, 10416), +(10863, 9750), +(10864, 1200), +(10865, 12650), +(10866, 14950), +(10867, 10000), +(10868, 10000), +(10869, 0), +(10870, 0), +(10871, 12650), +(10872, 11000), +(10873, 11000), +(10874, 2400), +(10875, 12916), +(10876, 11300), +(10877, 10416), +(10878, 16500), +(10879, 5375), +(10880, 13375), +(10881, 19000), +(10882, 1250), +(10883, 19000), +(10884, 19000), +(10885, 19000), +(10886, 10750), +(10887, 19000), +(10888, 8250), +(10890, 5000), +(10891, 5000), +(10892, 11650), +(10893, 1150), +(10894, 12000), +(10895, 11000), +(10896, 12650), +(10897, 13750), +(10898, 12650), +(10899, 0), +(10900, 19000), +(10901, 12650), +(10902, 4875), +(10903, 12000), +(10904, 1250), +(10905, 1250), +(10906, 1250), +(10907, 1041), +(10908, 9750), +(10909, 12000), +(10910, 12000), +(10911, 17950), +(10912, 11000), +(10913, 11000), +(10914, 11000), +(10915, 4875), +(10916, 11000), +(10917, 0), +(10918, 0), +(10919, 11000), +(10920, 11000), +(10921, 11000), +(10922, 11000), +(10923, 12300), +(10924, 0), +(10925, 8250), +(10926, 11000), +(10927, 11000), +(10928, 11000), +(10929, 13750), +(10930, 0), +(10931, 0), +(10932, 0), +(10933, 0), +(10934, 12250), +(10935, 950), +(10936, 12625), +(10937, 0), +(10938, 0), +(10939, 0), +(10940, 0), +(10943, 15800), +(10945, 19000), +(10946, 19000), +(10947, 6250), +(10948, 9500), +(10956, 19000), +(10957, 15800), +(10958, 19000), +(10968, 1250), +(10969, 12650), +(10970, 12650), +(10971, 0), +(10972, 12650), +(10973, 12650), +(10974, 0), +(10975, 12650), +(10976, 19000), +(10980, 0), +(10981, 19000), +(10982, 3150), +(10983, 1250), +(10984, 12650), +(10988, 1250), +(10994, 15800), +(10995, 15800), +(10996, 15800), +(10997, 15800), +(10999, 19000), +(11001, 19000), +(11002, 19000), +(11003, 12650), +(11004, 12650), +(11005, 0), +(11006, 0), +(11007, 12650), +(11008, 3150), +(11009, 12650), +(11010, 0), +(11011, 0), +(11012, 1250), +(11013, 0), +(11014, 12650), +(11015, 12650), +(11016, 12650), +(11017, 12650), +(11018, 0), +(11019, 12650), +(11020, 6250), +(11021, 0), +(11022, 12650), +(11023, 6250), +(11024, 12650), +(11025, 12650), +(11026, 1250), +(11027, 6250), +(11028, 9500), +(11029, 12650), +(11030, 0), +(11031, 0), +(11032, 0), +(11033, 0), +(11034, 12650), +(11035, 1150), +(11036, 1150), +(11037, 1150), +(11038, 1150), +(11039, 1150), +(11040, 12650), +(11041, 1150), +(11042, 1150), +(11043, 1150), +(11044, 1150), +(11045, 1150), +(11046, 1150), +(11047, 1150), +(11048, 15800), +(11049, 0), +(11050, 12650), +(11051, 19000), +(11052, 12650), +(11053, 12650), +(11054, 12650), +(11055, 6250), +(11056, 0), +(11057, 12650), +(11058, 19000), +(11059, 1250), +(11060, 12650), +(11061, 1250), +(11062, 0), +(11063, 12650), +(11064, 12650), +(11065, 12650), +(11066, 12650), +(11067, 15800), +(11068, 15800), +(11069, 15800), +(11070, 19000), +(11071, 15800), +(11072, 19000), +(11073, 0), +(11074, 6250), +(11075, 15800), +(11076, 12650), +(11077, 19000), +(11078, 19000), +(11079, 9500), +(11080, 12650), +(11081, 12650), +(11082, 12650), +(11083, 12650), +(11084, 9500), +(11085, 12650), +(11088, 12650), +(11089, 12650), +(11090, 1250), +(11091, 12650), +(11092, 12650), +(11093, 12650), +(11094, 0), +(11095, 12650), +(11096, 12650), +(11097, 1250), +(11098, 12650), +(11099, 0), +(11100, 12650), +(11101, 12650), +(11102, 0), +(11103, 0), +(11104, 0), +(11105, 0), +(11106, 0), +(11107, 19000), +(11108, 0), +(11109, 0), +(11110, 0), +(11111, 0), +(11112, 0), +(11113, 0), +(11118, 1250), +(11122, 350), +(11123, 350), +(11125, 3300), +(11127, 3300), +(11128, 650), +(11129, 1250), +(11131, 15800), +(11132, 3300), +(11133, 4600), +(11134, 12650), +(11135, 350), +(11136, 3700), +(11137, 350), +(11138, 3700), +(11139, 3700), +(11140, 350), +(11141, 3700), +(11142, 400), +(11143, 3900), +(11144, 3700), +(11145, 3700), +(11146, 3700), +(11147, 3900), +(11148, 400), +(11149, 4100), +(11150, 400), +(11151, 5250), +(11155, 4100), +(11157, 4100), +(11158, 4600), +(11159, 4100), +(11160, 4100), +(11161, 5750), +(11162, 19000), +(11163, 15800), +(11164, 15800), +(11165, 19000), +(11168, 3900), +(11170, 0), +(11171, 450), +(11172, 4100), +(11173, 4400), +(11176, 350), +(11177, 0), +(11179, 3500), +(11180, 3500), +(11182, 4400), +(11183, 4100), +(11184, 3900), +(11185, 3900), +(11190, 350), +(11191, 3300), +(11192, 350), +(11193, 350), +(11194, 0), +(11195, 15800), +(11197, 4400), +(11199, 3700), +(11200, 3900), +(11202, 350), +(11203, 400), +(11204, 4100), +(11205, 5250), +(11206, 4100), +(11207, 400), +(11208, 3700), +(11209, 350), +(11210, 400), +(11211, 350), +(11212, 350), +(11213, 400), +(11214, 400), +(11215, 1250), +(11216, 4400), +(11219, 12650), +(11221, 350), +(11222, 4600), +(11224, 350), +(11353, 19000), +(11361, 19000), +(11362, 19000), +(11363, 12650), +(11367, 19000), +(11368, 19000), +(11369, 19000), +(11370, 12650), +(11371, 19000), +(11372, 19000), +(11373, 19000), +(11374, 19000), +(11375, 12650), +(11376, 12650), +(11377, 19000), +(11378, 12650), +(11379, 12650), +(11380, 12650), +(11381, 19000), +(11382, 12650), +(11383, 19000), +(11384, 12650), +(11385, 19000), +(11386, 12650), +(11387, 19000), +(11388, 12650), +(11391, 1250), +(11424, 0), +(11450, 6250), +(11453, 0), +(11480, 1250), +(11481, 1250), +(11487, 25300), +(11489, 12650), +(11491, 25300), +(11495, 9500), +(11496, 1250), +(11497, 1250), +(11498, 19000), +(11499, 12650), +(11501, 12650), +(11502, 12650), +(11512, 9500), +(11513, 9500), +(11514, 12650), +(11515, 9500), +(11516, 1250), +(11517, 0), +(11519, 9500), +(11520, 15800), +(11522, 9500), +(11523, 9500), +(11524, 9500), +(11525, 9500), +(11530, 12650), +(11531, 9500), +(11532, 9500), +(11533, 1250), +(11534, 12650), +(11535, 12650), +(11536, 9500), +(11537, 9500), +(11538, 12650), +(11539, 12650), +(11540, 12650), +(11541, 12650), +(11542, 12650), +(11543, 15800), +(11544, 0), +(11545, 12650), +(11546, 12650), +(11547, 0), +(11548, 0), +(11549, 3150), +(11553, 0), +(11554, 0), +(11555, 0), +(11556, 0), +(11576, 0), +(11664, 0), +(11665, 0), +(11666, 0), +(11667, 0), +(11668, 0), +(11690, 12650), +(11695, 1250), +(11873, 0), +(11874, 12650), +(11876, 9500), +(11879, 9500), +(11884, 15800), +(11916, 17500), +(11936, 0), +(11946, 27000), +(11947, 50500), +(11951, 70500), +(11952, 95500), +(11953, 11650), +(11954, 6250), +(12061, 0), +(12512, 12000), +(12514, 12000), +(79999, 0), +(80000, 0), +(80001, 0), +(80002, 0), +(80003, 0), +(80004, 0), +(80005, 0), +(80006, 0), +(80007, 0), +(80008, 0), +(80009, 0), +(80010, 0), +(80011, 0), +(80012, 0), +(80013, 0), +(80014, 0), +(80015, 0), +(80016, 0); diff --git a/sql/world/base/vanilla_quest_levels.sql b/sql/world/base/vanilla_quest_levels.sql index 5789c70..213e701 100644 --- a/sql/world/base/vanilla_quest_levels.sql +++ b/sql/world/base/vanilla_quest_levels.sql @@ -304,9 +304,6 @@ UPDATE quest_template SET RequiredItemId1 = 10699, RequiredItemId2 = 0, Required /* Rise, Obsidion! */ UPDATE quest_template SET QuestLevel = 52 WHERE ID=3566; -/* */ -UPDATE quest_template SET LogTitle = Plainsrunning, QuestLevel = 60, MinLevel = 45 WHERE ID=3581; - /* Bring the Light */ UPDATE quest_template SET QuestLevel = 42, MinLevel = 39 WHERE ID=3636; diff --git a/src/IndividualProgression.cpp b/src/IndividualProgression.cpp index 8da2c59..98e4c0b 100644 --- a/src/IndividualProgression.cpp +++ b/src/IndividualProgression.cpp @@ -4,7 +4,7 @@ #include "IndividualProgression.h" -static float vanillaPowerAdjustment, vanillaHealthAdjustment, tbcPowerAdjustment, tbcHealthAdjustment; +static float vanillaPowerAdjustment, vanillaHealthAdjustment, tbcPowerAdjustment, tbcHealthAdjustment, vanillaHealingAdjustment, tbcHealingAdjustment; static bool enabled, questXpFix, hunterPetLevelFix, requirePreAQQuests, enforceGroupRules; class gobject_ipp_wotlk : public GameObjectScript @@ -118,8 +118,10 @@ private: { enabled = sConfigMgr->GetOption("IndividualProgression.Enable", true); vanillaPowerAdjustment = sConfigMgr->GetOption("IndividualProgression.VanillaPowerAdjustment", 1); + vanillaHealingAdjustment = sConfigMgr->GetOption("IndividualProgression.VanillaHealingAdjustment", 1); vanillaHealthAdjustment = sConfigMgr->GetOption("IndividualProgression.VanillaHealthAdjustment", 1); tbcPowerAdjustment = sConfigMgr->GetOption("IndividualProgression.TBCPowerAdjustment", 1); + tbcHealingAdjustment = sConfigMgr->GetOption("IndividualProgression.TBCHealingAdjustment", 1); tbcHealthAdjustment = sConfigMgr->GetOption("IndividualProgression.TBCHealthAdjustment", 1); questXpFix = sConfigMgr->GetOption("IndividualProgression.QuestXPFix", true); hunterPetLevelFix = sConfigMgr->GetOption("IndividualProgression.HunterPetLevelFix", true); @@ -127,12 +129,111 @@ private: enforceGroupRules = sConfigMgr->GetOption("IndividualProgression.EnforceGroupRules", true); } + void LoadXpValues() + { + if (enabled && questXpFix) + { + LOG_INFO("module", "Loading Quest XP cache...."); + uint32 questXpAmount = 0; + QueryResult result = WorldDatabase.Query("SELECT entry, xpValue FROM custom_quest_xp"); + if (result) + { + do + { + uint32 questId = (*result)[0].Get(); + uint32 xpValue = (*result)[1].Get(); + questXpMap.insert({questId, xpValue}); + questXpAmount++; + } while (result->NextRow()); + } + LOG_INFO("module", "Loaded {} quest XP values into cache", questXpAmount); + } + } + public: IndividualPlayerProgression_WorldScript() : WorldScript("IndividualProgression_WorldScript") { } void OnBeforeConfigLoad(bool /*reload*/) override { LoadConfig(); + LoadXpValues(); + } +}; + +class IndividualPlayerProgression_PetScript : public PetScript +{ +private: + bool hasPassedProgression(Player* player, ProgressionState state) + { + return player->GetPlayerSetting("mod-individual-progression", SETTING_PROGRESSION_STATE).value >= state; + } + + void CheckAdjustments(Pet* pet) + { + if (!enabled) + { + return; + } + if (!pet || !pet->GetOwner()) + { + return; + } + if (!hasPassedProgression(pet->GetOwner(), PROGRESSION_NAXX40)) + { + AdjustVanillaStats(pet); + } + else if (!hasPassedProgression(pet->GetOwner(), PROGRESSION_TBC_TIER_5)) + { + AdjustTBCStats(pet); + } + + } + + void AdjustVanillaStats(Pet* pet) + { + float adjustmentValue = -100.0 * (1.0 - vanillaPowerAdjustment); + float adjustmentApplyPercent = (pet->getLevel() - 10.0) / 50.0; + float computedAdjustment = pet->getLevel() > 10 ? (adjustmentValue * adjustmentApplyPercent) : 0; + float hpAdjustmentValue = -100.0 * (1.0 - vanillaHealthAdjustment); + float hpAdjustment = pet->getLevel() > 10 ? (hpAdjustmentValue * adjustmentApplyPercent) : 0; + AdjustStats(pet, computedAdjustment, hpAdjustment); + } + + void AdjustTBCStats(Pet* pet) + { + float adjustmentValue = -100.0 * (1.0 - tbcPowerAdjustment); + float adjustmentApplyPercent = 1; + float computedAdjustment = pet->getLevel() > 10 ? (adjustmentValue * adjustmentApplyPercent) : 0; + float hpAdjustmentValue = -100.0 * (1.0 - tbcHealthAdjustment); + float hpAdjustment = pet->getLevel() > 10 ? (hpAdjustmentValue * adjustmentApplyPercent) : 0; + AdjustStats(pet, computedAdjustment, hpAdjustment); + } + + void AdjustStats(Pet* pet, float computedAdjustment, float hpAdjustment) + { + int32 bp0 = 0; // This would be the damage taken adjustment value, but we are already adjusting health + int32 bp1 = static_cast(computedAdjustment); + int32 bp2 = static_cast(hpAdjustment); + + pet->RemoveAura(DAMAGE_DONE_TAKEN_SPELL); + pet->CastCustomSpell(pet, DAMAGE_DONE_TAKEN_SPELL, &bp0, &bp1, nullptr, false); + + pet->RemoveAura(ABSORB_SPELL); + pet->CastCustomSpell(pet, ABSORB_SPELL, &bp1, nullptr, nullptr, false); + + pet->RemoveAura(HEALING_DONE_SPELL); + pet->CastCustomSpell(pet, HEALING_DONE_SPELL, &bp1, nullptr, nullptr, false); + + pet->RemoveAura(HP_AURA_SPELL); + pet->CastCustomSpell(pet, HP_AURA_SPELL, &bp2, nullptr, nullptr, false); + } + +public: + IndividualPlayerProgression_PetScript() : PetScript("IndividualProgression_PetScript") { } + + void OnPetAddToWorld(Pet* pet) override + { + CheckAdjustments(pet); } }; // Add player scripts @@ -152,26 +253,76 @@ private: } } -public: - IndividualPlayerProgression() : PlayerScript("IndividualProgression") { } - - void OnAfterUpdateAttackPowerAndDamage(Player* player, float& /*level*/, float& base_attPower, float& attPowerMod, float& attPowerMultiplier, bool /*ranged*/) override + void CheckAdjustments(Player* player) { if (!enabled) { return; } - // Player is still in Vanilla content - give Vanilla damage adjustment if (!hasPassedProgression(player, PROGRESSION_NAXX40)) { - float computedAdjustment = player->getLevel() > 10 ? 1 - ((player->getLevel() - 10) / 50) * (1 - vanillaPowerAdjustment) : 1; - base_attPower *= computedAdjustment; + AdjustVanillaStats(player); } - // Player is in TBC content - give TBC damage adjustment else if (!hasPassedProgression(player, PROGRESSION_TBC_TIER_5)) { - base_attPower *= tbcPowerAdjustment; + AdjustTBCStats(player); } + + } + + void AdjustVanillaStats(Player* player) + { + float adjustmentValue = -100.0 * (1.0 - vanillaPowerAdjustment); + float adjustmentApplyPercent = (player->getLevel() - 10.0) / 50.0; + float computedAdjustment = player->getLevel() > 10 ? (adjustmentValue * adjustmentApplyPercent) : 0; + AdjustStats(player, computedAdjustment); + } + + void AdjustTBCStats(Player* player) + { + float adjustmentValue = -100.0 * (1.0 - tbcPowerAdjustment); + float adjustmentApplyPercent = 1; + float computedAdjustment = player->getLevel() > 10 ? (adjustmentValue * adjustmentApplyPercent) : 0; + AdjustStats(player, computedAdjustment); + } + + void AdjustStats(Player* player, float computedAdjustment) + { + int32 bp0 = 0; // This would be the damage taken adjustment value, but we are already adjusting health + int32 bp1 = static_cast(computedAdjustment); + + player->RemoveAura(DAMAGE_DONE_TAKEN_SPELL); + player->CastCustomSpell(player, DAMAGE_DONE_TAKEN_SPELL, &bp0, &bp1, nullptr, false); + + player->RemoveAura(ABSORB_SPELL); + player->CastCustomSpell(player, ABSORB_SPELL, &bp1, nullptr, nullptr, false); + + player->RemoveAura(HEALING_DONE_SPELL); + player->CastCustomSpell(player, HEALING_DONE_SPELL, &bp1, nullptr, nullptr, false); + } + + +public: + IndividualPlayerProgression() : PlayerScript("IndividualProgression") { } + + void OnLogin(Player* player) override + { + CheckAdjustments(player); + } + + void OnMapChanged(Player* player) override + { + CheckAdjustments(player); + } + + void OnLevelChanged(Player* player, uint8 /*oldLevel*/) override + { + CheckAdjustments(player); + } + + void OnPlayerResurrect(Player* player, float /*restore_percent*/, bool /*applySickness*/) override + { + CheckAdjustments(player); } void OnAfterUpdateMaxHealth(Player* player, float& value) override @@ -199,11 +350,15 @@ public: { return; } - // Note that this current implementation is too wide and will affect some undesired quests - int32 quest_level = quest->GetQuestLevel(); - if (quest_level < 71 && quest_level > 29) + if (questXpMap.count(quest->GetQuestId())) { - xpValue = xpValue * 0.6; + uint32 vanillaXpValue = questXpMap[quest->GetQuestId()]; + // If XP was already reduced due to out-leveling the quest or other reasons, use the reduced value + if (vanillaXpValue < xpValue) + { + // Otherwise, return the correct Vanilla/TBC Quest XP + xpValue = vanillaXpValue; + } } } @@ -225,20 +380,6 @@ public: } } - void OnBeforeGuardianInitStatsForLevel(Player* player, Guardian* guardian, CreatureTemplate const* cinfo, PetType& petType) override - { - // Currently bugged - disabled for now -// if (!enabled || !hunterPetLevelFix) -// { -// return; -// } -// // We don't want to scale hunter pet to its owners level, but we don't know of the original level, so use the maximum from the creature_template -// if (guardian->IsPet() && player->getClass() == CLASS_HUNTER && guardian->getLevel() > cinfo->maxlevel) -// { -// guardian->SetLevel(cinfo->maxlevel); -// } - } - bool OnBeforeTeleport(Player* player, uint32 mapid, float x, float y, float z, float /*orientation*/, uint32 /*options*/, Unit* /*target*/) override { if (!enabled || player->IsGameMaster()) @@ -411,6 +552,7 @@ void AddSC_mod_individual_progression() { new IndividualPlayerProgression(); new IndividualPlayerProgression_WorldScript(); + new IndividualPlayerProgression_PetScript(); new npc_ipp_aq(); new npc_ipp_tbc(); new gobject_ipp_tbc(); diff --git a/src/IndividualProgression.h b/src/IndividualProgression.h index 48eb8d4..b4c164a 100644 --- a/src/IndividualProgression.h +++ b/src/IndividualProgression.h @@ -10,6 +10,10 @@ #include "MapMgr.h" #include "ObjectAccessor.h" #include "Group.h" +#include "Pet.h" + +typedef std::unordered_map questXpMapType; +questXpMapType questXpMap; enum ProgressionBossIDs { @@ -29,6 +33,16 @@ enum ProgressionBossIDs HALION = 39863 }; +enum BuffSpells +{ + HP_AURA_SPELL = 89501, + DAMAGE_DONE_TAKEN_SPELL = 89502, + BASE_STAT_AP_SPELL = 89503, + RAGE_FROM_DAMAGE_SPELL = 89504, + ABSORB_SPELL = 89505, + HEALING_DONE_SPELL = 89506 +}; + enum ProgressionQuestIDs { MIGHT_OF_KALIMDOR = 8742