From e1275b296d4927554672a372ec53b933053cfa51 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sun, 11 Apr 2021 07:44:20 -0300
Subject: Start working out on the focus skills

---
 db/pre-re/item_db.conf    |   2 +-
 db/pre-re/skill_db.conf   |  82 ++++++--
 db/pre-re/skill_tree.conf | 481 ++--------------------------------------------
 3 files changed, 93 insertions(+), 472 deletions(-)

(limited to 'db/pre-re')

diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index 94f7b83f..1f5bd39e 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -11471,7 +11471,7 @@ item_db: (
 	BindOnEquip: false
 	Delay: 0
 	OnEquipScript: <"
-		bonus bDeaf, 1;
+		bonus bDeaf, 1; // FIXME SC_SILENCE or Manner = 0 or whatever
 	">
 },
 {
diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf
index 29e24b08..f77e26e2 100644
--- a/db/pre-re/skill_db.conf
+++ b/db/pre-re/skill_db.conf
@@ -1751,7 +1751,7 @@ skill_db: (
 },
 {
 	Id: 43
-	Name: "AC_OWL"
+	Name: "SKILL_MALLARDS_EYE"
 	Description: "Owl's Eye"
 	MaxLevel: 10
 	NumberOfHits: 0
@@ -38417,8 +38417,8 @@ skill_db: (
 },
 {
 	Id: 20002
-	Name: "EVOL_SUPER_MENU"
-	Description: "Super Menu"
+	Name: "TMW2_FAKESKILL"
+	Description: "Resync"
 	MaxLevel: 1
 	SkillType: {
 		Self: true
@@ -38426,22 +38426,82 @@ skill_db: (
 },
 {
 	Id: 20003
-	Name: "EVOL_MONSTER_IDENTIFY"
-	Description: "Monster Identify"
-	MaxLevel: 1
+	Name: "SKILL_POOL"
+	Description: "Focus"
+	MaxLevel: 10
 	SkillType: {
-		Self: true
+		Passive: true
 	}
-	CoolDown: 3000
 },
-{
+/*{
 	Id: 20004
-	Name: "EVOL_CRAFTING"
-	Description: "Crafting"
+	Name: "SKILL_MALLARDS_EYE"
+	Description: "Mallard Eye"
+	MaxLevel: 10
+	SkillType: {
+		Passive: true
+	}
+},*/
+{
+	Id: 20005
+	Name: "SKILL_BRAWLING"
+	Description: "Brawling"
+	MaxLevel: 10
+	SkillType: {
+		Passive: true
+	}
+},
+{
+	Id: 20006
+	Name: "SKILL_SPEED"
+	Description: "Speed"
+	MaxLevel: 10
+	SkillType: {
+		Passive: true
+	}
+},
+{
+	Id: 20007
+	Name: "SKILL_RESIST_POISON"
+	Description: "Resist Status Condition"
+	MaxLevel: 10
+	SkillType: {
+		Passive: true
+	}
+},
+{
+	Id: 20008
+	Name: "SKILL_ASTRAL_SOUL"
+	Description: "Astral Soul"
+	MaxLevel: 10
+	SkillType: {
+		Passive: true
+	}
+},
+{
+	Id: 20009
+	Name: "SKILL_RAGING"
+	Description: "Raging"
 	MaxLevel: 10
 	SkillType: {
 		Passive: true
 	}
 },
+{
+	Id: 20010
+	Name: "EVOL_AREA_PROVOKE"
+	Description: "Itenplz"
+	MaxLevel: 9
+	SkillType: {
+		//Self: true
+		Friend: true // <- Can it aim an enemy??
+	}
+	CoolDown: 1000
+	Requirements: {
+		SPCost: 0 // FIXME?
+	}
+},
+// TODO: Bind magic scripts
+// Wand Aggravate(AreaProvoke) Abizit FlareDart Alizarin Cobalt Gamboge Mauve Lum MagicBlade Sulphur Kalmurk Parum ArrowHail Barrier(OK) EnchantLifestone FlyingBackpack(?) Joyplim Hide(?) LayOnHands Ingrav Knuclkes MakeArrow MakeIronPowder MakeShirt MakeTanktop MakeSTanktop Protect Rain Shear SFluffy SMouboo SPinkie SSnake SSPiky SWicked ToxicDart Necro
 )
 
diff --git a/db/pre-re/skill_tree.conf b/db/pre-re/skill_tree.conf
index 934769c0..bdabe1ad 100644
--- a/db/pre-re/skill_tree.conf
+++ b/db/pre-re/skill_tree.conf
@@ -34,512 +34,73 @@ Talpan: {
 		EVOL_MONSTER_IDENTIFY: 0
 		AC_SHOWER: 0
 		MG_FIREWALL: 0
+		TMW2_FAKESKILL: 0
 
-		/*
-		EVOL_CRAFTING: 0
-		SM_SWORD: 0
-		SM_TWOHAND: 0
-		AC_OWL: 0
-		NV_FIRSTAID: 0
-		WE_BABY: 0
-		WE_CALLPARENT: 0
-		WE_CALLBABY: 0
-		MC_VENDING: 0
-		MC_PUSHCART: 0
-		ALL_BUYING_STORE: 0
-		KN_RIDING: 0
-		SM_BASH: 0
-		TK_HIGHJUMP: 0
-		MG_THUNDERSTORM: 0
-		AS_CLOAKING: 0
-		TF_DOUBLE: 0
-		TF_HIDING: 0
-		WZ_VERMILION: 0
-		ST_CHASEWALK: 0
-		WS_CARTBOOST: 0
-		TK_RUN: 0
-		RA_RESEARCHTRAP: 0
-		SC_DIMENSIONDOOR: 0
-		WZ_STORMGUST: 0
-		WL_SUMMONFB: 0
-		WL_RELEASE: 0
-		WL_SUMMONSTONE: 0
-		SC_INVISIBILITY: 0
-		RG_GRAFFITI: 0
-		RG_CLEANER: 0
-		SA_COMA: 0
-		CH_SOULCOLLECT: 0
-		SL_STUN: 0
-		AL_BLESSING: 0
-		WL_STASIS: 0
-		RA_CAMOUFLAGE: 0
-		SC_MANHOLE: 0
-		AL_RUWACH: 0
-		AL_TELEPORT: 0
-		MG_SAFETYWALL: 0
-		WZ_QUAGMIRE: 0
-		MO_BODYRELOCATION: 0
-		MO_CALLSPIRITS: 0
-		GN_HELLS_PLANT: 0
-		GN_DEMONIC_FIRE: 0
-		GN_CRAZYWEED: 0
-		GN_WALLOFTHORN: 0
-		WE_MALE: 0
-		WE_FEMALE: 0
-		WE_CALLPARTNER: 0
-		MG_COLDBOLT: 0
+		SKILL_POOL: 0
+		SKILL_MALLARDS_EYE: 0
+		SKILL_BRAWLING: 0
+		SKILL_SPEED: 0
+		SKILL_RESIST_POISON: 0
+		SKILL_ASTRAL_SOUL: 0
+		SKILL_RAGING: 0
 
-		SA_FREECAST: 0
-		ALL_FULL_THROTTLE: 0
-		SA_DRAGONOLOGY: 0
-		CR_TRUST: 0
-		SM_RECOVERY: 0
-		MG_SRECOVERY: 0
-		MC_MAMMONITE: 0
-		TF_DETOXIFY: 0
-		NV_TRICKDEAD: 0
-		HW_MAGICPOWER: 0
-		TF_POISON: 0
-		TF_BACKSLIDING: 0
-		MC_DISCOUNT: 0
-		GC_DARKILLUSION: 0
-		AC_CHARGEARROW: 0
-		ASC_METEORASSAULT: 0
-		SN_SHARPSHOOTING: 0
-		KN_AUTOCOUNTER: 0
-		AC_VULTURE: 0
-		MG_SOULSTRIKE: 0
-		MG_NAPALMBEAT: 0
-		SA_SEISMICWEAPON: 0
-		SN_WINDWALK: 0
-		MG_LIGHTNINGBOLT: 0
-		SA_FLAMELAUNCHER: 0
-		MG_FIREBOLT: 0
-		MG_FIREBALL: 0
-		SO_FIREWALK: 0
-		SA_FROSTWEAPON: 0
-		MG_FROSTDIVER: 0
-		WZ_FROSTNOVA: 0
-		SM_PROVOKE: 0
-		EVOL_MASS_PROVOKE: 0
-		TF_STEAL: 0
-		MC_OVERCHARGE: 0
-		AL_HOLYLIGHT: 0
-		AL_HEAL: 0
-		AB_HIGHNESSHEAL: 0
-        */
+		EVOL_AREA_PROVOKE: 0
 	}
 }
 
 CaveUkar: {
 	skills: {
-		EVOL_CRAFTING: 0
-		SM_SWORD: 0
-		SM_TWOHAND: 0
-		AC_OWL: 0
 		NV_BASIC: 0
-		NV_FIRSTAID: 0
-		WE_BABY: 0
-		WE_CALLPARENT: 0
-		WE_CALLBABY: 0
-		MC_VENDING: 0
-		MC_PUSHCART: 0
-		ALL_BUYING_STORE: 0
+		ALL_INCCARRY: 0
 		AM_CALLHOMUN: 0
-		KN_RIDING: 0
-		SM_BASH: 0
-		TK_HIGHJUMP: 0
-		MG_THUNDERSTORM: 0
-		AS_CLOAKING: 0
-		TF_DOUBLE: 0
-		TF_HIDING: 0
-		WZ_VERMILION: 0
-		ST_CHASEWALK: 0
-		WS_CARTBOOST: 0
-		TK_RUN: 0
-		RA_RESEARCHTRAP: 0
-		SC_DIMENSIONDOOR: 0
-		WZ_STORMGUST: 0
-		WL_SUMMONFB: 0
-		WL_RELEASE: 0
-		WL_SUMMONSTONE: 0
-		SC_INVISIBILITY: 0
-		RG_GRAFFITI: 0
-		RG_CLEANER: 0
-		SA_COMA: 0
-		CH_SOULCOLLECT: 0
-		SL_STUN: 0
-		AL_BLESSING: 0
-		WL_STASIS: 0
-		RA_CAMOUFLAGE: 0
-		SC_MANHOLE: 0
-		AL_RUWACH: 0
-		AL_TELEPORT: 0
-		MG_SAFETYWALL: 0
-		WZ_QUAGMIRE: 0
-		MO_BODYRELOCATION: 0
-		MO_CALLSPIRITS: 0
-		GN_HELLS_PLANT: 0
-		GN_DEMONIC_FIRE: 0
-		GN_CRAZYWEED: 0
-		GN_WALLOFTHORN: 0
-		WE_MALE: 0
-		WE_FEMALE: 0
-		WE_CALLPARTNER: 0
-		MG_COLDBOLT: 0
 		EVOL_PHYSICAL_SHIELD: 0
 		EVOL_MONSTER_IDENTIFY: 0
-
-		SA_FREECAST: 0
-		ALL_FULL_THROTTLE: 0
-		SA_DRAGONOLOGY: 0
-		CR_TRUST: 0
-		SM_RECOVERY: 0
-		MG_SRECOVERY: 0
-		MC_MAMMONITE: 0
-		TF_DETOXIFY: 0
-		NV_TRICKDEAD: 0
-		HW_MAGICPOWER: 0
-		TF_POISON: 0
-		TF_BACKSLIDING: 0
-		MC_DISCOUNT: 0
-		GC_DARKILLUSION: 0
-		AC_CHARGEARROW: 0
 		AC_SHOWER: 0
-		ASC_METEORASSAULT: 0
-		SN_SHARPSHOOTING: 0
-		KN_AUTOCOUNTER: 0
-		AC_VULTURE: 0
-		MG_SOULSTRIKE: 0
-		MG_NAPALMBEAT: 0
-		SA_SEISMICWEAPON: 0
-		SN_WINDWALK: 0
-		MG_LIGHTNINGBOLT: 0
 		MG_FIREWALL: 0
-		SA_FLAMELAUNCHER: 0
-		MG_FIREBOLT: 0
-		MG_FIREBALL: 0
-		SO_FIREWALK: 0
-		SA_FROSTWEAPON: 0
-		MG_FROSTDIVER: 0
-		WZ_FROSTNOVA: 0
-		SM_PROVOKE: 0
-		EVOL_MASS_PROVOKE: 0
-		TF_STEAL: 0
-		MC_OVERCHARGE: 0
-		ALL_INCCARRY: 0
-		AL_HOLYLIGHT: 0
-		AL_HEAL: 0
-		AB_HIGHNESSHEAL: 0
+		TMW2_FAKESKILL: 0
+
 	}
 }
 
 FireKralog: {
 	skills: {
-		EVOL_CRAFTING: 0
-		SM_SWORD: 0
-		SM_TWOHAND: 0
-		AC_OWL: 0
 		NV_BASIC: 0
-		NV_FIRSTAID: 0
-		WE_BABY: 0
-		WE_CALLPARENT: 0
-		WE_CALLBABY: 0
-		MC_VENDING: 0
-		MC_PUSHCART: 0
-		ALL_BUYING_STORE: 0
+		ALL_INCCARRY: 0
 		AM_CALLHOMUN: 0
-		KN_RIDING: 0
-		SM_BASH: 0
-		TK_HIGHJUMP: 0
-		MG_THUNDERSTORM: 0
-		AS_CLOAKING: 0
-		TF_DOUBLE: 0
-		TF_HIDING: 0
-		WZ_VERMILION: 0
-		ST_CHASEWALK: 0
-		WS_CARTBOOST: 0
-		TK_RUN: 0
-		RA_RESEARCHTRAP: 0
-		SC_DIMENSIONDOOR: 0
-		WZ_STORMGUST: 0
-		WL_SUMMONFB: 0
-		WL_RELEASE: 0
-		WL_SUMMONSTONE: 0
-		SC_INVISIBILITY: 0
-		RG_GRAFFITI: 0
-		RG_CLEANER: 0
-		SA_COMA: 0
-		CH_SOULCOLLECT: 0
-		SL_STUN: 0
-		AL_BLESSING: 0
-		WL_STASIS: 0
-		RA_CAMOUFLAGE: 0
-		SC_MANHOLE: 0
-		AL_RUWACH: 0
-		AL_TELEPORT: 0
-		MG_SAFETYWALL: 0
-		WZ_QUAGMIRE: 0
-		MO_BODYRELOCATION: 0
-		MO_CALLSPIRITS: 0
-		GN_HELLS_PLANT: 0
-		GN_DEMONIC_FIRE: 0
-		GN_CRAZYWEED: 0
-		GN_WALLOFTHORN: 0
-		WE_MALE: 0
-		WE_FEMALE: 0
-		WE_CALLPARTNER: 0
-		MG_COLDBOLT: 0
 		EVOL_PHYSICAL_SHIELD: 0
 		EVOL_MONSTER_IDENTIFY: 0
-
-		SA_FREECAST: 0
-		ALL_FULL_THROTTLE: 0
-		SA_DRAGONOLOGY: 0
-		CR_TRUST: 0
-		SM_RECOVERY: 0
-		MG_SRECOVERY: 0
-		MC_MAMMONITE: 0
-		TF_DETOXIFY: 0
-		NV_TRICKDEAD: 0
-		HW_MAGICPOWER: 0
-		TF_POISON: 0
-		TF_BACKSLIDING: 0
-		MC_DISCOUNT: 0
-		GC_DARKILLUSION: 0
-		AC_CHARGEARROW: 0
 		AC_SHOWER: 0
-		ASC_METEORASSAULT: 0
-		SN_SHARPSHOOTING: 0
-		KN_AUTOCOUNTER: 0
-		AC_VULTURE: 0
-		MG_SOULSTRIKE: 0
-		MG_NAPALMBEAT: 0
-		SA_SEISMICWEAPON: 0
-		SN_WINDWALK: 0
-		MG_LIGHTNINGBOLT: 0
 		MG_FIREWALL: 0
-		SA_FLAMELAUNCHER: 0
-		MG_FIREBOLT: 0
-		MG_FIREBALL: 0
-		SO_FIREWALK: 0
-		SA_FROSTWEAPON: 0
-		MG_FROSTDIVER: 0
-		WZ_FROSTNOVA: 0
-		SM_PROVOKE: 0
-		EVOL_MASS_PROVOKE: 0
-		TF_STEAL: 0
-		MC_OVERCHARGE: 0
-		ALL_INCCARRY: 0
-		AL_HOLYLIGHT: 0
-		AL_HEAL: 0
-		AB_HIGHNESSHEAL: 0
+		TMW2_FAKESKILL: 0
+
 	}
 }
 
 LightRaijin: {
 	skills: {
-		EVOL_CRAFTING: 0
-		SM_SWORD: 0
-		SM_TWOHAND: 0
-		AC_OWL: 0
 		NV_BASIC: 0
-		NV_FIRSTAID: 0
-		WE_BABY: 0
-		WE_CALLPARENT: 0
-		WE_CALLBABY: 0
-		MC_VENDING: 0
-		MC_PUSHCART: 0
-		ALL_BUYING_STORE: 0
+		ALL_INCCARRY: 0
 		AM_CALLHOMUN: 0
-		KN_RIDING: 0
-		SM_BASH: 0
-		TK_HIGHJUMP: 0
-		MG_THUNDERSTORM: 0
-		AS_CLOAKING: 0
-		TF_DOUBLE: 0
-		TF_HIDING: 0
-		WZ_VERMILION: 0
-		ST_CHASEWALK: 0
-		WS_CARTBOOST: 0
-		TK_RUN: 0
-		RA_RESEARCHTRAP: 0
-		SC_DIMENSIONDOOR: 0
-		WZ_STORMGUST: 0
-		WL_SUMMONFB: 0
-		WL_RELEASE: 0
-		WL_SUMMONSTONE: 0
-		SC_INVISIBILITY: 0
-		RG_GRAFFITI: 0
-		RG_CLEANER: 0
-		SA_COMA: 0
-		CH_SOULCOLLECT: 0
-		SL_STUN: 0
-		AL_BLESSING: 0
-		WL_STASIS: 0
-		RA_CAMOUFLAGE: 0
-		SC_MANHOLE: 0
-		AL_RUWACH: 0
-		AL_TELEPORT: 0
-		MG_SAFETYWALL: 0
-		WZ_QUAGMIRE: 0
-		MO_BODYRELOCATION: 0
-		MO_CALLSPIRITS: 0
-		GN_HELLS_PLANT: 0
-		GN_DEMONIC_FIRE: 0
-		GN_CRAZYWEED: 0
-		GN_WALLOFTHORN: 0
-		WE_MALE: 0
-		WE_FEMALE: 0
-		WE_CALLPARTNER: 0
-		MG_COLDBOLT: 0
 		EVOL_PHYSICAL_SHIELD: 0
 		EVOL_MONSTER_IDENTIFY: 0
-
-		SA_FREECAST: 0
-		ALL_FULL_THROTTLE: 0
-		SA_DRAGONOLOGY: 0
-		CR_TRUST: 0
-		SM_RECOVERY: 0
-		MG_SRECOVERY: 0
-		MC_MAMMONITE: 0
-		TF_DETOXIFY: 0
-		NV_TRICKDEAD: 0
-		HW_MAGICPOWER: 0
-		TF_POISON: 0
-		TF_BACKSLIDING: 0
-		MC_DISCOUNT: 0
-		GC_DARKILLUSION: 0
-		AC_CHARGEARROW: 0
 		AC_SHOWER: 0
-		ASC_METEORASSAULT: 0
-		SN_SHARPSHOOTING: 0
-		KN_AUTOCOUNTER: 0
-		AC_VULTURE: 0
-		MG_SOULSTRIKE: 0
-		MG_NAPALMBEAT: 0
-		SA_SEISMICWEAPON: 0
-		SN_WINDWALK: 0
-		MG_LIGHTNINGBOLT: 0
 		MG_FIREWALL: 0
-		SA_FLAMELAUNCHER: 0
-		MG_FIREBOLT: 0
-		MG_FIREBALL: 0
-		SO_FIREWALK: 0
-		SA_FROSTWEAPON: 0
-		MG_FROSTDIVER: 0
-		WZ_FROSTNOVA: 0
-		SM_PROVOKE: 0
-		EVOL_MASS_PROVOKE: 0
-		TF_STEAL: 0
-		MC_OVERCHARGE: 0
-		ALL_INCCARRY: 0
-		AL_HOLYLIGHT: 0
-		AL_HEAL: 0
-		AB_HIGHNESSHEAL: 0
+		TMW2_FAKESKILL: 0
+
 	}
 }
 
 SeaTritan: {
 	skills: {
-		EVOL_CRAFTING: 0
-		SM_SWORD: 0
-		SM_TWOHAND: 0
-		AC_OWL: 0
 		NV_BASIC: 0
-		NV_FIRSTAID: 0
-		WE_BABY: 0
-		WE_CALLPARENT: 0
-		WE_CALLBABY: 0
-		MC_VENDING: 0
-		MC_PUSHCART: 0
-		ALL_BUYING_STORE: 0
+		ALL_INCCARRY: 0
 		AM_CALLHOMUN: 0
-		KN_RIDING: 0
-		SM_BASH: 0
-		TK_HIGHJUMP: 0
-		MG_THUNDERSTORM: 0
-		AS_CLOAKING: 0
-		TF_DOUBLE: 0
-		TF_HIDING: 0
-		WZ_VERMILION: 0
-		ST_CHASEWALK: 0
-		WS_CARTBOOST: 0
-		TK_RUN: 0
-		RA_RESEARCHTRAP: 0
-		SC_DIMENSIONDOOR: 0
-		WZ_STORMGUST: 0
-		WL_SUMMONFB: 0
-		WL_RELEASE: 0
-		WL_SUMMONSTONE: 0
-		SC_INVISIBILITY: 0
-		RG_GRAFFITI: 0
-		RG_CLEANER: 0
-		SA_COMA: 0
-		CH_SOULCOLLECT: 0
-		SL_STUN: 0
-		AL_BLESSING: 0
-		WL_STASIS: 0
-		RA_CAMOUFLAGE: 0
-		SC_MANHOLE: 0
-		AL_RUWACH: 0
-		AL_TELEPORT: 0
-		MG_SAFETYWALL: 0
-		WZ_QUAGMIRE: 0
-		MO_BODYRELOCATION: 0
-		MO_CALLSPIRITS: 0
-		GN_HELLS_PLANT: 0
-		GN_DEMONIC_FIRE: 0
-		GN_CRAZYWEED: 0
-		GN_WALLOFTHORN: 0
-		WE_MALE: 0
-		WE_FEMALE: 0
-		WE_CALLPARTNER: 0
-		MG_COLDBOLT: 0
 		EVOL_PHYSICAL_SHIELD: 0
 		EVOL_MONSTER_IDENTIFY: 0
-
-		SA_FREECAST: 0
-		ALL_FULL_THROTTLE: 0
-		SA_DRAGONOLOGY: 0
-		CR_TRUST: 0
-		SM_RECOVERY: 0
-		MG_SRECOVERY: 0
-		MC_MAMMONITE: 0
-		TF_DETOXIFY: 0
-		NV_TRICKDEAD: 0
-		HW_MAGICPOWER: 0
-		TF_POISON: 0
-		TF_BACKSLIDING: 0
-		MC_DISCOUNT: 0
-		GC_DARKILLUSION: 0
-		AC_CHARGEARROW: 0
 		AC_SHOWER: 0
-		ASC_METEORASSAULT: 0
-		SN_SHARPSHOOTING: 0
-		KN_AUTOCOUNTER: 0
-		AC_VULTURE: 0
-		MG_SOULSTRIKE: 0
-		MG_NAPALMBEAT: 0
-		SA_SEISMICWEAPON: 0
-		SN_WINDWALK: 0
-		MG_LIGHTNINGBOLT: 0
 		MG_FIREWALL: 0
-		SA_FLAMELAUNCHER: 0
-		MG_FIREBOLT: 0
-		MG_FIREBALL: 0
-		SO_FIREWALK: 0
-		SA_FROSTWEAPON: 0
-		MG_FROSTDIVER: 0
-		WZ_FROSTNOVA: 0
-		SM_PROVOKE: 0
-		EVOL_MASS_PROVOKE: 0
-		TF_STEAL: 0
-		MC_OVERCHARGE: 0
-		ALL_INCCARRY: 0
-		AL_HOLYLIGHT: 0
-		AL_HEAL: 0
-		AB_HIGHNESSHEAL: 0
+		TMW2_FAKESKILL: 0
+
 	}
 }
 
-- 
cgit v1.2.3-70-g09d2