Skip to content
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.

Sign up for GitHub

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

improve: rework in unscripted weapons and moveevents #1494

Merged
merged 13 commits into from
Feb 29, 2024
Merged

improve: rework in unscripted weapons and moveevents #1494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
dce63dc
improve: rework in unscripted weapons and moveevents
dudantas Aug 23, 2023
1398cc9
feat: remove old registration and add new on items.xml
dudantas Aug 30, 2023
4441267
Merge branch 'main' into improve-rework-unscripted-weapon-and-moveevent
dudantas Sep 20, 2023
38d8135
feat: finish registering of weapons and equipments from XML
dudantas Sep 21, 2023
c4c480c
Merge remote-tracking branch 'upstream/main' into improve-rework-unsc…
luan Sep 30, 2023
7859d6c
fixup unscripted
luan Sep 30, 2023
863d50e
Merge branch 'main' into improve-rework-unscripted-weapon-and-moveevent
dudantas Feb 25, 2024
1b773c9
fix: compilation errors related to conflict ptr
dudantas Feb 25, 2024
9a08805
fix: remove unused variable
dudantas Feb 25, 2024
f0d5c4e
feat: chain for weapons (sword, axe, club and wand/rod)
dudantas Feb 28, 2024
e2b8e54
fix: remove testing logs
dudantas Feb 28, 2024
656ddba
fix: disable clang
dudantas Feb 28, 2024
e2d8c9d
fix: remove protobuf compiled files
dudantas Feb 29, 2024
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
4 changes: 2 additions & 2 deletions .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,13 @@ AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: MultiLine
BinPackArguments: true
BinPackParameters: true
BreakBeforeBraces: Custom
BraceWrapping:
AfterCaseLabel: false
AfterClass: false
AfterControlStatement: false
AfterEnum: false
AfterFunction: true
AfterFunction: false
AfterNamespace: false
AfterObjCDeclaration: false
AfterStruct: false
Expand All @@ -42,7 +43,6 @@ BraceWrapping:
SplitEmptyRecord: true
SplitEmptyNamespace: true
BreakBeforeBinaryOperators: All
BreakBeforeBraces: Attach
BreakBeforeInheritanceComma: false
BreakInheritanceList: BeforeColon
BreakBeforeTernaryOperators: true
Expand Down
6 changes: 5 additions & 1 deletion config.lua.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,11 +419,15 @@ multiplierSpeedOnFist = 5
maxSpeedOnFist = 500
disableLegacyRaids = false
disableMonsterArmor = false
combatChainDelay = 50
minElementalResistance = -200
maxElementalResistance = 200
maxDamageReflection = 200

-- Chain system
toggleChainSystem = true
combatChainDelay = 50
combatChainTargets = 5

-- Global server Save
-- NOTE: globalServerSaveNotifyDuration in minutes
globalServerSaveNotifyMessage = true
Expand Down
Loading
Loading