update data: 87e9212478978a952391aaafa1c769e382224616

// missing datapack

.github/workflows/build-ubuntu.yml

@@ -5,7 +5,11 @@ on:
   workflow_dispatch:
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
+    paths:
+      - 'src/**'
   push:
+    paths:
+      - 'src/**'
     branches:
       - main
 
@@ -31,6 +35,13 @@ jobs:
             triplet: x64-linux
 
     steps:
+      - name: Cancel Previous Runs
+        if: github.ref != 'refs/heads/main'
+        uses: fkirc/skip-duplicate-actions@master
+        with:
+          concurrent_skipping: 'same_content'
+          cancel_others: true
+
       - name: Checkout repository
         uses: actions/checkout@main
 
@@ -82,8 +93,3 @@ jobs:
           name: otxserver-${{ matrix.os }}-${{ matrix.buildtype }}-${{ github.sha }}
           path: |
             ${{ github.workspace }}/build/${{ matrix.buildtype }}/bin/
-
-      - name: Unit tests
-        run: |
-          chmod +x ${{ github.workspace }}/build/${{ matrix.buildtype }}/tests/canary_ut
-          ${{ github.workspace }}/build/${{ matrix.buildtype }}/tests/canary_ut

.github/workflows/build-windows-cmake.yml

@@ -4,7 +4,11 @@ on:
   workflow_dispatch:
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
+    paths:
+      - 'src/**'
   push:
+    paths:
+      - 'src/**'
     branches:
       - main
 env:
@@ -25,6 +29,13 @@ jobs:
             packages: >
               sccache
     steps:
+      - name: Cancel Previous Runs
+        if: github.ref != 'refs/heads/main'
+        uses: fkirc/skip-duplicate-actions@master
+        with:
+          concurrent_skipping: 'same_content'
+          cancel_others: true
+
       - name: Checkout repository
         uses: actions/checkout@main
 

.gitignore

@@ -371,6 +371,7 @@ tasks.json
 config.lua
 config_canary.lua
 client_assertions.txt
+.env
 # Extensions
 *.ini
 *.otb

cmake/modules/BaseConfig.cmake

@@ -134,8 +134,6 @@ endfunction()
 
 ## Setup shared target basic configurations
 function(setup_target TARGET_NAME)
-    set_output_directory(${TARGET_NAME})
-
     if (MSVC AND BUILD_STATIC_LIBRARY)
         set_property(TARGET ${TARGET_NAME} PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
     endif()

cmake/modules/CanaryLib.cmake

@@ -1,14 +1,23 @@
 # Define and setup CanaryLib main library target
-if(BUILD_STATIC_LIBRARY)
-    add_library(${PROJECT_NAME}_lib STATIC)
-else()
-    add_library(${PROJECT_NAME}_lib SHARED)
-endif()
-
+add_library(${PROJECT_NAME}_lib)
 setup_target(${PROJECT_NAME}_lib)
 
-# Include sources cmake file to add source files to lib
-include(Sources)
+# Add subdirectories
+add_subdirectory(config)
+add_subdirectory(creatures)
+add_subdirectory(database)
+add_subdirectory(game)
+add_subdirectory(io)
+add_subdirectory(items)
+add_subdirectory(lib)
+add_subdirectory(lua)
+add_subdirectory(map)
+add_subdirectory(security)
+add_subdirectory(server)
+add_subdirectory(utils)
+
+# Add more global sources - please add preferably in the sub_directory CMakeLists.
+target_sources(${PROJECT_NAME}_lib PRIVATE canary_server.cpp protobuf/appearances.pb.cc)
 
 # Add public pre compiler header to lib, to pass down to related targets
 target_precompile_headers(${PROJECT_NAME}_lib PUBLIC pch.hpp)

config.lua.dist

@@ -10,7 +10,7 @@ coreDirectory = "data"
 -- Set log level
 -- It can be trace, debug, info, warning, error, critical, off (default: info).
 -- NOTE: Will only display logs with level higher or equal the one set.
-logLevel = debug
+logLevel = "debug"
 
 -- Combat settings
 -- NOTE: valid values for worldType are: "pvp", "no-pvp" and "pvp-enforced"
@@ -185,6 +185,7 @@ onlyPremiumAccount = false
 -- NOTE: toggleTravelsFree will make all travels from boat free
 -- NOTE: buyAolCommandFee will add fee when player buy aol by command (!aol), active changing value more than 0 (fee value. ex: 1 = 1gp  aol will be 50001)
 -- NOTE: buyBlessCommandFee will add fee when player buy bless by command (!bless), active changing value between 1 and 100 (fee percent. ex: 3 = 3%, 30 = 30%)
+-- NOTE: teleportPlayerToVocationRoom will enable oressa to teleport player to his/her room vocation
 weatherRain = false
 thunderEffect = false
 allConsoleLog = false
@@ -198,6 +199,7 @@ toggleServerIsRetroPVP = false
 toggleTravelsFree = false
 buyAolCommandFee = 0
 buyBlessCommandFee = 0
+teleportPlayerToVocationRoom = true
 
 -- Teleport summon
 -- Set to true will never remove the summon
@@ -251,8 +253,11 @@ deathLosePercent = -1
 -- NOTE: set housePriceEachSQM to -1 to disable the ingame buy house functionality
 -- NOTE: set houseBuyLevel to 0 to disable the min level purchase functionality.
 -- Periods: daily/weekly/monthly/yearly/never
+-- Base: sqm,rent,sqm+rent
+housePriceRentMultiplier = 0.0
 housePriceEachSQM = 1000
 houseRentPeriod = "never"
+houseRentRate = 1.0
 houseOwnedByAccount = false
 houseBuyLevel = 100
 

data/XML/storages.xml

@@ -29,5 +29,6 @@ When adding a new range or storage, make sure that the ranges do not overlap, an
 		<storage name="wheel.scroll.revised" key="3" />
 		<storage name="wheel.scroll.extended" key="4" />
 		<storage name="wheel.scroll.advanced" key="5" />
+		<storage name="talkaction.potions.flask" key="6" />
 	</range>
 </storages>

data/events/scripts/player.lua

@@ -640,15 +640,5 @@ function Player:onChangeZone(zone)
 	return false
 end
 
-function Player:onChangeHazard(isHazard)
-	if not isHazard then
-		self:setHazardSystemPoints(0)
-		player:getParty():updateHazard()
-		return true
-	end
-
-	return self:updateHazard()
-end
-
 function Player:onInventoryUpdate(item, slot, equip)
 end