Skip to content

Commit

Permalink
Update Base and Adjust patches to conform (#26)
Browse files Browse the repository at this point in the history
* Create db-pr-override.txt

For testing new base

* Update DirtyFighting.sql

* Updating Spells to match new schema

* Update DirtyFighting

* Update TrainingAcademy

* Update Void

* Update Level 8 Spells

* reset level8

* Void Spells

* Final Level8Spells update

* Update db-pr-override.txt

* Update db-pr-override.txt

* Update ACE-World-16PY

* Switch Base to 0.7.1
  • Loading branch information
LtRipley36706 authored Jan 20, 2019
1 parent af0fcb5 commit a0a83e5
Show file tree
Hide file tree
Showing 845 changed files with 3,297 additions and 2,608 deletions.
2 changes: 1 addition & 1 deletion AppVeyor/dbversion.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.7.0
0.7.1
2 changes: 1 addition & 1 deletion Database/ACE-World-16PY
Submodule ACE-World-16PY updated 8645 files
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 5938;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (5938, 'Blinding Assault', 98320 /* Skill, Additive, AttackSkills */, 0 /* None */, -20);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 5939;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (5939, 'Bleeding Assault', 36868 /* Int, SingleStat, Additive */, 318 /* DamageOverTime */, 120);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 5940;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (5940, 'Unbalancing Assault', 163856 /* Skill, Additive, DefenseSkills */, 0 /* None */, -20);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 5941;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (5941, 'Traumatic Assault', 36868 /* Int, SingleStat, Additive */, 317 /* HealingResistRating */, 20);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 5942;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (5942, 'Blinding Blow', 98320 /* Skill, Additive, AttackSkills */, 0 /* None */, -10);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 5943;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (5943, 'Bleeding Blow', 36868 /* Int, SingleStat, Additive */, 318 /* DamageOverTime */, 60);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 5944;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (5944, 'Unbalancing Blow', 163856 /* Skill, Additive, DefenseSkills */, 0 /* None */, -10);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 5945;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (5945, 'Traumatic Blow', 36868 /* Int, SingleStat, Additive */, 317 /* HealingResistRating */, 10);
15 changes: 0 additions & 15 deletions Database/Patches/DirtyFighting/DirtyFighting.sql

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 292;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (292, 'Light Weapon Mastery Other I', 36884 /* Int, Skill, SingleStat, Additive */, 45 /* LightWeapons */, 10);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 293;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (293, 'Light Weapon Mastery Other II', 36884 /* Int, Skill, SingleStat, Additive */, 45 /* LightWeapons */, 15);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 294;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (294, 'Light Weapon Mastery Other III', 36884 /* Int, Skill, SingleStat, Additive */, 45 /* LightWeapons */, 20);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 295;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (295, 'Light Weapon Mastery Other IV', 36884 /* Int, Skill, SingleStat, Additive */, 45 /* LightWeapons */, 25);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 296;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (296, 'Light Weapon Mastery Other V', 36884 /* Int, Skill, SingleStat, Additive */, 45 /* LightWeapons */, 30);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 297;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (297, 'Light Weapon Mastery Other VI', 36884 /* Int, Skill, SingleStat, Additive */, 45 /* LightWeapons */, 35);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 298;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (298, 'Light Weapon Mastery Self I', 36884 /* Int, Skill, SingleStat, Additive */, 45 /* LightWeapons */, 10);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 299;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (299, 'Light Weapon Mastery Self II', 36884 /* Int, Skill, SingleStat, Additive */, 45 /* LightWeapons */, 15);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 300;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (300, 'Light Weapon Mastery Self III', 36884 /* Int, Skill, SingleStat, Additive */, 45 /* LightWeapons */, 20);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 301;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (301, 'Light Weapon Mastery Self IV', 36884 /* Int, Skill, SingleStat, Additive */, 45 /* LightWeapons */, 25);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 302;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (302, 'Light Weapon Mastery Self V', 36884 /* Int, Skill, SingleStat, Additive */, 45 /* LightWeapons */, 30);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 303;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (303, 'Light Weapon Mastery Self VI', 36884 /* Int, Skill, SingleStat, Additive */, 45 /* LightWeapons */, 35);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 304;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (304, 'Light Weapon Ineptitude Other I', 36884 /* Int, Skill, SingleStat, Additive */, 45 /* LightWeapons */, -10);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 305;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (305, 'Light Weapon Ineptitude Other II', 36884 /* Int, Skill, SingleStat, Additive */, 45 /* LightWeapons */, -15);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 306;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (306, 'Light Weapon Ineptitude Other III', 36884 /* Int, Skill, SingleStat, Additive */, 45 /* LightWeapons */, -20);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 307;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (307, 'Light Weapon Ineptitude Other IV', 36884 /* Int, Skill, SingleStat, Additive */, 45 /* LightWeapons */, -25);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 308;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (308, 'Light Weapon Ineptitude Other V', 36884 /* Int, Skill, SingleStat, Additive */, 45 /* LightWeapons */, -30);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 309;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (309, 'Light Weapon Ineptitude Other VI', 36884 /* Int, Skill, SingleStat, Additive */, 45 /* LightWeapons */, -35);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 310;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (310, 'Light Weapon Ineptitude Self I', 36884 /* Int, Skill, SingleStat, Additive */, 45 /* LightWeapons */, -10);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 311;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (311, 'Light Weapon Ineptitude Self II', 36884 /* Int, Skill, SingleStat, Additive */, 45 /* LightWeapons */, -15);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 312;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (312, 'Light Weapon Ineptitude Self III', 36884 /* Int, Skill, SingleStat, Additive */, 45 /* LightWeapons */, -20);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 313;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (313, 'Light Weapon Ineptitude Self IV', 36884 /* Int, Skill, SingleStat, Additive */, 45 /* LightWeapons */, -25);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 314;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (314, 'Light Weapon Ineptitude Self V', 36884 /* Int, Skill, SingleStat, Additive */, 45 /* LightWeapons */, -30);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 315;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (315, 'Light Weapon Ineptitude Self VI', 36884 /* Int, Skill, SingleStat, Additive */, 45 /* LightWeapons */, -35);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 316;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (316, 'Finesse Weapon Mastery Other I', 36884 /* Int, Skill, SingleStat, Additive */, 46 /* FinesseWeapons */, 10);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 317;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (317, 'Finesse Weapon Mastery Other II', 36884 /* Int, Skill, SingleStat, Additive */, 46 /* FinesseWeapons */, 15);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 318;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (318, 'Finesse Weapon Mastery Other III', 36884 /* Int, Skill, SingleStat, Additive */, 46 /* FinesseWeapons */, 20);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 319;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (319, 'Finesse Weapon Mastery Other IV', 36884 /* Int, Skill, SingleStat, Additive */, 46 /* FinesseWeapons */, 25);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 320;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (320, 'Finesse Weapon Mastery Other V', 36884 /* Int, Skill, SingleStat, Additive */, 46 /* FinesseWeapons */, 30);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 321;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (321, 'Finesse Weapon Mastery Other VI', 36884 /* Int, Skill, SingleStat, Additive */, 46 /* FinesseWeapons */, 35);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 322;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (322, 'Finesse Weapon Mastery Self I', 36884 /* Int, Skill, SingleStat, Additive */, 46 /* FinesseWeapons */, 10);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 323;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (323, 'Finesse Weapon Mastery Self II', 36884 /* Int, Skill, SingleStat, Additive */, 46 /* FinesseWeapons */, 15);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 324;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (324, 'Finesse Weapon Mastery Self III', 36884 /* Int, Skill, SingleStat, Additive */, 46 /* FinesseWeapons */, 20);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 325;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (325, 'Finesse Weapon Mastery Self IV', 36884 /* Int, Skill, SingleStat, Additive */, 46 /* FinesseWeapons */, 25);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 326;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (326, 'Finesse Weapon Mastery Self V', 36884 /* Int, Skill, SingleStat, Additive */, 46 /* FinesseWeapons */, 30);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 327;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (327, 'Finesse Weapon Mastery Self VI', 36884 /* Int, Skill, SingleStat, Additive */, 46 /* FinesseWeapons */, 35);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 328;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (328, 'Finesse Weapon Ineptitude Other I', 36884 /* Int, Skill, SingleStat, Additive */, 46 /* FinesseWeapons */, -10);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 329;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (329, 'Finesse Weapon Ineptitude Other II', 36884 /* Int, Skill, SingleStat, Additive */, 46 /* FinesseWeapons */, -15);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 330;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (330, 'Finesse Weapon Ineptitude Other III', 36884 /* Int, Skill, SingleStat, Additive */, 46 /* FinesseWeapons */, -20);
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DELETE FROM `spell` WHERE `id` = 331;

INSERT INTO `spell` (`id`, `name`, `stat_Mod_Type`, `stat_Mod_Key`, `stat_Mod_Val`)
VALUES (331, 'Finesse Weapon Ineptitude Other IV', 36884 /* Int, Skill, SingleStat, Additive */, 46 /* FinesseWeapons */, -25);
Loading

0 comments on commit a0a83e5

Please sign in to comment.