Skip to content

Commit

Permalink
feat: zones
Browse files Browse the repository at this point in the history
  • Loading branch information
luan committed Oct 10, 2023
1 parent 55ffdc4 commit c2c8103
Show file tree
Hide file tree
Showing 49 changed files with 3,368 additions and 2,531 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ build-release
CMakeLists.txt.user*

# RME
remeres
rme
rme.cfg
data/user
world

# Visual Studio
*.MAP
Expand Down
238 changes: 138 additions & 100 deletions CMakePresets.json
Original file line number Diff line number Diff line change
@@ -1,102 +1,140 @@
{
"version": 3,
"cmakeMinimumRequired": {
"major": 3,
"minor": 22,
"patch": 0
},
"configurePresets": [
{
"name": "windows-release",
"displayName": "Windows - Release",
"description": "Sets Ninja generator, compilers, build and install directory and set build type as release",
"generator": "Ninja",
"binaryDir": "${sourceDir}/build/${presetName}",
"cacheVariables": {
"CMAKE_TOOLCHAIN_FILE": {
"value": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
"type": "FILEPATH"
},
"VCPKG_TARGET_TRIPLET": "x64-windows-static",
"CMAKE_BUILD_TYPE": "Release",
"OPTIONS_ENABLE_SCCACHE": "ON"
},
"architecture": {
"value": "x64",
"strategy": "external"
},
"vendor": {
"microsoft.com/VisualStudioSettings/CMake/1.0": {
"hostOS": [ "Windows" ]
}
},
"condition": {
"type": "equals",
"lhs": "${hostSystemName}",
"rhs": "Windows"
}
},
{
"name": "linux-release",
"displayName": "Linux - Release",
"description": "Sets Ninja generator, compilers, build and install directory and set build type as release",
"generator": "Ninja",
"binaryDir": "${sourceDir}/build/${presetName}",
"cacheVariables": {
"CMAKE_TOOLCHAIN_FILE": {
"value": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
"type": "FILEPATH"
},
"CMAKE_BUILD_TYPE": "Release",
"OPTIONS_ENABLE_CCACHE": "ON"
},
"condition": {
"type": "equals",
"lhs": "${hostSystemName}",
"rhs": "Linux"
}
},
{
"name": "windows-debug",
"inherits": "windows-release",
"displayName": "Windows - Debug",
"description": "Build Debug Mode",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"DEBUG_LOG": "ON"
},
"architecture": {
"value": "x64",
"strategy": "external"
}
},
{
"name": "linux-debug",
"inherits": "linux-release",
"displayName": "Linux - Debug Build",
"description": "Build Debug Mode",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"DEBUG_LOG": "ON"
}
}
],
"buildPresets": [
{
"name": "linux-release",
"configurePreset": "linux-release"
},
{
"name": "linux-debug",
"configurePreset": "linux-debug"
},
{
"name": "windows-release",
"configurePreset": "windows-release"
},
{
"name": "windows-Xdebug",
"configurePreset": "windows-debug"
}
]
"version": 3,
"cmakeMinimumRequired": {
"major": 3,
"minor": 22,
"patch": 0
},
"configurePresets": [
{
"name": "windows-release",
"displayName": "Windows - Release",
"description": "Sets Ninja generator, compilers, build and install directory and set build type as release",
"generator": "Ninja",
"binaryDir": "${sourceDir}/build/${presetName}",
"cacheVariables": {
"CMAKE_TOOLCHAIN_FILE": {
"value": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
"type": "FILEPATH"
},
"VCPKG_TARGET_TRIPLET": "x64-windows-static",
"CMAKE_BUILD_TYPE": "Release",
"OPTIONS_ENABLE_SCCACHE": "ON"
},
"architecture": {
"value": "x64",
"strategy": "external"
},
"vendor": {
"microsoft.com/VisualStudioSettings/CMake/1.0": {
"hostOS": ["Windows"]
}
},
"condition": {
"type": "equals",
"lhs": "${hostSystemName}",
"rhs": "Windows"
}
},
{
"name": "linux-release",
"displayName": "Linux - Release",
"description": "Sets Ninja generator, compilers, build and install directory and set build type as release",
"generator": "Ninja",
"binaryDir": "${sourceDir}/build/${presetName}",
"cacheVariables": {
"CMAKE_TOOLCHAIN_FILE": {
"value": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
"type": "FILEPATH"
},
"CMAKE_BUILD_TYPE": "Release",
"OPTIONS_ENABLE_CCACHE": "ON"
},
"condition": {
"type": "equals",
"lhs": "${hostSystemName}",
"rhs": "Linux"
}
},
{
"name": "macos-release",
"displayName": "macOS - Release",
"description": "Sets Ninja generator, compilers, build and install directory and set build type as release",
"generator": "Ninja",
"binaryDir": "${sourceDir}/build/${presetName}",
"cacheVariables": {
"CMAKE_TOOLCHAIN_FILE": {
"value": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
"type": "FILEPATH"
},
"CMAKE_BUILD_TYPE": "Release",
"OPTIONS_ENABLE_CCACHE": "ON"
},
"condition": {
"type": "equals",
"lhs": "${hostSystemName}",
"rhs": "Darwin"
}
},
{
"name": "windows-debug",
"inherits": "windows-release",
"displayName": "Windows - Debug",
"description": "Build Debug Mode",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"DEBUG_LOG": "ON"
},
"architecture": {
"value": "x64",
"strategy": "external"
}
},
{
"name": "linux-debug",
"inherits": "linux-release",
"displayName": "Linux - Debug Build",
"description": "Build Debug Mode",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"DEBUG_LOG": "ON"
}
},
{
"name": "macos-debug",
"inherits": "macos-release",
"displayName": "macOS - Debug Build",
"description": "Build Debug Mode",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"DEBUG_LOG": "ON"
}
}
],
"buildPresets": [
{
"name": "linux-release",
"configurePreset": "linux-release"
},
{
"name": "linux-debug",
"configurePreset": "linux-debug"
},
{
"name": "windows-release",
"configurePreset": "windows-release"
},
{
"name": "windows-Xdebug",
"configurePreset": "windows-debug"
},
{
"name": "macos-release",
"configurePreset": "macos-release"
},
{
"name": "macos-debug",
"configurePreset": "macos-debug"
}
]
}
14 changes: 7 additions & 7 deletions data/creatures/monsters.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<monster name="Abyssador" looktype="495" />
<monster name="Abyssal Calamary" looktype="451" />
<monster name="Achad" looktype="146" lookhead="93" lookbody="93" looklegs="57" lookfeet="97" lookaddons="3" />
<monster name="Acid Blob" looktype="314" />
<monster name="Acid Blob" looktype="315" />
<monster name="Acolyte Of Darkness" looktype="9" />
<monster name="Acolyte Of The Cult" looktype="194" lookhead="114" lookbody="121" looklegs="121" lookfeet="57" lookaddons="0" />
<monster name="Adept Of The Cult" looktype="194" lookhead="114" lookbody="94" looklegs="94" lookfeet="57" lookaddons="0" />
Expand Down Expand Up @@ -228,7 +228,7 @@
<monster name="Cult Believer" looktype="132" lookhead="98" lookbody="77" looklegs="39" lookfeet="57" lookaddons="1" />
<monster name="Cult Enforcer" looktype="134" lookhead="114" lookbody="19" looklegs="76" lookfeet="76" lookaddons="1" />
<monster name="Cult Scholar" looktype="145" />
<monster name="Cursed Ape" looktype="1592" />
<monster name="Cursed Ape" looktype="1506" />
<monster name="Cursed Book" looktype="1061" lookhead="79" lookbody="83" looklegs="113" lookfeet="0" lookaddons="0" />
<monster name="Cursed Gladiator" looktype="100" />
<monster name="Cursed Prospector" looktype="1268" />
Expand Down Expand Up @@ -616,11 +616,10 @@
<monster name="Ice Witch" looktype="149" />
<monster name="Icecold Book" looktype="1061" lookhead="87" lookbody="85" looklegs="79" lookfeet="0" lookaddons="0" />
<monster name="Icicle" looktype="904" />
<monster name="Iks Ahpututu" looktype="1590" />
<monster name="Iks Aucar" looktype="1587" />
<monster name="Iks Chuka" looktype="1588" />
<monster name="Iks Churrascan" looktype="1587" />
<monster name="Iks Pututu" looktype="1589" />
<monster name="Iks Ahpututu" looktype="1509" />
<monster name="Iks Aucar" looktype="1507" />
<monster name="Iks Chuka" looktype="1508" />
<monster name="Iks Pututu" looktype="1508" />
<monster name="Imp Intruder" looktype="237" />
<monster name="Incineron" looktype="243" />
<monster name="Incredibly Old Witch" looktype="54" />
Expand Down Expand Up @@ -1408,4 +1407,5 @@
<monster name="Zugurosh" looktype="12" lookhead="2" lookbody="35" looklegs="57" lookfeet="91" lookaddons="0" />
<monster name="Zulazza The Corruptor" looktype="334" />
<monster name="Zushuka" looktype="149" lookhead="86" lookbody="12" looklegs="31" lookfeet="60" lookaddons="0" />
<monster name="Elf Overseer" looktype="159" lookhead="57" lookbody="95" looklegs="114" lookfeet="116" lookaddons="0" />
</monsters>
2 changes: 2 additions & 0 deletions data/menubar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
<item name="Replace Items on Selection" action="REPLACE_ON_SELECTION_ITEMS" help="Replace items on selected area."/>
<item name="Find Item on Selection" action="SEARCH_ON_SELECTION_ITEM" help="Find items on selected area."/>
<item name="Remove Item on Selection" action="REMOVE_ON_SELECTION_ITEM" help="Remove item on selected area."/>
<item name="Remove Monsters on Selection" action="REMOVE_ON_SELECTION_MONSTER" help="Remove monsters on selected area."/>
<separator/>
<menu name="$Find on Selection">
<item name="Find $Everything" action="SEARCH_ON_SELECTION_EVERYTHING" help="Find all unique/action/text/container items."/>
Expand Down Expand Up @@ -157,6 +158,7 @@
<item name="$Creature Palette" hotkey="C" action="SELECT_MONSTER" help="Select the Creature palette."/>
<item name="$Npc Palette" hotkey="N" action="SELECT_NPC" help="Select the Npc palette."/>
<item name="$Waypoint Palette" hotkey="W" action="SELECT_WAYPOINT" help="Select the Waypoint palette."/>
<item name="$Zones Palette" hotkey="Z" action="SELECT_ZONES" help="Select the Zones palette."/>
<item name="$RAW Palette" hotkey="R" action="SELECT_RAW" help="Select the RAW palette."/>
</menu>
<!--
Expand Down
8 changes: 5 additions & 3 deletions source/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ project(remeres)

find_package(asio CONFIG REQUIRED)
find_package(fmt CONFIG REQUIRED)
find_package(GLUT REQUIRED)
find_package(glfw3 CONFIG REQUIRED)
find_package(nlohmann_json CONFIG REQUIRED)
find_package(OpenGL REQUIRED)
find_package(Threads REQUIRED)
Expand Down Expand Up @@ -171,6 +171,7 @@ target_sources(${PROJECT_NAME}
palette_house.cpp
palette_npc.cpp
palette_waypoints.cpp
palette_zones.cpp
palette_window.cpp
pngfiles.cpp
preferences.cpp
Expand Down Expand Up @@ -199,20 +200,21 @@ target_sources(${PROJECT_NAME}
waypoint_brush.cpp
waypoints.cpp
welcome_dialog.cpp
zone_brush.cpp
zones.cpp
)

target_include_directories(${PROJECT_NAME}
PRIVATE
${CMAKE_SOURCE_DIR}/source
${OPENGL_INCLUDE_DIR}
${GLUT_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIR}
)

target_link_libraries(${PROJECT_NAME}
PRIVATE
${OPENGL_LIBRARIES}
${GLUT_LIBRARIES}
glfw
${ZLIB_LIBRARIES}
fmt::fmt
asio::asio
Expand Down
Loading

0 comments on commit c2c8103

Please sign in to comment.