Skip to content

Commit

Permalink
Merge pull request #1407 from SolastaMods/Dev
Browse files Browse the repository at this point in the history
1.3.57.3B
  • Loading branch information
ThyWoof authored Jun 16, 2022
2 parents 84c36fb + 43802d5 commit ba18b08
Show file tree
Hide file tree
Showing 82 changed files with 52,712 additions and 51,334 deletions.
Original file line number Diff line number Diff line change
@@ -1,27 +1,4 @@
AbilityCheckAffinityDarkelfLightSensitivity Title='Feature/&AbilityCheckAffinityDarkelfLightSensitivityTitle'.
AbilityCheckAffinityDarkelfLightSensitivity Description='Feature/&AbilityCheckAffinityDarkelfLightSensitivityDescription'.
ConditionDarkelfLightSensitive Title='Condition/&ConditionDarkelfLightSensitiveTitle'.
ConditionDarkelfLightSensitive Description='Condition/&ConditionDarkelfLightSensitiveDescription'.
CraftingManualRecipeEnchantCEHalberd+1 Description='Item/&CraftingManualRecipeEnchantCEHalberd+1Description'.
CraftingManualRecipeEnchantCEHalberd+2 Description='Item/&CraftingManualRecipeEnchantCEHalberd+2Description'.
CraftingManualRecipeEnchantCEHalberdLightning Description='Item/&CraftingManualRecipeEnchantCEHalberdLightningDescription'.
CraftingManualRecipeEnchantCEHandXbow+1 Description='Item/&CraftingManualRecipeEnchantCEHandXbow+1Description'.
CraftingManualRecipeEnchantCEHandXbow+2 Description='Item/&CraftingManualRecipeEnchantCEHandXbow+2Description'.
CraftingManualRecipeEnchantCEHandXbowAcid Description='Item/&CraftingManualRecipeEnchantCEHandXbowAcidDescription'.
CraftingManualRecipeEnchantCELongMace+1 Description='Item/&CraftingManualRecipeEnchantCELongMace+1Description'.
CraftingManualRecipeEnchantCELongMace+2 Description='Item/&CraftingManualRecipeEnchantCELongMace+2Description'.
CraftingManualRecipeEnchantCELongMaceThunder Description='Item/&CraftingManualRecipeEnchantCELongMaceThunderDescription'.
CraftingManualRecipeEnchantCEPike+1 Description='Item/&CraftingManualRecipeEnchantCEPike+1Description'.
CraftingManualRecipeEnchantCEPike+2 Description='Item/&CraftingManualRecipeEnchantCEPike+2Description'.
CraftingManualRecipeEnchantCEPikePsychic Description='Item/&CraftingManualRecipeEnchantCEPikePsychicDescription'.
CraftingManualRecipePrimingCEHalberd Description='Item/&CraftingManualRecipePrimingCEHalberdDescription'.
CraftingManualRecipePrimingCEHandXbow Description='Item/&CraftingManualRecipePrimingCEHandXbowDescription'.
CraftingManualRecipePrimingCELongMace Description='Item/&CraftingManualRecipePrimingCELongMaceDescription'.
CraftingManualRecipePrimingCEPike Description='Item/&CraftingManualRecipePrimingCEPikeDescription'.
DHFeeblemindSpellActionAffinity Title='ActionAffinity/&DHFeeblemindSpellTitle'.
FeatureSetGreenWitchMagic Title='Subclass/&GreenWitchMagic'.
FeatureSetRedWitchMagic Title='Subclass/&RedWitchMagic'.
FeatureSetWhiteWitchMagic Title='Subclass/&WhiteWitchMagic'.
SpendPowerBundle Title='Reaction/&SpendPowerBundleTitle'.
SpendPowerBundle Description='Reaction/&SpendPowerBundleDescription'.
WardenArmorProficiencyMulticlass Title='Feature/&WardenArmorProficiencyTitle'.
236 changes: 224 additions & 12 deletions Diagnostics/CE-Definitions-Translations-OrphanedTerms-en.txt

Large diffs are not rendered by default.

202 changes: 20 additions & 182 deletions Diagnostics/CommunityExpansionBlueprints/Assets.txt

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,6 @@
"featureDefinition": "Definition:WitchCurseChoice:c3db88af-d7e0-524c-b75e-76880164d312",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:WitchFeatureSetRitualCasting:ac0f43fd-914a-507e-8048-59a63a1f913e",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ProficiencyWitchSavingthrow:92e3de37-3ad5-564b-9a89-471aa66a0e20",
Expand All @@ -204,6 +199,11 @@
"featureDefinition": "Definition:ProficiencyWitchWeapon:4c979244-2e24-5026-8ac1-d8c5b6e56f6a",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:WitchFeatureSetRitualCasting:ac0f43fd-914a-507e-8048-59a63a1f913e",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:WitchCacklePower:3f26a5fd-b743-58c0-ad61-73573d9b9cdd",
Expand All @@ -219,6 +219,16 @@
"featureDefinition": "Definition:WitchMaledictionChoice:5a533036-e190-51c9-a2f6-41a98ec542d7",
"level": 2
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ClassWitchMaledictionReplace:985cd311-859f-5af2-9573-27642fd3adc6",
"level": 2
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ClassWitchMaledictionReplace:985cd311-859f-5af2-9573-27642fd3adc6",
"level": 3
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:SubclassChoiceWitchCovens:7bf15fce-aef1-5eaa-af76-6b99c7e0aef5",
Expand All @@ -229,45 +239,130 @@
"featureDefinition": "Definition:FeatureSetAbilityScoreChoice:0f791ae5a6ffdc742be023184a115e1d",
"level": 4
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ClassWitchMaledictionReplace:985cd311-859f-5af2-9573-27642fd3adc6",
"level": 4
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:WitchMaledictionChoice:5a533036-e190-51c9-a2f6-41a98ec542d7",
"level": 5
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ClassWitchMaledictionReplace:985cd311-859f-5af2-9573-27642fd3adc6",
"level": 5
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ClassWitchMaledictionReplace:985cd311-859f-5af2-9573-27642fd3adc6",
"level": 6
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ClassWitchMaledictionReplace:985cd311-859f-5af2-9573-27642fd3adc6",
"level": 7
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureSetAbilityScoreChoice:0f791ae5a6ffdc742be023184a115e1d",
"level": 8
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ClassWitchMaledictionReplace:985cd311-859f-5af2-9573-27642fd3adc6",
"level": 8
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:WitchMaledictionChoice:5a533036-e190-51c9-a2f6-41a98ec542d7",
"level": 9
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ClassWitchMaledictionReplace:985cd311-859f-5af2-9573-27642fd3adc6",
"level": 9
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ClassWitchMaledictionReplace:985cd311-859f-5af2-9573-27642fd3adc6",
"level": 10
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ClassWitchMaledictionReplace:985cd311-859f-5af2-9573-27642fd3adc6",
"level": 11
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureSetAbilityScoreChoice:0f791ae5a6ffdc742be023184a115e1d",
"level": 12
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ClassWitchMaledictionReplace:985cd311-859f-5af2-9573-27642fd3adc6",
"level": 12
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:WitchMaledictionChoice:5a533036-e190-51c9-a2f6-41a98ec542d7",
"level": 13
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ClassWitchMaledictionReplace:985cd311-859f-5af2-9573-27642fd3adc6",
"level": 13
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ClassWitchMaledictionReplace:985cd311-859f-5af2-9573-27642fd3adc6",
"level": 14
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ClassWitchMaledictionReplace:985cd311-859f-5af2-9573-27642fd3adc6",
"level": 15
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureSetAbilityScoreChoice:0f791ae5a6ffdc742be023184a115e1d",
"level": 16
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ClassWitchMaledictionReplace:985cd311-859f-5af2-9573-27642fd3adc6",
"level": 16
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:WitchMaledictionChoice:5a533036-e190-51c9-a2f6-41a98ec542d7",
"level": 17
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ClassWitchMaledictionReplace:985cd311-859f-5af2-9573-27642fd3adc6",
"level": 17
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ClassWitchMaledictionReplace:985cd311-859f-5af2-9573-27642fd3adc6",
"level": 18
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureSetAbilityScoreChoice:0f791ae5a6ffdc742be023184a115e1d",
"level": 19
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ClassWitchMaledictionReplace:985cd311-859f-5af2-9573-27642fd3adc6",
"level": 19
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ClassWitchMaledictionReplace:985cd311-859f-5af2-9573-27642fd3adc6",
"level": 20
}
],
"personalityFlagOccurences": [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,6 @@
"featureDefinition": "Definition:AttributeModifierDarkelfCharismaAbilityScoreIncrease:21fbf034-47bd-436b-b92d-95883549a6d8",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:AttributeModifierElfAbilityScoreIncrease:122e862ec1d88c649b2d784db05233cd",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:AttributeModifierElfHighAbilityScoreIncrease:73c548582398b1f4cba312925b63348b",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:DarkelfMagic:0271c652-b4aa-4346-806d-9711e634271b",
Expand All @@ -33,31 +23,6 @@
"featureDefinition": "Definition:DarkelfWeaponTraining:ec6e4a4a-5635-4378-a370-5a5ab7dab2ea",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:SenseDarkvision:446f786482b07db45b6f4a0854be3056",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ProficiencyElfWeaponTraining:d834d84ae89d67846af1a9262e0f62ff",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureSetElfFeyAncestry:c123d2bc2667e7641a5b5bc9fdd94512",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:CastSpellElfHigh:af29de11ba0046743bc46559b557e32a",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ProficiencyElfKeenSenses:531f0b2fe59517a45a4c0cd65cd7acda",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureSetElfHighLanguages:752c07b8faab19c43af3b28543d9f15d",
Expand All @@ -68,21 +33,6 @@
"featureDefinition": "Definition:MoveModeMove6:6f358015fcdb8e147a7cfef7e2506430",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:MoveModeMove6:6f358015fcdb8e147a7cfef7e2506430",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ProficiencyElfStaticLanguages:29e56f27ba2f91848b052476f1b12901",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:SenseNormalVision:222ef639393ed4e4bbd7152690597945",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:LightAffinityDarkelfLightSensitivity:707231ea-e34d-4e26-9af8-4e52c0cb85c3",
Expand All @@ -93,11 +43,6 @@
"featureDefinition": "Definition:SenseSuperiorDarkvision:388ca3fa81ee8a84c831be14214fd1c0",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:CampAffinityElfTrance:02e0f7bc4afeb2b43ab60ec0a048f5ae",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:PowerDarkelfFaerieFire:68c2a6d0-cbac-4185-bdf5-b0f5b22ef73a",
Expand All @@ -110,21 +55,15 @@
}
],
"subRaces": [],
"inventoryDefinition": "Definition:HumanoidInventory:2a836ff45f2eb274eb079425509421ac",
"inventoryDefinition": null,
"personalityFlagOccurences": [
{
"$type": "PersonalityFlagOccurence, Assembly-CSharp",
"weight": 30,
"personalityFlag": "ElfFlag"
"weight": 2,
"personalityFlag": "GpSpellcaster"
}
],
"languageAutolearnPreference": [
"Language_Dwarvish",
"Language_Halfling",
"Language_Orc",
"Language_Goblin",
"Language_Goblin"
],
"languageAutolearnPreference": [],
"audioSwitches": [],
"audioRaceRTPCValue": 3.0,
"racePresentation": {
Expand Down Expand Up @@ -284,17 +223,17 @@
"preferedSkinColors": {
"$type": "TA.RangedInt, Assembly-CSharp",
"minValue": 48,
"maxValue": 48
"maxValue": 53
},
"preferedHairColors": {
"$type": "TA.RangedInt, Assembly-CSharp",
"minValue": 0,
"maxValue": 2
"minValue": 48,
"maxValue": 53
}
},
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
"hidden": true,
"hidden": false,
"title": "Race/&DarkelfRaceTitle",
"description": "Race/&DarkelfRaceDescription",
"spriteReference": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"$type": "SolastaCommunityExpansion.CustomDefinitions.FeatureDefinitionFeatureSetReplaceCustom, SolastaCommunityExpansion",
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
"hidden": false,
"title": "Feature/&ClassWitchMaledictionReplaceTitle",
"description": "Feature/&ClassWitchMaledictionReplaceDescription",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "",
"m_SubObjectName": null,
"m_SubObjectType": null
},
"color": {
"$type": "UnityEngine.Color, UnityEngine.CoreModule",
"r": 1.0,
"g": 1.0,
"b": 1.0,
"a": 1.0
},
"symbolChar": "221E",
"sortOrder": 0,
"unusedInSolastaCOTM": false,
"usedInValleyDLC": false
},
"contentCopyright": "UserContent",
"guid": "985cd311-859f-5af2-9573-27642fd3adc6",
"contentPack": 9999,
"name": "ClassWitchMaledictionReplace"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"$type": "SolastaCommunityExpansion.CustomDefinitions.FeatureDefinitionRemover, SolastaCommunityExpansion",
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
"hidden": false,
"title": "Class/&WitchMaledictionAbateTitle",
"description": "Class/&WitchMaledictionAbateDescription",
"spriteReference": {
"$type": "UnityEngine.AddressableAssets.AssetReferenceSprite, Unity.Addressables",
"m_AssetGUID": "5580079428663804cae6755e56fd835a",
"m_SubObjectName": "ShockingGrasp",
"m_SubObjectType": "UnityEngine.Sprite, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"
},
"color": {
"$type": "UnityEngine.Color, UnityEngine.CoreModule",
"r": 1.0,
"g": 1.0,
"b": 1.0,
"a": 1.0
},
"symbolChar": "221E",
"sortOrder": 0,
"unusedInSolastaCOTM": false,
"usedInValleyDLC": false
},
"contentCopyright": "UserContent",
"guid": "800b8396-cb28-5464-a9ae-7ef5b3368754",
"contentPack": 9999,
"name": "WitchMaledictionAbateRemover"
}
Loading

0 comments on commit ba18b08

Please sign in to comment.