diff --git a/scripts/vscripts/system/tower.lua b/scripts/vscripts/system/tower.lua index 883924c..8c147e9 100755 --- a/scripts/vscripts/system/tower.lua +++ b/scripts/vscripts/system/tower.lua @@ -852,330 +852,56 @@ local thtd_ability_table = { } -local thtd_combo_table = { - ["letty_cirno"] = - { - "letty", "cirno" - }--[[, - ["letty"] = - { - ["letty_cirno"] = - { - ["abilityName"] = "thtd_letty_01", - } - }, - ["lyrica"] = - { - ["lyrica_lunasa_merlin"] = - { - ["delay"] = 3, - ["duration"] = 3, - ["abilityName"] = "thtd_lyrica_01", - } - }, - ["lunasa"] = - { - ["lyrica_lunasa_merlin"] = - { - ["delay"] = 3, - ["duration"] = 3, - } - }, - ["merlin"] = - { - ["lyrica_lunasa_merlin"] = - { - ["delay"] = 3, - ["duration"] = 3, - } - }, - ["youmu"] = - { - ["yuyuko_youmu"] = - { - ["delay"] = 9, - ["duration"] = 5, - ["abilityName"] = "thtd_youmu_01", - }, - ["youmu_reisen"] = - { - ["abilityName"] = "thtd_youmu_02", - } - }, - ["yuyuko"] = - { - ["yuyuko_youmu"] = - { - ["delay"] = 13, - ["duration"] = 5, - ["abilityName"] = "thtd_yuyuko_02", - }, - ["yuyuko_yukari"] = - { - ["abilityName"] = "thtd_yuyuko_01", - } - }, - ["marisa"] = - { - ["reimu_marisa"] = - { - ["delay"] = 3, - ["duration"] = 2, - ["abilityName"] = "thtd_marisa_01", - ["abilityName2"] = "thtd_marisa_03", - }, - ["marisa_alice"] = - { - ["delay"] = 2, - ["duration"] = 3, - ["abilityName"] = "thtd_marisa_02", - } - }, - ["alice"] = - { - ["marisa_alice"] = - { - ["delay"] = 3, - ["duration"] = 3, - ["abilityName"] = "thtd_alice_03", - }, - ["reimu_alice"] = - { - ["delay"] = 3, - ["duration"] = 3, - ["abilityName"] = "thtd_alice_02", - } - }, - ["koishi"] = - { - ["koishi_satori"] = - { - ["delay"] = 5, - ["duration"] = 2, - ["abilityName"] = "thtd_koishi_01", - } - }, - ["satori"] = - { - ["koishi_satori"] = - { - ["abilityName"] = "thtd_satori_02", - } - }, - ["sakuya"] = - { - ["remilia_sakuya"] = - { - ["delay"] = 3, - ["duration"] = 3, - ["abilityName"] = "thtd_sakuya_02", - }, - ["meirin_sakuya"] = - { - ["abilityName"] = "thtd_sakuya_03", - } - }, - ["koakuma"] = - { - ["koakuma_patchouli"] = - { - ["delay"] = 7, - ["duration"] = 3, - ["abilityName"] = "thtd_koakuma_01", - } - }, - ["patchouli"] = - { - ["koakuma_patchouli"] = - { - ["delay"] = 5, - ["duration"] = 2, - ["abilityName"] = "thtd_patchouli_04", - } - }, - ["eirin"] = - { - ["eirin_kaguya"] = - { - ["delay"] = 2, - ["duration"] = 2, - ["abilityName"] = "thtd_eirin_01", - } - }, - ["kaguya"] = - { - ["eirin_kaguya"] = - { - ["delay"] = 2, - ["duration"] = 3, - ["abilityName"] = "thtd_kaguya_01", - } - }, - ["yukari"] = - { - ["reimu_yukari"] = - { - ["abilityName"] = "thtd_yukari_01", - }, - ["chen_yukari_ran"] = - { - ["abilityName"] = "thtd_yukari_04", - } - }, - ["remilia"] = - { - ["remilia_sakuya"] = - { - ["abilityName"] = "thtd_remilia_04", - }, - ["remilia_flandre"] = - { - ["abilityName"] = "thtd_remilia_02", - } - }, - ["reimu"] = - { - ["rumia_reimu"] = - { - ["abilityName"] = "thtd_reimu_01", - }, - ["reimu_marisa"] = - { - ["abilityName"] = "thtd_reimu_02", - }, - ["reimu_yukari"] = - { - ["abilityName"] = "thtd_reimu_04", - }, - }, - ["flandre"] = - { - ["remilia_flandre"] = - { - ["abilityName"] = "thtd_flandre_02", - } - }, - ["soga"] = - { - ["futo_soga"] = - { - ["abilityName"] = "thtd_soga_03", - } - }, - ["minamitsu"] = - { - ["nue_minamitsu"] = - { - ["abilityName"] = "thtd_minamitsu_02", - } - }, - ["futo"] = - { - ["futo_soga"] = - { - ["abilityName"] = "thtd_futo_02", - } - }, - ["sanae"] = - { - ["suwako_kanako_sanae"] = - { - ["abilityName"] = "thtd_sanae_04", - } - }, - ["tenshi"] = - { - ["tenshi_iku"] = - { - ["abilityName"] = "thtd_tenshi_03", - } - }, - ["mokou"] = - { - ["mokou_keine"] = - { - ["abilityName"] = "thtd_mokou_01", - } - }, - ["reisen"] = - { - ["youmu_reisen"] = - { - ["abilityName"] = "thtd_reisen_02", - } - }, - ["utsuho"] = - { - ["utsuho_rin"] = - { - ["abilityName"] = "thtd_utsuho_01", - } - }, - ["keine"] = - { - ["mokou_keine"] = - { - ["abilityName"] = "thtd_keine_03", - } - }, - ["ran"] = - { - ["chen_yukari_ran"] = - { - ["abilityName"] = "thtd_ran_03", - } - }, - ["yoshika"] = - { - ["yoshika_seiga"] = - { - ["abilityName"] = "thtd_yoshika_01", - } - }, - ["rumia"] = - { - ["rumia_reimu"] = - { - ["abilityName"] = "thtd_rumia_04", - } - }, - ["meirin"] = - { - ["meirin_sakuya"] = - { - ["abilityName"] = "thtd_meirin_02", - } - }, - ["iku"] = - { - ["tenshi_iku"] = - { - ["abilityName"] = "thtd_iku_01", - } - }, - ["junko"] = - { - ["junko_hecatia"] = - { - ["abilityName"] = "thtd_junko_01", - } - }, - ["hecatia"] = - { - ["junko_hecatia"] = - { - ["abilityName"] = "thtd_hecatia_03", - } - }, - ["daiyousei"] = - { - ["daiyousei_cirno"] = - { - ["abilityName"] = "thtd_daiyousei_03", - } - }, ]] +local thtd_combo_table = { + ["letty_cirno"] = {"letty", "cirno"}, + ["letty_cirno"] = {"letty", "cirno"}, + ["lyrica_lunasa_merlin"] = {"lyrica", "lunasa", "merlin"}, + ["lyrica_lunasa_merlin"] = {"lyrica", "lunasa", "merlin"}, + ["lyrica_lunasa_merlin"] = {"lyrica", "lunasa", "merlin"}, + ["yuyuko_youmu"] = {"yuyuko", "youmu"}, + ["youmu_reisen"] = {"youmu", "reisen"}, + ["yuyuko_youmu"] = {"yuyuko", "youmu"}, + ["yuyuko_yukari"] = {"yuyuko", "yukari"}, + ["reimu_marisa"] = {"reimu", "marisa"}, + ["marisa_alice"] = {"marisa", "alice"}, + ["marisa_alice"] = {"marisa", "alice"}, + ["reimu_alice"] = {"reimu", "alice"}, + ["koishi_satori"] = {"koishi", "satori"}, + ["koishi_satori"] = {"koishi", "satori"}, + ["remilia_sakuya"] = {"remilia", "sakuya"}, + ["meirin_sakuya"] = {"meirin", "sakuya"}, + ["koakuma_patchouli"] = {"koakuma", "patchouli"}, + ["koakuma_patchouli"] = {"koakuma", "patchouli"}, + ["eirin_kaguya"] = {"eirin", "kaguya"}, + ["eirin_kaguya"] = {"eirin", "kaguya"}, + ["reimu_yukari"] = {"reimu", "yukari"}, + ["chen_yukari_ran"] = {"chen", "yukari", "ran"}, + ["remilia_sakuya"] = {"remilia", "sakuya"}, + ["remilia_flandre"] = {"remilia", "flandre"}, + ["rumia_reimu"] = {"rumia", "reimu"}, + ["reimu_marisa"] = {"reimu", "marisa"}, + ["reimu_yukari"] = {"reimu", "yukari"}, + ["remilia_flandre"] = {"remilia", "flandre"}, + ["futo_soga"] = {"futo", "soga"}, + ["nue_minamitsu"] = {"nue", "minamitsu"}, + ["futo_soga"] = {"futo", "soga"}, + ["suwako_kanako_sanae"] = {"suwako", "kanako", "sanae"}, + ["tenshi_iku"] = {"tenshi", "iku"}, + ["mokou_keine"] = {"mokou", "keine"}, + ["youmu_reisen"] = {"youmu", "reisen"}, + ["utsuho_rin"] = {"utsuho", "rin"}, + ["mokou_keine"] = {"mokou", "keine"}, + ["chen_yukari_ran"] = {"chen", "yukari", "ran"}, + ["yoshika_seiga"] = {"yoshika", "seiga"}, + ["rumia_reimu"] = {"rumia", "reimu"}, + ["meirin_sakuya"] = {"meirin", "sakuya"}, + ["tenshi_iku"] = {"tenshi", "iku"}, + ["junko_hecatia"] = {"junko", "hecatia"}, + ["junko_hecatia"] = {"junko", "hecatia"}, + ["daiyousei_cirno"] = {"daiyousei", "cirno"} } + -------------------------------------------------- -- 初始化tower