mirror of
https://github.com/ErikasKontenis/SabrehavenServer.git
synced 2025-06-14 13:04:27 +02:00
commit new world
This commit is contained in:
ErikasKontenis
parent
1efbf9c38d
commit
0dfb49beaa
@ -22,7 +22,7 @@ Servers = {
|
||||
Evoulinia = "evolunia.net:7171:1098",
|
||||
GarneraTest = "garnera-global.net:7171:1100",
|
||||
LocalTestServ = "127.0.0.1:7171:1098:110:30:93" ]]
|
||||
Local = "127.0.0.1:7171:792",
|
||||
--Local = "127.0.0.1:7171:792",
|
||||
Vanilla = "login.sabrehaven.com:7171:792"
|
||||
}
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
|
||||
|
||||
include(cotire)
|
||||
|
||||
add_compile_options(-Wall -Werror -pipe -fvisibility=hidden)
|
||||
add_compile_options(-Wall -pipe -fvisibility=hidden)
|
||||
set(CMAKE_CXX_FLAGS_PERFORMANCE "${CMAKE_CXX_FLAGS_RELEASE} -march=native")
|
||||
|
||||
if (CMAKE_COMPILER_IS_GNUCXX)
|
||||
@ -20,6 +20,7 @@ include(FindCXX11)
|
||||
include(FindLTO)
|
||||
|
||||
# Find packages.
|
||||
find_package(fmt)
|
||||
find_package(Crypto++ REQUIRED)
|
||||
find_package(GMP REQUIRED)
|
||||
find_package(PugiXML REQUIRED)
|
||||
@ -50,7 +51,7 @@ add_subdirectory(src)
|
||||
add_executable(tfs ${tfs_SRC})
|
||||
|
||||
include_directories(${MYSQL_INCLUDE_DIR} ${LUA_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${PUGIXML_INCLUDE_DIR} ${GMP_INCLUDE_DIR} ${Crypto++_INCLUDE_DIR})
|
||||
target_link_libraries(tfs ${MYSQL_CLIENT_LIBS} ${LUA_LIBRARIES} ${Boost_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY} ${PUGIXML_LIBRARIES} ${ZLIB_LIBRARY} ${GMP_LIBRARIES} ${Crypto++_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
|
||||
target_link_libraries(tfs ${MYSQL_CLIENT_LIBS} ${LUA_LIBRARIES} ${Boost_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY} ${PUGIXML_LIBRARIES} ${ZLIB_LIBRARY} ${GMP_LIBRARIES} ${Crypto++_LIBRARIES} fmt::fmt ${CMAKE_THREAD_LIBS_INIT})
|
||||
|
||||
set_target_properties(tfs PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "src/otpch.h")
|
||||
set_target_properties(tfs PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
|
||||
|
||||
@ -349,7 +349,7 @@
|
||||
<house name="Elm Street 4" houseid="347" entryx="32902" entryy="32055" entryz="6" rent="5140" townid="7" size="49" />
|
||||
<house name="Seagull Walk 1" houseid="348" entryx="32918" entryy="32052" entryz="6" rent="10090" townid="7" size="100" />
|
||||
<house name="Seagull Walk 2" houseid="349" entryx="32915" entryy="32037" entryz="6" rent="5330" townid="7" size="46" />
|
||||
<house name="Lucky Lane 1 (Shop)" houseid="350" entryx="32936" entryy="32090" entryz="6" rent="13620" townid="7" size="128" />
|
||||
<house name="Lucky Lane 1 (Shop)" houseid="350" entryx="32936" entryy="32090" entryz="6" rent="13620" townid="7" size="125" />
|
||||
<house name="Paupers Palace, Flat 01" houseid="351" entryx="32918" entryy="32094" entryz="7" rent="810" townid="7" size="6" />
|
||||
<house name="Paupers Palace, Flat 02" houseid="352" entryx="32914" entryy="32094" entryz="7" rent="900" townid="7" size="7" />
|
||||
<house name="Paupers Palace, Flat 03" houseid="353" entryx="32911" entryy="32100" entryz="7" rent="810" townid="7" size="6" />
|
||||
@ -1026,4 +1026,18 @@
|
||||
<house name="Unnamed House #2478" houseid="2478" entryx="32060" entryy="32433" entryz="7" rent="0" townid="1" size="32" />
|
||||
<house name="Unnamed House #2479" houseid="2479" entryx="32060" entryy="32429" entryz="7" rent="0" townid="1" size="32" />
|
||||
<house name="Unnamed House #2480" houseid="2480" entryx="32083" entryy="32440" entryz="7" rent="0" townid="1" size="47" />
|
||||
<house name="Unnamed House #2481" houseid="2481" entryx="33259" entryy="31857" entryz="7" rent="0" townid="5" size="32" />
|
||||
<house name="Unnamed House #2482" houseid="2482" entryx="33257" entryy="31867" entryz="7" rent="0" townid="5" size="45" />
|
||||
<house name="Unnamed House #2483" houseid="2483" entryx="33217" entryy="31782" entryz="7" rent="0" townid="5" size="41" />
|
||||
<house name="Unnamed House #2484" houseid="2484" entryx="33217" entryy="31782" entryz="6" rent="0" townid="5" size="41" />
|
||||
<house name="Unnamed House #2485" houseid="2485" entryx="33242" entryy="31784" entryz="6" rent="0" townid="5" size="37" />
|
||||
<house name="Unnamed House #2486" houseid="2486" entryx="33229" entryy="31765" entryz="6" rent="0" townid="5" size="26" />
|
||||
<house name="Unnamed House #2487" houseid="2487" entryx="33220" entryy="31924" entryz="7" rent="0" townid="5" size="170" />
|
||||
<house name="Unnamed House #2488" houseid="2488" entryx="33214" entryy="31759" entryz="7" rent="0" townid="5" size="32" />
|
||||
<house name="Unnamed House #2489" houseid="2489" entryx="32869" entryy="32126" entryz="6" rent="0" townid="7" size="112" />
|
||||
<house name="Unnamed House #2490" houseid="2490" entryx="32869" entryy="32125" entryz="6" rent="0" townid="7" size="116" />
|
||||
<house name="Unnamed House #2491" houseid="2491" entryx="32954" entryy="32073" entryz="8" rent="0" townid="7" size="16" />
|
||||
<house name="Unnamed House #2492" houseid="2492" entryx="32954" entryy="32069" entryz="8" rent="0" townid="7" size="16" />
|
||||
<house name="Unnamed House #2493" houseid="2493" entryx="32951" entryy="32069" entryz="8" rent="0" townid="7" size="16" />
|
||||
<house name="Unnamed House #2494" houseid="2494" entryx="32951" entryy="32073" entryz="8" rent="0" townid="7" size="16" />
|
||||
</houses>
|
||||
|
||||
@ -8862,8 +8862,8 @@
|
||||
<monster name="orc" x="0" y="0" z="7" spawntime="600" />
|
||||
<monster name="orc" x="-2" y="1" z="7" spawntime="600" />
|
||||
</spawn>
|
||||
<spawn centerx="33180" centery="31796" centerz="7" radius="1">
|
||||
<monster name="dog" x="0" y="0" z="7" spawntime="600" />
|
||||
<spawn centerx="33179" centery="31796" centerz="7" radius="1">
|
||||
<monster name="dog" x="1" y="0" z="7" spawntime="600" />
|
||||
</spawn>
|
||||
<spawn centerx="32189" centery="31797" centerz="7" radius="3">
|
||||
<monster name="rat" x="0" y="0" z="7" spawntime="600" />
|
||||
@ -9278,6 +9278,7 @@
|
||||
<spawn centerx="33157" centery="31875" centerz="7" radius="4">
|
||||
<monster name="deer" x="0" y="-2" z="7" spawntime="600" />
|
||||
<monster name="deer" x="0" y="0" z="7" spawntime="600" />
|
||||
<monster name="orc spearman" x="3" y="2" z="7" spawntime="60" />
|
||||
</spawn>
|
||||
<spawn centerx="33148" centery="31876" centerz="7" radius="1">
|
||||
<monster name="orc" x="-1" y="-1" z="7" spawntime="600" />
|
||||
@ -9335,8 +9336,10 @@
|
||||
<monster name="rabbit" x="3" y="3" z="7" spawntime="600" />
|
||||
</spawn>
|
||||
<spawn centerx="33140" centery="31887" centerz="7" radius="4">
|
||||
<monster name="orc spearman" x="0" y="-1" z="7" spawntime="60" />
|
||||
<monster name="poison spider" x="-1" y="0" z="7" spawntime="600" />
|
||||
<monster name="poison spider" x="0" y="0" z="7" spawntime="600" />
|
||||
<monster name="orc spearman" x="-4" y="1" z="7" spawntime="60" />
|
||||
<monster name="poison spider" x="2" y="2" z="7" spawntime="600" />
|
||||
</spawn>
|
||||
<spawn centerx="33323" centery="31888" centerz="7" radius="1">
|
||||
@ -9348,6 +9351,9 @@
|
||||
<monster name="snake" x="0" y="0" z="7" spawntime="600" />
|
||||
<monster name="snake" x="1" y="3" z="7" spawntime="600" />
|
||||
</spawn>
|
||||
<spawn centerx="33158" centery="31892" centerz="7" radius="1">
|
||||
<monster name="orc spearman" x="0" y="0" z="7" spawntime="60" />
|
||||
</spawn>
|
||||
<spawn centerx="32837" centery="31894" centerz="7" radius="5">
|
||||
<monster name="snake" x="2" y="-3" z="7" spawntime="600" />
|
||||
<monster name="snake" x="0" y="0" z="7" spawntime="600" />
|
||||
@ -9359,6 +9365,9 @@
|
||||
<monster name="deer" x="0" y="0" z="7" spawntime="600" />
|
||||
<monster name="deer" x="-2" y="2" z="7" spawntime="600" />
|
||||
</spawn>
|
||||
<spawn centerx="33155" centery="31896" centerz="7" radius="1">
|
||||
<monster name="orc spearman" x="0" y="0" z="7" spawntime="60" />
|
||||
</spawn>
|
||||
<spawn centerx="32705" centery="31897" centerz="7" radius="6">
|
||||
<monster name="rabbit" x="-5" y="-4" z="7" spawntime="600" />
|
||||
<monster name="rabbit" x="0" y="-2" z="7" spawntime="600" />
|
||||
@ -9429,6 +9438,9 @@
|
||||
<monster name="amazon" x="0" y="-2" z="7" spawntime="600" />
|
||||
<monster name="amazon" x="0" y="0" z="7" spawntime="600" />
|
||||
</spawn>
|
||||
<spawn centerx="33179" centery="31912" centerz="7" radius="1">
|
||||
<monster name="orc spearman" x="0" y="0" z="7" spawntime="60" />
|
||||
</spawn>
|
||||
<spawn centerx="32539" centery="31913" centerz="7" radius="3">
|
||||
<monster name="dwarf" x="0" y="0" z="7" spawntime="600" />
|
||||
<monster name="dwarf" x="1" y="1" z="7" spawntime="600" />
|
||||
@ -9442,6 +9454,9 @@
|
||||
<monster name="rabbit" x="1" y="-2" z="7" spawntime="600" />
|
||||
<monster name="rabbit" x="0" y="0" z="7" spawntime="600" />
|
||||
</spawn>
|
||||
<spawn centerx="33186" centery="31915" centerz="7" radius="1">
|
||||
<monster name="orc spearman" x="0" y="0" z="7" spawntime="60" />
|
||||
</spawn>
|
||||
<spawn centerx="32837" centery="31917" centerz="7" radius="3">
|
||||
<monster name="amazon" x="0" y="0" z="7" spawntime="600" />
|
||||
<monster name="amazon" x="-1" y="2" z="7" spawntime="600" />
|
||||
@ -9450,6 +9465,9 @@
|
||||
<monster name="amazon" x="0" y="0" z="7" spawntime="600" />
|
||||
<monster name="amazon" x="0" y="1" z="7" spawntime="600" />
|
||||
</spawn>
|
||||
<spawn centerx="33180" centery="31920" centerz="7" radius="1">
|
||||
<monster name="orc spearman" x="0" y="0" z="7" spawntime="60" />
|
||||
</spawn>
|
||||
<spawn centerx="32159" centery="31924" centerz="7" radius="3">
|
||||
<monster name="pig" x="0" y="0" z="7" spawntime="9000" />
|
||||
<monster name="pig" x="2" y="0" z="7" spawntime="9000" />
|
||||
@ -10830,7 +10848,7 @@
|
||||
<monster name="purple butterfly" x="0" y="0" z="7" spawntime="900" />
|
||||
</spawn>
|
||||
<spawn centerx="31968" centery="32167" centerz="7" radius="3">
|
||||
<monster name="spider" x="-2" y="-2" z="7" spawntime="600" />
|
||||
<monster name="spider" x="-1" y="0" z="7" spawntime="600" />
|
||||
<monster name="spider" x="0" y="0" z="7" spawntime="600" />
|
||||
</spawn>
|
||||
<spawn centerx="32017" centery="32167" centerz="7" radius="4">
|
||||
@ -20567,6 +20585,9 @@
|
||||
<monster name="goblin" x="0" y="-1" z="8" spawntime="600" />
|
||||
<monster name="goblin" x="0" y="0" z="8" spawntime="600" />
|
||||
</spawn>
|
||||
<spawn centerx="33272" centery="31870" centerz="8" radius="1">
|
||||
<monster name="rotworm" x="0" y="0" z="8" spawntime="60" />
|
||||
</spawn>
|
||||
<spawn centerx="33082" centery="31871" centerz="8" radius="4">
|
||||
<monster name="goblin" x="-1" y="0" z="8" spawntime="600" />
|
||||
<monster name="goblin" x="0" y="0" z="8" spawntime="600" />
|
||||
@ -20579,6 +20600,9 @@
|
||||
<spawn centerx="32830" centery="31873" centerz="8" radius="1">
|
||||
<monster name="beholder" x="0" y="0" z="8" spawntime="6000" />
|
||||
</spawn>
|
||||
<spawn centerx="33287" centery="31873" centerz="8" radius="1">
|
||||
<monster name="rotworm" x="0" y="0" z="8" spawntime="60" />
|
||||
</spawn>
|
||||
<spawn centerx="32529" centery="31875" centerz="8" radius="3">
|
||||
<monster name="dwarf" x="2" y="-1" z="8" spawntime="600" />
|
||||
<monster name="dwarf" x="0" y="0" z="8" spawntime="600" />
|
||||
@ -20602,6 +20626,12 @@
|
||||
<monster name="goblin" x="-2" y="0" z="8" spawntime="600" />
|
||||
<monster name="goblin" x="0" y="0" z="8" spawntime="600" />
|
||||
</spawn>
|
||||
<spawn centerx="33268" centery="31878" centerz="8" radius="1">
|
||||
<monster name="rotworm" x="0" y="0" z="8" spawntime="60" />
|
||||
</spawn>
|
||||
<spawn centerx="33285" centery="31878" centerz="8" radius="1">
|
||||
<monster name="rotworm" x="0" y="0" z="8" spawntime="60" />
|
||||
</spawn>
|
||||
<spawn centerx="32482" centery="31879" centerz="8" radius="3">
|
||||
<monster name="dwarf" x="-1" y="0" z="8" spawntime="600" />
|
||||
<monster name="dwarf" x="0" y="0" z="8" spawntime="600" />
|
||||
@ -20613,6 +20643,15 @@
|
||||
<monster name="dwarf" x="0" y="-1" z="8" spawntime="600" />
|
||||
<monster name="dwarf" x="0" y="0" z="8" spawntime="600" />
|
||||
</spawn>
|
||||
<spawn centerx="33169" centery="31882" centerz="8" radius="1">
|
||||
<monster name="orc spearman" x="0" y="0" z="8" spawntime="60" />
|
||||
</spawn>
|
||||
<spawn centerx="33171" centery="31884" centerz="8" radius="1">
|
||||
<monster name="orc spearman" x="0" y="0" z="8" spawntime="60" />
|
||||
</spawn>
|
||||
<spawn centerx="33272" centery="31885" centerz="8" radius="1">
|
||||
<monster name="rotworm" x="0" y="0" z="8" spawntime="60" />
|
||||
</spawn>
|
||||
<spawn centerx="33211" centery="31886" centerz="8" radius="3">
|
||||
<monster name="rotworm" x="-1" y="0" z="8" spawntime="500" />
|
||||
<monster name="rotworm" x="0" y="0" z="8" spawntime="500" />
|
||||
@ -20718,6 +20757,7 @@
|
||||
<monster name="orc" x="0" y="-1" z="8" spawntime="600" />
|
||||
<monster name="orc warrior" x="0" y="0" z="8" spawntime="600" />
|
||||
<monster name="orc" x="1" y="2" z="8" spawntime="600" />
|
||||
<monster name="orc spearman" x="-1" y="3" z="8" spawntime="60" />
|
||||
<monster name="orc spearman" x="1" y="3" z="8" spawntime="600" />
|
||||
</spawn>
|
||||
<spawn centerx="32520" centery="31915" centerz="8" radius="3">
|
||||
@ -20734,6 +20774,9 @@
|
||||
<monster name="poison spider" x="2" y="1" z="8" spawntime="600" />
|
||||
<monster name="poison spider" x="3" y="1" z="8" spawntime="600" />
|
||||
</spawn>
|
||||
<spawn centerx="33167" centery="31917" centerz="8" radius="1">
|
||||
<monster name="orc spearman" x="0" y="0" z="8" spawntime="60" />
|
||||
</spawn>
|
||||
<spawn centerx="32681" centery="31918" centerz="8" radius="3">
|
||||
<monster name="spider" x="0" y="-1" z="8" spawntime="600" />
|
||||
<monster name="spider" x="0" y="0" z="8" spawntime="600" />
|
||||
@ -20824,6 +20867,7 @@
|
||||
<monster name="orc spearman" x="0" y="1" z="8" spawntime="600" />
|
||||
<monster name="orc spearman" x="-1" y="2" z="8" spawntime="600" />
|
||||
<monster name="orc warrior" x="0" y="2" z="8" spawntime="600" />
|
||||
<monster name="orc spearman" x="2" y="2" z="8" spawntime="60" />
|
||||
<monster name="orc warrior" x="0" y="4" z="8" spawntime="600" />
|
||||
</spawn>
|
||||
<spawn centerx="32516" centery="31932" centerz="8" radius="4">
|
||||
@ -21314,6 +21358,9 @@
|
||||
<spawn centerx="32708" centery="32073" centerz="8" radius="1">
|
||||
<monster name="Wyvern" x="0" y="1" z="8" spawntime="60" />
|
||||
</spawn>
|
||||
<spawn centerx="32993" centery="32073" centerz="8" radius="1">
|
||||
<monster name="rotworm" x="0" y="0" z="8" spawntime="60" />
|
||||
</spawn>
|
||||
<spawn centerx="32073" centery="32076" centerz="8" radius="1">
|
||||
<monster name="troll" x="0" y="0" z="8" spawntime="600" />
|
||||
</spawn>
|
||||
@ -21323,6 +21370,9 @@
|
||||
<spawn centerx="32730" centery="32077" centerz="8" radius="1">
|
||||
<monster name="Wyvern" x="-1" y="-1" z="8" spawntime="60" />
|
||||
</spawn>
|
||||
<spawn centerx="32984" centery="32077" centerz="8" radius="1">
|
||||
<monster name="rotworm" x="0" y="0" z="8" spawntime="60" />
|
||||
</spawn>
|
||||
<spawn centerx="32318" centery="32078" centerz="8" radius="1">
|
||||
<monster name="bear" x="0" y="0" z="8" spawntime="60" />
|
||||
</spawn>
|
||||
@ -21339,6 +21389,9 @@
|
||||
<spawn centerx="32835" centery="32080" centerz="8" radius="1">
|
||||
<monster name="rotworm" x="0" y="0" z="8" spawntime="500" />
|
||||
</spawn>
|
||||
<spawn centerx="32980" centery="32080" centerz="8" radius="1">
|
||||
<monster name="rotworm" x="0" y="0" z="8" spawntime="60" />
|
||||
</spawn>
|
||||
<spawn centerx="33109" centery="32080" centerz="8" radius="3">
|
||||
<monster name="rotworm" x="0" y="0" z="8" spawntime="500" />
|
||||
<monster name="rotworm" x="-1" y="1" z="8" spawntime="500" />
|
||||
@ -37259,7 +37312,6 @@
|
||||
<monster name="rotworm" x="0" y="0" z="10" spawntime="500" />
|
||||
<monster name="rotworm" x="1" y="1" z="10" spawntime="500" />
|
||||
</spawn>
|
||||
<spawn centerx="33066" centery="31841" centerz="10" radius="4" />
|
||||
<spawn centerx="33095" centery="31841" centerz="10" radius="3">
|
||||
<monster name="bug" x="0" y="-2" z="10" spawntime="600" />
|
||||
<monster name="goblin" x="-1" y="-1" z="10" spawntime="600" />
|
||||
@ -43382,6 +43434,7 @@
|
||||
<monster name="phantasm" x="0" y="1" z="11" spawntime="240" />
|
||||
</spawn>
|
||||
<spawn centerx="33137" centery="31810" centerz="11" radius="3">
|
||||
<monster name="rat" x="-3" y="-2" z="11" spawntime="2500" />
|
||||
<monster name="rat" x="0" y="0" z="11" spawntime="600" />
|
||||
<monster name="rat" x="1" y="2" z="11" spawntime="600" />
|
||||
</spawn>
|
||||
@ -43412,6 +43465,9 @@
|
||||
<spawn centerx="33142" centery="31819" centerz="11" radius="1">
|
||||
<monster name="rat" x="0" y="0" z="11" spawntime="600" />
|
||||
</spawn>
|
||||
<spawn centerx="33149" centery="31823" centerz="11" radius="1">
|
||||
<monster name="rat" x="0" y="0" z="11" spawntime="60" />
|
||||
</spawn>
|
||||
<spawn centerx="33095" centery="31825" centerz="11" radius="3">
|
||||
<monster name="phantasm" x="2" y="1" z="11" spawntime="240" />
|
||||
</spawn>
|
||||
|
||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user