From 815c329c0c6743c4009cbbd2f07f588a222c93fb Mon Sep 17 00:00:00 2001 From: Pagani Walter Date: Thu, 23 Jun 2022 02:04:19 -0300 Subject: [PATCH] Updating the emulator --- .github/workflows/core-build.yml | 47 ++----------------- sql/characters/base/create_table.sql | 7 --- sql/{auth => db-auth}/updates/.gitkeep | 0 sql/db-characters/base/create_table.sql | 8 ++++ .../updates/.gitkeep | 0 .../base/reagent_bank_NPC.sql | 2 + sql/{world => db-world}/updates/.gitkeep | 0 src/ReagentBank_loader.cpp | 1 - 8 files changed, 15 insertions(+), 50 deletions(-) delete mode 100644 sql/characters/base/create_table.sql rename sql/{auth => db-auth}/updates/.gitkeep (100%) create mode 100644 sql/db-characters/base/create_table.sql rename sql/{characters => db-characters}/updates/.gitkeep (100%) rename sql/{world => db-world}/base/reagent_bank_NPC.sql (99%) rename sql/{world => db-world}/updates/.gitkeep (100%) diff --git a/.github/workflows/core-build.yml b/.github/workflows/core-build.yml index f66f694..921c9eb 100644 --- a/.github/workflows/core-build.yml +++ b/.github/workflows/core-build.yml @@ -1,49 +1,12 @@ name: core-build on: push: + branches: + - 'master' pull_request: jobs: build: - strategy: - fail-fast: false - matrix: - compiler: [clang] - runs-on: ubuntu-latest - name: ${{ matrix.compiler }} - env: - COMPILER: ${{ matrix.compiler }} - steps: - - uses: actions/checkout@v2 - with: - repository: 'azerothcore/azerothcore-wotlk' - ref: 'master' - submodules: 'recursive' - - uses: actions/checkout@v2 - with: - submodules: 'recursive' - path: 'modules/skeleton-module' - - name: Cache - uses: actions/cache@v2 - with: - path: /home/runner/.ccache - key: ccache:${{ matrix.compiler }}:${{ github.ref }}:${{ github.sha }} - restore-keys: | - ccache:${{ matrix.compiler }}:${{ github.ref }} - ccache:${{ matrix.compiler }} - - name: Configure OS - run: source ./acore.sh install-deps - env: - CONTINUOUS_INTEGRATION: true - - name: Create conf/config.sh - run: source ./apps/ci/ci-conf.sh - - name: Import db - run: source ./apps/ci/ci-import-db.sh - - name: Build - run: source ./apps/ci/ci-compile.sh - - name: Dry run - run: source ./apps/ci/ci-worldserver-dry-run.sh - - name: Check startup errors - run: source ./apps/ci/ci-error-check.sh - - name: Run unit tests - run: source ./apps/ci/ci-run-unit-tests.sh + uses: azerothcore/reusable-workflows/.github/workflows/core_build_modules.yml@main + with: + module_repo: ${{ github.event.repository.name }} diff --git a/sql/characters/base/create_table.sql b/sql/characters/base/create_table.sql deleted file mode 100644 index 8d3e274..0000000 --- a/sql/characters/base/create_table.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE TABLE IF NOT EXISTS `custom_reagent_bank` ( - `character_id` int(11) NOT NULL, - `item_entry` int(11) NOT NULL, - `item_subclass` int(11) NOT NULL, - `amount` int(11) NOT NULL, - PRIMARY KEY (`character_id`,`item_entry`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/sql/auth/updates/.gitkeep b/sql/db-auth/updates/.gitkeep similarity index 100% rename from sql/auth/updates/.gitkeep rename to sql/db-auth/updates/.gitkeep diff --git a/sql/db-characters/base/create_table.sql b/sql/db-characters/base/create_table.sql new file mode 100644 index 0000000..3a12c70 --- /dev/null +++ b/sql/db-characters/base/create_table.sql @@ -0,0 +1,8 @@ + +CREATE TABLE IF NOT EXISTS `custom_reagent_bank` ( + `character_id` int(11) NOT NULL, + `item_entry` int(11) NOT NULL, + `item_subclass` int(11) NOT NULL, + `amount` int(11) NOT NULL, + PRIMARY KEY (`character_id`,`item_entry`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/sql/characters/updates/.gitkeep b/sql/db-characters/updates/.gitkeep similarity index 100% rename from sql/characters/updates/.gitkeep rename to sql/db-characters/updates/.gitkeep diff --git a/sql/world/base/reagent_bank_NPC.sql b/sql/db-world/base/reagent_bank_NPC.sql similarity index 99% rename from sql/world/base/reagent_bank_NPC.sql rename to sql/db-world/base/reagent_bank_NPC.sql index a6ca124..a70c5e7 100644 --- a/sql/world/base/reagent_bank_NPC.sql +++ b/sql/db-world/base/reagent_bank_NPC.sql @@ -1,6 +1,8 @@ + SET @Entry = 190011, @Name = "Ling"; + DELETE FROM `creature_template` WHERE `entry` = @Entry; INSERT INTO `creature_template` (`entry`, `modelid1`, `modelid2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `scale`, `rank`, `dmgschool`, `baseattacktime`, `rangeattacktime`, `unit_class`, `unit_flags`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `AIName`, `MovementType`, `HoverHeight`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `flags_extra`, `ScriptName`) VALUES diff --git a/sql/world/updates/.gitkeep b/sql/db-world/updates/.gitkeep similarity index 100% rename from sql/world/updates/.gitkeep rename to sql/db-world/updates/.gitkeep diff --git a/src/ReagentBank_loader.cpp b/src/ReagentBank_loader.cpp index aa59485..8e974d0 100644 --- a/src/ReagentBank_loader.cpp +++ b/src/ReagentBank_loader.cpp @@ -12,4 +12,3 @@ void Addmod_reagent_bankScripts() { AddSC_mod_reagent_bank(); } -