Merge pull request #3230 from guilherme-gm/old-job-rebalances-4

2-2 jobs skill rebalance - Sage (2018 patch/Renewal)
HerculesWS · Jun 30, 2024 · 51fe12e · 51fe12e
2 parents 6dfc58c + 852ee9e
commit 51fe12e
Show file tree

Hide file tree

Showing 21 changed files with 289 additions and 155 deletions.
diff --git a/.github/workflows/clang15_test.yml b/.github/workflows/clang15_test.yml
@@ -21,6 +21,13 @@ jobs:
         HTTPLIB: ["", "--with-http_parser=llhttp"]
         SANITIZER: ["--disable-manager", "--disable-manager --enable-sanitize=full"]
         PACKET_VERSION: ["--enable-packetver=20221024", "--enable-packetver=20130724"]
+        include:
+          # Empty CLASSIC_AUTOSPELL_LIST for every other flow
+          - CLASSIC_AUTOSPELL_LIST: ""
+          # Use "-DCLASSIC_AUTOSPELL_LIST" for 20130724 RE or we will get warnings due to the list being too small
+          - PACKET_VERSION: "--enable-packetver=20130724"
+            RENEWAL: ""
+            CLASSIC_AUTOSPELL_LIST: "-DCLASSIC_AUTOSPELL_LIST"
         exclude:
           - PACKET_VERSION: "--enable-packetver=20130724"
             CLIENT_TYPE: "--enable-packetver-zero"
@@ -52,7 +59,7 @@ jobs:
       INSTALL_PACKAGES: ${{ matrix.CC }} mariadb-client libmariadbclient-dev-compat
       SQLHOST: mariadb
       CC: ${{ matrix.CC }}
-      CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }}
+      CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} CPPFLAGS=${{ matrix.CLASSIC_AUTOSPELL_LIST }}
       PACKET_VERSION: ${{ matrix.PACKET_VERSION }}
     steps:
       - uses: actions/checkout@v1

diff --git a/.github/workflows/gcc_test.yml b/.github/workflows/gcc_test.yml
@@ -21,6 +21,13 @@ jobs:
         HTTPLIB: ["", "--with-http_parser=llhttp"]
         SANITIZER: ["--disable-manager", "--disable-manager --enable-sanitize=full"]
         PACKET_VERSION: ["--enable-packetver=20221024", "--enable-packetver=20130724"]
+        include:
+          # Empty CLASSIC_AUTOSPELL_LIST for every other flow
+          - CLASSIC_AUTOSPELL_LIST: ""
+          # Use "-DCLASSIC_AUTOSPELL_LIST" for 20130724 RE or we will get warnings due to the list being too small
+          - PACKET_VERSION: "--enable-packetver=20130724"
+            RENEWAL: ""
+            CLASSIC_AUTOSPELL_LIST: "-DCLASSIC_AUTOSPELL_LIST"
         exclude:
           - PACKET_VERSION: "--enable-packetver=20130724"
             CLIENT_TYPE: "--enable-packetver-zero"
@@ -52,7 +59,7 @@ jobs:
       INSTALL_PACKAGES: ${{ matrix.CC }} mariadb-client libmariadbclient-dev-compat
       SQLHOST: mariadb
       CC: ${{ matrix.CC }}
-      CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-lto
+      CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-lto CPPFLAGS=${{ matrix.CLASSIC_AUTOSPELL_LIST }}
       PACKET_VERSION: ${{ matrix.PACKET_VERSION }}
     steps:
       - uses: actions/checkout@v1

diff --git a/.github/workflows/gccold1.yml b/.github/workflows/gccold1.yml
@@ -22,6 +22,9 @@ jobs:
         SANITIZER: ["--disable-manager --enable-sanitize=full"]
         PACKET_VERSION: ["--enable-packetver=20100105", "--enable-packetver=20171018"]
         LTO: [""]
+        include:
+          # Use "-DCLASSIC_AUTOSPELL_LIST" for all packetver or we will get warnings due to the list being too small (since they are old)
+          - CLASSIC_AUTOSPELL_LIST: "-DCLASSIC_AUTOSPELL_LIST"
         exclude:
           - PACKET_VERSION: "--enable-packetver=20100105"
             CLIENT_TYPE: "--enable-packetver-zero"
@@ -53,7 +56,7 @@ jobs:
       INSTALL_PACKAGES: ${{ matrix.CC }} mariadb-client libmariadbclient-dev-compat
       SQLHOST: mariadb
       CC: ${{ matrix.CC }}
-      CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-epoll
+      CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-epoll CPPFLAGS=${{ matrix.CLASSIC_AUTOSPELL_LIST }}
     steps:
       - uses: actions/checkout@v1
         with:

diff --git a/.github/workflows/gccold2.yml b/.github/workflows/gccold2.yml
@@ -22,6 +22,9 @@ jobs:
         SANITIZER: ["--disable-manager --enable-sanitize=full"]
         PACKET_VERSION: ["--enable-packetver=20100105", "--enable-packetver=20171018"]
         LTO: [""]
+        include:
+          # Use "-DCLASSIC_AUTOSPELL_LIST" for all packetver or we will get warnings due to the list being too small (since they are old)
+          - CLASSIC_AUTOSPELL_LIST: "-DCLASSIC_AUTOSPELL_LIST"
         exclude:
           - PACKET_VERSION: "--enable-packetver=20100105"
             CLIENT_TYPE: "--enable-packetver-zero"
@@ -53,7 +56,7 @@ jobs:
       INSTALL_PACKAGES: ${{ matrix.CC }} mariadb-client libmariadbclient-dev-compat
       SQLHOST: mariadb
       CC: ${{ matrix.CC }}
-      CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-epoll
+      CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-epoll CPPFLAGS=${{ matrix.CLASSIC_AUTOSPELL_LIST }}
     steps:
       - uses: actions/checkout@v1
         with:

diff --git a/.github/workflows/gccold3.yml b/.github/workflows/gccold3.yml
@@ -23,6 +23,9 @@ jobs:
         SANITIZER: ["--disable-manager --enable-sanitize=full"]
         PACKET_VERSION: ["--enable-packetver=20100105", "--enable-packetver=20171018"]
         LTO: [""]
+        include:
+          # Use "-DCLASSIC_AUTOSPELL_LIST" for all packetver or we will get warnings due to the list being too small (since they are old)
+          - CLASSIC_AUTOSPELL_LIST: "-DCLASSIC_AUTOSPELL_LIST"
         exclude:
           - PACKET_VERSION: "--enable-packetver=20100105"
             CLIENT_TYPE: "--enable-packetver-zero"
@@ -54,7 +57,7 @@ jobs:
       INSTALL_PACKAGES: ${{ matrix.CC }} mariadb-client libmariadbclient-dev-compat
       SQLHOST: mariadb
       CC: ${{ matrix.CC }}
-      CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-epoll
+      CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-epoll CPPFLAGS=${{ matrix.CLASSIC_AUTOSPELL_LIST }}
     steps:
       - uses: actions/checkout@v1
         with:

diff --git a/.github/workflows/gccsnapshot_test.yml b/.github/workflows/gccsnapshot_test.yml
@@ -21,6 +21,13 @@ jobs:
         HTTPLIB: ["", "--with-http_parser=llhttp"]
         SANITIZER: ["--disable-manager", "--disable-manager --enable-sanitize=full"]
         PACKET_VERSION: ["--enable-packetver=20221024", "--enable-packetver=20130724"]
+        include:
+          # Empty CLASSIC_AUTOSPELL_LIST for every other flow
+          - CLASSIC_AUTOSPELL_LIST: ""
+          # Use "-DCLASSIC_AUTOSPELL_LIST" for 20130724 RE or we will get warnings due to the list being too small
+          - PACKET_VERSION: "--enable-packetver=20130724"
+            RENEWAL: ""
+            CLASSIC_AUTOSPELL_LIST: "-DCLASSIC_AUTOSPELL_LIST"
         exclude:
           - PACKET_VERSION: "--enable-packetver=20130724"
             CLIENT_TYPE: "--enable-packetver-zero"
@@ -52,7 +59,7 @@ jobs:
       INSTALL_PACKAGES: ${{ matrix.CC }} mariadb-client libmariadbclient-dev-compat
       SQLHOST: mariadb
       CC: ${{ matrix.CC }}
-      CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-lto
+      CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-lto CPPFLAGS=${{ matrix.CLASSIC_AUTOSPELL_LIST }}
       PACKET_VERSION: ${{ matrix.PACKET_VERSION }}
     steps:
       - uses: actions/checkout@v1

diff --git a/.github/workflows/macos_latest.yml b/.github/workflows/macos_latest.yml
@@ -22,6 +22,13 @@ jobs:
         HTTPLIB: ["", "--with-http_parser=llhttp"]
         SANITIZER: ["--disable-manager", "--disable-manager --enable-sanitize=full"]
         PACKET_VERSION: ["--enable-packetver=20221024", "--enable-packetver=20130724"]
+        include:
+          # Empty CLASSIC_AUTOSPELL_LIST for every other flow
+          - CLASSIC_AUTOSPELL_LIST: ""
+          # Use "-DCLASSIC_AUTOSPELL_LIST" for 20130724 RE or we will get warnings due to the list being too small
+          - PACKET_VERSION: "--enable-packetver=20130724"
+            RENEWAL: ""
+            CLASSIC_AUTOSPELL_LIST: "-DCLASSIC_AUTOSPELL_LIST"
         exclude:
           - PACKET_VERSION: "--enable-packetver=20130724"
             CLIENT_TYPE: "--enable-packetver-zero"
@@ -36,6 +43,7 @@ jobs:
       CC: ${{ matrix.CC }}
       CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }}
       PACKET_VERSION: ${{ matrix.PACKET_VERSION }}
+      CLASSIC_AUTOSPELL_LIST: ${{ matrix.CLASSIC_AUTOSPELL_LIST }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -47,7 +55,7 @@ jobs:
 
       - name: prepare the build environment
         run: |
-          echo "CPPFLAGS=-I$(brew --prefix)/include" >> $GITHUB_ENV
+          echo "CPPFLAGS=-I$(brew --prefix)/include $CLASSIC_AUTOSPELL_LIST" >> $GITHUB_ENV
           echo "LDFLAGS=-L$(brew --prefix)/lib" >> $GITHUB_ENV
 
       - name: install packages

diff --git a/.github/workflows/macos_m1.yml b/.github/workflows/macos_m1.yml
@@ -22,6 +22,13 @@ jobs:
         HTTPLIB: ["", "--with-http_parser=llhttp"]
         SANITIZER: ["--disable-manager", "--disable-manager --enable-sanitize=full"]
         PACKET_VERSION: ["--enable-packetver=20221024", "--enable-packetver=20130724"]
+        include:
+          # Empty CLASSIC_AUTOSPELL_LIST for every other flow
+          - CLASSIC_AUTOSPELL_LIST: ""
+          # Use "-DCLASSIC_AUTOSPELL_LIST" for 20130724 RE or we will get warnings due to the list being too small
+          - PACKET_VERSION: "--enable-packetver=20130724"
+            RENEWAL: ""
+            CLASSIC_AUTOSPELL_LIST: "-DCLASSIC_AUTOSPELL_LIST"
         exclude:
           - PACKET_VERSION: "--enable-packetver=20130724"
             CLIENT_TYPE: "--enable-packetver-zero"
@@ -36,6 +43,7 @@ jobs:
       CC: ${{ matrix.CC }}
       CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.HTTPLIB }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }}
       PACKET_VERSION: ${{ matrix.PACKET_VERSION }}
+      CLASSIC_AUTOSPELL_LIST: ${{ matrix.CLASSIC_AUTOSPELL_LIST }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -47,7 +55,7 @@ jobs:
 
       - name: prepare the build environment
         run: |
-          echo "CPPFLAGS=-I$(brew --prefix)/include" >> $GITHUB_ENV
+          echo "CPPFLAGS=-I$(brew --prefix)/include $CLASSIC_AUTOSPELL_LIST" >> $GITHUB_ENV
           echo "LDFLAGS=-L$(brew --prefix)/lib" >> $GITHUB_ENV
 
       - name: install packages

diff --git a/db/pre-re/autospell_db.conf b/db/pre-re/autospell_db.conf
@@ -44,6 +44,7 @@ autospell_db: (
 	SkillId: Skill ID/Name                             (constant string or int)
 	SkillLevel: Highest usable level                   (int, defaults to 0) (can be grouped by AutoSpell Levels)
 	                                                   (Level 0 would mean not usable in this AutoSpell level)
+	                                                   (Level "HALF_AUTOSPELL_LEVEL" uses half of casted autospell level)
 	SpiritBoost: Use max level when under Sage Spirit? (boolean, defaults to false)
 },
 **************************************************************************/

diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf
@@ -8381,7 +8381,7 @@ skill_db: (
 	}
 	InterruptCast: true
 	CastTime: 3000
-	SkillData1: {
+	SkillData1: { // Endow (SC) duration (in milliseconds)
 		Lv1: 1200000
 		Lv2: 1200000
 		Lv3: 1200000
@@ -8424,7 +8424,7 @@ skill_db: (
 	}
 	InterruptCast: true
 	CastTime: 3000
-	SkillData1: {
+	SkillData1: { // Endow (SC) duration (in milliseconds)
 		Lv1: 1200000
 		Lv2: 1200000
 		Lv3: 1200000
@@ -8467,7 +8467,7 @@ skill_db: (
 	}
 	InterruptCast: true
 	CastTime: 3000
-	SkillData1: {
+	SkillData1: { // Endow (SC) duration (in milliseconds)
 		Lv1: 1200000
 		Lv2: 1200000
 		Lv3: 1200000
@@ -8510,7 +8510,7 @@ skill_db: (
 	}
 	InterruptCast: true
 	CastTime: 3000
-	SkillData1: {
+	SkillData1: { // Endow (SC) duration (in milliseconds)
 		Lv1: 1200000
 		Lv2: 1200000
 		Lv3: 1200000
@@ -8559,7 +8559,7 @@ skill_db: (
 	}
 	InterruptCast: true
 	CastTime: 5000
-	SkillData1: {
+	SkillData1: { // Ground skill unit duration (in milliseconds)
 		Lv1: 60000
 		Lv2: 120000
 		Lv3: 180000
@@ -8620,7 +8620,7 @@ skill_db: (
 	}
 	InterruptCast: true
 	CastTime: 5000
-	SkillData1: {
+	SkillData1: { // Ground skill unit duration (in milliseconds)
 		Lv1: 60000
 		Lv2: 120000
 		Lv3: 180000
@@ -8681,7 +8681,7 @@ skill_db: (
 	}
 	InterruptCast: true
 	CastTime: 5000
-	SkillData1: {
+	SkillData1: { // Ground skill unit duration (in milliseconds)
 		Lv1: 60000
 		Lv2: 120000
 		Lv3: 180000