Add skill: HerosMovement: Shove, Smite

Author: MokhaLeee

Contents/Gfx/Sources/SkillIcon/Shove.png

@@ -12,9 +12,17 @@ Pivot:[NL]
 Unit moves to opposite side of target ally.[X]
 
 ## MSG_SKILL_Reposition
-Reposition: Allows unit to pull an[NL]
-adjacent ally to its opposite side.[X]
+Reposition:[NL]
+Target ally moves to opposite side of unit.[X]
 
 ## MSG_SKILL_Swap
-Swap: Allows unit to swap positions[NL]
-with an adjacent ally.[X]
+Swap:[NL]
+Unit and target ally swap spaces.[X]
+
+## MSG_SKILL_Shove
+Shove:[NL]
+Pushes target ally 1 space away.[X]
+
+## MSG_SKILL_Smite
+Smite:[NL]
+Pushes target ally 2 spaces away.[X]

Contents/Gfx/Sources/SkillIcon/Smite.png

@@ -33,10 +33,12 @@ const u8 gHerosMovementTypes[0x100] = {
 	[CLASS_GENERAL] = HMU_SMITE,
 	[CLASS_GENERAL_F] = HMU_SMITE,
 
+#if 0
 	[CLASS_PRIEST] = HMU_SWARP,
 	[CLASS_CLERIC] = HMU_SWARP,
 	[CLASS_BISHOP] = HMU_SWARP,
 	[CLASS_BISHOP_F] = HMU_SWARP,
 	[CLASS_SUMMONER] = HMU_SWARP,
 	[CLASS_SUMMONER_F] = HMU_SWARP,
+#endif
 };

Contents/Texts/Source/texts/HerosMovement.txt

@@ -3941,4 +3941,18 @@ const struct SkillInfo gSkillInfos[MAX_SKILL_NUM + 1] = {
 		.icon = GFX_SkillIcon_Swap,
 	},
 #endif
+
+#if (defined(SID_Shove) && COMMON_SKILL_VALID(SID_Shove))
+	[SID_Shove] = {
+		.desc = MSG_SKILL_Shove,
+		.icon = GFX_SkillIcon_Shove,
+	},
+#endif
+
+#if (defined(SID_Smite) && COMMON_SKILL_VALID(SID_Smite))
+	[SID_Smite] = {
+		.desc = MSG_SKILL_Smite,
+		.icon = GFX_SkillIcon_Smite,
+	},
+#endif
 };

Data/HerosMovement/HmuTable.c

@@ -466,8 +466,8 @@ static void modify_unit_status(void)
 	AddSkillDbgListByPid(CHARACTER_EIRIKA, SID_Enrage);
 #endif
 
-#if defined(SID_Swap) && (COMMON_SKILL_VALID(SID_Swap))
-	AddSkillDbgListByPid(CHARACTER_EPHRAIM, SID_Swap);
+#if defined(SID_Reposition) && (COMMON_SKILL_VALID(SID_Reposition))
+	AddSkillDbgListByPid(CHARACTER_EPHRAIM, SID_Reposition);
 #endif
 }
 

Data/SkillSys/Source/SkillInfo.c

@@ -86,4 +86,12 @@ const SkillActionFunc_t gSkillActionFuncTable[MAX_SKILL_NUM + 1] = {
 #if (defined(SID_Swap) && COMMON_SKILL_VALID(SID_Swap))
 	[SID_Swap] = Action_Swap,
 #endif
+
+#if (defined(SID_Shove) && COMMON_SKILL_VALID(SID_Shove))
+	[SID_Shove] = Action_Shove,
+#endif
+
+#if (defined(SID_Smite) && COMMON_SKILL_VALID(SID_Smite))
+	[SID_Smite] = Action_Smite,
+#endif
 };

Debug/Event/Source/debug-event.c

@@ -321,7 +321,7 @@ struct MenuItemDef const *const gSkillMenuInfos[MAX_SKILL_NUM + 1] = {
 
 #if (defined(SID_Pivot) && COMMON_SKILL_VALID(SID_Pivot))
 	[SID_Pivot] = &(const struct MenuItemDef) {
-		.name = "　回り込み",
+		.name = "　迂迴",
 		.color = TEXT_COLOR_SYSTEM_WHITE,
 		.isAvailable = Pivot_Usability,
 		.onDraw = NULL,
@@ -334,7 +334,7 @@ struct MenuItemDef const *const gSkillMenuInfos[MAX_SKILL_NUM + 1] = {
 
 #if (defined(SID_Reposition) && COMMON_SKILL_VALID(SID_Reposition))
 	[SID_Reposition] = &(const struct MenuItemDef) {
-		.name = "　引き戻し",
+		.name = "　帶回",
 		.color = TEXT_COLOR_SYSTEM_WHITE,
 		.isAvailable = Reposition_Usability,
 		.onDraw = NULL,
@@ -347,7 +347,7 @@ struct MenuItemDef const *const gSkillMenuInfos[MAX_SKILL_NUM + 1] = {
 
 #if (defined(SID_Swap) && COMMON_SKILL_VALID(SID_Swap))
 	[SID_Swap] = &(const struct MenuItemDef) {
-		.name = "　入れ替え",
+		.name = "　替換",
 		.color = TEXT_COLOR_SYSTEM_WHITE,
 		.isAvailable = Swap_Usability,
 		.onDraw = NULL,
@@ -357,4 +357,30 @@ struct MenuItemDef const *const gSkillMenuInfos[MAX_SKILL_NUM + 1] = {
 		.onSwitchOut = NULL,
 	},
 #endif
+
+#if (defined(SID_Shove) && COMMON_SKILL_VALID(SID_Shove))
+	[SID_Shove] = &(const struct MenuItemDef) {
+		.name = "　衝撞",
+		.color = TEXT_COLOR_SYSTEM_WHITE,
+		.isAvailable = Shove_Usability,
+		.onDraw = NULL,
+		.onSelected = Shove_OnSelected,
+		.onIdle = NULL,
+		.onSwitchIn = NULL,
+		.onSwitchOut = NULL,
+	},
+#endif
+
+#if (defined(SID_Smite) && COMMON_SKILL_VALID(SID_Smite))
+	[SID_Smite] = &(const struct MenuItemDef) {
+		.name = "　重擊",
+		.color = TEXT_COLOR_SYSTEM_WHITE,
+		.isAvailable = Smite_Usability,
+		.onDraw = NULL,
+		.onSelected = Smite_OnSelected,
+		.onIdle = NULL,
+		.onSwitchIn = NULL,
+		.onSwitchOut = NULL,
+	},
+#endif
 };

Kernel/Data/SkillSys/Data/SkillActionInfo.c

@@ -3,3 +3,5 @@
 #include "Source/Pivot.lyn.event"
 #include "Source/Reposition.lyn.event"
 #include "Source/Swap.lyn.event"
+#include "Source/Shove.lyn.event"
+#include "Source/Smite.lyn.event"

Kernel/Data/SkillSys/Data/SkillMenuInfo.c

@@ -16,6 +16,14 @@ const u16 HerosMovementSkills[HMU_TYPE_COUNT] = {
 #if (defined(SID_Swap) && COMMON_SKILL_VALID(SID_Swap))
 	[HMU_SWAP] = SID_Swap,
 #endif
+
+#if (defined(SID_Shove) && COMMON_SKILL_VALID(SID_Shove))
+	[HMU_SHOVE] = SID_Shove,
+#endif
+
+#if (defined(SID_Smite) && COMMON_SKILL_VALID(SID_Smite))
+	[HMU_SMITE] = SID_Smite,
+#endif
 };
 
 STATIC_DECLAR bool HerosMovementSkillRequired(void)