Skip to content

Add support for Punch #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions src/Data/Gems.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 4 additions & 1 deletion src/Data/Skills/other.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2485,10 +2485,13 @@ skills["PoisonousConcoctionPlayer"] = {
}
skills["MeleeUnarmedPlayer"] = {
name = "Punch",
hidden = true,
baseTypeName = "Punch",
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 = {
},
Expand Down
4 changes: 4 additions & 0 deletions src/Export/Scripts/skills.lua
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
"UseGlobalStats",
"ModifiesNextSkill",
"OngoingSkill",
"UsableWhileShapeshifted",

Check warning on line 122 in src/Export/Scripts/skills.lua

View workflow job for this annotation

GitHub Actions / spellcheck

Unknown word (Shapeshifted)
"Meta",
"Bear",
"Wolf",
Expand All @@ -138,7 +138,7 @@
"SkillConsumesShock",
"Wall",
"Persistent",
"Nonpathing",

Check warning on line 141 in src/Export/Scripts/skills.lua

View workflow job for this annotation

GitHub Actions / spellcheck

Unknown word (Nonpathing)
"CanBecomeArrowRain",
"MultipleReservation",
"SupportedByElementalDischarge",
Expand All @@ -154,7 +154,7 @@
"SupportedByComboFinisher",
"Offering",
"Retaliation",
"Shapeshift",

Check warning on line 157 in src/Export/Scripts/skills.lua

View workflow job for this annotation

GitHub Actions / spellcheck

Unknown word (Shapeshift)
"Invocation",
"Grenade",
"NoDualWield",
Expand All @@ -181,7 +181,7 @@
"IsBlasphemy",
"PersistentShowsCastTime",
"GeneratesEnergy",
"CommandableMinion",

Check warning on line 184 in src/Export/Scripts/skills.lua

View workflow job for this annotation

GitHub Actions / spellcheck

Unknown word (Commandable)
}

-- This is here to fix name collisions like in the case of Barrage
Expand Down Expand Up @@ -486,6 +486,10 @@
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
Expand Down
1 change: 0 additions & 1 deletion src/Export/Skills/other.txt
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,6 @@ statMap = {
#mods
#skillEnd

#noGem
#skill MeleeUnarmedPlayer
#startSets
#set MeleeUnarmedPlayer
Expand Down
Loading