From f301b33254b198d5a4c530171d689cd0c2daf1ca Mon Sep 17 00:00:00 2001 From: ErikasKontenis Date: Fri, 24 Jan 2020 19:21:29 +0200 Subject: [PATCH] config updates before going to production --- config.lua | 20 ++++++++++---------- config.prod.lua | 18 +++++++++--------- data/XML/stages.xml | 7 +++++-- data/actions/actions.xml | 1 + data/world/map.otbm | Bin 79815569 -> 79811529 bytes 5 files changed, 25 insertions(+), 21 deletions(-) diff --git a/config.lua b/config.lua index f68d6ee..19cca05 100644 --- a/config.lua +++ b/config.lua @@ -10,15 +10,15 @@ experienceByKillingPlayers = false expFromPlayersLevelRange = 75 -- Skull System -banLength = 30 * 24 * 60 * 60 +banLength = 1 * 24 * 60 * 60 whiteSkullTime = 15 * 60 -redSkullTime = 30 * 24 * 60 * 60 +redSkullTime = 7 * 24 * 60 * 60 killsDayRedSkull = 3 -killsWeekRedSkull = 5 -killsMonthRedSkull = 10 +killsWeekRedSkull = 999 +killsMonthRedSkull = 999 killsDayBanishment = 6 -killsWeekBanishment = 10 -killsMonthBanishment = 20 +killsWeekBanishment = 999 +killsMonthBanishment = 999 -- Connection Config -- NOTE: maxPlayers set to 0 means no limit @@ -42,7 +42,7 @@ moneyRate = 1 -- NOTE: Leave deathLosePercent as -1 if you want to use the default -- death penalty formula. For the old formula, set it to 10. For -- no skill/experience loss, set it to 0. -deathLosePercent = -1 +deathLosePercent = 10 -- Houses houseRentPeriod = "monthly" @@ -83,9 +83,9 @@ newbieLevelThreshold = 5 -- Rates -- NOTE: rateExp is not used if you have enabled stages in data/XML/stages.xml rateExp = 1 -rateSkill = 25 -rateLoot = 5 -rateMagic = 15 +rateSkill = 5 +rateLoot = 1 +rateMagic = 2 rateSpawn = 0 -- Monsters diff --git a/config.prod.lua b/config.prod.lua index eb5a047..34550de 100644 --- a/config.prod.lua +++ b/config.prod.lua @@ -10,13 +10,13 @@ experienceByKillingPlayers = false expFromPlayersLevelRange = 75 -- Skull System -banLength = 30 * 24 * 60 * 60 +banLength = 1 * 24 * 60 * 60 whiteSkullTime = 15 * 60 -redSkullTime = 30 * 24 * 60 * 60 -killsDayRedSkull = 999 +redSkullTime = 7 * 24 * 60 * 60 +killsDayRedSkull = 3 killsWeekRedSkull = 999 killsMonthRedSkull = 999 -killsDayBanishment = 999 +killsDayBanishment = 6 killsWeekBanishment = 999 killsMonthBanishment = 999 @@ -42,7 +42,7 @@ moneyRate = 1 -- NOTE: Leave deathLosePercent as -1 if you want to use the default -- death penalty formula. For the old formula, set it to 10. For -- no skill/experience loss, set it to 0. -deathLosePercent = -1 +deathLosePercent = 10 -- Houses houseRentPeriod = "monthly" @@ -83,9 +83,9 @@ newbieLevelThreshold = 5 -- Rates -- NOTE: rateExp is not used if you have enabled stages in data/XML/stages.xml rateExp = 1 -rateSkill = 25 -rateLoot = 5 -rateMagic = 15 +rateSkill = 5 +rateLoot = 1 +rateMagic = 2 rateSpawn = 0 -- Monsters @@ -106,4 +106,4 @@ startupDatabaseOptimization = true ownerName = "Erikas" ownerEmail = "e.kontenis@gmail.com" url = "https://sabrehaven.com" -location = "France" +location = "France" \ No newline at end of file diff --git a/data/XML/stages.xml b/data/XML/stages.xml index 9e42ec1..0dcfcef 100644 --- a/data/XML/stages.xml +++ b/data/XML/stages.xml @@ -1,6 +1,9 @@ - - + + + + + \ No newline at end of file diff --git a/data/actions/actions.xml b/data/actions/actions.xml index 56ab43c..68b3572 100644 --- a/data/actions/actions.xml +++ b/data/actions/actions.xml @@ -227,6 +227,7 @@ + diff --git a/data/world/map.otbm b/data/world/map.otbm index b8c30bff5c9f942be8a150fe9f3ba77e73fc72ec..f5eff152e154793c5e6eb9eb93e574d86959c084 100644 GIT binary patch delta 5504 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