Skip to content

Commit

Permalink
new branch name
Browse files Browse the repository at this point in the history
  • Loading branch information
Grekopithikos committed Sep 24, 2024
1 parent 9406364 commit 0ec3e0a
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 3 deletions.
1 change: 1 addition & 0 deletions common/dynasties/8000_troll.txt
Original file line number Diff line number Diff line change
Expand Up @@ -452,5 +452,6 @@ three_heads = { name = "Three-Heads" culture=amani}

#darkspear
darktusk = { name = "Darktusk" culture=gurubashi }
hexx = { name = "Hexx" culture=gurubashi }
#winterax
winterax = { name = "Winterax" culture=drakkari}
2 changes: 1 addition & 1 deletion history/characters/17000_28000_bronzebeard.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3749,7 +3749,7 @@ dorfus_alphamage={
dynasty=alphamage
culture=bronzebeard religion=khazism
martial=5 diplomacy=6 stewardship=5 intrigue=5 learning=8
trait=education_learning_2
trait=education_learning_2 trait=magic_good_1
trait=generous trait=gregarious trait=honest
425.4.1={ birth=yes trait=creature_dwarf }
445.1.1={
Expand Down
2 changes: 1 addition & 1 deletion history/characters/52000_ogre.txt
Original file line number Diff line number Diff line change
Expand Up @@ -984,7 +984,7 @@
trait=education_martial_2
trait=beauty_good_3 #WHY NOT?!
trait=chaste trait=humble trait=brave trait=content
561.6.6={ birth=yes }
551.6.6={ birth=yes trait=creature_ogre }
583.1.1={
employer=10000 #Blackhand[2000]
}
Expand Down
19 changes: 18 additions & 1 deletion history/characters/59000_dalaranian.txt
Original file line number Diff line number Diff line change
Expand Up @@ -900,7 +900,24 @@ ulrik_von_stromhearth={
set_variable = { name = wc_elemental_fire_magic_lifestyle_additional_perks_variable value = wc_perks_needed_for_level_2_magic_trait_value }
set_variable = { name = wc_elemental_water_magic_lifestyle_additional_perks_variable value = wc_perks_needed_for_level_2_magic_trait_value }
}
employer = 59000 # Antonidas
}
745.3.14 = { death=yes }
}

theocritus={
name=Theocritus
culture=dalaranian
religion=kirin_tor
martial=7 diplomacy=8 stewardship=7 intrigue=7 learning=8
trait=education_learning_3 trait=magic_good_2
trait=just trait=calm
552.12.4={ birth=yes trait=creature_human }
572.1.1={
effect={
set_variable = { name = wc_order_magic_lifestyle_additional_perks_variable value = wc_perks_needed_for_level_3_magic_trait_value }
set_variable = { name = wc_elemental_fire_magic_lifestyle_additional_perks_variable value = wc_perks_needed_for_level_2_magic_trait_value }
set_variable = { name = wc_elemental_water_magic_lifestyle_additional_perks_variable value = wc_perks_needed_for_level_2_magic_trait_value }
}
}
745.3.14 = { death=yes }
}
24 changes: 24 additions & 0 deletions history/characters/68000_darkspear.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1027,4 +1027,28 @@ roitau={ #in charge of the roadies for The Tauren Chieftains
trait=education_stewardship_3 trait=lifestyle_traveler
582.4.9={ birth=yes trait=creature_troll }
662.1.30 = { death = yes }
}

zabra_hexx={ #the inhabitant of Scarlet Monastery before the Scarlet Crusade took up residence there.
name=Zabra
dynasty=hexx
culture=gurubashi religion=gurubism
martial=3 diplomacy=6 stewardship=6 intrigue=4 learning=8
trait=education_learning_3 trait=lifestyle_traveler
trait=patient trait=humble trait=calm trait=forgiving
572.4.9={ birth=yes trait=creature_troll }
603.1.1={
effect = {
set_variable = { name = wc_light_magic_lifestyle_additional_perks_variable value = wc_perks_needed_for_level_2_magic_trait_value }
learn_language=language_common
}
religion=holy_light #learned the ways of the Light from the books within its library
trait=pilgrim
}
615.1.1={
effect = {
set_variable = { name = wc_shadow_magic_lifestyle_additional_perks_variable value = wc_perks_needed_for_level_2_magic_trait_value }
}
}
662.1.30 = { death = yes }
}
3 changes: 3 additions & 0 deletions history/titles/00_k_dalaran.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ c_dalaran = {
613.1.13={holder = 48081} # Jaina Proudmoore
615.1.31={holder = 59001} # Khadgar
}
b_leightbrad = {
553.1.1={holder = ulrik_von_stromhearth}
}
c_dalarans_hills = {
1.1.1={
liege=d_dalaran
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18401,6 +18401,7 @@
Roitau:0 "Roitau"
Zathra:0 "Zathra"
Rinling:0 "Rinling"
Zabra:0 "Zabra"
Ripflesh:0 "Ripflesh"
Bly:0 "Bly"
Raven:0 "Raven"
Expand Down

0 comments on commit 0ec3e0a

Please sign in to comment.