From 6e709a0587915c32b1405a055747d933e178c2b7 Mon Sep 17 00:00:00 2001 From: Zimmermann Gyula Date: Sun, 21 May 2023 11:18:38 +0200 Subject: [PATCH] Version 1.1.0 Prevent installing on unmerged SoD. Move backup and inlined folder to weidu_external. --- README.md | 4 ++++ zg_bg_voices/english/setup.tra | 1 + zg_bg_voices/tph/cd_add_soundset.tph | 10 +++++----- zg_bg_voices/zg_bg_voices.tp2 | 6 ++++-- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index c0ef564..98ecf19 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,10 @@ Due to inconsistency with other voicesets the Rare Action lines on the Beamdog s Initial release. Adds the 18 new sets from BG1. +### 1.1.0 +Prevent installing on unmerged SoD. +Move backup and inlined folder to weidu_external. + ## Acknowledgments Thanks for CamDawg for [his documentation on EE 2.6+ voicesets](https://github.com/Gibberlings3/EE_soundset_tool). diff --git a/zg_bg_voices/english/setup.tra b/zg_bg_voices/english/setup.tra index af1f7fc..e6639e1 100644 --- a/zg_bg_voices/english/setup.tra +++ b/zg_bg_voices/english/setup.tra @@ -1,4 +1,5 @@ @0 = ~Baldur's Gate Voice Pack for EE 2.6+~ + @1 = ~DLC Merger is required before mods can be installed on this game.~ @1000 = ~BG: Female Confident~ @1001 = ~Indeed.~ [zgbgf0i] // i diff --git a/zg_bg_voices/tph/cd_add_soundset.tph b/zg_bg_voices/tph/cd_add_soundset.tph index cce2f16..e7b9995 100644 --- a/zg_bg_voices/tph/cd_add_soundset.tph +++ b/zg_bg_voices/tph/cd_add_soundset.tph @@ -94,23 +94,23 @@ DEFINE_ACTION_FUNCTION cd_add_soundset BEGIN ACTION_IF GAME_IS ~bgee~ BEGIN - <<<<<<<<./inlined/cd_add_soundset.tph + <<<<<<<< weidu_external/zg_bg_voices/cd_add_soundset.tph APPEND_COL ~charsnd.2da~ ~$ $ %cd_name% %cd_morale_break1% %cd_happy% %cd_unhappy_1% %cd_unhappy_2% %cd_breaking_pt% %cd_leader1% %cd_tired1% %cd_bored1% %cd_battlecry1% %cd_battlecry2% %cd_battlecry3% %cd_battlecry4% %cd_battlecry5% %cd_attack1% %cd_attack2% %cd_attack3% %cd_attack4% %cd_damage1% %cd_dying1% %cd_hurt1% %cd_forest% %cd_city% %cd_dungeon% %cd_day% %cd_night% %cd_common1% %cd_common2% %cd_common3% %cd_common4% %cd_common5% %cd_common6% %cd_action1% %cd_action2% %cd_action3% %cd_select_rare1% %cd_select_rare2% %cd_select_rare3% %cd_select_rare4% %cd_interaction1% %cd_interaction2% %cd_interaction3% %cd_interaction4% %cd_interaction5% %cd_action_rare1% %cd_action_rare2% %cd_action_rare3% %cd_action_rare4% %cd_padding% %cd_padding% %cd_special1% %cd_special2% %cd_special3% %cd_gen_death1% %cd_specific_death% %cd_complimented1% %cd_complimented2% %cd_complimented3% %cd_insulted1% %cd_insulted2% %cd_insulted3% %cd_dialog_hostile% %cd_dialog_default% %cd_select_rare5% %cd_select_rare6% %cd_criticalhit% %cd_criticalmiss% %cd_immune% %cd_inventory% %cd_pickpocket% %cd_shadows% %cd_disrupted% %cd_trap% %cd_padding% %cd_padding% %cd_select_rare5% %cd_select_rare6% %cd_select_rare7% %cd_select_rare8% %cd_action4% %cd_action5% %cd_action6% %cd_action7% %cd_morale_break2% %cd_leader2% %cd_tired2% %cd_bored2% %cd_hurt2% %cd_common7% %cd_damage2% %cd_damage3% %cd_dying2% %cd_gen_death2% %cd_padding% %cd_padding% %cd_padding% %cd_padding% %cd_padding% %cd_padding% %cd_padding%~ >>>>>>>> END ACTION_IF GAME_IS ~bg2ee eet~ BEGIN - <<<<<<<<./inlined/cd_add_soundset.tph + <<<<<<<< weidu_external/zg_bg_voices/cd_add_soundset.tph APPEND_COL ~charsnd.2da~ ~$ $ %cd_name% %cd_morale_break1% %cd_happy% %cd_unhappy_1% %cd_unhappy_2% %cd_breaking_pt% %cd_leader1% %cd_tired1% %cd_bored1% %cd_battlecry1% %cd_battlecry2% %cd_battlecry3% %cd_battlecry4% %cd_battlecry5% %cd_attack1% %cd_attack2% %cd_attack3% %cd_attack4% %cd_damage1% %cd_dying1% %cd_hurt1% %cd_forest% %cd_city% %cd_dungeon% %cd_day% %cd_night% %cd_common1% %cd_common2% %cd_common3% %cd_common4% %cd_common5% %cd_common6% %cd_action1% %cd_action2% %cd_action3% %cd_select_rare5% %cd_select_rare6% %cd_select_rare7% %cd_select_rare8% %cd_interaction1% %cd_interaction2% %cd_interaction3% %cd_interaction4% %cd_interaction5% %cd_action_rare1% %cd_action_rare2% %cd_action_rare3% %cd_action_rare4% %cd_padding% %cd_padding% %cd_special1% %cd_special2% %cd_special3% %cd_gen_death1% %cd_specific_death% %cd_complimented1% %cd_complimented2% %cd_complimented3% %cd_insulted1% %cd_insulted2% %cd_insulted3% %cd_dialog_hostile% %cd_dialog_default% %cd_select_rare5% %cd_select_rare6% %cd_criticalhit% %cd_criticalmiss% %cd_immune% %cd_inventory% %cd_pickpocket% %cd_shadows% %cd_disrupted% %cd_trap% %cd_padding% %cd_padding% %cd_select_rare1% %cd_select_rare2% %cd_select_rare3% %cd_select_rare4% %cd_action4% %cd_action5% %cd_action6% %cd_action7% %cd_morale_break2% %cd_leader2% %cd_tired2% %cd_bored2% %cd_hurt2% %cd_common7% %cd_damage2% %cd_damage3% %cd_dying2% %cd_gen_death2% %cd_padding% %cd_padding% %cd_padding% %cd_padding% %cd_padding% %cd_padding% %cd_padding%~ >>>>>>>> END ACTION_IF GAME_IS ~iwdee~ BEGIN - <<<<<<<<./inlined/cd_add_soundset.tph + <<<<<<<< weidu_external/zg_bg_voices/cd_add_soundset.tph APPEND_COL ~charsnd.2da~ ~$ $ %cd_name% %cd_morale_break1% %cd_happy% %cd_unhappy_1% %cd_unhappy_2% %cd_breaking_pt% %cd_leader1% %cd_tired1% %cd_bored1% %cd_battlecry1% %cd_battlecry2% %cd_battlecry3% %cd_battlecry4% %cd_battlecry5% %cd_attack1% %cd_attack2% %cd_attack3% %cd_attack4% %cd_damage1% %cd_dying1% %cd_hurt1% %cd_forest% %cd_city% %cd_dungeon% %cd_day% %cd_night% %cd_common1% %cd_common2% %cd_common3% %cd_common4% %cd_common5% %cd_common6% %cd_action1% %cd_action2% %cd_action3% %cd_select_rare1% %cd_select_rare2% %cd_select_rare3% %cd_select_rare4% %cd_interaction1% %cd_interaction2% %cd_interaction3% %cd_interaction4% %cd_interaction5% %cd_action_rare1% %cd_action_rare2% %cd_action_rare3% %cd_action_rare4% %cd_padding% %cd_padding% %cd_special1% %cd_special2% %cd_special3% %cd_gen_death1% %cd_specific_death% %cd_complimented1% %cd_complimented2% %cd_complimented3% %cd_insulted1% %cd_insulted2% %cd_insulted3% %cd_dialog_hostile% %cd_dialog_default% %cd_padding% %cd_padding% %cd_criticalhit% %cd_criticalmiss% %cd_immune% %cd_inventory% %cd_pickpocket% %cd_shadows% %cd_disrupted% %cd_trap% %cd_padding% %cd_padding% %cd_select_rare5% %cd_select_rare6% %cd_select_rare7% %cd_select_rare8% %cd_action4% %cd_action5% %cd_action6% %cd_action7% %cd_morale_break2% %cd_leader2% %cd_tired2% %cd_bored2% %cd_hurt2% %cd_common7% %cd_damage2% %cd_damage3% %cd_dying2% %cd_gen_death2% %cd_padding% %cd_padding% %cd_padding% %cd_padding% %cd_padding% %cd_padding% %cd_padding%~ >>>>>>>> END - COPY ~./inlined/cd_add_soundset.tph~ ~./inlined/cd_add_soundset.tph~ EVALUATE_BUFFER - REINCLUDE ~./inlined/cd_add_soundset.tph~ + COPY ~weidu_external/zg_bg_voices/cd_add_soundset.tph~ ~weidu_external/zg_bg_voices/cd_add_soundset.tph~ EVALUATE_BUFFER + REINCLUDE ~weidu_external/zg_bg_voices/cd_add_soundset.tph~ COPY_EXISTING ~charsnd.2da~ ~override~ PRETTY_PRINT_2DA diff --git a/zg_bg_voices/zg_bg_voices.tp2 b/zg_bg_voices/zg_bg_voices.tp2 index 89f2bb8..164dfa1 100644 --- a/zg_bg_voices/zg_bg_voices.tp2 +++ b/zg_bg_voices/zg_bg_voices.tp2 @@ -1,6 +1,6 @@ -BACKUP ~zg_bg_voices/backup~ // location to store files for uninstall purposes +BACKUP ~weidu_external/zg_bg_voices/backup~ // location to store files for uninstall purposes SUPPORT "https://forums.beamdog.com/discussion/82008" -VERSION ~1.0.3~ +VERSION ~1.1.0~ LANGUAGE ~English~ ~english~ ~%MOD_FOLDER%/english/setup.tra~ @@ -16,6 +16,8 @@ LANGUAGE ~English~ ~english~ ~%MOD_FOLDER%/english/setup.tra~ BEGIN @0 LABEL ZG-VOICE-BG +ACTION_IF ((FILE_EXISTS ~dlc/sod-dlc.zip~) OR (FILE_EXISTS ~sod-dlc.zip~)) THEN BEGIN FAIL @1 END + INCLUDE ~%MOD_FOLDER%/tph/cd_add_soundset.tph~ // includes the macro that does the work COPY ~%MOD_FOLDER%/sounds~ ~lang/en_us/sounds~ // change en_us to the appropriate language folder