Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
luanluciano93 committed Oct 12, 2024
2 parents 2aaffd1 + 34baa0a commit 5db0294
Show file tree
Hide file tree
Showing 482 changed files with 6,540 additions and 865,678 deletions.
68 changes: 0 additions & 68 deletions .github/workflows/analysis-qodana.yml

This file was deleted.

75 changes: 0 additions & 75 deletions .github/workflows/analysis-sonarcloud.yml

This file was deleted.

8 changes: 6 additions & 2 deletions config.lua.dist
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ serverMotd = "Welcome to the OTServBR-Global!"
statusTimeout = 5 * 1000
replaceKickOnLogin = true
maxPacketsPerSecond = 25
maxItem = 2000
maxContainer = 100
maxPlayersOnlinePerAccount = 1
maxPlayersOutsidePZPerAccount = 1

Expand All @@ -81,6 +79,12 @@ freeDepotLimit = 2000
premiumDepotLimit = 10000
depotBoxes = 20

-- Item and containers limit
-- NOTE: 'maxContainerDepth' defines the maximum depth to which containers can be nested
maxItem = 5000
maxContainer = 500
maxContainerDepth = 200

-- Augments System (Get more info in: https://github.com/opentibiabr/canary/pull/2602)
-- NOTE: the following values are for all weapons and equipments that have type of "increase damage", "powerful impact" and "strong impact".
-- To customize the percentage of a particular item with these augment types, please add to the item "augments" section on items.xml as the example above.
Expand Down
33 changes: 0 additions & 33 deletions data-otservbr-global/lib/core/constants.lua
Original file line number Diff line number Diff line change
@@ -1,33 +0,0 @@
ROSHAMUUL_MORTAR_THROWN = 20200
ROSHAMUUL_KILLED_FRAZZLEMAWS = 20201
ROSHAMUUL_KILLED_SILENCERS = 20202
ROSHAMUUL_GOLD_RECORD = 20203

SPIKE_FAME_POINTS = 27890

SPIKE_UPPER_PACIFIER_MAIN = 27891
SPIKE_UPPER_PACIFIER_DAILY = 27892
SPIKE_UPPER_MOUND_MAIN = 27893
SPIKE_UPPER_MOUND_DAILY = 27894
SPIKE_UPPER_TRACK_MAIN = 27895
SPIKE_UPPER_TRACK_DAILY = 27896
SPIKE_UPPER_KILL_MAIN = 27897
SPIKE_UPPER_KILL_DAILY = 27898

SPIKE_MIDDLE_CHARGE_MAIN = 27899
SPIKE_MIDDLE_CHARGE_DAILY = 27900
SPIKE_MIDDLE_MUSHROOM_MAIN = 27901
SPIKE_MIDDLE_MUSHROOM_DAILY = 27902
SPIKE_MIDDLE_NEST_MAIN = 27903
SPIKE_MIDDLE_NEST_DAILY = 27904
SPIKE_MIDDLE_KILL_MAIN = 27905
SPIKE_MIDDLE_KILL_DAILY = 27906

SPIKE_LOWER_PARCEL_MAIN = 27907
SPIKE_LOWER_PARCEL_DAILY = 27908
SPIKE_LOWER_UNDERCOVER_MAIN = 27909
SPIKE_LOWER_UNDERCOVER_DAILY = 27910
SPIKE_LOWER_LAVA_MAIN = 27911
SPIKE_LOWER_LAVA_DAILY = 27912
SPIKE_LOWER_KILL_MAIN = 27913
SPIKE_LOWER_KILL_DAILY = 27914
Loading

0 comments on commit 5db0294

Please sign in to comment.