From 951846939e2298b4031000e3312dfb4879b5b518 Mon Sep 17 00:00:00 2001
From: Peechey <92683202+Peechey@users.noreply.github.com>
Date: Sat, 18 Jan 2025 13:18:00 -0600
Subject: [PATCH 1/2] update skills script and other.txt to support Punch skill

---
 src/Data/Gems.lua             | 21 +++++++++++++++++++++
 src/Data/Skills/other.lua     |  6 +++++-
 src/Export/Scripts/skills.lua |  4 ++++
 src/Export/Skills/other.txt   |  2 +-
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/Data/Gems.lua b/src/Data/Gems.lua
index 07ea6832c..4e494a54a 100644
--- a/src/Data/Gems.lua
+++ b/src/Data/Gems.lua
@@ -5825,6 +5825,27 @@ return {
 		Tier = 3,
 		naturalMaxLevel = 1,
 	},
+	["Metadata/Items/Gems/SkillGemPlayerDefaultUnarmed"] = {
+		name = "Punch",
+		baseTypeName = "Punch",
+		gameId = "Metadata/Items/Gem/SkillGemPlayerDefaultUnarmed",
+		variantId = "PlayerDefaultUnarmed",
+		grantedEffectId = "MeleeUnarmedPlayer",
+		tags = {
+			grants_active_skill = true,
+			attack = true,
+			area = true,
+			melee = true,
+			strike = true,
+		},
+		gemType = "Attack",
+		tagString = "AoE, Melee, Strike",
+		reqStr = 0,
+		reqDex = 0,
+		reqInt = 0,
+		Tier = 0,
+		naturalMaxLevel = 20,
+	},
 	["Metadata/Items/Gems/SkillGemPlayerDefaultQuarterstaff"] = {
 		name = "Quarterstaff Strike",
 		baseTypeName = "Quarterstaff Strike",
diff --git a/src/Data/Skills/other.lua b/src/Data/Skills/other.lua
index 038e7fb4f..7583e9b38 100644
--- a/src/Data/Skills/other.lua
+++ b/src/Data/Skills/other.lua
@@ -2485,10 +2485,14 @@ skills["PoisonousConcoctionPlayer"] = {
 }
 skills["MeleeUnarmedPlayer"] = {
 	name = "Punch",
-	hidden = true,
+	baseTypeName = "Punch",
+	fromItem = true,
 	color = 4,
 	description = "Perform an Unarmed Strike.",
 	skillTypes = { [SkillType.Attack] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.Area] = true, },
+	weaponTypes = {
+		["None"] = true,
+	},
 	castTime = 1,
 	qualityStats = {
 	},
diff --git a/src/Export/Scripts/skills.lua b/src/Export/Scripts/skills.lua
index 4bfde49b2..83b19232c 100644
--- a/src/Export/Scripts/skills.lua
+++ b/src/Export/Scripts/skills.lua
@@ -486,6 +486,10 @@ directiveTable.skill = function(state, args, out)
 				weaponTypes[weaponClassMap[class.Id]] = true
 			end
 		end
+		-- Punch/MeleeUnarmedPlayer // skills with Unarmed in name that don't have restrictions
+		if #weaponTypes == 0 and (grantedId and grantedId:find("Unarmed")) then
+			weaponTypes["None"] = true
+		end
 		if next(weaponTypes) then
 			out:write('\tweaponTypes = {\n')
 			for type in pairs(weaponTypes) do
diff --git a/src/Export/Skills/other.txt b/src/Export/Skills/other.txt
index e74579ba8..2c5a5d08f 100644
--- a/src/Export/Skills/other.txt
+++ b/src/Export/Skills/other.txt
@@ -182,7 +182,7 @@ statMap = {
 #mods
 #skillEnd
 
-#noGem
+#from item
 #skill MeleeUnarmedPlayer
 #startSets
 #set MeleeUnarmedPlayer

From 6f2d698be0d28cf6f4ff2b24bc276d37246304ba Mon Sep 17 00:00:00 2001
From: Peechey <92683202+Peechey@users.noreply.github.com>
Date: Sat, 18 Jan 2025 13:25:54 -0600
Subject: [PATCH 2/2] remove from item

---
 src/Data/Skills/other.lua   | 1 -
 src/Export/Skills/other.txt | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/Data/Skills/other.lua b/src/Data/Skills/other.lua
index 7583e9b38..ce66bbfb1 100644
--- a/src/Data/Skills/other.lua
+++ b/src/Data/Skills/other.lua
@@ -2486,7 +2486,6 @@ skills["PoisonousConcoctionPlayer"] = {
 skills["MeleeUnarmedPlayer"] = {
 	name = "Punch",
 	baseTypeName = "Punch",
-	fromItem = true,
 	color = 4,
 	description = "Perform an Unarmed Strike.",
 	skillTypes = { [SkillType.Attack] = true, [SkillType.MeleeSingleTarget] = true, [SkillType.Multistrikeable] = true, [SkillType.Melee] = true, [SkillType.Area] = true, },
diff --git a/src/Export/Skills/other.txt b/src/Export/Skills/other.txt
index 2c5a5d08f..74f2ae1c3 100644
--- a/src/Export/Skills/other.txt
+++ b/src/Export/Skills/other.txt
@@ -182,7 +182,6 @@ statMap = {
 #mods
 #skillEnd
 
-#from item
 #skill MeleeUnarmedPlayer
 #startSets
 #set MeleeUnarmedPlayer