Skip to content

Commit

Permalink
lite
Browse files Browse the repository at this point in the history
data no completed
  • Loading branch information
mattyx14 committed Jan 21, 2022
1 parent cfa4ce3 commit e747021
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
5 changes: 3 additions & 2 deletions config.lua.dist
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions docker/server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,20 @@ 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 \
&& sed -i '/mysqlPass = .*$/c\mysqlPass = "otserver"' 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"]

2 changes: 1 addition & 1 deletion docker/test-server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down

0 comments on commit e747021

Please sign in to comment.