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.

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

Tales of the Past Machinima Easter Egg Characters #1457

Merged
merged 38 commits into from
Oct 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
127e460
Character entries
Malicos Sep 16, 2024
6cab77a
TotP characters traits and employers
Malicos Sep 16, 2024
4f32b98
fix Thainor's culture
Malicos Sep 16, 2024
dc8e5c5
Namelists
Malicos Sep 16, 2024
ae7c889
Updated Monóri's employer
Malicos Sep 16, 2024
9af7e82
Merge branch 'dev' into totp-easter-egg-characters
Malicos Sep 16, 2024
2c239bc
annotations
Malicos Sep 17, 2024
ae0a4d9
Merge branch 'dev' into totp-easter-egg-characters
Malicos Sep 17, 2024
971cc1a
more notes
Malicos Sep 17, 2024
5e234cb
Blazer (with the lazer)
Malicos Sep 18, 2024
32fbb7e
Jubai is a druid
Malicos Sep 18, 2024
4d8fc98
Yimo DNA
Malicos Sep 18, 2024
130ac81
Serphentos DNA
Malicos Sep 18, 2024
b08fc88
Monóri Silverleaf DNA
Malicos Sep 18, 2024
f3cc6b3
Thainor DNA + fixes
Malicos Sep 18, 2024
394e17e
Rebalanced characters so they're not utterly broken stat-wise
Malicos Sep 18, 2024
0228eb1
Add adventurer trait for landless
Malicos Sep 18, 2024
1077cb9
fix trait
Malicos Sep 18, 2024
ff8f260
Death dates
Malicos Sep 18, 2024
c4a59ca
Update wc_easteregg_characters.txt
Malicos Sep 18, 2024
e976b5f
Update wc_easteregg_characters.txt
Malicos Sep 18, 2024
e324829
fix death_battle stuff
Malicos Sep 18, 2024
8e7a51b
Update wc_easteregg_characters.txt
Malicos Sep 18, 2024
eaeb203
Serp and Monori's employers
Malicos Sep 19, 2024
52fbf5e
changed Gwaar's employer
Malicos Sep 19, 2024
9eff246
fix
Malicos Sep 19, 2024
467d075
made Tauren characters younger
Malicos Sep 19, 2024
f5acf14
fix loc issue with Monóri
Malicos Sep 19, 2024
185e50e
Merge branch 'dev' into totp-easter-egg-characters
Grekopithikos Sep 21, 2024
38dbd9d
duplicate special eyebrow dna fix
Grekopithikos Sep 21, 2024
34c5a8d
Merge branch 'dev' into totp-easter-egg-characters
Malicos Sep 23, 2024
4f0621e
Monóri's Parents
Malicos Sep 29, 2024
b79fa71
Naelorn is now Highborne arcanist
Malicos Sep 29, 2024
6e5bd4c
Fixed title distribution
Malicos Sep 29, 2024
ebd1855
More flavor, moved Monóri's undeath to late 609
Malicos Sep 29, 2024
7bf4a93
Fixed relationship and de jure liege of Nendis
Malicos Sep 29, 2024
f89c0be
small fix
Malicos Sep 29, 2024
53db375
Naelorn's dynasty
Malicos Sep 29, 2024
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
730 changes: 730 additions & 0 deletions common/dna_data/wc_easter_egg_dna.txt

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions common/dynasties/wc_easter_egg_dynasties.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,11 @@ easteregg_dyn10 = {
name= "dynn_Usul"
culture = wastewander
}
easteregg_dyn11 = {
name= "dynn_Silverleaf"
culture = night_elf
}
easteregg_dyn11_father = {
name= "dynn_Snowsong"
culture = highborne
}
32 changes: 31 additions & 1 deletion common/scripted_triggers/wc_his_character_triggers.txt
Original file line number Diff line number Diff line change
Expand Up @@ -743,6 +743,32 @@ is_easteregg13_trigger = {
exists = character:easteregg13 # Shrok (Easter Egg)
this = character:easteregg13 # Shrok (Easter Egg)
}
is_easteregg14_trigger = {
exists = this
exists = character:easteregg14 # Blazer (Easter Egg)
this = character:easteregg14 # Blazer (Easter Egg)
}
is_easteregg15_trigger = {
exists = this
exists = character:easteregg15 # Yimo (Easter Egg)
this = character:easteregg15 # Yimo (Easter Egg)
}
is_easteregg18_trigger = {
exists = this
exists = character:easteregg18 # Serphentos (Easter Egg)
this = character:easteregg18 # Serphentos (Easter Egg)
}
is_easteregg19_trigger = {
exists = this
exists = character:easteregg19 # Monóri (Easter Egg)
this = character:easteregg19 # Monóri (Easter Egg)
}
is_easteregg20_trigger = {
exists = this
exists = character:easteregg20 # Thainor (Easter Egg)
this = character:easteregg20 # Thainor (Easter Egg)
}


#Patreons

Expand Down Expand Up @@ -1106,7 +1132,11 @@ is_any_historical_character_trigger = {
is_easteregg11_trigger = yes
is_easteregg12_trigger = yes
is_easteregg13_trigger = yes

is_easteregg14_trigger = yes
is_easteregg15_trigger = yes
is_easteregg18_trigger = yes
is_easteregg19_trigger = yes
is_easteregg20_trigger = yes

#Patreons
is_mahiro_trigger = yes
Expand Down
14 changes: 14 additions & 0 deletions gfx/portraits/portrait_modifiers/50_beards_scripted_characters.txt
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,10 @@ beards_scripted_characters = {
add = 200
is_james_whitemane_trigger = yes
}
modifier = {
add = 200
is_easteregg20_trigger = yes # Thainor
}
# leave this modifier last
modifier = {
factor = 0
Expand Down Expand Up @@ -303,6 +307,7 @@ beards_scripted_characters = {
modifier = {
add = 200
is_alonsus_trigger = yes
is_easteregg15_trigger = yes
}
# leave this modifier last
modifier = {
Expand Down Expand Up @@ -925,6 +930,11 @@ beards_scripted_characters = {
is_anduin_wrynn_trigger = yes
has_fp2_dlc_trigger = yes
}
modifier = {
add = 200
is_easteregg14_trigger = yes
has_fp2_dlc_trigger = yes
}
# leave this modifier last
modifier = {
factor = 0
Expand Down Expand Up @@ -1107,6 +1117,10 @@ beards_scripted_characters = {
add = 200
is_brann_trigger = yes
}
modifier = {
add = 200
is_easteregg18_trigger = yes
}
# leave this modifier last
modifier = {
factor = 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -553,6 +553,7 @@ hairstyles_scripted_characters = {
modifier = {
add = 200
is_genn_trigger = yes
is_easteregg15_trigger = yes
}
# leave this modifier last
modifier = {
Expand Down Expand Up @@ -682,6 +683,7 @@ hairstyles_scripted_characters = {
is_easteregg2_trigger = yes # Garith Greenwood
is_easteregg9_trigger = yes # Ion of Hasic
is_easteregg12_trigger = yes # Kuk'Ald
is_easteregg20_trigger = yes # Thainor
}
}
# leave this modifier last
Expand Down Expand Up @@ -1114,6 +1116,7 @@ hairstyles_scripted_characters = {
add = 300
has_fp1_dlc_trigger = yes
is_liam_trigger = yes
is_easteregg14_trigger = yes
}
# leave this modifier last
modifier = {
Expand Down Expand Up @@ -1192,6 +1195,11 @@ hairstyles_scripted_characters = {
has_fp1_dlc_trigger = yes
is_rhonin_trigger = yes
}
modifier = {
add = 300
has_fp1_dlc_trigger = yes
is_easteregg18_trigger = yes
}
# leave this modifier last
modifier = {
factor = 0
Expand Down Expand Up @@ -1484,6 +1492,10 @@ hairstyles_scripted_characters = {
add = 200
is_sally_whitemane_trigger = yes
}
modifier = {
add = 200
is_easteregg19_trigger = yes # Monóri (Easter Egg)
}
# leave this modifier last
modifier = {
factor = 0
Expand Down
4 changes: 4 additions & 0 deletions gfx/portraits/portrait_modifiers/wc_facial_markings.txt
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,10 @@
add = 50
has_elunes_marks_trigger = yes
}
modifier = {
add = 200
is_easteregg19_trigger = yes # Monóri (Easter Egg)
}
}

is_valid_custom = {
Expand Down
Loading
Loading