From 93f60755de167a7ade2cc3d3b627e705c7e463ee Mon Sep 17 00:00:00 2001 From: sej Date: Tue, 29 Jun 2021 17:16:13 +0200 Subject: [PATCH 01/14] added shenic holy sites --- common/landed_titles/z_holy_sites.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/common/landed_titles/z_holy_sites.txt b/common/landed_titles/z_holy_sites.txt index 0b38d968d6..a39d50d52e 100644 --- a/common/landed_titles/z_holy_sites.txt +++ b/common/landed_titles/z_holy_sites.txt @@ -474,6 +474,23 @@ c_nordrassil = { holy_site = arcane_religion } +# thunder_king +c_tolnariv = { + holy_site = thunder_king +} +c_lei_shen = { + holy_site = thunder_king +} +c_xuen = { + holy_site = thunder_king +} +c_lushat_lan = { + holy_site = thunder_king +} +c_mogushan = { + holy_site = thunder_king +} + ### shamanism_group ### ### primitive_group ### # orcish_shamanism From 7ad14878a03564bab59f8add9a72a9bdd3727277 Mon Sep 17 00:00:00 2001 From: sej Date: Tue, 29 Jun 2021 17:22:58 +0200 Subject: [PATCH 02/14] you can now forge hammer of twilight even after forming black empire(GDC) --- decisions/wc_society_decisions.txt | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/decisions/wc_society_decisions.txt b/decisions/wc_society_decisions.txt index d5cc653433..a05c7f270d 100644 --- a/decisions/wc_society_decisions.txt +++ b/decisions/wc_society_decisions.txt @@ -701,15 +701,24 @@ society_decisions = { OR = { AND = { has_character_modifier = follower_of_nzoth - offmap_nzoth = { has_policy = old_god_working } + OR = { + offmap_nzoth = { has_policy = old_god_working } + offmap_nzoth = { has_policy = old_god_black_empire } + } } AND = { has_character_modifier = follower_of_cthun - offmap_cthun = { has_policy = old_god_working } + OR = { + offmap_cthun = { has_policy = old_god_working } + offmap_cthun = { has_policy = old_god_black_empire } + } } AND = { has_character_modifier = follower_of_yogg_saron - offmap_yoggsaron = { has_policy = old_god_working } + OR = { + offmap_yoggsaron = { has_policy = old_god_working } + offmap_yoggsaron = { has_policy = old_god_black_empire } + } } } } From 1b0090987aa25fe4415b534c7526cf24624e4db3 Mon Sep 17 00:00:00 2001 From: sej Date: Wed, 21 Jul 2021 18:26:51 +0200 Subject: [PATCH 03/14] you can now pillage barony of Ahn'Qiraj(GDC) --- common/scripted_triggers/wc_scripted_triggers.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/common/scripted_triggers/wc_scripted_triggers.txt b/common/scripted_triggers/wc_scripted_triggers.txt index 1c49442699..b2ad64a910 100644 --- a/common/scripted_triggers/wc_scripted_triggers.txt +++ b/common/scripted_triggers/wc_scripted_triggers.txt @@ -687,12 +687,6 @@ can_have_court_physician_trigger = { } # SETTLEMENT OR ANY BUILDING INSIDE OF IT CAN'T BE DESTORYED IF IT'S NOT TRUE settlement_can_be_destroyed_trigger = { - custom_tooltip = { - text = not_importrant_place_tooltip - NOT = { - title = b_ahnqiraj - } - } custom_tooltip = { text = unique_building_does_not_block_tooltip NOT = { From 77ed094ee4434da633d9ef21cdf2a54db8e996ad Mon Sep 17 00:00:00 2001 From: sej Date: Wed, 21 Jul 2021 18:42:00 +0200 Subject: [PATCH 04/14] fixed cenarion title owner title loc --- common/landed_titles/wc_titular_titles.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/landed_titles/wc_titular_titles.txt b/common/landed_titles/wc_titular_titles.txt index a3e8a583b4..d4bebed5cc 100644 --- a/common/landed_titles/wc_titular_titles.txt +++ b/common/landed_titles/wc_titular_titles.txt @@ -1412,8 +1412,8 @@ k_cenarion_circle = { # Title types # Character titles/names - title = "cenarion_circle_rank_4_male" - title_female = "cenarion_circle_rank_4_female" + title = "cenarion_circle_rank_5_male" + title_female = "cenarion_circle_rank_5_female" short_name = yes dynasty_title_names = no # Will not be named "Seljuk", etc. @@ -1438,8 +1438,8 @@ k_cenarion_circle_fake = { # Title types # Character titles/names - title = "cenarion_circle_rank_4_male" - title_female = "cenarion_circle_rank_4_female" + title = "cenarion_circle_rank_5_male" + title_female = "cenarion_circle_rank_5_female" short_name = yes dynasty_title_names = no # Will not be named "Seljuk", etc. From 27d16897de5ba84c91131c71b26b05e1dab15e29 Mon Sep 17 00:00:00 2001 From: sej Date: Wed, 21 Jul 2021 19:03:54 +0200 Subject: [PATCH 05/14] holding old gods prison no longer spams you with nightmares events --- events/wc_void_events.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/events/wc_void_events.txt b/events/wc_void_events.txt index 8eef3ca486..ba745b3cc8 100644 --- a/events/wc_void_events.txt +++ b/events/wc_void_events.txt @@ -1421,7 +1421,7 @@ character_event = { is_mage_class_trigger = yes } modifier = { - factor = 5 + factor = 2 holds_living_old_god_prison_trigger = yes } } From d11f683fe972eee298930ebaf85727054f5b2200 Mon Sep 17 00:00:00 2001 From: zumbak04 <46384992+zumbak04@users.noreply.github.com> Date: Fri, 13 Aug 2021 18:56:48 +0400 Subject: [PATCH 06/14] Deleted WCIMM.30 Deleted WCIMM.30 since WCIMM.20 the flag and modifiers are cleared in WCIMM.20 now. --- decisions/wc_test_decisions.txt | 3 +-- events/wc_immortal_events.txt | 44 +++++---------------------------- 2 files changed, 7 insertions(+), 40 deletions(-) diff --git a/decisions/wc_test_decisions.txt b/decisions/wc_test_decisions.txt index f96f3af548..a130c86db0 100644 --- a/decisions/wc_test_decisions.txt +++ b/decisions/wc_test_decisions.txt @@ -212,8 +212,7 @@ decisions = { has_character_flag = debug_mode_flag } allow = { - society_associated_with_public_religion_trigger = no - always = yes + must_have_ruled_too_long_penalty_trigger = yes } effect = { unknown_impregnate_cuckoo_this_effect = yes diff --git a/events/wc_immortal_events.txt b/events/wc_immortal_events.txt index b4bfece7f6..608d672b6b 100644 --- a/events/wc_immortal_events.txt +++ b/events/wc_immortal_events.txt @@ -31,12 +31,7 @@ character_event = { only_playable = yes trigger = { - OR = { - must_have_ruled_too_long_penalty_trigger = yes - FROMFROM = { - must_have_ruled_too_long_penalty_trigger = no - } - } + must_have_ruled_too_long_penalty_trigger = yes } immediate = { @@ -48,14 +43,6 @@ character_event = { character_event = { id = WCIMM.20 years = 50 } } - if = { - limit = { - FROMFROM = { - must_have_ruled_too_long_penalty_trigger = no - } - } - FROMFROM = { character_event = { id = WCIMM.30 } } - } } } #Ruled too long @@ -71,10 +58,15 @@ character_event = { is_playable = yes has_character_flag = ruled_too_long_timer_flag + must_have_ruled_too_long_penalty_trigger = yes } fail_trigger_effect = { clr_character_flag = ruled_too_long_timer_flag + remove_character_modifiers = { + modifier = ruled_too_long_modifier + amount = 30 + } } immediate = { @@ -86,28 +78,4 @@ character_event = { add_character_modifier = { name = ruled_too_long_modifier duration = -1 stacking = yes } } -} -# Clears ruled too long modifier when becomes unplayable -character_event = { - id = WCIMM.30 - - is_triggered_only = yes - hide_window = yes - - trigger = { - has_character_flag = ruled_too_long_timer_flag - } - - immediate = { - log = "WCIMM.30 fired for [Root.GetBestName]" - - clr_character_flag = ruled_too_long_timer_flag - - remove_character_modifiers = { - modifier = ruled_too_long_modifier - amount = 30 - } - - clear_delayed_event = { id = WCIMM.20 } - } } \ No newline at end of file From 1a2a4686791bc4c7cc9151c12a17f16fdc48c97a Mon Sep 17 00:00:00 2001 From: zumbak04 <46384992+zumbak04@users.noreply.github.com> Date: Mon, 16 Aug 2021 15:16:29 +0400 Subject: [PATCH 07/14] Fixed #1659 Subdue Void Creature Blocked Fixed an issue where rejecting the Subdue Void Creature decision after picking resulted in forever blocking it. --- events/wc_class_events.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/events/wc_class_events.txt b/events/wc_class_events.txt index 06741053a4..a365c06c4a 100644 --- a/events/wc_class_events.txt +++ b/events/wc_class_events.txt @@ -2792,6 +2792,9 @@ character_event = { option = { name = CHANGED_MY_MIND + clr_character_flag = summon_void_creature_ongoing_flag + clr_character_flag = summon_void_creature_cooldown_flag + ai_chance = { factor = 0 } From b0c129cc889a3424e11dc7dfb1b9e750f8e87cbf Mon Sep 17 00:00:00 2001 From: zumbak04 <46384992+zumbak04@users.noreply.github.com> Date: Mon, 16 Aug 2021 15:28:03 +0400 Subject: [PATCH 08/14] Fixed #1893 One Scepter Ner'zhul is no longer spawned with the Scepter of Sargeras. --- events/wc_undead_events.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/events/wc_undead_events.txt b/events/wc_undead_events.txt index 38f7eb8ed4..40e8fb57f9 100644 --- a/events/wc_undead_events.txt +++ b/events/wc_undead_events.txt @@ -39,7 +39,6 @@ province_event = { prestige = 1000 piety = 250 set_graphical_culture = nerzhul - add_artifact = scepter_of_sargeras c_icecrown = { location = { convert_to_target_undead_province_effect = yes } From e8950d4b20f84358822ac8f98ee2d320c3d58d66 Mon Sep 17 00:00:00 2001 From: zumbak04 <46384992+zumbak04@users.noreply.github.com> Date: Tue, 17 Aug 2021 02:16:22 +0400 Subject: [PATCH 09/14] Update open_ulduar.dds (GDC) --- gfx/interface/decision_icons/open_ulduar.dds | Bin 3264 -> 912 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gfx/interface/decision_icons/open_ulduar.dds b/gfx/interface/decision_icons/open_ulduar.dds index 41823fe190622e14407bdac9eb91ebe20879f1a3..f00afda37b797597afea7b77d0a1b98dcba1e868 100644 GIT binary patch literal 912 zcmcK2KP&@b6aes7r0tc`h@pewJ|SFb>T)q0gQ`ooOGwl9;$MWM2CjsG!Jnieok$uH zJ2klz5km)qm@G^NiwF}zD#ZUZnsddouzJb+zWm<%^1bB=LXe&T0E@#4rN*62N3L-g zVKTBsZ1cMXA=piQ7e70HAGA@_10{ zRq=_V=o=Owp{fk}kgX&q$;}knUT-FH-?<%~;w?n(J-b5Bvlb$rpRS`1`BvukHdBT^ z3IHgIBB9+r0*r~G&|3kKnTYB(^lN0EO;&jJ(8=%y`?5N(+V>T$XhA|qAPEaeAhZHn00CmhF<=Z1HBIo=*s&e2 z6FV6@ZR51lB-81Y@B0V(cb*<-EYI|+x0#7Xug=lYH{bJ}_k2fEB$Acxo;r2v-P6B3 zB@yGXR)v1?qr~ukKcpfu^kek#{M0GlJpcRV^vUA?zKEdXz@PO~^&sMv66=!@3&@BD zf}7In#L=l~fnAIVpd6+~D8; zdc^mC-{jS+B|iJSKy$@LX;Rbfkz7Vi=DddVu#&N)lJS&|u@OBJDI=Avi9%XSF{7lM zRtd=|BqZcw=g24CXEJk+>bQhr@;xqYSoz_fEx!J)&Zm!39Nvggs)~F$CDkcYn^&os zC>C{;@_MF91{#wlW-4Z8N;c|wD>Fqavjrm_g^Zw9$#hafF3?GBq=Th`l&Pec=VV+v z8s_f9ER8umH0ow*RWpk-HrD2>EH$jOrtLH+QtyMp)Z!35ub)8wyT*7@dfl?R`U@Z_rCF9nG^H4Io~7|!-kikWETtn|Fo zLD#QEuLQMxB+g^E-p9?2G`Bt+=WuO^z2y+swo?3YcZ`G8XnTJPNi%CX8;48%yu3Zh z-yY2K)lrFum(y&Q1Ke9bPoGMO>4R=`XSvqM|rtX;%+^SvrA6d?>zC%+AYJ_ z*+bf8C*wBa(!5X1C86r?!x!XvF~{X-1j)O(vWTEXBQELmZwuQ!k<|r@BEHxB+je7 z%WYoC>!M5YTh5(5!}iE9FUoZSay53joTS5zTd6u>xm0RADvdZxEiSndhv-eK;8p#8 zHsc8_f;FhoGN4d0?~5?u@(4e=7;);^9?i6QiBLCvmTvKxjD%0hxXnVJTt!%`#VdU5 z?U7>_wL4@A!P4Lpe5bSrM`t&^UEK^Aj3g{}ac5)hNR$)S}Y9djbd&gZZt9_dg2YwE%JFpzq=F){AvwDf-___o+zMJ5fJO1o*t5V zE#r0*VVxGgLN2^hkhSRXtK`CS1^t3`?8&gvM9OR>Db6+P=%wOyQ}63*^MWFuPbO!q zSM1v*dQYn+Za0fQ)QWY5;OLkSxY&yNSnhX|wOhytZpx%(Ld1=T`UXX8(qv%NW+v}- zkaOB7cpOxNeXK^p+^Lt_ym6a}thiGppF`B87xft^x$PtjIwHc)diUq+?meu`lA-F4;J|LLY2GK3^z-|+$_d8NcXcg=%p1Bdl?9b z(J%b-a&c&YZK18iAU7v-ZC=siqSEJ~=JN=alU%Qj3E_L*;h+)dV Date: Wed, 8 Sep 2021 20:44:43 +0200 Subject: [PATCH 10/14] ulduar now opens correctly for cho'gall --- events/wc_dark_cult_events.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/events/wc_dark_cult_events.txt b/events/wc_dark_cult_events.txt index c5e8994a25..e40e43a17e 100644 --- a/events/wc_dark_cult_events.txt +++ b/events/wc_dark_cult_events.txt @@ -1595,6 +1595,13 @@ narrative_event = { if = { limit = { NOT = { has_global_flag = twilights_hammer_kalimdor } } + d_ulduar = { + any_de_jure_vassal_title = { + location = { + remove_province_modifier = ulduar_closed_down + } + } + } if = { limit = { ai = no From 6cba425f7f04e2fcabde80cbe8fd1f4be7dee635 Mon Sep 17 00:00:00 2001 From: sej Date: Wed, 15 Sep 2021 23:38:35 +0200 Subject: [PATCH 11/14] added missing write down whisphers icon(GIH) --- .../decision_icons/write_down_whispers.dds | Bin 0 -> 3264 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 gfx/interface/decision_icons/write_down_whispers.dds diff --git a/gfx/interface/decision_icons/write_down_whispers.dds b/gfx/interface/decision_icons/write_down_whispers.dds new file mode 100644 index 0000000000000000000000000000000000000000..ad938099c356eccbef8d6ab7b080766304def36f GIT binary patch literal 3264 zcmeH}*-u>e6~}2J#Z?>%1`HTevlu8aFlL5jfMNE1XI7Sh0n9Q$T-zbU*kCZ;9l#KQ z!Kq_AL3UhMZS5whG-( zwXJAt)Y#PR80u7*G!D#$ZaOppjM{G6n*B7XT{Nj|G%59|TK*F+H@}|h`Vbw?MQouB zVq+iEH}g4tr@tUH{*=zapWq3t(4z9vSY9LfC^=Hof!Q^MtLp|mCqH52+}|0T{Tqqt z-{X$2(dIdWQa?m~sWuI-LK(u`d7V(=J-U)R9G&|I$@71ud-5@3^M7V+_A`c0e~vTp zKG~T?5|{x|+WWb^@g=Q-4xX%3b8((tMq!gBo# zE$zKHLrd5@ui);whSre4U>!qe9VVFA!Z&n}jF$>2EH@AsxI@q64zXj;@C`mBoP0!Z z^y<)E9h+_Xml}L(M9at zZ}M_Z1^Fc!0*RaSAO9`h#A71kzr-G1qDeQJ>Pcwi3Gw5eUe<$zRYn^^D$EKg1Qenugb;OXBU_Byr+bjGX$E4(lp9=aTgD7O{~{{C!Kp?*+oc zZlA}AWKOYQfB*A0RLxA1f=W3r87uqV;WyhIZ>7@PYe2P^fw z@M1R2#&OJ^6?x`UsplSM|9QdP!W-YD_rwl8$37OW{v^Dtr{Sr!*utN^89A`CbA3fr}U%XQ@;yVsQURc)vq;@;>3wZK4y8 z={qiYjC~+FyO4%w4XzOwdPtk?bsUlFf_Eo1KatU&;*@i5&z5NM*Nn_O6D{c2n_r8o z=Q0Lcl8PS;Q&l&P$#n{=X9kU7j5cFZ@|?og^A^#O`~L%PNw~O^>buFikkX&Ub5?LR z@bs(;<{IIn4;g&@H{utq=Ym7Dl;lbWdY+ zoRE%@6;GHHPZ$sm&)^7M$L70=JG>@*Ph)V-rs3Iq^O%Hho$aLX z@TPdhs`PP%(9xeu54MD_B%bI69O7|V1vTWCTSWW!F}rtbnZ@K;6o0rVdfXEHO}x@W2D%?Fs(=AJa9uL+|8MoUu(J!k=Gs_DW6}+4)M* z%MF6@Tf+4sdewteomJyaR_C*ngl-xH>G}SWi)D3%P{~Ij Date: Wed, 15 Sep 2021 23:38:55 +0200 Subject: [PATCH 12/14] added code for missing whisphers icon --- interface/wc_decision_icons.gfx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/interface/wc_decision_icons.gfx b/interface/wc_decision_icons.gfx index 5d838356be..d89c6a8239 100644 --- a/interface/wc_decision_icons.gfx +++ b/interface/wc_decision_icons.gfx @@ -408,4 +408,8 @@ spriteTypes = { name = "GFX_present_bachelor" texturefile = "gfx\\interface\\decision_icons\\decision_icon_present_bachelor.dds" } + spriteType = { + name = "GFX_write_down_whispers" + texturefile = "gfx\\interface\\decision_icons\\write_down_whispers.dds" + } } \ No newline at end of file From 1ea6d55a78c17a1d7030fb3733d9bb67321b2577 Mon Sep 17 00:00:00 2001 From: sej Date: Wed, 15 Sep 2021 23:42:56 +0200 Subject: [PATCH 13/14] moved decision icons to general file(GDC) --- interface/sad_decision_icons.gfx | 98 -------------------------------- interface/wc_decision_icons.gfx | 96 +++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 98 deletions(-) delete mode 100644 interface/sad_decision_icons.gfx diff --git a/interface/sad_decision_icons.gfx b/interface/sad_decision_icons.gfx deleted file mode 100644 index 5248705eb5..0000000000 --- a/interface/sad_decision_icons.gfx +++ /dev/null @@ -1,98 +0,0 @@ -spriteTypes = { - spriteType = { - name = "GFX_worgen_hunt" - texturefile = "gfx\\interface\\decision_icons\\worgen_hunt.dds" - } - spriteType = { - name = "GFX_seek_wd_blessing" - texturefile = "gfx\\interface\\decision_icons\\seek_wd_blessing.dds" - } - spriteType = { - name = "GFX_request_the_gift" - texturefile = "gfx\\interface\\decision_icons\\worgen_hunt.dds" - } - spriteType = { - name = "GFX_honor_local_spirits" - texturefile = "gfx\\interface\\decision_icons\\honor_local_spirits.dds" - } - spriteType = { - name = "GFX_seek_ancestral_help" - texturefile = "gfx\\interface\\decision_icons\\seek_ancestral_help.dds" - } - spriteType = { - name = "GFX_earth_mother_ritual" - texturefile = "gfx\\interface\\decision_icons\\earth_mother_ritual.dds" - } - spriteType = { - name = "GFX_approach_powerful_elemental" - texturefile = "gfx\\interface\\decision_icons\\approach_powerful_elemental.dds" - } - spriteType = { - name = "GFX_tidesages_blessing_decision" - texturefile = "gfx\\interface\\decision_icons\\tidesages_blessing_decision.dds" - } - spriteType = { - name = "GFX_pray_to_elune" - texturefile = "gfx\\interface\\decision_icons\\pray_to_elune.dds" - } - spriteType = { - name = "GFX_ritual_to_twin_gods" - texturefile = "gfx\\interface\\decision_icons\\ritual_to_twin_gods.dds" - } - spriteType = { - name = "GFX_request_potion" - texturefile = "gfx\\interface\\decision_icons\\request_potion.dds" - } - spriteType = { - name = "GFX_cat_form_druid" - texturefile = "gfx\\interface\\decision_icons\\cat_form_druid.dds" - } - spriteType = { - name = "GFX_bear_form_druid" - texturefile = "gfx\\interface\\decision_icons\\bear_form_druid.dds" - } - spriteType = { - name = "GFX_talon_form_druid" - texturefile = "gfx\\interface\\decision_icons\\talon_form_druid.dds" - } - spriteType = { - name = "GFX_stag_form_druid" - texturefile = "gfx\\interface\\decision_icons\\stag_form_druid.dds" - } - spriteType = { - name = "GFX_pack_form_druid" - texturefile = "gfx\\interface\\decision_icons\\pack_form_druid.dds" - } - spriteType = { - name = "GFX_shapeshift_back_druid" - texturefile = "gfx\\interface\\decision_icons\\shapeshift_back_druid.dds" - } - spriteType = { - name = "GFX_learn_cat_form" - texturefile = "gfx\\interface\\decision_icons\\learn_cat_form.dds" - } - spriteType = { - name = "GFX_learn_bear_form" - texturefile = "gfx\\interface\\decision_icons\\learn_bear_form.dds" - } - spriteType = { - name = "GFX_learn_talon_form" - texturefile = "gfx\\interface\\decision_icons\\learn_talon_form.dds" - } - spriteType = { - name = "GFX_learn_stag_form" - texturefile = "gfx\\interface\\decision_icons\\learn_stag_form.dds" - } - spriteType = { - name = "GFX_learn_master_cat_form" - texturefile = "gfx\\interface\\decision_icons\\learn_master_cat_form.dds" - } - spriteType = { - name = "GFX_learn_master_bear_form" - texturefile = "gfx\\interface\\decision_icons\\learn_master_bear_form.dds" - } - spriteType = { - name = "GFX_learn_master_talon_form" - texturefile = "gfx\\interface\\decision_icons\\learn_master_talon_form.dds" - } -} diff --git a/interface/wc_decision_icons.gfx b/interface/wc_decision_icons.gfx index d89c6a8239..301d20b4b3 100644 --- a/interface/wc_decision_icons.gfx +++ b/interface/wc_decision_icons.gfx @@ -412,4 +412,100 @@ spriteTypes = { name = "GFX_write_down_whispers" texturefile = "gfx\\interface\\decision_icons\\write_down_whispers.dds" } + spriteType = { + name = "GFX_worgen_hunt" + texturefile = "gfx\\interface\\decision_icons\\worgen_hunt.dds" + } + spriteType = { + name = "GFX_seek_wd_blessing" + texturefile = "gfx\\interface\\decision_icons\\seek_wd_blessing.dds" + } + spriteType = { + name = "GFX_request_the_gift" + texturefile = "gfx\\interface\\decision_icons\\worgen_hunt.dds" + } + spriteType = { + name = "GFX_honor_local_spirits" + texturefile = "gfx\\interface\\decision_icons\\honor_local_spirits.dds" + } + spriteType = { + name = "GFX_seek_ancestral_help" + texturefile = "gfx\\interface\\decision_icons\\seek_ancestral_help.dds" + } + spriteType = { + name = "GFX_earth_mother_ritual" + texturefile = "gfx\\interface\\decision_icons\\earth_mother_ritual.dds" + } + spriteType = { + name = "GFX_approach_powerful_elemental" + texturefile = "gfx\\interface\\decision_icons\\approach_powerful_elemental.dds" + } + spriteType = { + name = "GFX_tidesages_blessing_decision" + texturefile = "gfx\\interface\\decision_icons\\tidesages_blessing_decision.dds" + } + spriteType = { + name = "GFX_pray_to_elune" + texturefile = "gfx\\interface\\decision_icons\\pray_to_elune.dds" + } + spriteType = { + name = "GFX_ritual_to_twin_gods" + texturefile = "gfx\\interface\\decision_icons\\ritual_to_twin_gods.dds" + } + spriteType = { + name = "GFX_request_potion" + texturefile = "gfx\\interface\\decision_icons\\request_potion.dds" + } + spriteType = { + name = "GFX_cat_form_druid" + texturefile = "gfx\\interface\\decision_icons\\cat_form_druid.dds" + } + spriteType = { + name = "GFX_bear_form_druid" + texturefile = "gfx\\interface\\decision_icons\\bear_form_druid.dds" + } + spriteType = { + name = "GFX_talon_form_druid" + texturefile = "gfx\\interface\\decision_icons\\talon_form_druid.dds" + } + spriteType = { + name = "GFX_stag_form_druid" + texturefile = "gfx\\interface\\decision_icons\\stag_form_druid.dds" + } + spriteType = { + name = "GFX_pack_form_druid" + texturefile = "gfx\\interface\\decision_icons\\pack_form_druid.dds" + } + spriteType = { + name = "GFX_shapeshift_back_druid" + texturefile = "gfx\\interface\\decision_icons\\shapeshift_back_druid.dds" + } + spriteType = { + name = "GFX_learn_cat_form" + texturefile = "gfx\\interface\\decision_icons\\learn_cat_form.dds" + } + spriteType = { + name = "GFX_learn_bear_form" + texturefile = "gfx\\interface\\decision_icons\\learn_bear_form.dds" + } + spriteType = { + name = "GFX_learn_talon_form" + texturefile = "gfx\\interface\\decision_icons\\learn_talon_form.dds" + } + spriteType = { + name = "GFX_learn_stag_form" + texturefile = "gfx\\interface\\decision_icons\\learn_stag_form.dds" + } + spriteType = { + name = "GFX_learn_master_cat_form" + texturefile = "gfx\\interface\\decision_icons\\learn_master_cat_form.dds" + } + spriteType = { + name = "GFX_learn_master_bear_form" + texturefile = "gfx\\interface\\decision_icons\\learn_master_bear_form.dds" + } + spriteType = { + name = "GFX_learn_master_talon_form" + texturefile = "gfx\\interface\\decision_icons\\learn_master_talon_form.dds" + } } \ No newline at end of file From 1832327db08c2e4c4685d0fd9795e9d44c63f452 Mon Sep 17 00:00:00 2001 From: sej Date: Wed, 15 Sep 2021 23:44:28 +0200 Subject: [PATCH 14/14] moved event icons to general file(GDC) --- interface/sad_event_pictures.gfx | 66 -------------------------------- interface/wc_event_pictures.gfx | 64 +++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 66 deletions(-) delete mode 100644 interface/sad_event_pictures.gfx diff --git a/interface/sad_event_pictures.gfx b/interface/sad_event_pictures.gfx deleted file mode 100644 index 4b94454269..0000000000 --- a/interface/sad_event_pictures.gfx +++ /dev/null @@ -1,66 +0,0 @@ -spriteTypes = { - spriteType = { - name = "GFX_evt_fire" - texturefile = "gfx\\event_pictures\\fire.tga" - } - spriteType = { - name = "GFX_evt_air" - texturefile = "gfx\\event_pictures\\air.tga" - } - spriteType = { - name = "GFX_evt_water" - texturefile = "gfx\\event_pictures\\water.tga" - } - spriteType = { - name = "GFX_evt_earth" - texturefile = "gfx\\event_pictures\\earth.tga" - } - spriteType = { - name = "GFX_evt_ashamane" - texturefile = "gfx\\event_pictures\\ashamane.tga" - } - spriteType = { - name = "GFX_evt_aviana" - texturefile = "gfx\\event_pictures\\aviana.tga" - } - spriteType = { - name = "GFX_evt_ursoc" - texturefile = "gfx\\event_pictures\\ursoc.tga" - } - spriteType = { - name = "GFX_evt_goldrinn" - texturefile = "gfx\\event_pictures\\goldrinn.tga" - } - spriteType = { - name = "GFX_evt_malorne" - texturefile = "gfx\\event_pictures\\malorne.tga" - } - spriteType = { - name = "GFX_evt_elune" - texturefile = "gfx\\event_pictures\\elune.tga" - } - spriteType = { - name = "GFX_evt_tauren" - texturefile = "gfx\\event_pictures\\tauren.tga" - } - spriteType = { - name = "GFX_evt_ursocandursol" - texturefile = "gfx\\event_pictures\\ursoc_and_ursol.tga" - } - spriteType = { - name = "GFX_evt_tidesage" - texturefile = "gfx\\event_pictures\\tidesage.tga" - } - spriteType = { - name = "GFX_evt_druidic_forest" - texturefile = "gfx\\event_pictures\\druidic_forest.tga" - } - spriteType = { - name = "GFX_evt_sand" - texturefile = "gfx\\event_pictures\\sand.tga" - } - spriteType = { - name = "GFX_evt_ice" - texturefile = "gfx\\event_pictures\\ice.tga" - } -} diff --git a/interface/wc_event_pictures.gfx b/interface/wc_event_pictures.gfx index 38755b143a..e0bd2632f2 100644 --- a/interface/wc_event_pictures.gfx +++ b/interface/wc_event_pictures.gfx @@ -644,4 +644,68 @@ spriteTypes = { texturefile = "gfx\\event_pictures\\ulduar.tga" allwaystransparent = yes } + spriteType = { + name = "GFX_evt_fire" + texturefile = "gfx\\event_pictures\\fire.tga" + } + spriteType = { + name = "GFX_evt_air" + texturefile = "gfx\\event_pictures\\air.tga" + } + spriteType = { + name = "GFX_evt_water" + texturefile = "gfx\\event_pictures\\water.tga" + } + spriteType = { + name = "GFX_evt_earth" + texturefile = "gfx\\event_pictures\\earth.tga" + } + spriteType = { + name = "GFX_evt_ashamane" + texturefile = "gfx\\event_pictures\\ashamane.tga" + } + spriteType = { + name = "GFX_evt_aviana" + texturefile = "gfx\\event_pictures\\aviana.tga" + } + spriteType = { + name = "GFX_evt_ursoc" + texturefile = "gfx\\event_pictures\\ursoc.tga" + } + spriteType = { + name = "GFX_evt_goldrinn" + texturefile = "gfx\\event_pictures\\goldrinn.tga" + } + spriteType = { + name = "GFX_evt_malorne" + texturefile = "gfx\\event_pictures\\malorne.tga" + } + spriteType = { + name = "GFX_evt_elune" + texturefile = "gfx\\event_pictures\\elune.tga" + } + spriteType = { + name = "GFX_evt_tauren" + texturefile = "gfx\\event_pictures\\tauren.tga" + } + spriteType = { + name = "GFX_evt_ursocandursol" + texturefile = "gfx\\event_pictures\\ursoc_and_ursol.tga" + } + spriteType = { + name = "GFX_evt_tidesage" + texturefile = "gfx\\event_pictures\\tidesage.tga" + } + spriteType = { + name = "GFX_evt_druidic_forest" + texturefile = "gfx\\event_pictures\\druidic_forest.tga" + } + spriteType = { + name = "GFX_evt_sand" + texturefile = "gfx\\event_pictures\\sand.tga" + } + spriteType = { + name = "GFX_evt_ice" + texturefile = "gfx\\event_pictures\\ice.tga" + } }