fixed a missing parenthesis, added baseline non encrypted tables from tadb, added function for loading tables from file without kv or encryption

2021-10-24 16:34:42 -04:00
parent b9a5a8fe23
commit 616fb96310
8 changed files with 1950 additions and 310 deletions
--- a/scripts/npc/combo_table.txt
+++ b/scripts/npc/combo_table.txt
@@ -1,12 +1,326 @@
-combo_table
-{
-    "1"    "C5ACAE4FA8E657B7F5557BDBA854AAF79C686A95DFFF7DEF344EF7BF4764F8502D8629F7C618CD8423869A83513CD7C2340C0B4197DA319480DF5037D1C7916D7E5B49DD608F893F3C7E0BA827AE552FC5EAB9C1D4A0D5B12E0EF339F40951744BE72844F4AD8E34F1F02C9F71A22D4D4FF7CB9E6585CCB783E0E818A44D974"
-    "2"    "A7A6FA4F9E3772171064FB591B62EC3FCC8AA1789B5837FC2A71253971D821976F7293E7A8B5E946E553E9117C25EBADF82D1F67888233170B3B3D02F758FAE109828F2CDDF327F57F725A7A80C1027D0165D2A5644FAB65DAB0F2F3B52104B70A174DEEF88F3027A3BA33E9A7FEA29BAB4C111D50190129CFD79867EE4FCDE"
-    "3"    "FFBF55A0305E7879050537DF3CF67AE26AEC9C4D15A9B91093143672C21C7597DC249D2BBE4FA15FC0D22E776056B6DF59DFD5D97DD59A5C454D71FCDB54BB483086786008BC52AABDD322B9BB2790DC908719F098A7A3B120D08521A1561345FC1AFB6C12DD616764CAE6FA637928093BA4FF008B4EA9899044339980FFFAE"
-    "4"    "EF9B58A74F6B0F32B25735BC4C29AAAE97CD7AF0CE840B21F6B40D7AE4B386C004AE8811C664C5FAAFE72D1BEE49F7D05D9CB17DC20BECECC793C718B489C2A8C381AE38DF0CA26381C7E636702A76E1C79E9F72CBC73D9BDABD3195BE17494A0EFCC5EAD6A1C0BD7499CFFA6A9823191875F6C9CD23AA096764160F26037B9"
-    "5"    "B1B5DA44B16742E17105DCD3BE007C52192EFEB5AD485F24C403909D879BA4727A6F49B75678A349BEDBC2CC3FFDB7D6511F3E291962B53F799D708F154A2003593849F63AF6A244B7F946628AD63EC331E7929900F214FE83B647FC9C8661A7A744A23777B9FF90CD044D10E8C79CAB4D1BA619C49756A58614C9C383E7DCD"
-    "6"    "50173DC447D42699A3BD95404CE01A47DA45C4F1D5E5F2CA674CC96A3955D0A0A0AD75ADDE6D0E85CA9937C8780A089E1BAD836681346CAE1ECB7C159488F7052A172D8547D9EF7831A1C879B40BD6D8EFEE0F83DCC87A0F7C266C77645F1A8E3F08788B8134BA4A20B667EBC72939D2DCCBA822CBA96F900E4898FB0AEF29B"
-    "7"    "75475056CA493E414381123068CC198E22C94FFB83899BDEE5673D178CD330CE503774DBB509A74236BE768CC6ECB9E0FD87B112586168A4BC7A46FF688419FCD338647A9E5AEEC0C771CB2ADB77DE888F66778C869FD0585C395E6CDD14F7D4EBA1025081459A4D84E9A3064AF2CE60330A4F1E8B6AA65944DA6BFF2CC7AB9"
-    "8"    "65D3A8D7DE9D087F5A872D49DB8F77BF31234D6A86BE74AD24FA255CE721336C2E6CE14C74DF317F77DF41285D651B5A48322808022D6D0B65CEE720C9E21A38BD4AA587F3DB63443170357EF32636AF141B07289D3D6BA3E276F4F2BFB03FADAEA03FEE483F4FE6070CB0DAF869F10F460E8ADB8A38311391900D789E57B30"
-    "9"    "EFA946ECF356B0579C4F3F9F48AC2CC49C1ED75EB85CB6C0C506AC01FCEF1D879D7395E726625337737D055536D67816B563F6547D58ABCA6C"
+{	
+	["cirno"] = 
+	{
+		["letty_cirno"] = 
+		{		
+			["abilityName"] = "thtd_cirno_01",				
+		}
+	},
+	["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",			
+		}
+	},	
 }