summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-04-10 22:59:35 +0300
committerAndrei Karas <akaras@inbox.ru>2015-04-10 22:59:35 +0300
commitdf8247b810ece6ab47bdc83b70b10040094024fe (patch)
tree56d9a63cbece4a9559939deca668c0e007c30eac /db
parentf7a4c50eb2ec90840394b9e5845423b51e46a31b (diff)
downloadserverdata-df8247b810ece6ab47bdc83b70b10040094024fe.tar.gz
serverdata-df8247b810ece6ab47bdc83b70b10040094024fe.tar.bz2
serverdata-df8247b810ece6ab47bdc83b70b10040094024fe.tar.xz
serverdata-df8247b810ece6ab47bdc83b70b10040094024fe.zip
Update configuration files from hercules.
Diffstat (limited to 'db')
-rw-r--r--db/re/job_db.conf380
-rw-r--r--db/re/job_db1.txt13
-rw-r--r--db/re/size_fix.txt4
-rw-r--r--db/re/skill_cast_db.txt2
-rw-r--r--db/re/skill_db.txt14
-rw-r--r--db/re/skill_unit_db.txt17
-rw-r--r--db/sc_config.txt2
7 files changed, 402 insertions, 30 deletions
diff --git a/db/re/job_db.conf b/db/re/job_db.conf
new file mode 100644
index 00000000..71f4a034
--- /dev/null
+++ b/db/re/job_db.conf
@@ -0,0 +1,380 @@
+//====================================================
+//= _ _ _
+//= | | | | | |
+//= | |_| | ___ _ __ ___ _ _| | ___ ___
+//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __|
+//= | | | | __/ | | (__| |_| | | __/\__ \
+//= \_| |_/\___|_| \___|\__,_|_|\___||___/
+//=
+//= http://hercules.ws/board/
+//================= More Information =================
+// http://hercules.ws/board/topic/9082-job-db1txt-redesign/
+//============== RE Structure Example ================
+/*
+Job_Name: { // Job names as in src/map/pc.c (they are hardcoded at the moment so if you want to add a new job you should add it there)
+ Inherit: ( "Other_Job_Name" ); // Base job from which this job will inherit its max weight, base ASPD set and HP/SP table.
+ InheritHP: ( "Other_Job_Name" );// Base job from which this job will inherit its HP table.
+ InheritSP: ( "Other_Job_Name" );// Base job from which this job will inherit its SP table.
+ Weight: Max Weight (int, defaults to 20000, units in Weight/10)
+ BaseASPD: { // Base ASPD for specific weapon type
+ Fist: 0~200 (int, defaults to 200)
+ Dagger: 0~200 (int, defaults to 200)
+ Sword: 0~200 (int, defaults to 200)
+ TwoHandSword: 0~200 (int, defaults to 200)
+ Spear: 0~200 (int, defaults to 200)
+ TwoHandSpear: 0~200 (int, defaults to 200)
+ Axe: 0~200 (int, defaults to 200)
+ TwoHandAxe: 0~200 (int, defaults to 200)
+ Mace: 0~200 (int, defaults to 200)
+ TwoHandMace: 0~200 (int, defaults to 200)
+ Rod: 0~200 (int, defaults to 200)
+ Bow: 0~200 (int, defaults to 200)
+ Knuckle: 0~200 (int, defaults to 200)
+ Instrumen: 0~200 (int, defaults to 200)
+ Whip: 0~200 (int, defaults to 200)
+ Book: 0~200 (int, defaults to 200)
+ Katar: 0~200 (int, defaults to 200)
+ Revolver: 0~200 (int, defaults to 200)
+ Rifle: 0~200 (int, defaults to 200)
+ GatlingGun: 0~200 (int, defaults to 200)
+ Shotgun: 0~200 (int, defaults to 200)
+ GrenadeLauncher: 0~200 (int, defaults to 200)
+ FuumaShuriken: 0~200 (int, defaults to 200)
+ TwoHandRod: 0~200 (int, defaults to 200)
+ Shield: 0~200 (int, defaults to 0)
+ }
+ HPTable:[ 1, .... 150 ] (int[]) Reference table for base HP per level
+ SPTable:[ 1, .... 150 ] (int[]) Reference table for base SP per level
+ // Note: If table index size is smaller than the max level the server will automatically generate the missing index based on the average increase per level.
+}
+*/
+//====================================================
+Human: {
+ Weight: 20000
+ BaseASPD: {
+ Fist: 40
+ Dagger: 55
+ Sword: 57
+ Axe: 50
+ Mace: 50
+ TwoHandMace: 55
+ Rod: 65
+ TwoHandRod: 65
+ Shield: 10
+ }
+ HPTable:[ 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, // 1 - 10
+ 90, 95, 100, 105, 110, 115, 120, 125, 130, 135, // 11 - 20
+ 140, 145, 150, 155, 160, 165, 170, 175, 180, 185, // 21 - 30
+ 190, 195, 200, 205, 210, 215, 220, 225, 230, 235, // 31 - 40
+ 240, 245, 250, 255, 260, 265, 270, 275, 280, 285, // 41 - 50
+ 290, 295, 300, 305, 310, 315, 320, 325, 330, 335, // 51 - 60
+ 340, 345, 350, 355, 360, 365, 370, 375, 380, 385, // 61 - 70
+ 390, 395, 400, 405, 410, 415, 420, 425, 430, 435, // 71 - 80
+ 440, 445, 450, 455, 460, 465, 470, 475, 480, 485, // 81 - 90
+ 490, 495, 500, 505, 510, 515, 520, 525, 530, 535, // 91 - 100
+ 540, 545, 550, 555, 560, 565, 570, 575, 580, 585, // 101 - 110
+ 590, 595, 600, 605, 610, 615, 620, 625, 630, 635, // 111 - 120
+ 640, 645, 650, 655, 660, 665, 670, 675, 680, 685, // 121 - 130
+ 690, 695, 700, 705, 710, 715, 720, 725, 730, 735, // 131 - 140
+ 740, 745, 750, 755, 760, 765, 770, 775, 780, 785, // 141 - 150
+ 790, 795, 800, 805, 810, 815, 820, 825, 830, 835] // 151 - 160
+ SPTable:[ 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 1 - 10
+ 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 11 - 20
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, // 21 - 30
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, // 31 - 40
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, // 41 - 50
+ 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, // 51 - 60
+ 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, // 61 - 70
+ 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, // 71 - 80
+ 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, // 81 - 90
+ 101, 102, 103, 104, 105, 106, 107, 108, 109, 100, // 91 - 100
+ 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, // 101 - 110
+ 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, // 111 - 120
+ 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, // 121 - 130
+ 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, // 131 - 140
+ 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, // 141 - 150
+ 151, 152, 153, 154, 155, 156, 157, 158, 159, 160] // 151 - 160
+}
+
+Ukar: {
+ Weight: 20000
+ BaseASPD: {
+ Fist: 40
+ Dagger: 55
+ Sword: 57
+ Axe: 50
+ Mace: 50
+ TwoHandMace: 55
+ Rod: 65
+ TwoHandRod: 65
+ Shield: 10
+ }
+ HPTable:[ 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, // 1 - 10
+ 90, 95, 100, 105, 110, 115, 120, 125, 130, 135, // 11 - 20
+ 140, 145, 150, 155, 160, 165, 170, 175, 180, 185, // 21 - 30
+ 190, 195, 200, 205, 210, 215, 220, 225, 230, 235, // 31 - 40
+ 240, 245, 250, 255, 260, 265, 270, 275, 280, 285, // 41 - 50
+ 290, 295, 300, 305, 310, 315, 320, 325, 330, 335, // 51 - 60
+ 340, 345, 350, 355, 360, 365, 370, 375, 380, 385, // 61 - 70
+ 390, 395, 400, 405, 410, 415, 420, 425, 430, 435, // 71 - 80
+ 440, 445, 450, 455, 460, 465, 470, 475, 480, 485, // 81 - 90
+ 490, 495, 500, 505, 510, 515, 520, 525, 530, 535, // 91 - 100
+ 540, 545, 550, 555, 560, 565, 570, 575, 580, 585, // 101 - 110
+ 590, 595, 600, 605, 610, 615, 620, 625, 630, 635, // 111 - 120
+ 640, 645, 650, 655, 660, 665, 670, 675, 680, 685, // 121 - 130
+ 690, 695, 700, 705, 710, 715, 720, 725, 730, 735, // 131 - 140
+ 740, 745, 750, 755, 760, 765, 770, 775, 780, 785, // 141 - 150
+ 790, 795, 800, 805, 810, 815, 820, 825, 830, 835] // 151 - 160
+ SPTable:[ 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 1 - 10
+ 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 11 - 20
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, // 21 - 30
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, // 31 - 40
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, // 41 - 50
+ 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, // 51 - 60
+ 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, // 61 - 70
+ 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, // 71 - 80
+ 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, // 81 - 90
+ 101, 102, 103, 104, 105, 106, 107, 108, 109, 100, // 91 - 100
+ 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, // 101 - 110
+ 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, // 111 - 120
+ 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, // 121 - 130
+ 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, // 131 - 140
+ 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, // 141 - 150
+ 151, 152, 153, 154, 155, 156, 157, 158, 159, 160] // 151 - 160
+}
+
+Demon: {
+ Weight: 20000
+ BaseASPD: {
+ Fist: 40
+ Dagger: 55
+ Sword: 57
+ Axe: 50
+ Mace: 50
+ TwoHandMace: 55
+ Rod: 65
+ TwoHandRod: 65
+ Shield: 10
+ }
+ HPTable:[ 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, // 1 - 10
+ 90, 95, 100, 105, 110, 115, 120, 125, 130, 135, // 11 - 20
+ 140, 145, 150, 155, 160, 165, 170, 175, 180, 185, // 21 - 30
+ 190, 195, 200, 205, 210, 215, 220, 225, 230, 235, // 31 - 40
+ 240, 245, 250, 255, 260, 265, 270, 275, 280, 285, // 41 - 50
+ 290, 295, 300, 305, 310, 315, 320, 325, 330, 335, // 51 - 60
+ 340, 345, 350, 355, 360, 365, 370, 375, 380, 385, // 61 - 70
+ 390, 395, 400, 405, 410, 415, 420, 425, 430, 435, // 71 - 80
+ 440, 445, 450, 455, 460, 465, 470, 475, 480, 485, // 81 - 90
+ 490, 495, 500, 505, 510, 515, 520, 525, 530, 535, // 91 - 100
+ 540, 545, 550, 555, 560, 565, 570, 575, 580, 585, // 101 - 110
+ 590, 595, 600, 605, 610, 615, 620, 625, 630, 635, // 111 - 120
+ 640, 645, 650, 655, 660, 665, 670, 675, 680, 685, // 121 - 130
+ 690, 695, 700, 705, 710, 715, 720, 725, 730, 735, // 131 - 140
+ 740, 745, 750, 755, 760, 765, 770, 775, 780, 785, // 141 - 150
+ 790, 795, 800, 805, 810, 815, 820, 825, 830, 835] // 151 - 160
+ SPTable:[ 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 1 - 10
+ 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 11 - 20
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, // 21 - 30
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, // 31 - 40
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, // 41 - 50
+ 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, // 51 - 60
+ 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, // 61 - 70
+ 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, // 71 - 80
+ 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, // 81 - 90
+ 101, 102, 103, 104, 105, 106, 107, 108, 109, 100, // 91 - 100
+ 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, // 101 - 110
+ 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, // 111 - 120
+ 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, // 121 - 130
+ 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, // 131 - 140
+ 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, // 141 - 150
+ 151, 152, 153, 154, 155, 156, 157, 158, 159, 160] // 151 - 160
+}
+
+Elven: {
+ Weight: 20000
+ BaseASPD: {
+ Fist: 40
+ Dagger: 55
+ Sword: 57
+ Axe: 50
+ Mace: 50
+ TwoHandMace: 55
+ Rod: 65
+ TwoHandRod: 65
+ Shield: 10
+ }
+ HPTable:[ 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, // 1 - 10
+ 90, 95, 100, 105, 110, 115, 120, 125, 130, 135, // 11 - 20
+ 140, 145, 150, 155, 160, 165, 170, 175, 180, 185, // 21 - 30
+ 190, 195, 200, 205, 210, 215, 220, 225, 230, 235, // 31 - 40
+ 240, 245, 250, 255, 260, 265, 270, 275, 280, 285, // 41 - 50
+ 290, 295, 300, 305, 310, 315, 320, 325, 330, 335, // 51 - 60
+ 340, 345, 350, 355, 360, 365, 370, 375, 380, 385, // 61 - 70
+ 390, 395, 400, 405, 410, 415, 420, 425, 430, 435, // 71 - 80
+ 440, 445, 450, 455, 460, 465, 470, 475, 480, 485, // 81 - 90
+ 490, 495, 500, 505, 510, 515, 520, 525, 530, 535, // 91 - 100
+ 540, 545, 550, 555, 560, 565, 570, 575, 580, 585, // 101 - 110
+ 590, 595, 600, 605, 610, 615, 620, 625, 630, 635, // 111 - 120
+ 640, 645, 650, 655, 660, 665, 670, 675, 680, 685, // 121 - 130
+ 690, 695, 700, 705, 710, 715, 720, 725, 730, 735, // 131 - 140
+ 740, 745, 750, 755, 760, 765, 770, 775, 780, 785, // 141 - 150
+ 790, 795, 800, 805, 810, 815, 820, 825, 830, 835] // 151 - 160
+ SPTable:[ 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 1 - 10
+ 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 11 - 20
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, // 21 - 30
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, // 31 - 40
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, // 41 - 50
+ 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, // 51 - 60
+ 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, // 61 - 70
+ 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, // 71 - 80
+ 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, // 81 - 90
+ 101, 102, 103, 104, 105, 106, 107, 108, 109, 100, // 91 - 100
+ 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, // 101 - 110
+ 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, // 111 - 120
+ 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, // 121 - 130
+ 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, // 131 - 140
+ 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, // 141 - 150
+ 151, 152, 153, 154, 155, 156, 157, 158, 159, 160] // 151 - 160
+}
+
+Orc: {
+ Weight: 20000
+ BaseASPD: {
+ Fist: 40
+ Dagger: 55
+ Sword: 57
+ Axe: 50
+ Mace: 50
+ TwoHandMace: 55
+ Rod: 65
+ TwoHandRod: 65
+ Shield: 10
+ }
+ HPTable:[ 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, // 1 - 10
+ 90, 95, 100, 105, 110, 115, 120, 125, 130, 135, // 11 - 20
+ 140, 145, 150, 155, 160, 165, 170, 175, 180, 185, // 21 - 30
+ 190, 195, 200, 205, 210, 215, 220, 225, 230, 235, // 31 - 40
+ 240, 245, 250, 255, 260, 265, 270, 275, 280, 285, // 41 - 50
+ 290, 295, 300, 305, 310, 315, 320, 325, 330, 335, // 51 - 60
+ 340, 345, 350, 355, 360, 365, 370, 375, 380, 385, // 61 - 70
+ 390, 395, 400, 405, 410, 415, 420, 425, 430, 435, // 71 - 80
+ 440, 445, 450, 455, 460, 465, 470, 475, 480, 485, // 81 - 90
+ 490, 495, 500, 505, 510, 515, 520, 525, 530, 535, // 91 - 100
+ 540, 545, 550, 555, 560, 565, 570, 575, 580, 585, // 101 - 110
+ 590, 595, 600, 605, 610, 615, 620, 625, 630, 635, // 111 - 120
+ 640, 645, 650, 655, 660, 665, 670, 675, 680, 685, // 121 - 130
+ 690, 695, 700, 705, 710, 715, 720, 725, 730, 735, // 131 - 140
+ 740, 745, 750, 755, 760, 765, 770, 775, 780, 785, // 141 - 150
+ 790, 795, 800, 805, 810, 815, 820, 825, 830, 835] // 151 - 160
+ SPTable:[ 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 1 - 10
+ 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 11 - 20
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, // 21 - 30
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, // 31 - 40
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, // 41 - 50
+ 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, // 51 - 60
+ 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, // 61 - 70
+ 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, // 71 - 80
+ 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, // 81 - 90
+ 101, 102, 103, 104, 105, 106, 107, 108, 109, 100, // 91 - 100
+ 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, // 101 - 110
+ 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, // 111 - 120
+ 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, // 121 - 130
+ 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, // 131 - 140
+ 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, // 141 - 150
+ 151, 152, 153, 154, 155, 156, 157, 158, 159, 160] // 151 - 160
+}
+
+Raijin: {
+ Weight: 20000
+ BaseASPD: {
+ Fist: 40
+ Dagger: 55
+ Sword: 57
+ Axe: 50
+ Mace: 50
+ TwoHandMace: 55
+ Rod: 65
+ TwoHandRod: 65
+ Shield: 10
+ }
+ HPTable:[ 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, // 1 - 10
+ 90, 95, 100, 105, 110, 115, 120, 125, 130, 135, // 11 - 20
+ 140, 145, 150, 155, 160, 165, 170, 175, 180, 185, // 21 - 30
+ 190, 195, 200, 205, 210, 215, 220, 225, 230, 235, // 31 - 40
+ 240, 245, 250, 255, 260, 265, 270, 275, 280, 285, // 41 - 50
+ 290, 295, 300, 305, 310, 315, 320, 325, 330, 335, // 51 - 60
+ 340, 345, 350, 355, 360, 365, 370, 375, 380, 385, // 61 - 70
+ 390, 395, 400, 405, 410, 415, 420, 425, 430, 435, // 71 - 80
+ 440, 445, 450, 455, 460, 465, 470, 475, 480, 485, // 81 - 90
+ 490, 495, 500, 505, 510, 515, 520, 525, 530, 535, // 91 - 100
+ 540, 545, 550, 555, 560, 565, 570, 575, 580, 585, // 101 - 110
+ 590, 595, 600, 605, 610, 615, 620, 625, 630, 635, // 111 - 120
+ 640, 645, 650, 655, 660, 665, 670, 675, 680, 685, // 121 - 130
+ 690, 695, 700, 705, 710, 715, 720, 725, 730, 735, // 131 - 140
+ 740, 745, 750, 755, 760, 765, 770, 775, 780, 785, // 141 - 150
+ 790, 795, 800, 805, 810, 815, 820, 825, 830, 835] // 151 - 160
+ SPTable:[ 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 1 - 10
+ 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 11 - 20
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, // 21 - 30
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, // 31 - 40
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, // 41 - 50
+ 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, // 51 - 60
+ 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, // 61 - 70
+ 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, // 71 - 80
+ 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, // 81 - 90
+ 101, 102, 103, 104, 105, 106, 107, 108, 109, 100, // 91 - 100
+ 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, // 101 - 110
+ 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, // 111 - 120
+ 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, // 121 - 130
+ 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, // 131 - 140
+ 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, // 141 - 150
+ 151, 152, 153, 154, 155, 156, 157, 158, 159, 160] // 151 - 160
+}
+
+Tritan: {
+ Weight: 20000
+ BaseASPD: {
+ Fist: 40
+ Dagger: 55
+ Sword: 57
+ Axe: 50
+ Mace: 50
+ TwoHandMace: 55
+ Rod: 65
+ TwoHandRod: 65
+ Shield: 10
+ }
+ HPTable:[ 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, // 1 - 10
+ 90, 95, 100, 105, 110, 115, 120, 125, 130, 135, // 11 - 20
+ 140, 145, 150, 155, 160, 165, 170, 175, 180, 185, // 21 - 30
+ 190, 195, 200, 205, 210, 215, 220, 225, 230, 235, // 31 - 40
+ 240, 245, 250, 255, 260, 265, 270, 275, 280, 285, // 41 - 50
+ 290, 295, 300, 305, 310, 315, 320, 325, 330, 335, // 51 - 60
+ 340, 345, 350, 355, 360, 365, 370, 375, 380, 385, // 61 - 70
+ 390, 395, 400, 405, 410, 415, 420, 425, 430, 435, // 71 - 80
+ 440, 445, 450, 455, 460, 465, 470, 475, 480, 485, // 81 - 90
+ 490, 495, 500, 505, 510, 515, 520, 525, 530, 535, // 91 - 100
+ 540, 545, 550, 555, 560, 565, 570, 575, 580, 585, // 101 - 110
+ 590, 595, 600, 605, 610, 615, 620, 625, 630, 635, // 111 - 120
+ 640, 645, 650, 655, 660, 665, 670, 675, 680, 685, // 121 - 130
+ 690, 695, 700, 705, 710, 715, 720, 725, 730, 735, // 131 - 140
+ 740, 745, 750, 755, 760, 765, 770, 775, 780, 785, // 141 - 150
+ 790, 795, 800, 805, 810, 815, 820, 825, 830, 835] // 151 - 160
+ SPTable:[ 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, // 1 - 10
+ 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, // 11 - 20
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, // 21 - 30
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, // 31 - 40
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, // 41 - 50
+ 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, // 51 - 60
+ 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, // 61 - 70
+ 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, // 71 - 80
+ 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, // 81 - 90
+ 101, 102, 103, 104, 105, 106, 107, 108, 109, 100, // 91 - 100
+ 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, // 101 - 110
+ 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, // 111 - 120
+ 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, // 121 - 130
+ 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, // 131 - 140
+ 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, // 141 - 150
+ 151, 152, 153, 154, 155, 156, 157, 158, 159, 160] // 151 - 160
+}
+
diff --git a/db/re/job_db1.txt b/db/re/job_db1.txt
deleted file mode 100644
index 9de52ce8..00000000
--- a/db/re/job_db1.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-// Job-specific Values Database
-//
-// Structure of Database:
-// JobID,Weight,HPFactor,HPMultiplicator,SPFactor,Unarmed,Dagger,1HSword,2HSword,1HSpear,2HSpear,1HAxe,2HAxe,1HMace,2HMace(unused),Rod,Bow,Knuckle,Instrument,Whip,Book,Katar,Revolver,Rifle,Gatling Gun,Shotgun,Grenade Launcher,Fuuma Shuriken,2HStaff,Shield
-//
-// Evol
-0, 20000,0 ,500 ,100 ,440 ,590 ,610 ,2000 ,2000 ,2000 ,540 ,2000 ,540 ,540 ,690 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,690 ,540
-1, 20000,0 ,500 ,100 ,440 ,590 ,610 ,2000 ,2000 ,2000 ,540 ,2000 ,540 ,540 ,690 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,690 ,540
-2, 20000,0 ,500 ,100 ,440 ,590 ,610 ,2000 ,2000 ,2000 ,540 ,2000 ,540 ,540 ,690 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,690 ,540
-3, 20000,0 ,500 ,100 ,440 ,590 ,610 ,2000 ,2000 ,2000 ,540 ,2000 ,540 ,540 ,690 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,690 ,540
-4, 20000,0 ,500 ,100 ,440 ,590 ,610 ,2000 ,2000 ,2000 ,540 ,2000 ,540 ,540 ,690 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,690 ,540
-5, 20000,0 ,500 ,100 ,440 ,590 ,610 ,2000 ,2000 ,2000 ,540 ,2000 ,540 ,540 ,690 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,690 ,540
-6, 20000,0 ,500 ,100 ,440 ,590 ,610 ,2000 ,2000 ,2000 ,540 ,2000 ,540 ,540 ,690 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,690 ,540
diff --git a/db/re/size_fix.txt b/db/re/size_fix.txt
index 81bba504..f83560a8 100644
--- a/db/re/size_fix.txt
+++ b/db/re/size_fix.txt
@@ -2,6 +2,6 @@
//Columns: Weapon type, Rows: Target size.
//Unarmed, Knife, 1H Sword, 2H Sword, 1H Spear, 2H Spears, 1H Axe, 2H Axe, Mace, 2H Mace, Staff, Bow, Knuckle, Musical Instrument, Whip, Book, Katar, Revolver, Rifle, Shotgun, Gatling Gun, Grenade Launcher, Fuuma Shuriken, 2H Staff
-100,100, 75, 75, 75, 75, 50, 50, 75,100,100,100,100, 75, 75,100, 75,100,100,100,100,100,100,100 // Size: Small
-100, 75,100, 75, 75, 75, 75, 75,100,100,100,100, 75,100,100,100,100,100,100,100,100,100,100,100 // Size: Medium
+100,100, 75, 75, 75, 75, 50, 50, 75, 75,100,100,100, 75, 75,100, 75,100,100,100,100,100, 75,100 // Size: Small
+100, 75,100, 75, 75, 75, 75, 75,100,100,100,100, 75,100,100,100,100,100,100,100,100,100, 75,100 // Size: Medium
100, 50, 75,100,100,100,100,100,100,100,100, 75, 50, 75, 50, 50, 75,100,100,100,100,100,100,100 // Size: Large
diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt
index d5798248..a9b2c614 100644
--- a/db/re/skill_cast_db.txt
+++ b/db/re/skill_cast_db.txt
@@ -964,6 +964,8 @@
//==========================================
//===== New Monster Skills =================
+//-- NPC_EARTHQUAKE
+653,0,0,0,900,0,0,-1
//-- NPC_ICEBREATH
655,0,0,0,0,12000,0,-1
//-- NPC_ACIDBREATH
diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt
index 07ececa4..cdde52f2 100644
--- a/db/re/skill_db.txt
+++ b/db/re/skill_db.txt
@@ -527,7 +527,7 @@
481,0,0,0,0,0,0,5,0,no,0,0,0,none,0, HP_MANARECHARGE,Mana Recharge
482,0,6,4,0,0x1,0,5,1,no,0,0,0,magic,0, PF_DOUBLECASTING,Double Casting
483,16,6,2,0,0x1,1:2:3:4:5,1,1,no,0,0,0,none,0, HW_GANBANTEIN,Ganbantein
-484,9,6,2,2,0x91,0,5,1,yes,0,0,0,misc,0, HW_GRAVITATION,Gravitation Field
+484,18,6,2,2,0x91,0,5,1,yes,0,0,0,misc,0, HW_GRAVITATION,Gravitation Field
485,-2,6,1,-1,0x8,0,10,1,no,0,0,0,weapon,0, WS_CARTTERMINATION,Cart Termination
486,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0, WS_OVERTHRUSTMAX,Maximum Power Thrust
487,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0, CG_LONGINGFREEDOM,Longing for Freedom
@@ -567,7 +567,7 @@
521,-9,6,2,-1,0x40,1,10,1,no,0,0,0,weapon,3, GS_GROUNDDRIFT,Ground Drift
522,0,0,0,0,0,0,10,1,no,0,0,0,weapon,0, NJ_TOBIDOUGU,Shuriken Training
523,9,6,1,-1,0x40,0,10,1,no,0,0,0,weapon,0, NJ_SYURIKEN,Throw Shuriken
-524,9,8,1,-1,0x40,0,5,-3,no,0,0,0,weapon,0, NJ_KUNAI,Throw Kunai
+524,9,8,1,-1,0x40,0,5,3,no,0,0,0,weapon,0, NJ_KUNAI,Throw Kunai
525,9,8,2,-1,0x2,0,5,-3:-3:-4:-4:-5,no,0,0,0,weapon,0, NJ_HUUMA,Throw Huuma Shuriken
526,9,6,1,0,0x50,0,10,1,no,0,0,0,misc,0, NJ_ZENYNAGE,Throw Zeny
527,0,6,4,-1,0,0,5,1,no,0,0,0,weapon,4, NJ_TATAMIGAESHI,Improvised Defense
@@ -590,7 +590,7 @@
544,-5,8,1,0,0x40,0,10,1,no,0,0,0,weapon,0, NJ_ISSEN,Final Strike
// Additional NPC Skills (Episode 11.3)
-653,0,8,4,0,0x6,5:7:9:11:13:5:7:9:11:13,10,1,no,0,0x2,0,magic,0, NPC_EARTHQUAKE,Earthquake
+653,0,8,4,0,0x26,5:7:9:11:13:5:7:9:11:13,10,1,no,0,0x2002,0,weapon,0, NPC_EARTHQUAKE,Earthquake
654,9,6,1,3,0,5,10,1,no,0,0x2,14,weapon,0, NPC_FIREBREATH,Fire Breath
655,9,6,1,1,0,5,10,1,no,0,0x2,14,weapon,0, NPC_ICEBREATH,Ice Breath
656,9,6,1,4,0,5,10,1,no,0,0x2,14,weapon,0, NPC_THUNDERBREATH,Thunder Breath
@@ -738,11 +738,11 @@
2038,11,8,1,6,0x2,3,5,-3,yes,0,0,0,magic,0, AB_JUDEX,Judex
2039,0,6,4,0,0x1,0,1,1,yes,0,0,0,magic,0, AB_ANCILLA,Ancilla
2040,11,8,1,6,0,0,10,-10,yes,0,0,0,magic,0, AB_ADORAMUS,Adoramus
-2041,0,6,4,6,0x3,3:7:15,3,1,yes,0,0,0,magic,0, AB_CLEMENTIA,Crementia
-2042,0,6,4,6,0x3,3:7:15,3,1,yes,0,0,0,magic,0, AB_CANTO,Canto Candidus
+2041,0,6,4,0,0x3,3:7:15,3,1,yes,0,0,0,magic,0, AB_CLEMENTIA,Crementia
+2042,0,6,4,0,0x3,3:7:15,3,1,yes,0,0,0,magic,0, AB_CANTO,Canto Candidus
2043,0,6,4,6,0x3,3:7:15,3,1,yes,0,0,0,magic,0, AB_CHEAL,Coluceo Heal
2044,11,6,2,6,0x1,0,5,1,yes,0,0,1,magic,0, AB_EPICLESIS,Epiclesis
-2045,0,6,4,6,0x3,15,10,1,yes,0,0,0,magic,0, AB_PRAEFATIO,Praefatio
+2045,0,6,4,0,0x3,15,10,1,yes,0,0,0,magic,0, AB_PRAEFATIO,Praefatio
2046,0,6,4,6,0x3,15,10,1,yes,0,0,0,magic,0, AB_ORATIO,Oratio
2047,0,6,4,6,0x3,15,4,1,yes,0,0,0,magic,0, AB_LAUDAAGNUS,Lauda Agnus
2048,0,6,4,6,0x3,15,4,1,yes,0,0,0,magic,0, AB_LAUDARAMUS,Lauda Ramus
@@ -1076,7 +1076,7 @@
3006,7:8:9:10:11,6,2,0,0x2,2,5,0,no,0,0,0,weapon,0, KO_BAKURETSU,Bakuretsu Kunai
3007,0,6,4,-1,0x42,4:4:4:4:5,5,0,no,0,0,0,misc,0, KO_HAPPOKUNAI,Happo Kunai
3008,9,8,2,0,0x12,2,10,-10,no,0,0,0,misc,0, KO_MUCHANAGE,Mucha Nage
-3009,9:10:11:12:13,8,2,-1,0x2,3,5,2,no,0,0,0,weapon,0, KO_HUUMARANKA,Huuma Shuriken Ranka
+3009,9:10:11:12:13,8,2,-1,0x2,3,5,-5,no,0,0,0,weapon,0, KO_HUUMARANKA,Huuma Shuriken Ranka
3010,3,6,4,0,0x42,0,5,1,no,0,0x80,0,weapon,0, KO_MAKIBISHI,Makibishi
3011,0,6,4,0,0x1,0,5,0,yes,0,0,0,none,0, KO_MEIKYOUSISUI,Meikyo Shisui
3012,0,6,4,0,0x1,0,5,0,no,0,0,1,none,3:4:5:6:7, KO_ZANZOU,Zanzou
diff --git a/db/re/skill_unit_db.txt b/db/re/skill_unit_db.txt
index f0f359bc..ffc451a0 100644
--- a/db/re/skill_unit_db.txt
+++ b/db/re/skill_unit_db.txt
@@ -67,15 +67,15 @@
312,0xa4, , 4, 0, -1,party, 0x240 //BD_INTOABYSS
313,0xa5, , 4, 0, -1,party, 0x200 //BD_SIEGFRIED
317,0xa6, , 3, 0,3000,enemy, 0x400 //BA_DISSONANCE
-319,0xa7, , 3, 0, -1,all, 0x440 //BA_WHISTLE
-320,0xa8, , 3, 0, -1,all, 0x440 //BA_ASSASSINCROSS
-321,0xa9, , 3, 0, -1,all, 0x440 //BA_POEMBRAGI
+319,0xa7, , 3, 0,3000,all, 0xC40 //BA_WHISTLE
+320,0xa8, , 3, 0,3000,all, 0xC40 //BA_ASSASSINCROSS
+321,0xa9, , 3, 0,3000,all, 0xC40 //BA_POEMBRAGI
322,0xaa, , 3, 0,6000,all, 0xC40 //BA_APPLEIDUN
325,0xab, , 3, 0,3000,enemy, 0x100 //DC_UGLYDANCE
-327,0xac, , 3, 0, -1,all, 0x140 //DC_HUMMING
-328,0xad, , 3, 0, -1,enemy, 0x100 //DC_DONTFORGETME
-329,0xae, , 3, 0, -1,all, 0x140 //DC_FORTUNEKISS
-330,0xaf, , 3, 0, -1,all, 0x140 //DC_SERVICEFORYOU
+327,0xac, , 3, 0,3000,all, 0x940 //DC_HUMMING
+328,0xad, , 3, 0,3000,enemy, 0x900 //DC_DONTFORGETME
+329,0xae, , 3, 0,3000,all, 0x940 //DC_FORTUNEKISS
+330,0xaf, , 3, 0,3000,all, 0x940 //DC_SERVICEFORYOU
336,0xb2, , 0,-1, -1,noone, 0x000 //WE_CALLPARTNER
339,0x86, , -1, 0, 300,enemy, 0x000 //NPC_DARKGRANDCROSS
362,0xb4, , 0, 2, 300,all, 0x000 //HP_BASILICA
@@ -97,6 +97,7 @@
535,0xbd, , -1, 0, 20,enemy, 0x010 //NJ_KAENSIN
538,0xbb, , 1:1:1:2:2:2:3:3:3:4,0,-1,all,0x010 //NJ_SUITON
541,0x86, , 0, 3:3:4:4:5, 100,enemy, 0x018 //NJ_RAIGEKISAI
+653,0xc6, , 0, 5:7:9:11:13:5:7:9:11:13, 300,enemy, 0x010 //NPC_EARTHQUAKE
670,0xc7, , 1, 4:7:10:13:16:19:22:25:28:31,1000,all,0x008 //NPC_EVILLAND
//706,0xfd, , 0, 0,1000,all, 0x000 //NPC_VENOMFOG
@@ -158,7 +159,7 @@
3006,0x86, , 0, 2, 100,enemy, 0x018 //KO_BAKURETSU
3008,0x86, , 0, 2, 100,enemy, 0x018 //KO_MUCHANAGE
-3009,0x86, , 0, 3, 500,enemy, 0x018 //KO_HUUMARANKA
+3009,0x86, , 0, 3, 100,enemy, 0x018 //KO_HUUMARANKA
3020,0xf8, , 0, 3, 100,all, 0x018 //KO_ZENKAI
3010,0xfc, , 0, 0,5000,enemy, 0x018 //KO_MAKIBISHI
diff --git a/db/sc_config.txt b/db/sc_config.txt
index 7d84d94a..cd0b050f 100644
--- a/db/sc_config.txt
+++ b/db/sc_config.txt
@@ -406,6 +406,8 @@ SC_SOULCOLD,78
SC_HAWKEYES,78
SC_GDSKILL_REGENERATION,78
+SC_ORCISH, 2
+
// Unremovable
SC_WEIGHTOVER50, 207
SC_WEIGHTOVER90, 207