Skip to content

Commit

Permalink
Merge pull request #4654 from SolastaMods/dev
Browse files Browse the repository at this point in the history 
1.5.97.11
  • Loading branch information
@ThyWoof
ThyWoof authored May 27, 2024
2 parents 10c9267 + 2b5b9ed commit d660c1d
Show file tree
Hide file tree
Showing 120 changed files with 1,332 additions and 1,496 deletions.
42 changes: 5 additions & 37 deletions Diagnostics/UnfinishedBusinessBlueprints/Assets.txt
View file

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion Diagnostics/UnfinishedBusinessBlueprints/CharacterRaceDefinition/RaceGrayDwarf.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@
"featureDefinition": "Definition:AttributeModifierGrayDwarfStrengthAbilityScoreIncrease:25954e3c-a310-5775-84b7-1c936d815cca",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:SenseDarkvision:446f786482b07db45b6f4a0854be3056",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:FeatureSetGrayDwarfAncestry:48f08b34-9ff9-5055-accb-d2d8adc27cb4",
Expand All @@ -30,7 +35,7 @@
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:SenseSuperiorDarkvision:388ca3fa81ee8a84c831be14214fd1c0",
"featureDefinition": "Definition:SenseNormalVision:222ef639393ed4e4bbd7152690597945",
"level": 1
},
{
Expand Down
10 changes: 10 additions & 0 deletions Diagnostics/UnfinishedBusinessBlueprints/CharacterRaceDefinition/RaceIronbornDwarf.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@
"featureDefinition": "Definition:AttributeModifierIronbornDwarfStrengthAbilityScoreIncrease:9be9d1a0-07a6-569a-8901-105f69eddb76",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:SenseDarkvision:446f786482b07db45b6f4a0854be3056",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ProficiencyIronbornDwarfArmorTraining:6b3b86a5-5a8e-5208-b590-d63322af3186",
Expand All @@ -22,6 +27,11 @@
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ProficiencyDwarfLanguages:bc18fab78e7b7414590755243ca5b6d3",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:SenseNormalVision:222ef639393ed4e4bbd7152690597945",
"level": 1
}
],
"subRaces": [],
Expand Down
10 changes: 10 additions & 0 deletions Diagnostics/UnfinishedBusinessBlueprints/CharacterRaceDefinition/RaceObsidianDwarf.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,20 @@
"featureDefinition": "Definition:DamageAffinityObsidianDwarfFireResistance:3ec3875d-a184-50b0-a8b4-84b685c644e4",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:SenseDarkvision:446f786482b07db45b6f4a0854be3056",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:ProficiencyObsidianDwarfLanguages:0b99ff27-3652-5c77-abce-2b00cd7dec30",
"level": 1
},
{
"$type": "FeatureUnlockByLevel, Assembly-CSharp",
"featureDefinition": "Definition:SenseNormalVision:222ef639393ed4e4bbd7152690597945",
"level": 1
}
],
"subRaces": [],
Expand Down
160 changes: 0 additions & 160 deletions ...cs/UnfinishedBusinessBlueprints/ConditionDefinition/ConditionDomainSmithBlessedMetal.json
View file

This file was deleted.

3 changes: 2 additions & 1 deletion Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatAcrobat.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"knownFeatsPrerequisite": [],
"features": [
"Definition:AttributeModifierCreed_Of_Misaye:74d55f601f8ad8246b18a19766524280",
"Definition:PowerFeatAcrobat:acbb3f93-a540-503d-b3d8-31dfa87a2a95"
"Definition:PowerFeatAcrobat:acbb3f93-a540-503d-b3d8-31dfa87a2a95",
"Definition:ProficiencyFeatAcrobat:fe1d07bd-a7a1-5c92-804e-e97a96c0a211"
],
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
Expand Down
4 changes: 3 additions & 1 deletion Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatApothecaryCha.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
"familyTag": "Apothecary",
"knownFeatsPrerequisite": [],
"features": [
"Definition:AttributeModifierCreed_Of_Solasta:330246532ae609848887c37e44b7f7e4"
"Definition:AttributeModifierCreed_Of_Solasta:330246532ae609848887c37e44b7f7e4",
"Definition:ProficiencyCraftyHerbalismKit:9418eab1-c4ca-51d3-8566-ed00ecb2afe2",
"Definition:ProficiencyCraftyMedicine:0f303467-f208-5a69-96e0-9c249edd7033"
],
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
Expand Down
4 changes: 3 additions & 1 deletion Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatApothecaryInt.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
"familyTag": "Apothecary",
"knownFeatsPrerequisite": [],
"features": [
"Definition:AttributeModifierCreed_Of_Pakri:de9467691aafac34c890c3e25d2f306c"
"Definition:AttributeModifierCreed_Of_Pakri:de9467691aafac34c890c3e25d2f306c",
"Definition:ProficiencyCraftyHerbalismKit:9418eab1-c4ca-51d3-8566-ed00ecb2afe2",
"Definition:ProficiencyCraftyMedicine:0f303467-f208-5a69-96e0-9c249edd7033"
],
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
Expand Down
4 changes: 3 additions & 1 deletion Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatApothecaryWis.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
"familyTag": "Apothecary",
"knownFeatsPrerequisite": [],
"features": [
"Definition:AttributeModifierCreed_Of_Maraike:7fd526d5e743c6f48bad92aac9b1738d"
"Definition:AttributeModifierCreed_Of_Maraike:7fd526d5e743c6f48bad92aac9b1738d",
"Definition:ProficiencyCraftyHerbalismKit:9418eab1-c4ca-51d3-8566-ed00ecb2afe2",
"Definition:ProficiencyCraftyMedicine:0f303467-f208-5a69-96e0-9c249edd7033"
],
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
Expand Down
3 changes: 2 additions & 1 deletion Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatArcanist.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"knownFeatsPrerequisite": [],
"features": [
"Definition:AttributeModifierCreed_Of_Pakri:de9467691aafac34c890c3e25d2f306c",
"Definition:PowerFeatArcanist:e6ac8ee4-7cc2-5b1e-a689-60f74c048d59"
"Definition:PowerFeatArcanist:e6ac8ee4-7cc2-5b1e-a689-60f74c048d59",
"Definition:ProficiencyCraftyArcana:619274ef-feed-56b7-9ad5-6394333b3884"
],
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
Expand Down
3 changes: 2 additions & 1 deletion Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatAthleteDex.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"knownFeatsPrerequisite": [],
"features": [
"Definition:AttributeModifierCreed_Of_Misaye:74d55f601f8ad8246b18a19766524280",
"Definition:MovementAffinityAthlete:91ac75d7-4763-54d6-98f5-7554fc304f01"
"Definition:MovementAffinityAthlete:91ac75d7-4763-54d6-98f5-7554fc304f01",
"Definition:ProficiencyAthlete:241be27a-e339-5e2b-952c-ec4dd090b461"
],
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
Expand Down
3 changes: 2 additions & 1 deletion Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatAthleteStr.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"knownFeatsPrerequisite": [],
"features": [
"Definition:AttributeModifierCreed_Of_Einar:38c2a545af534bb45ad92ffe7f30d62e",
"Definition:MovementAffinityAthlete:91ac75d7-4763-54d6-98f5-7554fc304f01"
"Definition:MovementAffinityAthlete:91ac75d7-4763-54d6-98f5-7554fc304f01",
"Definition:ProficiencyAthlete:241be27a-e339-5e2b-952c-ec4dd090b461"
],
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
Expand Down
4 changes: 3 additions & 1 deletion Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatCraftyScriber.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
"familyTag": "",
"knownFeatsPrerequisite": [],
"features": [
"Definition:AttributeModifierCreed_Of_Pakri:de9467691aafac34c890c3e25d2f306c"
"Definition:AttributeModifierCreed_Of_Pakri:de9467691aafac34c890c3e25d2f306c",
"Definition:ProficiencyCraftyArcana:619274ef-feed-56b7-9ad5-6394333b3884",
"Definition:ProficiencyCraftyScrollKit:fba8bc65-1229-51e6-810d-12206ec4cce9"
],
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
Expand Down
1 change: 1 addition & 0 deletions Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatHealer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"Definition:PowerFeatHealerMedKit:26cb929d-2f43-5b24-be1c-7b7c2cde50b8",
"Definition:PowerFeatHealerResuscitate:8e82c80d-e8c0-533c-ac8b-a5a5ee85b655",
"Definition:PowerFeatHealerStabilize:456c154f-34d4-511a-a25e-f0ad93009839",
"Definition:ProficiencyFeatHealerMedicine:0f1b648b-e2fc-55e1-a1c7-7467d4db50e2",
"Definition:ProficiencyFeatHealerMedicine:0f1b648b-e2fc-55e1-a1c7-7467d4db50e2"
],
"guiPresentation": {
Expand Down
3 changes: 2 additions & 1 deletion Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatPickPocket.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"familyTag": "",
"knownFeatsPrerequisite": [],
"features": [
"Definition:AbilityCheckAffinityFeatPickPocket:30c18aff-792b-5d16-9579-80acfb7fcd89"
"Definition:AbilityCheckAffinityFeatPickPocket:30c18aff-792b-5d16-9579-80acfb7fcd89",
"Definition:ProficiencyFeatPickPocket:3b9d1757-103e-57a0-bd7b-b9174e57400f"
],
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
Expand Down
3 changes: 2 additions & 1 deletion Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatStealthy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"familyTag": "",
"knownFeatsPrerequisite": [],
"features": [
"Definition:AttributeModifierCreed_Of_Misaye:74d55f601f8ad8246b18a19766524280"
"Definition:AttributeModifierCreed_Of_Misaye:74d55f601f8ad8246b18a19766524280",
"Definition:ProficiencyFeatStealthy:dfb97213-b173-5c3c-910c-1b555599df79"
],
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
Expand Down
3 changes: 2 additions & 1 deletion Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatTheologian.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"knownFeatsPrerequisite": [],
"features": [
"Definition:AttributeModifierCreed_Of_Pakri:de9467691aafac34c890c3e25d2f306c",
"Definition:PowerFeatTheologian:1285becd-b2b5-5885-8f8f-b4d33fcea587"
"Definition:PowerFeatTheologian:1285becd-b2b5-5885-8f8f-b4d33fcea587",
"Definition:ProficiencyCraftyReligion:28a79077-c8ba-55af-9191-86fe0d9d6657"
],
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
Expand Down
4 changes: 3 additions & 1 deletion Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatToxicologistCha.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
"familyTag": "Toxicologist",
"knownFeatsPrerequisite": [],
"features": [
"Definition:AttributeModifierCreed_Of_Solasta:330246532ae609848887c37e44b7f7e4"
"Definition:AttributeModifierCreed_Of_Solasta:330246532ae609848887c37e44b7f7e4",
"Definition:ProficiencyCraftyNature:29c0f4f0-57c2-5a82-b5c1-88eaf4123d94",
"Definition:ProficiencyCraftyPoisonersKit:a6c63404-64c1-5af8-b9cf-3f6dd08709fb"
],
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
Expand Down
4 changes: 3 additions & 1 deletion Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatToxicologistInt.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
"familyTag": "Toxicologist",
"knownFeatsPrerequisite": [],
"features": [
"Definition:AttributeModifierCreed_Of_Pakri:de9467691aafac34c890c3e25d2f306c"
"Definition:AttributeModifierCreed_Of_Pakri:de9467691aafac34c890c3e25d2f306c",
"Definition:ProficiencyCraftyNature:29c0f4f0-57c2-5a82-b5c1-88eaf4123d94",
"Definition:ProficiencyCraftyPoisonersKit:a6c63404-64c1-5af8-b9cf-3f6dd08709fb"
],
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
Expand Down
4 changes: 3 additions & 1 deletion Diagnostics/UnfinishedBusinessBlueprints/FeatDefinition/FeatToxicologistWis.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
"familyTag": "Toxicologist",
"knownFeatsPrerequisite": [],
"features": [
"Definition:AttributeModifierCreed_Of_Maraike:7fd526d5e743c6f48bad92aac9b1738d"
"Definition:AttributeModifierCreed_Of_Maraike:7fd526d5e743c6f48bad92aac9b1738d",
"Definition:ProficiencyCraftyNature:29c0f4f0-57c2-5a82-b5c1-88eaf4123d94",
"Definition:ProficiencyCraftyPoisonersKit:a6c63404-64c1-5af8-b9cf-3f6dd08709fb"
],
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
Expand Down
3 changes: 2 additions & 1 deletion Diagnostics/UnfinishedBusinessBlueprints/FeatDefinitionWithPrerequisites/FeatMenacing.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"knownFeatsPrerequisite": [],
"features": [
"Definition:AttributeModifierCreed_Of_Solasta:330246532ae609848887c37e44b7f7e4",
"Definition:PowerFeatMenacing:2e3ca902-484d-53b9-9daf-97f99a6efc50"
"Definition:PowerFeatMenacing:2e3ca902-484d-53b9-9daf-97f99a6efc50",
"Definition:ProficiencyFeatMenacing:124a0eba-3658-5337-a675-1de95d55c6ad"
],
"guiPresentation": {
"$type": "GuiPresentation, Assembly-CSharp",
Expand Down
Loading

0 comments on commit d660c1d

Please sign in to comment.