Added Summoner Skills(in DB)

Added Summoner SC ID's in status.h

7 files changed, 1835 insertions, 46 deletions

diff --git a/db/constants.conf b/db/constants.conf
index b271a14e0..09c0fa9e4 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -1383,6 +1383,18 @@ constants_db: {
 	SC_G_LIFEPOTION:                  640
 	SC_MYSTICPOWDER:                  641
 
+	// Summoner
+	SC_SUHIDE:                        642
+	SC_SU_STOOP:                      643
+	SC_SPRITEMABLE:                   644
+	SC_CATNIPPOWDER:                  645
+	SC_SV_ROOTTWIST:                  646
+	SC_BITESCAR:                      647
+	SC_ARCLOUSEDASH:                  648
+	SC_TUNAPARTY:                     649
+	SC_SHRIMP:                        650
+	SC_FRESHSHRIMP:                   651
+
 	comment__: "Emotes"
 	e_gasp:         0
 	e_what:         1
diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf
index a8a58924a..9a9b64038 100644
--- a/db/pre-re/skill_db.conf
+++ b/db/pre-re/skill_db.conf
@@ -32172,10 +32172,37 @@ skill_db: (
 	}
 },
 {
-	Id: 5015
-	Name: "SR_FLASHCOMBO_ATK_STEP1"
-	Description: "Flash Combo Attack Step 1"
-	MaxLevel: 5
+	Id: 5018
+	Name: "SU_BASIC_SKILL"
+	Description: "New Basic Skill"
+	MaxLevel: 1
+	NumberOfHits: 0
+},
+{
+	Id: 5019
+	Name: "SU_BITE"
+	Description: "Bite"
+	MaxLevel: 1
+	Range: 2
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Enemy: true
+	}
+	AttackType: "Weapon"
+	Element: "Ele_Weapon"
+	InterruptCast: true
+	CastTime: 1000
+	AfterCastActDelay: 1000
+	FixedCastTime: 0
+	Requirements: {
+		SPCost: 10
+	}
+},
+{
+	Id: 5020
+	Name: "SU_HIDE"
+	Description: "Hide"
+	MaxLevel: 1
 	Hit: "BDT_SKILL"
 	SkillType: {
 		Self: true
@@ -32183,15 +32210,67 @@ skill_db: (
 	DamageType: {
 		NoDamage: true
 	}
+	InterruptCast: true
+	AfterCastActDelay: 1000
+	SkillData1: -1
+	CoolDown: 15000
+	FixedCastTime: 0
 	Requirements: {
-		SPCost: 1
+		SPCost: 30
 	}
 },
 {
-	Id: 5016
-	Name: "SR_FLASHCOMBO_ATK_STEP2"
-	Description: "Flash Combo Attack Step 2"
-	MaxLevel: 5
+	Id: 5021
+	Name: "SU_SCRATCH"
+	Description: "Scratch"
+	MaxLevel: 3
+	Range: 2
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Enemy: true
+	}
+	AttackType: "Weapon"
+	Element: "Ele_Weapon"
+	DamageType: {
+		SplashArea: true
+	}
+	SplashRange: 1
+	InterruptCast: true
+	AfterCastActDelay: 1000
+	SkillData1: 10000
+	CoolDown: {
+		Lv1: 3000
+		Lv2: 2000
+		Lv3: 1000
+		Lv4: 1
+		Lv5: 1
+		Lv6: 1
+		Lv7: 1
+		Lv8: 1
+		Lv9: 1
+		Lv10: 1
+	}
+	FixedCastTime: 0
+	Requirements: {
+		SPCost: {
+			Lv1: 20
+			Lv2: 25
+			Lv3: 30
+			Lv4: 35
+			Lv5: 40
+			Lv6: 45
+			Lv7: 50
+			Lv8: 55
+			Lv9: 60
+			Lv10: 65
+		}
+	}
+},
+{
+	Id: 5022
+	Name: "SU_STOOP"
+	Description: "Stoop"
+	MaxLevel: 1
 	Hit: "BDT_SKILL"
 	SkillType: {
 		Self: true
@@ -32199,30 +32278,609 @@ skill_db: (
 	DamageType: {
 		NoDamage: true
 	}
+	InterruptCast: true
+	AfterCastActDelay: 1000
+	SkillData1: 6000
+	CoolDown: 15000
+	FixedCastTime: 0
 	Requirements: {
-		SPCost: 1
+		SPCost: 10
 	}
 },
 {
-	Id: 5017
-	Name: "SR_FLASHCOMBO_ATK_STEP3"
-	Description: "Flash Combo Attack Step 3"
+	Id: 5023
+	Name: "SU_LOPE"
+	Description: "Lope"
+	MaxLevel: 3
+	Range: {
+		Lv1: 6
+		Lv2: 10
+		Lv3: 14
+		Lv4: 18
+		Lv5: 22
+		Lv6: 26
+		Lv7: 30
+		Lv8: 34
+		Lv9: 38
+		Lv10: 42
+	}
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Place: true
+	}
+	DamageType: {
+		NoDamage: true
+	}
+	InterruptCast: true
+	CastTime: 500
+	AfterCastActDelay: 1000
+	CoolDown: {
+		Lv1: 2000
+		Lv2: 4000
+		Lv3: 6000
+		Lv4: 8000
+		Lv5: 10000
+		Lv6: 12000
+		Lv7: 14000
+		Lv8: 16000
+		Lv9: 18000
+		Lv10: 20000
+	}
+	FixedCastTime: 0
+	Requirements: {
+		SPCost: {
+			Lv1: 30
+			Lv2: 30
+			Lv3: 30
+			Lv4: 30
+			Lv5: 30
+			Lv6: 30
+			Lv7: 30
+			Lv8: 30
+			Lv9: 30
+			Lv10: 30
+		}
+	}
+},
+{
+	Id: 5024
+	Name: "SU_SPRITEMABLE"
+	Description: "Spirit Marble"
+	MaxLevel: 1
+	NumberOfHits: 0
+},
+{
+	Id: 5025
+	Name: "SU_POWEROFLAND"
+	Description: "Power of Land"
+	MaxLevel: 1
+	NumberOfHits: 0
+},
+{
+	Id: 5026
+	Name: "SU_SV_STEMSPEAR"
+	Description: "Silvervine Stem Spear"
 	MaxLevel: 5
+	Range: 9
 	Hit: "BDT_SKILL"
 	SkillType: {
-		Self: true
+		Enemy: true
+	}
+	AttackType: "Magic"
+	Element: {
+		Lv1: "Ele_Earth"
+		Lv2: "Ele_Fire"
+		Lv3: "Ele_Water"
+		Lv4: "Ele_Wind"
+		Lv5: "Ele_Ghost"
+	}
+	InterruptCast: true
+	CastTime: 2500
+	AfterCastActDelay: 1000
+	SkillData1: 10000
+	FixedCastTime: 0
+	Requirements: {
+		SPCost: {
+			Lv1: 40
+			Lv2: 40
+			Lv3: 40
+			Lv4: 40
+			Lv5: 40
+			Lv6: 40
+			Lv7: 40
+			Lv8: 40
+			Lv9: 40
+			Lv10: 40
+		}
+	}
+},
+{
+	Id: 5027
+	Name: "SU_CN_POWDERING"
+	Description: "Catnip Powdering"
+	MaxLevel: 5
+	Range: 9
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Enemy: true
+	}
+	DamageType: {
+		NoDamage: true
+		SplashArea: true
+	}
+	SplashRange: {
+		Lv1: 3
+		Lv2: 3
+		Lv3: 5
+		Lv4: 5
+		Lv5: 7
+	}
+	InterruptCast: true
+	SkillInstances: 1
+	CastTime: 1500
+	AfterCastActDelay: 1000
+	SkillData1: {
+		Lv1: 3000
+		Lv2: 4000
+		Lv3: 5000
+		Lv4: 6000
+		Lv5: 7000
+	}
+	FixedCastTime: 0
+	Requirements: {
+		SPCost: {
+			Lv1: 40
+			Lv2: 36
+			Lv3: 32
+			Lv4: 28
+			Lv5: 24
+		}
+		Items: {
+			Catnip_Fruit: 1
+		}
+	}
+	Unit: {
+		Id: 0x106
+		Layout: {
+			Lv1: 1
+			Lv2: 1
+			Lv3: 2
+			Lv4: 2
+			Lv5: 3
+		}
+		Interval: -1
+		Target: "Enemy"
+		Flag: {
+			UF_PATHCHECK: true
+			UF_RANGEDSINGLEUNIT: true
+		}
+	}
+},
+{
+	Id: 5028
+	Name: "SU_CN_METEOR"
+	Description: "Catnip Meteor"
+	MaxLevel: 5
+	Range: 9
+	Hit: "BDT_MULTIHIT"
+	SkillType: {
+		Place: true
+	}
+	AttackType: "Magic"
+	SplashRange: {
+		Lv1: 3
+		Lv2: 3
+		Lv3: 5
+		Lv4: 5
+		Lv5: 7
+	}
+	NumberOfHits: {
+		Lv1: 1
+		Lv2: 2
+		Lv3: 3
+		Lv4: 4
+		Lv5: 5
+	}
+	InterruptCast: true
+	CastTime: 6000
+	AfterCastActDelay: 1000
+	SkillData1: {
+		Lv1: 1500
+		Lv2: 2000
+		Lv3: 2500
+		Lv4: 3000
+		Lv5: 3500
+	}
+	SkillData2: 20000
+	CoolDown: {
+		Lv1: 2000
+		Lv2: 3000
+		Lv3: 4000
+		Lv4: 5000
+		Lv5: 6000
+
+	}
+	FixedCastTime: 0
+	Requirements: {
+		SPCost: {
+			Lv1: 20
+			Lv2: 35
+			Lv3: 50
+			Lv4: 65
+			Lv5: 80
+		}
+		Items: {
+			Catnip_Fruit: 1
+		}
+	}
+	Unit: {
+		Id: 0x86
+		Range: 1
+		Interval: 500
+		Target: "Enemy"
+		Flag: {
+			UF_PATHCHECK: true
+		}
+	}
+},
+{
+	Id: 5029
+	Name: "SU_SV_ROOTTWIST"
+	Description: "Silvervine Root Twist"
+	MaxLevel: 5
+	Range: 9
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Enemy: true
 	}
 	DamageType: {
 		NoDamage: true
 	}
+	InterruptCast: true
+	SkillInstances: 1
+	AfterCastActDelay: 1000
+	SkillData1: {
+		Lv1: 7000
+		Lv2: 9000
+		Lv3: 11000
+		Lv4: 13000
+		Lv5: 15000
+		Lv6: 17000
+		Lv7: 19000
+		Lv8: 21000
+		Lv9: 23000
+		Lv10: 25000
+	}
+	CoolDown: 3000
+	FixedCastTime: 0
+	Requirements: {
+		SPCost: {
+			Lv1: 10
+			Lv2: 12
+			Lv3: 14
+			Lv4: 16
+			Lv5: 18
+			Lv6: 20
+			Lv7: 22
+			Lv8: 24
+			Lv9: 26
+			Lv10: 28
+		}
+	}
+	Unit: {
+		Id: 0x107
+		Interval: 1000
+		Target: "Enemy"
+		Flag: {
+			UF_PATHCHECK: true
+		}
+	}
+},
+{
+	Id: 5030
+	Name: "SU_SV_ROOTTWIST_ATK"
+	Description: "Silver Vine Root Twist Attack"
+	MaxLevel: 5
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Enemy: true
+	}
+	AttackType: "Magic"
+	Element: "Ele_Poison"
+	DamageType: {
+		IgnoreElement: true
+		IgnoreDefense: true
+	}
+	SkillInstances: 1
+	AfterCastActDelay: 1000
+	FixedCastTime: 0
 	Requirements: {
 		SPCost: 1
 	}
 },
 {
-	Id: 5018
-	Name: "SR_FLASHCOMBO_ATK_STEP4"
-	Description: "Flash Combo Attack Step 4"
+	Id: 5031
+	Name: "SU_POWEROFLIFE"
+	Description: "Power of Life"
+	MaxLevel: 1
+	NumberOfHits: 0
+},
+{
+	Id: 5032
+	Name: "SU_SCAROFTAROU"
+	Description: "Scar of Tarou"
+	MaxLevel: 5
+	Range: 9
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Enemy: true
+	}
+	AttackType: "Weapon"
+	Element: "Ele_Weapon"
+	InterruptCast: true
+	CastTime: 500
+	AfterCastActDelay: 1000
+	SkillData1: 9000
+	SkillData2: 1000
+	FixedCastTime: 0
+	Requirements: {
+		SPCost: {
+			Lv1: 10
+			Lv2: 14
+			Lv3: 18
+			Lv4: 22
+			Lv5: 26
+			Lv6: 30
+			Lv7: 34
+			Lv8: 38
+			Lv9: 42
+			Lv10: 46
+		}
+	}
+},
+{
+	Id: 5033
+	Name: "SU_PICKYPECK"
+	Description: "Picky Peck"
+	MaxLevel: 5
+	Range: 9
+	Hit: "BDT_MULTIHIT"
+	SkillType: {
+		Enemy: true
+	}
+	AttackType: "Weapon"
+	Element: "Ele_Weapon"
+	NumberOfHits: -5
+	InterruptCast: true
+	CastTime: 2500
+	AfterCastActDelay: 1000
+	FixedCastTime: 0
+	Requirements: {
+		SPCost: {
+			Lv1: 10
+			Lv2: 19
+			Lv3: 28
+			Lv4: 37
+			Lv5: 46
+			Lv6: 55
+			Lv7: 64
+			Lv8: 73
+			Lv9: 82
+			Lv10: 91
+		}
+	}
+},
+{
+	Id: 5034
+	Name: "SU_PICKYPECK_DOUBLE_ATK"
+	Description: "Picky Peck Double Attack"
+	MaxLevel: 5
+	Hit: "BDT_MULTIHIT"
+	SkillType: {
+		Enemy: true
+	}
+	AttackType: "Weapon"
+	Element: "Ele_Weapon"
+	NumberOfHits: -5
+	InterruptCast: true
+	AfterCastActDelay: 1000
+	FixedCastTime: 0
+	Requirements: {
+		SPCost: 1
+	}
+},
+{
+	Id: 5035
+	Name: "SU_ARCLOUSEDASH"
+	Description: "Arclouse Dash"
+	MaxLevel: 5
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Friend: true
+	}
+	DamageType: {
+		NoDamage: true
+	}
+	InterruptCast: true
+	CastTime: 2500
+	AfterCastActDelay: 1000
+	SkillData1: {
+		Lv1: 60000
+		Lv2: 70000
+		Lv3: 80000
+		Lv4: 90000
+		Lv5: 100000
+		Lv6: 110000
+		Lv7: 120000
+		Lv8: 130000
+		Lv9: 140000
+		Lv10: 150000
+	}
+	CoolDown: 10000
+	FixedCastTime: 0
+ 	Requirements: {
+		SPCost: {
+			Lv1: 12
+			Lv2: 20
+			Lv3: 28
+			Lv4: 36
+			Lv5: 44
+			Lv6: 52
+			Lv7: 60
+			Lv8: 68
+			Lv9: 76
+			Lv10: 84
+		}
+	}
+},
+{
+	Id: 5036
+	Name: "SU_LUNATICCARROTBEAT"
+	Description: "Lunatic Carrot Beat"
+	MaxLevel: 5
+	Range: 9
+	Hit: "BDT_MULTIHIT"
+	SkillType: {
+		Enemy: true
+	}
+	AttackType: "Weapon"
+	Element: "Ele_Weapon"
+	DamageType: {
+		SplashArea: true
+ 	}
+	SplashRange: {
+		Lv1: 1
+		Lv2: 1
+		Lv3: 2
+		Lv4: 2
+		Lv5: 3
+		Lv6: 3
+		Lv7: 4
+		Lv8: 4
+		Lv9: 5
+		Lv10: 5
+	}
+	NumberOfHits: {
+		Lv1: 1
+		Lv2: 2
+		Lv3: 3
+		Lv4: 4
+		Lv5: 5
+		Lv6: 6
+		Lv7: 7
+		Lv8: 8
+		Lv9: 9
+		Lv10: 10
+	}
+	InterruptCast: true
+	CastTime: 3000
+	AfterCastActDelay: 1000
+	SkillData1: 1000
+	CoolDown: 8000
+	FixedCastTime: 0
+	Requirements: {
+		SPCost: {
+			Lv1: 15
+			Lv2: 25
+			Lv3: 35
+			Lv4: 45
+			Lv5: 55
+			Lv6: 65
+			Lv7: 75
+			Lv8: 85
+			Lv9: 95
+			Lv10: 105
+		}
+	}
+},
+{
+	Id: 5037
+	Name: "SU_POWEROFSEA"
+	Description: "Power of Sea"
+	MaxLevel: 1
+	NumberOfHits: 0
+},
+{
+	Id: 5038
+	Name: "SU_TUNABELLY"
+	Description: "Tuna Belly"
+ 	MaxLevel: 5
+	Range: 9
+ 	Hit: "BDT_SKILL"
+ 	SkillType: {
+		Friend: true
+	}
+	DamageType: {
+		NoDamage: true
+	}
+	InterruptCast: true
+	CastTime: 2000
+	AfterCastActDelay: 1000
+	CoolDown: {
+		Lv1: 8000
+		Lv2: 10000
+		Lv3: 12000
+		Lv4: 14000
+		Lv5: 16000
+		Lv6: 18000
+		Lv7: 20000
+		Lv8: 22000
+		Lv9: 24000
+		Lv10: 26000
+	}
+	FixedCastTime: 0
+	Requirements: {
+		SPCost: {
+			Lv1: 20
+			Lv2: 30
+			Lv3: 40
+			Lv4: 50
+			Lv5: 60
+			Lv6: 70
+			Lv7: 80
+			Lv8: 90
+			Lv9: 100
+			Lv10: 110
+		}
+	}
+},
+{
+	Id: 5039
+	Name: "SU_TUNAPARTY"
+	Description: "Tuna Party"
+	MaxLevel: 5
+	Range: 9
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Friend: true
+ 	}
+ 	DamageType: {
+ 		NoDamage: true
+ 	}
+	InterruptCast: true
+	AfterCastActDelay: 1000
+	SkillData1: 30000
+	CoolDown: 20000
+	FixedCastTime: 0
+ 	Requirements: {
+		SPCost: {
+			Lv1: 20
+			Lv2: 30
+			Lv3: 40
+			Lv4: 50
+			Lv5: 60
+			Lv6: 70
+			Lv7: 80
+			Lv8: 90
+			Lv9: 100
+			Lv10: 110
+		}
+	}
+},
+{
+	Id: 5040
+	Name: "SU_BUNCHOFSHRIMP"
+	Description: "Bunch of Shrimp"
 	MaxLevel: 5
 	Hit: "BDT_SKILL"
 	SkillType: {
@@ -32230,10 +32888,122 @@ skill_db: (
 	}
 	DamageType: {
 		NoDamage: true
+		SplashArea: true
+	}
+	SplashRange: -1
+	InterruptCast: true
+	AfterCastActDelay: 1000
+	SkillData1: {
+		Lv1: 60000
+		Lv2: 90000
+		Lv3: 120000
+		Lv4: 150000
+		Lv5: 180000
+		Lv6: 210000
+		Lv7: 240000
+		Lv8: 270000
+		Lv9: 300000
+		Lv10: 330000
+ 	}
+	CoolDown: 10000
+	FixedCastTime: 0
+	Requirements: {
+		SPCost: {
+			Lv1: 44
+			Lv2: 48
+			Lv3: 52
+			Lv4: 56
+			Lv5: 60
+			Lv6: 64
+			Lv7: 68
+			Lv8: 72
+			Lv9: 76
+			Lv10: 80
+		}
+		Items: {
+			Prawn: 1
+		}
+
+	}
+},
+{
+	Id: 5041
+	Name: "SU_FRESHSHRIMP"
+	Description: "Fresh Shrimp"
+ 	MaxLevel: 5
+	Range: 9
+ 	Hit: "BDT_SKILL"
+ 	SkillType: {
+		Friend: true
+ 	}
+ 	DamageType: {
+ 		NoDamage: true
+		SplashArea: true
 	}
+	InterruptCast: true
+	AfterCastActDelay: 1000
+	SkillData1: 120000
+	CoolDown: 7000
+	FixedCastTime: 0
 	Requirements: {
-		SPCost: 1
+		SPCost: {
+			Lv1: 22
+			Lv2: 24
+			Lv3: 26
+			Lv4: 28
+			Lv5: 30
+			Lv6: 32
+			Lv7: 34
+			Lv8: 36
+			Lv9: 38
+			Lv10: 40
+		}
+	}
+},
+{
+	Id: 5042
+	Name: "SU_CN_METEOR_ATK"
+	Description: ""
+	MaxLevel: 5
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Place: true
+	}
+	SkillInfo: {
+		Chorus: true
+	}
+	AttackType: "Magic"
+	InterruptCast: true
+	Requirements: {
+		SPCost: {
+			Lv1: 20
+			Lv2: 35
+			Lv3: 50
+			Lv4: 65
+			Lv5: 80
+		}
+		Items: {
+			Catnip_Fruit: 1
+		}
+	}
+},
+{
+	Id: 5043
+	Name: "SU_LUNATICCARROTBEAT2"
+	Description: "Lunatic Carrot Beat 2"
+	MaxLevel: 5
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Enemy: true
 	}
+	SkillInfo: {
+		Chorus: true
+ 	}
+	AttackType: "Weapon"
+	InterruptCast: true
+ 	Requirements: {
+ 		SPCost: 1
+ 	}
 },
 {
 	Id: 8001
diff --git a/db/pre-re/skill_tree.conf b/db/pre-re/skill_tree.conf
index 805e7929c..00fc6c915 100644
--- a/db/pre-re/skill_tree.conf
+++ b/db/pre-re/skill_tree.conf
@@ -3955,3 +3955,93 @@ Rebellion: {
 		}
 	}
 }
+
+Summoner: {
+	skills: {
+		SU_BASIC_SKILL: 1
+		SU_BITE: {
+			MaxLevel: 1
+			SU_BASIC_SKILL: 1
+		}
+		SU_HIDE: {
+			MaxLevel: 1
+			SU_BITE: 1
+		}
+		SU_SCRATCH: {
+			MaxLevel: 3
+			SU_HIDE: 1
+		}
+		SU_STOOP: {
+			MaxLevel: 1
+			SU_SCRATCH: 3
+		}
+		SU_LOPE: {
+			MaxLevel: 3
+			SU_STOOP: 1
+		}
+		SU_SPRITEMABLE: {
+			MaxLevel: 1
+			SU_LOPE: 3
+		}
+		SU_POWEROFLAND: {
+			MaxLevel: 1
+			SU_CN_POWDERING: 3
+		}
+		SU_SV_STEMSPEAR: {
+			MaxLevel: 5
+			SU_SPRITEMABLE: 1
+		}
+		SU_CN_POWDERING: {
+			MaxLevel: 5
+			SU_CN_METEOR: 3
+		}
+		SU_CN_METEOR: {
+			MaxLevel: 5
+			SU_SV_ROOTTWIST: 3
+		}
+		SU_SV_ROOTTWIST: {
+			MaxLevel: 5
+			SU_SV_STEMSPEAR: 3
+		}
+		SU_POWEROFLIFE: {
+			MaxLevel: 1
+			SU_LUNATICCARROTBEAT: 3
+		}
+		SU_SCAROFTAROU: {
+			MaxLevel: 5
+			SU_SV_ROOTTWIST: 3
+		}
+		SU_PICKYPECK: {
+			MaxLevel: 5
+			SU_SPRITEMABLE: 1
+		}
+		SU_ARCLOUSEDASH: {
+			MaxLevel: 5
+			SU_PICKYPECK: 3
+		}
+		SU_LUNATICCARROTBEAT: {
+			MaxLevel: 5
+			SU_SCAROFTAROU: 3
+		}
+		SU_POWEROFSEA: {
+			MaxLevel: 1
+			SU_TUNAPARTY: 3
+		}
+		SU_TUNABELLY: {
+			MaxLevel: 5
+			SU_BUNCHOFSHRIMP: 3
+		}
+		SU_TUNAPARTY: {
+			MaxLevel: 5
+			SU_TUNABELLY: 3
+		}
+		SU_BUNCHOFSHRIMP: {
+			MaxLevel: 5
+			SU_FRESHSHRIMP: 3
+		}
+		SU_FRESHSHRIMP: {
+			MaxLevel: 5
+			SU_SPRITEMABLE: 1
+		}	
+	}
+}
diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index 7503428fc..505aa2603 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -33026,10 +33026,37 @@ skill_db: (
 	}
 },
 {
-	Id: 5015
-	Name: "SR_FLASHCOMBO_ATK_STEP1"
-	Description: "Flash Combo Attack Step 1"
-	MaxLevel: 5
+	Id: 5018
+	Name: "SU_BASIC_SKILL"
+	Description: "New Basic Skill"
+	MaxLevel: 1
+	NumberOfHits: 0
+},
+{
+	Id: 5019
+	Name: "SU_BITE"
+	Description: "Bite"
+	MaxLevel: 1
+	Range: 2
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Enemy: true
+	}
+	AttackType: "Weapon"
+	Element: "Ele_Weapon"
+	InterruptCast: true
+	CastTime: 1000
+	AfterCastActDelay: 1000
+	FixedCastTime: 0
+	Requirements: {
+		SPCost: 10
+	}
+},
+{
+	Id: 5020
+	Name: "SU_HIDE"
+	Description: "Hide"
+	MaxLevel: 1
 	Hit: "BDT_SKILL"
 	SkillType: {
 		Self: true
@@ -33037,15 +33064,67 @@ skill_db: (
 	DamageType: {
 		NoDamage: true
 	}
+	InterruptCast: true
+	AfterCastActDelay: 1000
+	SkillData1: -1
+	CoolDown: 15000
+	FixedCastTime: 0
 	Requirements: {
-		SPCost: 1
+		SPCost: 30
 	}
 },
 {
-	Id: 5016
-	Name: "SR_FLASHCOMBO_ATK_STEP2"
-	Description: "Flash Combo Attack Step 2"
-	MaxLevel: 5
+	Id: 5021
+	Name: "SU_SCRATCH"
+	Description: "Scratch"
+	MaxLevel: 3
+	Range: 2
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Enemy: true
+	}
+	AttackType: "Weapon"
+	Element: "Ele_Weapon"
+	DamageType: {
+		SplashArea: true
+	}
+	SplashRange: 1
+	InterruptCast: true
+	AfterCastActDelay: 1000
+	SkillData1: 10000
+	CoolDown: {
+		Lv1: 3000
+		Lv2: 2000
+		Lv3: 1000
+		Lv4: 1
+		Lv5: 1
+		Lv6: 1
+		Lv7: 1
+		Lv8: 1
+		Lv9: 1
+		Lv10: 1
+	}
+	FixedCastTime: 0
+	Requirements: {
+		SPCost: {
+			Lv1: 20
+			Lv2: 25
+			Lv3: 30
+			Lv4: 35
+			Lv5: 40
+			Lv6: 45
+			Lv7: 50
+			Lv8: 55
+			Lv9: 60
+			Lv10: 65
+		}
+	}
+},
+{
+	Id: 5022
+	Name: "SU_STOOP"
+	Description: "Stoop"
+	MaxLevel: 1
 	Hit: "BDT_SKILL"
 	SkillType: {
 		Self: true
@@ -33053,30 +33132,609 @@ skill_db: (
 	DamageType: {
 		NoDamage: true
 	}
+	InterruptCast: true
+	AfterCastActDelay: 1000
+	SkillData1: 6000
+	CoolDown: 15000
+	FixedCastTime: 0
 	Requirements: {
-		SPCost: 1
+		SPCost: 10
 	}
 },
 {
-	Id: 5017
-	Name: "SR_FLASHCOMBO_ATK_STEP3"
-	Description: "Flash Combo Attack Step 3"
+	Id: 5023
+	Name: "SU_LOPE"
+	Description: "Lope"
+	MaxLevel: 3
+	Range: {
+		Lv1: 6
+		Lv2: 10
+		Lv3: 14
+		Lv4: 18
+		Lv5: 22
+		Lv6: 26
+		Lv7: 30
+		Lv8: 34
+		Lv9: 38
+		Lv10: 42
+	}
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Place: true
+	}
+	DamageType: {
+		NoDamage: true
+	}
+	InterruptCast: true
+	CastTime: 500
+	AfterCastActDelay: 1000
+	CoolDown: {
+		Lv1: 2000
+		Lv2: 4000
+		Lv3: 6000
+		Lv4: 8000
+		Lv5: 10000
+		Lv6: 12000
+		Lv7: 14000
+		Lv8: 16000
+		Lv9: 18000
+		Lv10: 20000
+	}
+	FixedCastTime: 0
+	Requirements: {
+		SPCost: {
+			Lv1: 30
+			Lv2: 30
+			Lv3: 30
+			Lv4: 30
+			Lv5: 30
+			Lv6: 30
+			Lv7: 30
+			Lv8: 30
+			Lv9: 30
+			Lv10: 30
+		}
+	}
+},
+{
+	Id: 5024
+	Name: "SU_SPRITEMABLE"
+	Description: "Spirit Marble"
+	MaxLevel: 1
+	NumberOfHits: 0
+},
+{
+	Id: 5025
+	Name: "SU_POWEROFLAND"
+	Description: "Power of Land"
+	MaxLevel: 1
+	NumberOfHits: 0
+},
+{
+	Id: 5026
+	Name: "SU_SV_STEMSPEAR"
+	Description: "Silvervine Stem Spear"
 	MaxLevel: 5
+	Range: 9
 	Hit: "BDT_SKILL"
 	SkillType: {
-		Self: true
+		Enemy: true
+	}
+	AttackType: "Magic"
+	Element: {
+		Lv1: "Ele_Earth"
+		Lv2: "Ele_Fire"
+		Lv3: "Ele_Water"
+		Lv4: "Ele_Wind"
+		Lv5: "Ele_Ghost"
+	}
+	InterruptCast: true
+	CastTime: 2500
+	AfterCastActDelay: 1000
+	SkillData1: 10000
+	FixedCastTime: 0
+	Requirements: {
+		SPCost: {
+			Lv1: 40
+			Lv2: 40
+			Lv3: 40
+			Lv4: 40
+			Lv5: 40
+			Lv6: 40
+			Lv7: 40
+			Lv8: 40
+			Lv9: 40
+			Lv10: 40
+		}
+	}
+},
+{
+	Id: 5027
+	Name: "SU_CN_POWDERING"
+	Description: "Catnip Powdering"
+	MaxLevel: 5
+	Range: 9
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Enemy: true
+	}
+	DamageType: {
+		NoDamage: true
+		SplashArea: true
+	}
+	SplashRange: {
+		Lv1: 3
+		Lv2: 3
+		Lv3: 5
+		Lv4: 5
+		Lv5: 7
+	}
+	InterruptCast: true
+	SkillInstances: 1
+	CastTime: 1500
+	AfterCastActDelay: 1000
+	SkillData1: {
+		Lv1: 3000
+		Lv2: 4000
+		Lv3: 5000
+		Lv4: 6000
+		Lv5: 7000
+	}
+	FixedCastTime: 0
+	Requirements: {
+		SPCost: {
+			Lv1: 40
+			Lv2: 36
+			Lv3: 32
+			Lv4: 28
+			Lv5: 24
+		}
+		Items: {
+			Catnip_Fruit: 1
+		}
+	}
+	Unit: {
+		Id: 0x106
+		Layout: {
+			Lv1: 1
+			Lv2: 1
+			Lv3: 2
+			Lv4: 2
+			Lv5: 3
+		}
+		Interval: -1
+		Target: "Enemy"
+		Flag: {
+			UF_PATHCHECK: true
+			UF_RANGEDSINGLEUNIT: true
+		}
+	}
+},
+{
+	Id: 5028
+	Name: "SU_CN_METEOR"
+	Description: "Catnip Meteor"
+	MaxLevel: 5
+	Range: 9
+	Hit: "BDT_MULTIHIT"
+	SkillType: {
+		Place: true
+	}
+	AttackType: "Magic"
+	SplashRange: {
+		Lv1: 3
+		Lv2: 3
+		Lv3: 5
+		Lv4: 5
+		Lv5: 7
+	}
+	NumberOfHits: {
+		Lv1: 1
+		Lv2: 2
+		Lv3: 3
+		Lv4: 4
+		Lv5: 5
+	}
+	InterruptCast: true
+	CastTime: 6000
+	AfterCastActDelay: 1000
+	SkillData1: {
+		Lv1: 1500
+		Lv2: 2000
+		Lv3: 2500
+		Lv4: 3000
+		Lv5: 3500
+	}
+	SkillData2: 20000
+	CoolDown: {
+		Lv1: 2000
+		Lv2: 3000
+		Lv3: 4000
+		Lv4: 5000
+		Lv5: 6000
+
+	}
+	FixedCastTime: 0
+	Requirements: {
+		SPCost: {
+			Lv1: 20
+			Lv2: 35
+			Lv3: 50
+			Lv4: 65
+			Lv5: 80
+		}
+		Items: {
+			Catnip_Fruit: 1
+		}
+	}
+	Unit: {
+		Id: 0x86
+		Range: 1
+		Interval: 500
+		Target: "Enemy"
+		Flag: {
+			UF_PATHCHECK: true
+		}
+	}
+},
+{
+	Id: 5029
+	Name: "SU_SV_ROOTTWIST"
+	Description: "Silvervine Root Twist"
+	MaxLevel: 5
+	Range: 9
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Enemy: true
 	}
 	DamageType: {
 		NoDamage: true
 	}
+	InterruptCast: true
+	SkillInstances: 1
+	AfterCastActDelay: 1000
+	SkillData1: {
+		Lv1: 7000
+		Lv2: 9000
+		Lv3: 11000
+		Lv4: 13000
+		Lv5: 15000
+		Lv6: 17000
+		Lv7: 19000
+		Lv8: 21000
+		Lv9: 23000
+		Lv10: 25000
+	}
+	CoolDown: 3000
+	FixedCastTime: 0
+	Requirements: {
+		SPCost: {
+			Lv1: 10
+			Lv2: 12
+			Lv3: 14
+			Lv4: 16
+			Lv5: 18
+			Lv6: 20
+			Lv7: 22
+			Lv8: 24
+			Lv9: 26
+			Lv10: 28
+		}
+	}
+	Unit: {
+		Id: 0x107
+		Interval: 1000
+		Target: "Enemy"
+		Flag: {
+			UF_PATHCHECK: true
+		}
+	}
+},
+{
+	Id: 5030
+	Name: "SU_SV_ROOTTWIST_ATK"
+	Description: "Silver Vine Root Twist Attack"
+	MaxLevel: 5
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Enemy: true
+	}
+	AttackType: "Magic"
+	Element: "Ele_Poison"
+	DamageType: {
+		IgnoreElement: true
+		IgnoreDefense: true
+	}
+	SkillInstances: 1
+	AfterCastActDelay: 1000
+	FixedCastTime: 0
 	Requirements: {
 		SPCost: 1
 	}
 },
 {
-	Id: 5018
-	Name: "SR_FLASHCOMBO_ATK_STEP4"
-	Description: "Flash Combo Attack Step 4"
+	Id: 5031
+	Name: "SU_POWEROFLIFE"
+	Description: "Power of Life"
+	MaxLevel: 1
+	NumberOfHits: 0
+},
+{
+	Id: 5032
+	Name: "SU_SCAROFTAROU"
+	Description: "Scar of Tarou"
+	MaxLevel: 5
+	Range: 9
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Enemy: true
+	}
+	AttackType: "Weapon"
+	Element: "Ele_Weapon"
+	InterruptCast: true
+	CastTime: 500
+	AfterCastActDelay: 1000
+	SkillData1: 9000
+	SkillData2: 1000
+	FixedCastTime: 0
+	Requirements: {
+		SPCost: {
+			Lv1: 10
+			Lv2: 14
+			Lv3: 18
+			Lv4: 22
+			Lv5: 26
+			Lv6: 30
+			Lv7: 34
+			Lv8: 38
+			Lv9: 42
+			Lv10: 46
+		}
+	}
+},
+{
+	Id: 5033
+	Name: "SU_PICKYPECK"
+	Description: "Picky Peck"
+	MaxLevel: 5
+	Range: 9
+	Hit: "BDT_MULTIHIT"
+	SkillType: {
+		Enemy: true
+	}
+	AttackType: "Weapon"
+	Element: "Ele_Weapon"
+	NumberOfHits: -5
+	InterruptCast: true
+	CastTime: 2500
+	AfterCastActDelay: 1000
+	FixedCastTime: 0
+	Requirements: {
+		SPCost: {
+			Lv1: 10
+			Lv2: 19
+			Lv3: 28
+			Lv4: 37
+			Lv5: 46
+			Lv6: 55
+			Lv7: 64
+			Lv8: 73
+			Lv9: 82
+			Lv10: 91
+		}
+	}
+},
+{
+	Id: 5034
+	Name: "SU_PICKYPECK_DOUBLE_ATK"
+	Description: "Picky Peck Double Attack"
+	MaxLevel: 5
+	Hit: "BDT_MULTIHIT"
+	SkillType: {
+		Enemy: true
+	}
+	AttackType: "Weapon"
+	Element: "Ele_Weapon"
+	NumberOfHits: -5
+	InterruptCast: true
+	AfterCastActDelay: 1000
+	FixedCastTime: 0
+	Requirements: {
+		SPCost: 1
+	}
+},
+{
+	Id: 5035
+	Name: "SU_ARCLOUSEDASH"
+	Description: "Arclouse Dash"
+	MaxLevel: 5
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Friend: true
+	}
+	DamageType: {
+		NoDamage: true
+	}
+	InterruptCast: true
+	CastTime: 2500
+	AfterCastActDelay: 1000
+	SkillData1: {
+		Lv1: 60000
+		Lv2: 70000
+		Lv3: 80000
+		Lv4: 90000
+		Lv5: 100000
+		Lv6: 110000
+		Lv7: 120000
+		Lv8: 130000
+		Lv9: 140000
+		Lv10: 150000
+	}
+	CoolDown: 10000
+	FixedCastTime: 0
+ 	Requirements: {
+		SPCost: {
+			Lv1: 12
+			Lv2: 20
+			Lv3: 28
+			Lv4: 36
+			Lv5: 44
+			Lv6: 52
+			Lv7: 60
+			Lv8: 68
+			Lv9: 76
+			Lv10: 84
+		}
+	}
+},
+{
+	Id: 5036
+	Name: "SU_LUNATICCARROTBEAT"
+	Description: "Lunatic Carrot Beat"
+	MaxLevel: 5
+	Range: 9
+	Hit: "BDT_MULTIHIT"
+	SkillType: {
+		Enemy: true
+	}
+	AttackType: "Weapon"
+	Element: "Ele_Weapon"
+	DamageType: {
+		SplashArea: true
+ 	}
+	SplashRange: {
+		Lv1: 1
+		Lv2: 1
+		Lv3: 2
+		Lv4: 2
+		Lv5: 3
+		Lv6: 3
+		Lv7: 4
+		Lv8: 4
+		Lv9: 5
+		Lv10: 5
+	}
+	NumberOfHits: {
+		Lv1: 1
+		Lv2: 2
+		Lv3: 3
+		Lv4: 4
+		Lv5: 5
+		Lv6: 6
+		Lv7: 7
+		Lv8: 8
+		Lv9: 9
+		Lv10: 10
+	}
+	InterruptCast: true
+	CastTime: 3000
+	AfterCastActDelay: 1000
+	SkillData1: 1000
+	CoolDown: 8000
+	FixedCastTime: 0
+	Requirements: {
+		SPCost: {
+			Lv1: 15
+			Lv2: 25
+			Lv3: 35
+			Lv4: 45
+			Lv5: 55
+			Lv6: 65
+			Lv7: 75
+			Lv8: 85
+			Lv9: 95
+			Lv10: 105
+		}
+	}
+},
+{
+	Id: 5037
+	Name: "SU_POWEROFSEA"
+	Description: "Power of Sea"
+	MaxLevel: 1
+	NumberOfHits: 0
+},
+{
+	Id: 5038
+	Name: "SU_TUNABELLY"
+	Description: "Tuna Belly"
+ 	MaxLevel: 5
+	Range: 9
+ 	Hit: "BDT_SKILL"
+ 	SkillType: {
+		Friend: true
+	}
+	DamageType: {
+		NoDamage: true
+	}
+	InterruptCast: true
+	CastTime: 2000
+	AfterCastActDelay: 1000
+	CoolDown: {
+		Lv1: 8000
+		Lv2: 10000
+		Lv3: 12000
+		Lv4: 14000
+		Lv5: 16000
+		Lv6: 18000
+		Lv7: 20000
+		Lv8: 22000
+		Lv9: 24000
+		Lv10: 26000
+	}
+	FixedCastTime: 0
+	Requirements: {
+		SPCost: {
+			Lv1: 20
+			Lv2: 30
+			Lv3: 40
+			Lv4: 50
+			Lv5: 60
+			Lv6: 70
+			Lv7: 80
+			Lv8: 90
+			Lv9: 100
+			Lv10: 110
+		}
+	}
+},
+{
+	Id: 5039
+	Name: "SU_TUNAPARTY"
+	Description: "Tuna Party"
+	MaxLevel: 5
+	Range: 9
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Friend: true
+ 	}
+ 	DamageType: {
+ 		NoDamage: true
+ 	}
+	InterruptCast: true
+	AfterCastActDelay: 1000
+	SkillData1: 30000
+	CoolDown: 20000
+	FixedCastTime: 0
+ 	Requirements: {
+		SPCost: {
+			Lv1: 20
+			Lv2: 30
+			Lv3: 40
+			Lv4: 50
+			Lv5: 60
+			Lv6: 70
+			Lv7: 80
+			Lv8: 90
+			Lv9: 100
+			Lv10: 110
+		}
+	}
+},
+{
+	Id: 5040
+	Name: "SU_BUNCHOFSHRIMP"
+	Description: "Bunch of Shrimp"
 	MaxLevel: 5
 	Hit: "BDT_SKILL"
 	SkillType: {
@@ -33084,12 +33742,124 @@ skill_db: (
 	}
 	DamageType: {
 		NoDamage: true
+		SplashArea: true
 	}
+	SplashRange: -1
+	InterruptCast: true
+	AfterCastActDelay: 1000
+	SkillData1: {
+		Lv1: 60000
+		Lv2: 90000
+		Lv3: 120000
+		Lv4: 150000
+		Lv5: 180000
+		Lv6: 210000
+		Lv7: 240000
+		Lv8: 270000
+		Lv9: 300000
+		Lv10: 330000
+ 	}
+	CoolDown: 10000
+	FixedCastTime: 0
 	Requirements: {
-		SPCost: 1
+		SPCost: {
+			Lv1: 44
+			Lv2: 48
+			Lv3: 52
+			Lv4: 56
+			Lv5: 60
+			Lv6: 64
+			Lv7: 68
+			Lv8: 72
+			Lv9: 76
+			Lv10: 80
+		}
+		Items: {
+			Prawn: 1
+		}
+
+	}
+},
+{
+	Id: 5041
+	Name: "SU_FRESHSHRIMP"
+	Description: "Fresh Shrimp"
+ 	MaxLevel: 5
+	Range: 9
+ 	Hit: "BDT_SKILL"
+ 	SkillType: {
+		Friend: true
+ 	}
+ 	DamageType: {
+ 		NoDamage: true
+		SplashArea: true
+	}
+	InterruptCast: true
+	AfterCastActDelay: 1000
+	SkillData1: 120000
+	CoolDown: 7000
+	FixedCastTime: 0
+	Requirements: {
+		SPCost: {
+			Lv1: 22
+			Lv2: 24
+			Lv3: 26
+			Lv4: 28
+			Lv5: 30
+			Lv6: 32
+			Lv7: 34
+			Lv8: 36
+			Lv9: 38
+			Lv10: 40
+		}
 	}
 },
 {
+	Id: 5042
+	Name: "SU_CN_METEOR_ATK"
+	Description: ""
+	MaxLevel: 5
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Place: true
+	}
+	SkillInfo: {
+		Chorus: true
+	}
+	AttackType: "Magic"
+	InterruptCast: true
+	Requirements: {
+		SPCost: {
+			Lv1: 20
+			Lv2: 35
+			Lv3: 50
+			Lv4: 65
+			Lv5: 80
+		}
+		Items: {
+			Catnip_Fruit: 1
+		}
+	}
+},
+{
+	Id: 5043
+	Name: "SU_LUNATICCARROTBEAT2"
+	Description: "Lunatic Carrot Beat 2"
+	MaxLevel: 5
+	Hit: "BDT_SKILL"
+	SkillType: {
+		Enemy: true
+	}
+	SkillInfo: {
+		Chorus: true
+ 	}
+	AttackType: "Weapon"
+	InterruptCast: true
+ 	Requirements: {
+ 		SPCost: 1
+ 	}
+},
+{
 	Id: 8001
 	Name: "HLIF_HEAL"
 	Description: "Healing Touch"
diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index 6e040420b..e9feb2111 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -3952,3 +3952,93 @@ Rebellion: {
 		}
 	}
 }
+
+Summoner: {
+	skills: {
+		SU_BASIC_SKILL: 1
+		SU_BITE: {
+			MaxLevel: 1
+			SU_BASIC_SKILL: 1
+		}
+		SU_HIDE: {
+			MaxLevel: 1
+			SU_BITE: 1
+		}
+		SU_SCRATCH: {
+			MaxLevel: 3
+			SU_HIDE: 1
+		}
+		SU_STOOP: {
+			MaxLevel: 1
+			SU_SCRATCH: 3
+		}
+		SU_LOPE: {
+			MaxLevel: 3
+			SU_STOOP: 1
+		}
+		SU_SPRITEMABLE: {
+			MaxLevel: 1
+			SU_LOPE: 3
+		}
+		SU_POWEROFLAND: {
+			MaxLevel: 1
+			SU_CN_POWDERING: 3
+		}
+		SU_SV_STEMSPEAR: {
+			MaxLevel: 5
+			SU_SPRITEMABLE: 1
+		}
+		SU_CN_POWDERING: {
+			MaxLevel: 5
+			SU_CN_METEOR: 3
+		}
+		SU_CN_METEOR: {
+			MaxLevel: 5
+			SU_SV_ROOTTWIST: 3
+		}
+		SU_SV_ROOTTWIST: {
+			MaxLevel: 5
+			SU_SV_STEMSPEAR: 3
+		}
+		SU_POWEROFLIFE: {
+			MaxLevel: 1
+			SU_LUNATICCARROTBEAT: 3
+		}
+		SU_SCAROFTAROU: {
+			MaxLevel: 5
+			SU_SV_ROOTTWIST: 3
+		}
+		SU_PICKYPECK: {
+			MaxLevel: 5
+			SU_SPRITEMABLE: 1
+		}
+		SU_ARCLOUSEDASH: {
+			MaxLevel: 5
+			SU_PICKYPECK: 3
+		}
+		SU_LUNATICCARROTBEAT: {
+			MaxLevel: 5
+			SU_SCAROFTAROU: 3
+		}
+		SU_POWEROFSEA: {
+			MaxLevel: 1
+			SU_TUNAPARTY: 3
+		}
+		SU_TUNABELLY: {
+			MaxLevel: 5
+			SU_BUNCHOFSHRIMP: 3
+		}
+		SU_TUNAPARTY: {
+			MaxLevel: 5
+			SU_TUNABELLY: 3
+		}
+		SU_BUNCHOFSHRIMP: {
+			MaxLevel: 5
+			SU_FRESHSHRIMP: 3
+		}
+		SU_FRESHSHRIMP: {
+			MaxLevel: 5
+			SU_SPRITEMABLE: 1
+		}	
+	}
+}
diff --git a/src/map/skill.h b/src/map/skill.h
index c7761b082..6cc4d32ff 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -1365,6 +1365,10 @@ enum e_skill {
 	ITEM_OPTION_SPLASH_ATTACK,
 	GM_FORCE_TRANSFER,
 	GM_WIDE_RESURRECTION,
+	ALL_NIFLHEIM_RECALL,
+ 	ALL_PRONTERA_RECALL,
+	ALL_GLASTHEIM_RECALL,
+	ALL_THANATOS_RECALL,
 
 	GC_DARKCROW = 5001,
 	RA_UNLIMIT,
@@ -1382,6 +1386,47 @@ enum e_skill {
 	ALL_FULL_THROTTLE,
 	NC_MAGMA_ERUPTION_DOTDAMAGE,
 
+	/** Summoner */
+	SU_BASIC_SKILL = 5018,
+	SU_BITE,
+	SU_HIDE,
+	SU_SCRATCH,
+	SU_STOOP,
+	SU_LOPE,
+	SU_SPRITEMABLE,
+	SU_POWEROFLAND,
+	SU_SV_STEMSPEAR,
+	SU_CN_POWDERING,
+	SU_CN_METEOR,
+	SU_SV_ROOTTWIST,
+	SU_SV_ROOTTWIST_ATK,
+	SU_POWEROFLIFE,
+	SU_SCAROFTAROU,
+	SU_PICKYPECK,
+	SU_PICKYPECK_DOUBLE_ATK,
+	SU_ARCLOUSEDASH,
+	SU_LUNATICCARROTBEAT,
+	SU_POWEROFSEA,
+	SU_TUNABELLY,
+	SU_TUNAPARTY,
+	SU_BUNCHOFSHRIMP,
+	SU_FRESHSHRIMP,
+	SU_CN_METEOR2,
+	SU_LUNATICCARROTBEAT2,
+	SU_SOULATTACK,
+	SU_POWEROFFLOCK,
+	SU_SVG_SPIRIT,
+	SU_HISS,
+	SU_NYANGGRASS,
+	SU_GROOMING,
+	SU_PURRING,
+	SU_SHRIMPARTY,
+	SU_SPIRITOFLIFE,
+	SU_MEOWMEOW,
+	SU_SPIRITOFLAND,
+	SU_CHATTERING,
+	SU_SPIRITOFSEA,
+
 	HLIF_HEAL = 8001,
 	HLIF_AVOID,
 	HLIF_BRAIN,
diff --git a/src/map/status.h b/src/map/status.h
index e4a326e88..b16539015 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -828,6 +828,18 @@ typedef enum sc_type {
 	SC_M_LIFEPOTION,
 	SC_G_LIFEPOTION, // 640
 	SC_MYSTICPOWDER,
+
+	// Summoner
+	SC_SUHIDE,
+	SC_SU_STOOP,
+	SC_SPRITEMABLE,
+	SC_CATNIPPOWDER,
+	SC_SV_ROOTTWIST,
+	SC_BITESCAR,
+	SC_ARCLOUSEDASH,
+	SC_TUNAPARTY,
+	SC_SHRIMP,	// 650
+	SC_FRESHSHRIMP,
 #ifndef SC_MAX
 	SC_MAX, //Automatically updated max, used in for's to check we are within bounds.
 #endif
@@ -1747,10 +1759,10 @@ enum si_type {
 	//SI_HEALTHSTATE_HEAVYPOISON             = 890,
 	//SI_HEALTHSTATE_FEAR                    = 891,
 	//SI_CHERRY_BLOSSOM_CAKE                 = 892,
-	//SI_SU_STOOP                            = 893,
-	//SI_CATNIPPOWDER                        = 894,
+	SI_SU_STOOP                            = 893,
+	SI_CATNIPPOWDER                        = 894,
 	SI_BLOSSOM_FLUTTERING                    = 895,
-	//SI_SV_ROOTTWIST                        = 896,
+	SI_SV_ROOTTWIST                        = 896,
 	//SI_ATTACK_PROPERTY_NOTHING             = 897,
 	//SI_ATTACK_PROPERTY_WATER               = 898,
 	//SI_ATTACK_PROPERTY_GROUND              = 899,
@@ -1772,11 +1784,11 @@ enum si_type {
 	//SI_RESIST_PROPERTY_DARKNESS            = 914,
 	//SI_RESIST_PROPERTY_TELEKINESIS         = 915,
 	//SI_RESIST_PROPERTY_UNDEAD              = 916,
-	//SI_BITESCAR                            = 917,
-	//SI_ARCLOUSEDASH                        = 918,
-	//SI_TUNAPARTY                           = 919,
-	//SI_SHRIMP                              = 920,
-	//SI_FRESHSHRIMP                         = 921,
+	SI_BITESCAR                            = 917,
+	SI_ARCLOUSEDASH                        = 918,
+	SI_TUNAPARTY                           = 919,
+	SI_SHRIMP                              = 920,
+	SI_FRESHSHRIMP                         = 921,
 	//SI_PERIOD_RECEIVEITEM                  = 922,
 	//SI_PERIOD_PLUSEXP                      = 923,
 	//SI_PERIOD_PLUSJOBEXP                   = 924,
@@ -1788,11 +1800,11 @@ enum si_type {
 	//SI_HELM_ISIA                           = 930,
 	//SI_HELM_ASIR                           = 931,
 	//SI_HELM_URJ                            = 932,
-	//SI_SUHIDE                              = 933,
+	SI_SUHIDE                              = 933,
 	//SI_                                    = 934,
 	//SI_DORAM_BUF_01                        = 935,
 	//SI_DORAM_BUF_02                        = 936,
-	//SI_SPRITEMABLE                         = 937,
+	SI_SPRITEMABLE                         = 937,
 	//SI_EP16_2_BUFF_SS                      = 963,
 	//SI_EP16_2_BUFF_SC                      = 964,
 	//SI_EP16_2_BUFF_AC                      = 965,