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.

Sign up for GitHub

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

Greymane bloodline #1701

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

Greymane bloodline #1701

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
49c3fbc
15.7.2020
aybarsavci Jul 14, 2020
31a869a
Create this new file bc...
aybarsavci Jul 14, 2020
325d566
Update 00_zuwc_united_localisation.csv
aybarsavci Jul 15, 2020
7b37d3b
added german translation
arithon Jul 15, 2020
d8dbce3
Fixed some bugs, debuff
aybarsavci Jul 15, 2020
a882f51
Merge branch 'Greymane-Bloodline' of https://github.com/Warcraft-GoA-…
aybarsavci Jul 15, 2020
4da3a6a
Update wc_bloodlines.txt
aybarsavci Jul 15, 2020
121b867
Merge branch 'Greymane-Bloodline' of https://github.com/Warcraft-GoA-…
aybarsavci Jul 15, 2020
a6d5f94
Add files via upload
aybarsavci Jul 15, 2020
4195cc4
Encoding changed
zumbak04 Jul 15, 2020
e2b4713
More encoding changed
zumbak04 Jul 15, 2020
c0da000
Test
zumbak04 Jul 15, 2020
c13a190
Revert "Test"
zumbak04 Jul 15, 2020
7fa4c06
Delete 00_Greymane.csv
aybarsavci Jul 15, 2020
aba7ccf
Chro. Order / More Historical Bloodline.
aybarsavci Jul 22, 2020
8b6852e
Merge branch 'Greymane-Bloodline' of https://github.com/Warcraft-GoA-…
aybarsavci Jul 22, 2020
5e0dc70
Merge remote-tracking branch 'remotes/origin/master' into Greymane-Bl…
zumbak04 Jul 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
15.7.2020 Added Greymane bloodline
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is it?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bang! Not addressed.

12 changes: 12 additions & 0 deletions common/bloodlines/wc_bloodlines.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,4 +389,16 @@ ymiron = {
allow_bastards = yes
picture = GFX_bloodlines_placeholder_symbol_2
flags = { historical_bloodline bloodline_warrior_training }
}
greymane = {
monthly_character_prestige = 0.15
gilnean_opinion = 10
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The opinion is not declared in Warcraft-Guardians-of-Azeroth\common\modifier_definitions\wc_opinion_modifier_definitions.txt
See how other opinions are handled.

command_modifier = {
morale_defence = 0.05
}
combat_rating = 5
aybarsavci marked this conversation as resolved.
Show resolved Hide resolved

inheritance = patrilineal
picture = bloodlines_symbol_norse_wolf
flags = { historical_bloodline bloodline_heroes }
}
36 changes: 21 additions & 15 deletions history/characters/46000_gilnean.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,16 @@
dna="ckijbdhmnng"
culture=gilnean religion=holy_light
martial=6 diplomacy=6 stewardship=6 intrigue=5 learning=6
add_trait=fortune_builder add_trait=diligent
add_trait=midas_touched add_trait=diligent
add_trait=trusting
add_trait=patient
518.8.9={ birth=yes add_trait=creature_human }
569.3.15={ death=yes }
545.7.11 = {
create_bloodline = {
type = greymane
}
}
aybarsavci marked this conversation as resolved.
Show resolved Hide resolved
}
46001={
name=Genn
Expand Down Expand Up @@ -39,7 +45,7 @@
dna="glijbjhmbng"
culture=gilnean religion=holy_light
martial=6 diplomacy=5 stewardship=4 intrigue=6 learning=6
add_trait=charismatic_negotiator add_trait=chaste add_trait=gregarious add_trait=humble
add_trait=charismatic_negotiator add_trait=chaste add_trait=gregarious add_trait=humble
add_trait=trusting add_trait=kind
disallow_random_traits=yes
558.4.12={ birth=yes add_trait=creature_human }
Expand Down Expand Up @@ -166,7 +172,7 @@
dna="hccfigjgecn"
culture=gilnean religion=holy_light
martial=5 diplomacy=7 stewardship=6 intrigue=5 learning=8
add_trait=indulgent_wastrel add_trait=temperate add_trait=arbitrary add_trait=craven add_trait=slothful
add_trait=indulgent_wastrel add_trait=temperate add_trait=arbitrary add_trait=craven add_trait=slothful
add_trait=humble add_trait=cruel
536.1.24={ birth=yes add_trait=creature_human }
607.10.1={ death=yes }
Expand All @@ -177,7 +183,7 @@
dna="acdmgojgecn"
culture=gilnean religion=holy_light
martial=4 diplomacy=8 stewardship=7 intrigue=7 learning=8
add_trait=charismatic_negotiator add_trait=zealous add_trait=honest add_trait=greedy add_trait=cruel
add_trait=charismatic_negotiator add_trait=zealous add_trait=honest add_trait=greedy add_trait=cruel
father=46015 #Mano
556.7.17={ birth=yes add_trait=creature_human }
618.11.27={ death=yes }
Expand All @@ -188,7 +194,7 @@
dna="hcbfogigeck"
culture=gilnean religion=holy_light
martial=7 diplomacy=8 stewardship=8 intrigue=7 learning=7
add_trait=tough_soldier add_trait=deceitful add_trait=chaste add_trait=humble add_trait=slothful
add_trait=tough_soldier add_trait=deceitful add_trait=chaste add_trait=humble add_trait=slothful
add_trait=brave
father=46015 #Mano
564.10.21={ birth=yes add_trait=creature_human }
Expand Down Expand Up @@ -239,7 +245,7 @@
dna="cemgighkgof"
culture=gilnean religion=old_ways
martial=4 diplomacy=6 stewardship=8 intrigue=5 learning=5
add_trait=intricate_webweaver add_trait=hedonist add_trait=just add_trait=craven add_trait=proud
add_trait=intricate_webweaver add_trait=hedonist add_trait=just add_trait=craven add_trait=proud
add_trait=slothful add_trait=content add_trait=drunkard
556.7.25={ birth=yes add_trait=creature_human }
618.3.6={ death=yes }
Expand Down Expand Up @@ -284,7 +290,7 @@
dna="mleadjjipmj"
culture=gilnean religion=old_ways
martial=8 diplomacy=7 stewardship=4 intrigue=6 learning=7
add_trait=midas_touched add_trait=slothful add_trait=cruel add_trait=envious add_trait=trusting
add_trait=midas_touched add_trait=slothful add_trait=cruel add_trait=envious add_trait=trusting
add_trait=charitable
father=46027 #Darius
559.6.3={ birth=yes add_trait=creature_human }
Expand All @@ -306,7 +312,7 @@
dna="mbeifjcmfij"
culture=gilnean religion=old_ways
martial=7 diplomacy=4 stewardship=4 intrigue=4 learning=4
add_trait=midas_touched add_trait=humble add_trait=cruel add_trait=lustful
add_trait=midas_touched add_trait=humble add_trait=cruel add_trait=lustful
add_trait=brave add_trait=zealous add_trait=envious
father=46027 #Darius
573.2.26={ birth=yes add_trait=creature_human }
Expand All @@ -320,7 +326,7 @@
dna="eojjfpnfbcc"
culture=gilnean religion=old_ways
martial=5 diplomacy=7 stewardship=5 intrigue=8 learning=5
add_trait=martial_cleric add_trait=humble add_trait=content add_trait=cruel add_trait=gluttonous
add_trait=martial_cleric add_trait=humble add_trait=content add_trait=cruel add_trait=gluttonous
add_trait=gregarious add_trait=craven
533.7.15={ birth=yes add_trait=creature_human }
615.10.8={ death=yes }
Expand Down Expand Up @@ -375,7 +381,7 @@
dna="nodlpiabidb"
culture=gilnean religion=holy_light
martial=5 diplomacy=6 stewardship=5 intrigue=5 learning=8
add_trait=indulgent_wastrel add_trait=paranoid add_trait=cruel add_trait=shy
add_trait=indulgent_wastrel add_trait=paranoid add_trait=cruel add_trait=shy
add_trait=proud add_trait=cynical
549.2.10={ birth=yes add_trait=creature_human }
631.3.15={ death=yes }
Expand All @@ -387,7 +393,7 @@
dna="kbgfennocpm"
culture=gilnean religion=old_ways
martial=8 diplomacy=5 stewardship=6 intrigue=4 learning=4
add_trait=thrifty_clerk add_trait=trusting add_trait=content add_trait=craven
add_trait=thrifty_clerk add_trait=trusting add_trait=content add_trait=craven
add_trait=cruel add_trait=shy
545.2.12={ birth=yes add_trait=creature_human }
608.12.25={ death=yes }
Expand Down Expand Up @@ -444,7 +450,7 @@
dna="dmnojdaamjf"
culture=gilnean religion=holy_light
martial=7 diplomacy=6 stewardship=4 intrigue=7 learning=6
trait=tough_soldier trait=honest trait=slothful trait=zealous trait=cruel
trait=tough_soldier trait=honest trait=slothful trait=zealous trait=cruel
trait=gregarious trait=wroth
524.3.5={ birth=yes add_trait=creature_human }
609.5.15={ death=yes }
Expand Down Expand Up @@ -487,7 +493,7 @@
dna="difelcgapjh"
culture=gilnean religion=holy_light
martial=7 diplomacy=5 stewardship=8 intrigue=6 learning=5
trait=elusive_shadow trait=proud trait=zealous trait=ambitious trait=slothful
trait=elusive_shadow trait=proud trait=zealous trait=ambitious trait=slothful
trait=gluttonous trait=honest
father=46050 #Gregor
570.11.26={ birth=yes add_trait=creature_human }
Expand All @@ -501,7 +507,7 @@
dna="syfgvtbtyea"
culture=gilnean religion=holy_light
martial=5 diplomacy=5 stewardship=7 intrigue=7 learning=8
trait=mastermind_theologian trait=kind trait=zealous trait=proud trait=diligent
trait=mastermind_theologian trait=kind trait=zealous trait=proud trait=diligent
569.11.26={ birth=yes add_trait=creature_human }
581.10.3 = {
religion = arcane_religion
Expand Down Expand Up @@ -535,4 +541,4 @@
capital = c_southbreak
}
645.7.29={ death=yes }
}
}
2 changes: 2 additions & 0 deletions localisation/00_zuwc_united_localisation.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3016,6 +3016,8 @@ EVTOPTB_WCADD_1100;I'll pay [target_crystal_owner.GetHerHim] a visit!;;Ich werde
EVTDESC_WCADD_2000;Today you woke up relieved. You feel magic flowing through you. Finally you've been able to rid yourself of your hunger.;;Heute seid Ihr erleichtert aufgewacht. Ihr f�hlt, wie Magie Euch durchstr�mt. Endlich konntet Ihr Euch von Eurem Hunger befreien.;;;;;;;;;;;x
EVTDESC_WCADD_1150;Unlike your brethren, you don't feel magical hunger. Can it mean that you're immune? And why? Is it due to the blessing of [Root.Religion.GetHighGodName] or your willpower?;;Im Gegensatz zu Euren Br�dern sp�rt Ihr keinen magischen Hunger. Kann es bedeuten, dass Ihr immun seid? Und warum? Liegt es am Segen von [Root.Religion.GetHighGodName] oder an Eurer Willensst�rke?;;;;;;;;;;;x
EVTOPTB_WCCRS_130;If only I were a gorak.;;Wenn ich doch nur ein Gorak w�re.;;;;;;;;;;;x
greymane;Blood of [This.GetFirstNameWithNick];Sang de [This.GetFirstNameWithNick];Blut von [This.GetFirstNameWithNick];;;;;;;;;;;x
greymane_desc;Archibald Greymane was the king of Gilneas and the father of Genn Greymane. Under his rule, Gilneas prospered. His views on asking for help were that it was for the weak.;;Archibald Greymane war der K�nig von Gilneas und der Vater von Genn Greymane. Unter seiner Herrschaft florierte Gilneas. Seine Ansichten zur Bitte um Unterst�tzung waren, dass dies f�r die Schwachen bestimmt war.;;;;;;;;;;;x
;;;;;;;;;;;;;;x
;;;;;;;;;;;;;;x
;;;;;;;;;;;;;;x
Expand Down