diff --git a/config.lua.dist b/config.lua.dist index 0141dc1aa..6663773d2 100644 --- a/config.lua.dist +++ b/config.lua.dist @@ -166,11 +166,12 @@ sortLootByChance = true -- Rates -- NOTE: rateExp, rateSkill and rateMagic is used when 'rateUseStages = false' - or a fallback only -- To configure rates see file data/stages.lua +rateUseStages = true rateExp = 1 -rateSkill = 50 rateLoot = 3 -rateMagic = 25 rateSpawn = 1 +rateSkill = 1 +rateMagic = 1 -- Today regeneration condition over an loop every 1 second, -- so values which should regenerated less then 1 second diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile index 456a49770..dc06c7760 100644 --- a/docker/server/Dockerfile +++ b/docker/server/Dockerfile @@ -32,12 +32,12 @@ RUN cmake -DCMAKE_TOOLCHAIN_FILE=/opt/vcpkg/scripts/buildsystems/vcpkg.cmake .. # Stage 3: load data and execute FROM build -COPY --from=build /srv/build/bin/otbr /bin/otbr -COPY LICENSE *.sql key.pem /otbr/ -COPY data /otbr/data -COPY config.lua.dist /otbr/config.lua +COPY --from=build /srv/build/bin/otxsr /bin/otxsr +COPY LICENSE *.sql key.pem /otxsr/ +COPY data /otxsr/data +COPY config.lua.dist /otxsr/config.lua -WORKDIR /otbr +WORKDIR /otxsr RUN sed -i '/mysqlHost = .*$/c\mysqlHost = "mysql"' config.lua \ && sed -i '/mysqlUser = .*$/c\mysqlUser = "otserver"' config.lua \ @@ -45,7 +45,7 @@ RUN sed -i '/mysqlHost = .*$/c\mysqlHost = "mysql"' config.lua \ && sed -i '/mysqlDatabase = .*$/c\mysqlDatabase = "otserver"' config.lua \ && unzip -o data/world/world.zip -d data/world/ -VOLUME /otbr +VOLUME /otxsr -ENTRYPOINT ["/bin/otbr"] +ENTRYPOINT ["/bin/otxsr"] diff --git a/docker/test-server.sh b/docker/test-server.sh index 271517ea0..4974ad67b 100644 --- a/docker/test-server.sh +++ b/docker/test-server.sh @@ -64,7 +64,7 @@ mkdir -p build cd build cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake .. make -j`nproc` -mv bin/otbr ../ +mv bin/otxsr ../ cd .. unzip -o data/world/world.zip -d data/world/