From be60424164a35414e945bd1ed7cabfbba5ff6c56 Mon Sep 17 00:00:00 2001
From: littlefoot <littlefoot@orfl.xyz>
Date: Sun, 24 Oct 2021 20:00:53 -0400
Subject: [PATCH] attack factor stuff is probably all wrong but lets roll with
 it for now

---
 scripts/npc/attack_factor.txt     | 548 ++++--------------------------
 scripts/vscripts/system/tower.lua |  72 +++-
 2 files changed, 139 insertions(+), 481 deletions(-)

diff --git a/scripts/npc/attack_factor.txt b/scripts/npc/attack_factor.txt
index 1b5d431..9958cd0 100755
--- a/scripts/npc/attack_factor.txt
+++ b/scripts/npc/attack_factor.txt
@@ -1,482 +1,70 @@
 {
-	["lily"] = {
-		[1] = {0,0},
-		[2] = {0,0},
-		[3] = {0,0},
-		[4] = {0,0},
-		[5] = {0,0},
-	},
-	["nazrin"] = {
-		[1] = {10,1},
-		[2] = {40,2},
-		[3] = {100,4},
-		[4] = {200,5},
-		[5] = {500,6},
-	},
-	["mugiyousei"] = {
-		[1] = {10,2},
-		[2] = {55,3},
-		[3] = {145,4},
-		[4] = {350,6.5},
-		[5] = {1400,26},
-	},
-	["shanghainingyou"] = {
-		[1] = {10,2},
-		[2] = {55,3},
-		[3] = {145,4},
-		[4] = {350,6.5},
-		[5] = {1400,26},
-	},
-	["hourainingyou"] = {
-		[1] = {10,2},
-		[2] = {55,3},
-		[3] = {145,4},
-		[4] = {350,6.5},
-		[5] = {1400,26},
-	},
-	["hanadayousei"] = {
-		[1] = {10,2},
-		[2] = {55,3},
-		[3] = {145,4},
-		[4] = {350,6.5},
-		[5] = {1400,26},
-	},
-	["maidyousei"] = {
-		[1] = {10,2},
-		[2] = {55,3},
-		[3] = {145,4},
-		[4] = {350,6.5},
-		[5] = {1400,26},
-	},
-	["cirno"] = {
-		[1] = {15,2},
-		[2] = {60,3.5},
-		[3] = {160,5},
-		[4] = {375,6.5},
-		[5] = {1800,10},
-	},
-	["kogasa"] = {
-		[1] = {15,2},
-		[2] = {60,3.5},
-		[3] = {160,5},
-		[4] = {375,6.5},
-		[5] = {1800,10},
-	},
-	["letty"] = {
-		[1] = {15,2},
-		[2] = {60,3.5},
-		[3] = {160,5},
-		[4] = {375,6.5},
-		[5] = {1800,10},
-	},
-	["lyrica"] = {
-		[1] = {15,2},
-		[2] = {60,3.5},
-		[3] = {160,5},
-		[4] = {375,6.5},
-		[5] = {1800,10},
-	},
-	["lunasa"] = {
-		[1] = {15,2},
-		[2] = {60,3.5},
-		[3] = {160,5},
-		[4] = {375,6.5},
-		[5] = {1800,10},
-	},
-	["merlin"] = {
-		[1] = {15,2},
-		[2] = {60,3.5},
-		[3] = {160,5},
-		[4] = {375,6.5},
-		[5] = {1800,10},
-	},
-	["rumia"] = {
-		[1] = {15,2},
-		[2] = {60,3.5},
-		[3] = {160,5},
-		[4] = {375,6.5},
-		[5] = {1800,10},
-	},
-	["satori"] = {
-		[1] = {15,2},
-		[2] = {60,3.5},
-		[3] = {160,5},
-		[4] = {375,6.5},
-		[5] = {1800,10},
-	},
-	["iku"] = {
-		[1] = {15,2},
-		[2] = {60,3.5},
-		[3] = {160,5},
-		[4] = {375,6.5},
-		[5] = {1800,10},
-	},
-	["mystia"] = {
-		[1] = {15,2},
-		[2] = {60,3.5},
-		[3] = {160,5},
-		[4] = {375,6.5},
-		[5] = {1800,10},
-	},
-	["marisa"] = {
-		[1] = {20,2.5},
-		[2] = {75,4.0},
-		[3] = {190,5},
-		[4] = {400,7.0},
-		[5] = {2000,12},
-	},
-	["marisa"] = {
-		[1] = {20,2.5},
-		[2] = {75,4.0},
-		[3] = {190,5},
-		[4] = {400,7.0},
-		[5] = {2000,12},
-	},
-	["tenshi"] = {
-		[1] = {20,2.5},
-		[2] = {75,4.0},
-		[3] = {190,5},
-		[4] = {400,7.0},
-		[5] = {2000,12},
-	},
-	["patchouli"] = {
-		[1] = {10,1.0},
-		[2] = {50,1.0},
-		[3] = {100,1.0},
-		[4] = {150,1.0},
-		[5] = {500,1.0},
-	},
-	["reisen"] = {
-		[1] = {20,2.5},
-		[2] = {75,4.0},
-		[3] = {190,5},
-		[4] = {400,7.0},
-		[5] = {2000,12},
-	},
-	["yuyuko"] = {
-		[1] = {1,1.0},
-		[2] = {1,1.0},
-		[3] = {1,1.0},
-		[4] = {1,1.0},
-		[5] = {1,1.0},
-	},
-	["youmu"] = {
-		[1] = {20,2.5},
-		[2] = {75,4.0},
-		[3] = {190,5},
-		[4] = {400,7.0},
-		[5] = {2000,12},
-	},
-	["rin"] = {
-		[1] = {20,2.5},
-		[2] = {75,4.0},
-		[3] = {190,5},
-		[4] = {400,7.0},
-		[5] = {2000,12},
-	},
-	["utsuho"] = {
-		[1] = {20,2.5},
-		[2] = {75,4.0},
-		[3] = {190,5},
-		[4] = {400,7.0},
-		[5] = {2000,12},
-	},
-	["reimu"] = {
-		[1] = {25,3.0},
-		[2] = {85,4.5},
-		[3] = {220,5},
-		[4] = {450,7.5},
-		[5] = {2200,15.0},
-	},
-	["daiyousei"] = {
-		[1] = {15,2},
-		[2] = {60,3.5},
-		[3] = {160,5},
-		[4] = {375,6.5},
-		[5] = {1800,10},
-	},
-	["cirno_ex"] = 
-	{
-		[1] = {30,3.0},
-		[2] = {110,5.0},
-		[3] = {300,7.5},
-		[4] = {600,10.0},
-		[5] = {2400,30.0},
-	},
-	["remilia"] = {
-		[1] = {25,3.0},
-		[2] = {85,4.5},
-		[3] = {220,5},
-		[4] = {450,7.5},
-		[5] = {2200,15.0},
-	},
-	["flandre"] = {
-		[1] = {28,3.0},
-		[2] = {85,4.5},
-		[3] = {220,5},
-		[4] = {450,7.5},
-		[5] = {2200,15.0},
-	},
-	["sakuya"] = {
-		[1] = {20,2.5},
-		[2] = {75,4.0},
-		[3] = {190,5},
-		[4] = {400,7.0},
-		[5] = {2000,12},
-	},
-	["koishi"] = {
-		[1] = {25,3.0},
-		[2] = {85,4.5},
-		[3] = {220,5},
-		[4] = {450,7.5},
-		[5] = {2200,15.0},
-	},
-	["koakuma"] = {
-		[1] = {15,2},
-		[2] = {60,3.5},
-		[3] = {160,5},
-		[4] = {375,6.5},
-		[5] = {1800,10},
-	},
-	["meirin"] = {
-		[1] = {15,2},
-		[2] = {60,3.5},
-		[3] = {160,5},
-		[4] = {375,6.5},
-		[5] = {1800,10},
-	},
-	["yuuka"] = {
-		[1] = {25,3.0},
-		[2] = {85,4.5},
-		[3] = {220,5},
-		[4] = {450,7.5},
-		[5] = {2200,15.0},
-	},
-	["yukari"] = {
-		[1] = {25,3.0},
-		[2] = {85,4.5},
-		[3] = {220,5},
-		[4] = {450,7.5},
-		[5] = {2200,15.0},
-	},
-	["ran"] = {
-		[1] = {20,2.5},
-		[2] = {75,4.0},
-		[3] = {190,5},
-		[4] = {400,7.0},
-		[5] = {2000,12},
-	},
-	["chen"] = {
-		[1] = {15,2},
-		[2] = {60,3.5},
-		[3] = {160,5},
-		[4] = {375,6.5},
-		[5] = {1800,10},
-	},
-	["eirin"] = {
-		[1] = {15,2},
-		[2] = {60,3.5},
-		[3] = {160,5},
-		[4] = {375,6.5},
-		[5] = {1800,10},
-	},
-	["mokou"] = {
-		[1] = {30,2.5},
-		[2] = {105,4.0},
-		[3] = {230,5},
-		[4] = {450,7.0},
-		[5] = {2300,12},
-	},
-	["kaguya"] = {
-		[1] = {20,2.5},
-		[2] = {75,4.0},
-		[3] = {190,5},
-		[4] = {400,7.0},
-		[5] = {2000,12},
-	},
-	["aya"] = {
-		[1] = {20,2.5},
-		[2] = {75,4.0},
-		[3] = {190,5},
-		[4] = {400,7.0},
-		[5] = {2000,12},
-	},
-	["hatate"] = {
-		[1] = {15,2},
-		[2] = {60,3.5},
-		[3] = {160,5},
-		[4] = {375,6.5},
-		[5] = {1800,10},
-	},
-	["momiji"] = {
-		[1] = {15,2},
-		[2] = {60,3.5},
-		[3] = {160,5},
-		[4] = {375,6.5},
-		[5] = {1800,10},
-	},
-	["sanae"] = {
-		[1] = {20,2.5},
-		[2] = {75,4.0},
-		[3] = {190,5},
-		[4] = {400,7.0},
-		[5] = {2000,12},
-	},
-	["kanako"] = {
-		[1] = {25,3.0},
-		[2] = {85,4.5},
-		[3] = {220,5},
-		[4] = {450,7.5},
-		[5] = {2200,15.0},
-	},
-	["suwako"] = {
-		[1] = {20,2.5},
-		[2] = {75,4.0},
-		[3] = {190,5},
-		[4] = {400,7.0},
-		[5] = {2000,12},
-	},
-	["minamitsu"] = {
-		[1] = {20,2.5},
-		[2] = {75,4.0},
-		[3] = {190,5},
-		[4] = {400,7.0},
-		[5] = {2000,12},
-	},
-	["nue"] = {
-		[1] = {20,2.5},
-		[2] = {75,4.0},
-		[3] = {190,5},
-		[4] = {400,7.0},
-		[5] = {2000,12},
-	},
-	["rumia_ex"] = 
-	{
-		[1] = {30,3.0},
-		[2] = {110,5.0},
-		[3] = {300,7.5},
-		[4] = {600,10.0},
-		[5] = {2400,30.0},
-	},
-	["toramaru"] = {
-		[1] = {20,2.5},
-		[2] = {75,4.0},
-		[3] = {190,5},
-		[4] = {400,7.0},
-		[5] = {2000,12},
-	},
-	["shinki"] = {
-		[1] = {25,3.0},
-		[2] = {85,4.5},
-		[3] = {220,5},
-		[4] = {450,7.5},
-		[5] = {2200,15.0},
-	},
-	["byakuren"] = {
-		[1] = {25,3.0},
-		[2] = {85,4.5},
-		[3] = {220,5},
-		[4] = {450,7.5},
-		[5] = {2200,15.0},
-	},
-	["soga"] = {
-		[1] = {20,2.5},
-		[2] = {75,4.0},
-		[3] = {190,5},
-		[4] = {400,7.0},
-		[5] = {2000,12},
-	},
-	["miko"] = {
-		[1] = {25,3.0},
-		[2] = {85,4.5},
-		[3] = {220,5},
-		[4] = {450,7.5},
-		[5] = {2200,15.0},
-	},
-	["futo"] = {
-		[1] = {20,2.5},
-		[2] = {75,4.0},
-		[3] = {190,5},
-		[4] = {400,7.0},
-		[5] = {2000,12},
-	},
-	["yoshika"] = {
-		[1] = {15,2},
-		[2] = {60,3.5},
-		[3] = {160,5},
-		[4] = {375,6.5},
-		[5] = {1800,10},
-	},
-	["seiga"] = {
-		[1] = {20,2.5},
-		[2] = {75,4.0},
-		[3] = {190,5},
-		[4] = {400,7.0},
-		[5] = {2000,12},
-	},
-	["keine"] = {
-		[1] = {20,2.5},
-		[2] = {75,4.0},
-		[3] = {190,5},
-		[4] = {400,7.0},
-		[5] = {2000,12},
-	},
-	["medicine"] = {
-		[1] = {15,2},
-		[2] = {60,3.5},
-		[3] = {160,5},
-		[4] = {375,6.5},
-		[5] = {1800,10},
-	},
-	["luna"] = {
-		[1] = {15,2},
-		[2] = {60,3.5},
-		[3] = {160,5},
-		[4] = {375,6.5},
-		[5] = {1800,10},
-	},
-	["star"] = {
-		[1] = {15,2},
-		[2] = {60,3.5},
-		[3] = {160,5},
-		[4] = {375,6.5},
-		[5] = {1800,10},
-	},
-	["sunny"] = {
-		[1] = {15,2},
-		[2] = {60,3.5},
-		[3] = {160,5},
-		[4] = {375,6.5},
-		[5] = {1800,10},
-	},
-	["yuugi"] = 
-	{
-		[1] = {30,3.0},
-		[2] = {110,5.0},
-		[3] = {300,7.5},
-		[4] = {600,10.0},
-		[5] = {2400,30.0},
-	},
-	["suika"] = 
-	{
-		[1] = {25,3.0},
-		[2] = {85,4.5},
-		[3] = {220,5},
-		[4] = {450,7.5},
-		[5] = {2200,15.0},
-	},
-	["junko"] = {
-		[1] = {30,3.0},
-		[2] = {110,5.0},
-		[3] = {300,7.5},
-		[4] = {600,10.0},
-		[5] = {2400,30.0},
-	},
-	["hecatia"] = {
-		[1] = {30,3.0},
-		[2] = {110,5.0},
-		[3] = {300,7.5},
-		[4] = {600,10.0},
-		[5] = {2400,30.0},
-	},
+	["lily"] = 0,
+	["nazrin"] = 1,
+	["mugiyousei"] = 2,
+	["shanghainingyou"] = 2,
+	["hourainingyou"] = 2,
+	["hanadayousei"] = 2,
+	["maidyousei"] = 2,
+	["cirno"] = 2,
+	["kogasa"] = 2,
+	["letty"] = 2,
+	["lyrica"] = 2,
+	["lunasa"] = 2,
+	["merlin"] = 2,
+	["rumia"] = 2,
+	["satori"] = 2,
+	["iku"] = 2,
+	["mystia"] = 2,
+	["marisa"] = 2.5,
+	["marisa"] = 2.5,
+	["tenshi"] = 2.5,
+	["patchouli"] = 1.0,
+	["reisen"] = 2.5,
+	["yuyuko"] = 1.0,
+	["youmu"] = 2.5,
+	["rin"] = 2.5,
+	["utsuho"] = 2.5,
+	["reimu"] = 3.0,
+	["daiyousei"] = 2,
+	["cirno_ex"] = 3.0,
+	["remilia"] = 3.0,
+	["flandre"] = 3.0,
+	["sakuya"] = 2.5,
+	["koishi"] = 3.0,
+	["koakuma"] = 2,
+	["meirin"] = 2,
+	["yuuka"] = 3.0,
+	["yukari"] = 3.0,
+	["ran"] = 2.5,
+	["chen"] = 2,
+	["eirin"] = 2,
+	["mokou"] = 2.5,
+	["kaguya"] = 2.5,
+	["aya"] = 2.5,
+	["hatate"] = 2,
+	["momiji"] = 2,
+	["sanae"] = 2.5,
+	["kanako"] = 3.0,
+	["suwako"] = 2.5,
+	["minamitsu"] = 2.5,
+	["nue"] = 2.5,
+	["rumia_ex"] = 3.0,
+	["toramaru"] = 2.5,
+	["shinki"] = 3.0,
+	["byakuren"] = 3.0,
+	["soga"] = 2.5,
+	["miko"] = 3.0,
+	["futo"] = 2.5,
+	["yoshika"] = 2,
+	["seiga"] = 2.5,
+	["keine"] = 2.5,
+	["medicine"] = 2,
+	["luna"] = 2,
+	["star"] = 2,
+	["sunny"] = 2,
+	["yuugi"] = 3.0,
+	["suika"] = 3.0,
+	["junko"] = 3.0,
+	["hecatia"] = 3.0
 }
\ No newline at end of file
diff --git a/scripts/vscripts/system/tower.lua b/scripts/vscripts/system/tower.lua
index 3ce7eae..1579fb6 100755
--- a/scripts/vscripts/system/tower.lua
+++ b/scripts/vscripts/system/tower.lua
@@ -617,7 +617,77 @@ local thtd_power_table = {
 	},
 }
 
-local thtd_attack_factor = {} -- Need to update the attack factor table, use defaults for now
+local thtd_attack_factor = {
+	["lily"] = 0,
+	["nazrin"] = 1,
+	["mugiyousei"] = 2,
+	["shanghainingyou"] = 2,
+	["hourainingyou"] = 2,
+	["hanadayousei"] = 2,
+	["maidyousei"] = 2,
+	["cirno"] = 2,
+	["kogasa"] = 2,
+	["letty"] = 2,
+	["lyrica"] = 2,
+	["lunasa"] = 2,
+	["merlin"] = 2,
+	["rumia"] = 2,
+	["satori"] = 2,
+	["iku"] = 2,
+	["mystia"] = 2,
+	["marisa"] = 2.5,
+	["marisa"] = 2.5,
+	["tenshi"] = 2.5,
+	["patchouli"] = 1.0,
+	["reisen"] = 2.5,
+	["yuyuko"] = 1.0,
+	["youmu"] = 2.5,
+	["rin"] = 2.5,
+	["utsuho"] = 2.5,
+	["reimu"] = 3.0,
+	["daiyousei"] = 2,
+	["cirno_ex"] = 3.0,
+	["remilia"] = 3.0,
+	["flandre"] = 3.0,
+	["sakuya"] = 2.5,
+	["koishi"] = 3.0,
+	["koakuma"] = 2,
+	["meirin"] = 2,
+	["yuuka"] = 3.0,
+	["yukari"] = 3.0,
+	["ran"] = 2.5,
+	["chen"] = 2,
+	["eirin"] = 2,
+	["mokou"] = 2.5,
+	["kaguya"] = 2.5,
+	["aya"] = 2.5,
+	["hatate"] = 2,
+	["momiji"] = 2,
+	["sanae"] = 2.5,
+	["kanako"] = 3.0,
+	["suwako"] = 2.5,
+	["minamitsu"] = 2.5,
+	["nue"] = 2.5,
+	["rumia_ex"] = 3.0,
+	["toramaru"] = 2.5,
+	["shinki"] = 3.0,
+	["byakuren"] = 3.0,
+	["soga"] = 2.5,
+	["miko"] = 3.0,
+	["futo"] = 2.5,
+	["yoshika"] = 2,
+	["seiga"] = 2.5,
+	["keine"] = 2.5,
+	["medicine"] = 2,
+	["luna"] = 2,
+	["star"] = 2,
+	["sunny"] = 2,
+	["yuugi"] = 3.0,
+	["suika"] = 3.0,
+	["junko"] = 3.0,
+	["hecatia"] = 3.0
+}
+
 local thtd_ability_table = {
 	["lily"] = {
 		[1] = {["thtd_lily_01"] = 1,["thtd_lily_02"] = 0},