Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adding retail chance tables for level 8 spell components, adding quality mod to more rolls #3262

Merged
merged 45 commits into from
Oct 3, 2020

Conversation

gmriggs
Copy link
Collaborator

@gmriggs gmriggs commented Oct 1, 2020

see 782b7a4 for the changes specific to this pr

…difficulty, damage variance, weapondefense, and weaponoffense
…lementalDamageBonus, WieldRequirements, and WeaponDefense
…nMod, ElementalDamageMod, WieldRequirements, and WeaponDefense
# Conflicts:
#	Source/ACE.Server/Factories/Entity/Mutations/Damage_WieldDifficulty_DamageVariance/finesse_axe.txt
#	Source/ACE.Server/Factories/Entity/Mutations/Damage_WieldDifficulty_DamageVariance/finesse_dagger_ms.txt
#	Source/ACE.Server/Factories/Entity/Mutations/Damage_WieldDifficulty_DamageVariance/finesse_mace_jitte.txt
#	Source/ACE.Server/Factories/Entity/Mutations/Damage_WieldDifficulty_DamageVariance/finesse_spear.txt
#	Source/ACE.Server/Factories/Entity/Mutations/Damage_WieldDifficulty_DamageVariance/finesse_sword.txt
#	Source/ACE.Server/Factories/Entity/Mutations/Damage_WieldDifficulty_DamageVariance/finesse_unarmed.txt
#	Source/ACE.Server/Factories/Entity/Mutations/Damage_WieldDifficulty_DamageVariance/light_axe.txt
#	Source/ACE.Server/Factories/Entity/Mutations/Damage_WieldDifficulty_DamageVariance/light_dagger_ms.txt
#	Source/ACE.Server/Factories/Entity/Mutations/Damage_WieldDifficulty_DamageVariance/light_finesse_axe.txt
#	Source/ACE.Server/Factories/Entity/Mutations/Damage_WieldDifficulty_DamageVariance/light_finesse_dagger.txt
#	Source/ACE.Server/Factories/Entity/Mutations/Damage_WieldDifficulty_DamageVariance/light_finesse_dagger_ms.txt
#	Source/ACE.Server/Factories/Entity/Mutations/Damage_WieldDifficulty_DamageVariance/light_finesse_mace.txt
#	Source/ACE.Server/Factories/Entity/Mutations/Damage_WieldDifficulty_DamageVariance/light_finesse_mace_jitte.txt
#	Source/ACE.Server/Factories/Entity/Mutations/Damage_WieldDifficulty_DamageVariance/light_finesse_spear.txt
#	Source/ACE.Server/Factories/Entity/Mutations/Damage_WieldDifficulty_DamageVariance/light_finesse_staff.txt
#	Source/ACE.Server/Factories/Entity/Mutations/Damage_WieldDifficulty_DamageVariance/light_finesse_sword.txt
#	Source/ACE.Server/Factories/Entity/Mutations/Damage_WieldDifficulty_DamageVariance/light_finesse_sword_ms.txt
#	Source/ACE.Server/Factories/Entity/Mutations/Damage_WieldDifficulty_DamageVariance/light_finesse_unarmed.txt
#	Source/ACE.Server/Factories/Entity/Mutations/Damage_WieldDifficulty_DamageVariance/light_mace.txt
#	Source/ACE.Server/Factories/Entity/Mutations/Damage_WieldDifficulty_DamageVariance/light_staff.txt
#	Source/ACE.Server/Factories/Entity/Mutations/Damage_WieldDifficulty_DamageVariance/two_handed_cleaver.txt
#	Source/ACE.Server/Factories/Entity/Mutations/Damage_WieldDifficulty_DamageVariance/two_handed_mace.txt
#	Source/ACE.Server/Factories/Entity/Mutations/MeleeWeapons/Damage_WieldDifficulty_DamageVariance/finesse_axe.txt
#	Source/ACE.Server/Factories/Entity/Mutations/MeleeWeapons/Damage_WieldDifficulty_DamageVariance/finesse_dagger.txt
#	Source/ACE.Server/Factories/Entity/Mutations/MeleeWeapons/Damage_WieldDifficulty_DamageVariance/finesse_dagger_ms.txt
#	Source/ACE.Server/Factories/Entity/Mutations/MeleeWeapons/Damage_WieldDifficulty_DamageVariance/finesse_mace.txt
#	Source/ACE.Server/Factories/Entity/Mutations/MeleeWeapons/Damage_WieldDifficulty_DamageVariance/finesse_mace_jitte.txt
#	Source/ACE.Server/Factories/Entity/Mutations/MeleeWeapons/Damage_WieldDifficulty_DamageVariance/finesse_spear.txt
#	Source/ACE.Server/Factories/Entity/Mutations/MeleeWeapons/Damage_WieldDifficulty_DamageVariance/finesse_staff.txt
#	Source/ACE.Server/Factories/Entity/Mutations/MeleeWeapons/Damage_WieldDifficulty_DamageVariance/finesse_sword.txt
#	Source/ACE.Server/Factories/Entity/Mutations/MeleeWeapons/Damage_WieldDifficulty_DamageVariance/finesse_sword_ms.txt
#	Source/ACE.Server/Factories/Entity/Mutations/MeleeWeapons/Damage_WieldDifficulty_DamageVariance/finesse_unarmed.txt
#	Source/ACE.Server/Factories/Entity/Mutations/MeleeWeapons/Damage_WieldDifficulty_DamageVariance/light_axe.txt
#	Source/ACE.Server/Factories/Entity/Mutations/MeleeWeapons/Damage_WieldDifficulty_DamageVariance/light_dagger.txt
#	Source/ACE.Server/Factories/Entity/Mutations/MeleeWeapons/Damage_WieldDifficulty_DamageVariance/light_dagger_ms.txt
#	Source/ACE.Server/Factories/Entity/Mutations/MeleeWeapons/Damage_WieldDifficulty_DamageVariance/light_mace.txt
#	Source/ACE.Server/Factories/Entity/Mutations/MeleeWeapons/Damage_WieldDifficulty_DamageVariance/light_spear.txt
#	Source/ACE.Server/Factories/Entity/Mutations/MeleeWeapons/Damage_WieldDifficulty_DamageVariance/light_staff.txt
#	Source/ACE.Server/Factories/Entity/Mutations/MeleeWeapons/Damage_WieldDifficulty_DamageVariance/light_sword.txt
#	Source/ACE.Server/Factories/Entity/Mutations/MeleeWeapons/Damage_WieldDifficulty_DamageVariance/light_unarmed.txt
#	Source/ACE.Server/Factories/Entity/Mutations/MeleeWeapons/Damage_WieldDifficulty_DamageVariance/two_handed_axe.txt
#	Source/ACE.Server/Factories/Entity/Mutations/MeleeWeapons/Damage_WieldDifficulty_DamageVariance/two_handed_mace.txt
#	Source/ACE.Server/Factories/Entity/Mutations/MeleeWeapons/Damage_WieldDifficulty_DamageVariance/two_handed_sword.txt
#	Source/ACE.Server/Factories/Enum/TreasureWeaponType.cs
#	Source/ACE.Server/Factories/LootGenerationFactory_Melee.cs
# Conflicts:
#	Source/ACE.Server/Factories/LootGenerationFactory_Magic.cs
#	Source/ACE.Server/Factories/LootGenerationFactory_Melee.cs
#	Source/ACE.Server/Factories/LootGenerationFactory_Missile.cs
# Conflicts:
#	Source/ACE.Server/Factories/LootGenerationFactory_Magic.cs
#	Source/ACE.Server/Factories/LootGenerationFactory_Missile.cs
# Conflicts:
#	Source/ACE.Server/Factories/Enum/TreasureWeaponType.cs
#	Source/ACE.Server/Factories/LootGenerationFactory.cs
#	Source/ACE.Server/Factories/LootGenerationFactory_Melee.cs
#	Source/ACE.Server/Factories/LootGenerationFactory_Missile.cs
# Conflicts:
#	Source/ACE.Server/Factories/LootGenerationFactory_Magic.cs
# Conflicts:
#	Source/ACE.Server/Factories/LootGenerationFactory.cs
#	Source/ACE.Server/Factories/LootGenerationFactory_Magic.cs
# Conflicts:
#	Source/ACE.Server/Factories/LootGenerationFactory.cs
#	Source/ACE.Server/Factories/LootGenerationFactory_Magic.cs
# Conflicts:
#	Source/ACE.Server/Factories/LootGenerationFactory.cs
# Conflicts:
#	Source/ACE.Server/Factories/LootGenerationFactory.cs
#	Source/ACE.Server/Factories/LootGenerationFactory_Magic.cs
# Conflicts:
#	Source/ACE.Server/Factories/LootGenerationFactory_Magic.cs
# Conflicts:
#	Source/ACE.Server/Factories/LootGenerationFactory.cs
#	Source/ACE.Server/Factories/LootGenerationFactory_Magic.cs
@gmriggs gmriggs merged commit 3b1b560 into ACEmulator:master Oct 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants