Skip to content

Commit

Permalink
Merge pull request #1286 from Myphicbowser/no-void-naga
Browse files Browse the repository at this point in the history 
Made Naga Government Feudal instead of Eldritch
  • Loading branch information
@Myphicbowser
Myphicbowser authored Jan 5, 2024
2 parents 862e1e2 + 74b845b commit c051096
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 27 deletions.
1 change: 0 additions & 1 deletion common/scripted_effects/wc_race_effects.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,6 @@ set_race_effect = {
limit = {
OR = {
is_being_gene_trigger = { BEING = being_void }
has_trait = creature_naga
has_trait = creature_nraqi
has_trait = creature_cthraxxi
has_trait = creature_qiraji
Expand Down
50 changes: 25 additions & 25 deletions history/characters/150000_naga.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
martial=6 diplomacy=5 stewardship=5 intrigue=7 learning=4
trait=education_martial_3
trait=ambitious trait=deceitful trait=diligent trait=arrogant
2.1.14={ birth=yes trait=creature_naga trait = being_void }
2.1.14={ birth=yes trait=creature_naga }
25.1.1={
# trait=physical_lifestyle_endurance_3
# trait=physical_lifestyle_strength_3
Expand All @@ -30,7 +30,7 @@
martial=8 diplomacy=5 stewardship=6 intrigue=6 learning=5
trait=education_learning_3
trait=patient trait=arrogant trait=cynical trait=deceitful
2.10.15={ birth=yes trait=creature_naga trait = being_void }
2.10.15={ birth=yes trait=creature_naga }
20.1.1={
effect={
set_variable = { name = wc_order_magic_lifestyle_additional_perks_variable value = wc_perks_needed_for_level_2_magic_trait_value }
Expand Down Expand Up @@ -59,7 +59,7 @@
trait=magic_good_1
trait=education_learning_3
trait=ambitious trait=arrogant trait=cynical trait=deceitful
2.10.15={ birth=yes trait=creature_naga trait = being_void }
2.10.15={ birth=yes trait=creature_naga }
20.1.1={
effect = {
set_variable = { name = wc_elemental_water_magic_lifestyle_additional_perks_variable value = wc_perks_needed_for_level_4_magic_trait_value }
Expand All @@ -83,7 +83,7 @@
culture=naga religion=nzoth_worship
martial=8 diplomacy=7 stewardship=5 intrigue=8 learning=7
trait=education_martial_3 trait=wrathful trait=paranoid trait=aggressive_attacker trait=ambitious
2.12.12={ birth=yes trait=creature_naga trait = being_void }
2.12.12={ birth=yes trait=creature_naga }
20.1.1={
effect={
set_variable = { name = wc_endurance_physical_lifestyle_additional_perks_variable value = wc_perks_needed_for_level_2_physical_trait_value }
Expand All @@ -110,7 +110,7 @@
trait=education_learning_4 trait=sadistic trait=trusting trait=just
trait=shy
father=150125 #Gozrissas
153.11.12={ birth=yes trait=creature_naga trait = being_void }
153.11.12={ birth=yes trait=creature_naga }
350.1.1={
effect = {
if = {
Expand All @@ -127,7 +127,7 @@
dynasty=111002
culture=naga religion=nzoth_worship
father=150125 #Gozrissas
239.7.14={ birth=yes trait=creature_naga trait = being_void }
239.7.14={ birth=yes trait=creature_naga }
350.1.1={
effect = {
if = {
Expand All @@ -144,7 +144,7 @@
dynasty=111002
culture=naga religion=nzoth_worship
father=150125 #Gozrissas
332.7.23={ birth=yes trait=creature_naga trait = being_void }
332.7.23={ birth=yes trait=creature_naga }
350.1.1={
effect = {
if = {
Expand All @@ -161,7 +161,7 @@
dynasty=111002
culture=naga religion=nzoth_worship
father=150125 #Gozrissas
400.8.3={ birth=yes trait=creature_naga trait = being_void }
400.8.3={ birth=yes trait=creature_naga }
550.1.1={
effect = {
if = {
Expand All @@ -178,7 +178,7 @@
dynasty=111002
culture=naga religion=nzoth_worship
father=150125 #Gozrissas
510.12.1={ birth=yes trait=creature_naga trait = being_void }
510.12.1={ birth=yes trait=creature_naga }
550.1.1={
effect = {
if = {
Expand All @@ -196,7 +196,7 @@
culture=naga religion=nzoth_worship
martial=5 diplomacy=4 stewardship=4 intrigue=7 learning=4
trait=education_martial_3 trait=torturer trait=shy trait=just trait=gluttonous
10.1.1={ birth=yes trait=creature_naga trait = being_void }
10.1.1={ birth=yes trait=creature_naga }
25.1.1={
effect = {
if = {
Expand All @@ -214,7 +214,7 @@
martial=8 diplomacy=4 stewardship=6 intrigue=7 learning=8
trait=education_stewardship_4 trait=scholar trait=chaste trait=temperate
father=150131 #Heth'jatar
194.9.21={ birth=yes trait=creature_naga trait = being_void }
194.9.21={ birth=yes trait=creature_naga }
350.1.1={
effect = {
if = {
Expand All @@ -231,7 +231,7 @@
dynasty=111003
culture=naga religion=nzoth_worship
father=150131 #Heth'jatar
273.2.5={ birth=yes trait=creature_naga trait = being_void }
273.2.5={ birth=yes trait=creature_naga }
350.1.1={
effect = {
if = {
Expand All @@ -251,7 +251,7 @@
martial=8 diplomacy=4 stewardship=6 intrigue=7 learning=7
trait=education_learning_3 trait=diligent trait=arrogant trait=zealous trait=ambitious
disallow_random_traits = yes
2.9.8={ birth=yes trait=creature_naga trait = being_void }
2.9.8={ birth=yes trait=creature_naga }
20.1.1={
effect={ set_variable = { name = wc_light_magic_lifestyle_additional_perks_variable value = wc_perks_needed_for_level_2_magic_trait_value } }
}
Expand All @@ -273,7 +273,7 @@
martial=8 diplomacy=5 stewardship=8 intrigue=4 learning=6
trait=education_martial_2 trait=sadistic trait=ambitious trait=arrogant
disallow_random_traits = yes
2.7.21={ birth=yes trait=creature_naga trait = being_void }
2.7.21={ birth=yes trait=creature_naga }
20.1.1={
effect={
set_variable = { name = wc_endurance_physical_lifestyle_additional_perks_variable value = wc_perks_needed_for_level_2_physical_trait_value }
Expand Down Expand Up @@ -302,7 +302,7 @@
martial=7 diplomacy=6 stewardship=6 intrigue=4 learning=5
trait=education_stewardship_1 trait=sadistic trait=stubborn trait=arrogant
disallow_random_traits = yes
2.7.21={ birth=yes trait=creature_naga trait=being_void }
2.7.21={ birth=yes trait=creature_naga }
20.1.1={
effect={
set_variable = { name = wc_endurance_physical_lifestyle_additional_perks_variable value = wc_perks_needed_for_level_3_physical_trait_value }
Expand Down Expand Up @@ -330,7 +330,7 @@
culture=naga religion=nzoth_worship
martial=4 diplomacy=8 stewardship=6 intrigue=7 learning=8
trait=education_learning_2 trait=chaste trait=patient trait=gregarious trait=deceitful
2.4.12={ birth=yes trait=creature_naga trait=being_void }
2.4.12={ birth=yes trait=creature_naga }
20.1.1={
effect={
set_variable = { name = wc_endurance_physical_lifestyle_additional_perks_variable value = wc_perks_needed_for_level_2_physical_trait_value }
Expand Down Expand Up @@ -360,7 +360,7 @@
martial=6 diplomacy=6 stewardship=5 intrigue=6 learning=6
trait=education_learning_4
trait=content trait=zealous trait=sadistic
2.7.21={ birth=yes trait=creature_naga trait = being_void }
2.7.21={ birth=yes trait=creature_naga }
20.1.1={
effect={ set_variable = { name = wc_shadow_magic_lifestyle_additional_perks_variable value = wc_perks_needed_for_level_5_magic_trait_value } }
give_nickname=nick_the_harbinger_of_the_void
Expand All @@ -385,7 +385,7 @@ lady_darkscale={
trait=magic_good_1
trait=education_learning_3
trait=ambitious trait=arrogant trait=wrathful trait=deceitful
1.10.15={ birth=yes trait=creature_naga trait = being_void }
1.10.15={ birth=yes trait=creature_naga }
20.1.1={
effect={
set_variable = { name = wc_elemental_water_magic_lifestyle_additional_perks_variable value = wc_perks_needed_for_level_2_magic_trait_value }
Expand All @@ -408,7 +408,7 @@ athissa={
trait=magic_good_1
trait=education_learning_3
trait=ambitious trait=arrogant trait=wrathful trait=deceitful
2.10.15={ birth=yes trait=creature_naga trait = being_void }
2.10.15={ birth=yes trait=creature_naga }
12.1.1={
effect={
set_variable = { name = wc_elemental_water_magic_lifestyle_additional_perks_variable value = wc_perks_needed_for_level_2_magic_trait_value }
Expand All @@ -431,7 +431,7 @@ lady_hatecoil={
trait=magic_good_1
trait=education_learning_3
trait=ambitious trait=arrogant trait=wrathful trait=deceitful
31.10.15={ birth=yes trait=creature_naga trait = being_void }
31.10.15={ birth=yes trait=creature_naga }
50.1.1={
effect={
set_variable = { name = wc_elemental_water_magic_lifestyle_additional_perks_variable value = wc_perks_needed_for_level_2_magic_trait_value }
Expand All @@ -454,7 +454,7 @@ lady_sssurine={
trait=magic_good_1
trait=education_learning_3
trait=ambitious trait=arrogant trait=wrathful trait=deceitful
41.10.15={ birth=yes trait=creature_naga trait = being_void }
41.10.15={ birth=yes trait=creature_naga }
50.1.1={
effect={
set_variable = { name = wc_elemental_water_magic_lifestyle_additional_perks_variable value = wc_perks_needed_for_level_2_magic_trait_value }
Expand All @@ -479,7 +479,7 @@ tidemistress_sashjtar={
trait=magic_good_1
trait=education_learning_3
trait=ambitious trait=arrogant trait=wrathful trait=deceitful
1.10.15={ birth=yes trait=creature_naga trait = being_void }
1.10.15={ birth=yes trait=creature_naga }
20.1.1={
effect={
set_variable = { name = wc_elemental_water_magic_lifestyle_additional_perks_variable value = wc_perks_needed_for_level_2_magic_trait_value }
Expand All @@ -498,7 +498,7 @@ lord_shalzaru={
dynasty=hatecrest
culture=naga religion=nzoth_worship
trait=sadistic
2.10.15={ birth=yes trait=creature_naga trait = being_void }
2.10.15={ birth=yes trait=creature_naga }
12.1.1={
effect={
set_variable = { name = wc_elemental_water_magic_lifestyle_additional_perks_variable value = wc_perks_needed_for_level_2_magic_trait_value }
Expand All @@ -518,7 +518,7 @@ lady_szallah={
name=Szallah
female=yes
culture=naga religion=nzoth_worship
2.10.15={ birth=yes trait=creature_naga trait = being_void }
2.10.15={ birth=yes trait=creature_naga }
50.1.1={
effect={
set_variable = { name = wc_elemental_water_magic_lifestyle_additional_perks_variable value = wc_perks_needed_for_level_2_magic_trait_value }
Expand All @@ -538,7 +538,7 @@ general_skessesh={
trait=education_martial_2
father=lord_shalzaru
mother=lady_szallah
52.10.15={ birth=yes trait=creature_naga trait = being_void }
52.10.15={ birth=yes trait=creature_naga }
12.1.1={
effect={
set_variable = { name = wc_elemental_water_magic_lifestyle_additional_perks_variable value = wc_perks_needed_for_level_2_magic_trait_value }
Expand Down
1 change: 0 additions & 1 deletion history/characters/330000_highborne.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
effect = { make_important_lore_character_effect = yes }
}
40.1.1={
trait=being_void
religion=nzoth_worship
culture=naga
remove_trait=creature_highborne
Expand Down
1 change: 1 addition & 0 deletions history/provinces/00_k_black_morass.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@
611.1.1={
culture=naga
religion=nzoth_worship
holding = tribal_holding
}
}

Expand Down
4 changes: 4 additions & 0 deletions history/provinces/00_k_eldarath.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
603.1.1={
culture=naga
religion=nzoth_worship
holding = tribal_holding
}
}

Expand Down Expand Up @@ -183,6 +184,7 @@
603.1.1={
culture=naga
religion=nzoth_worship
holding = tribal_holding
}
}

Expand All @@ -204,6 +206,7 @@
603.1.1={
culture=naga
religion=nzoth_worship
holding = tribal_holding
}
}

Expand All @@ -225,6 +228,7 @@
603.1.1={
culture=naga
religion=nzoth_worship
holding = tribal_holding
}
}

Expand Down

0 comments on commit c051096

Please sign in to comment.