yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Sarjuuk
2022-06-10 13:58:55 +02:00
parent c0e9159c1e 1bd752a60f
commit 8ec6cc548d
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -135,6 +135,6 @@ A: A search is only conducted against the currently used locale. You may have on
## Special Thanks
Said website with the red smiling rocket, for providing this beautifull website!
Please do not reagard this project as blatant rip-off, rather as "We do really liked your presentation, but since time and content progresses, you are sadly no longer supplying the data we need".
Please do not regard this project as blatant rip-off, rather as "We do really liked your presentation, but since time and content progresses, you are sadly no longer supplying the data we need".
![uses badges](http://forthebadge.com/images/badges/uses-badges.svg)

2
includes/types/spell.class.php
View File

@@ -2313,7 +2313,7 @@ class SpellList extends BaseType
$originalCastTime = 1500;
// Portion to Over Time
$PtOT = ($overTime / 15000) / (($overTime / 15000) + (OriginalCastTime / 3500));
$PtOT = ($overTime / 15000) / (($overTime / 15000) + ($originalCastTime / 3500));
if ($asDOT)
$castingTime = $castingTime * $PtOT;

11
setup/tools/sqlgen/mailtemplate.func.php
View File

@@ -19,13 +19,20 @@ SqlGen::register(new class extends SetupScript
DB::Aowow()->query('TRUNCATE aowow_mails');
// copy data over from dbc
DB::Aowow()->query('INSERT INTO ?_mails SELECT *, 0 FROM dbc_mailtemplate');
DB::Aowow()->query('
INSERT INTO ?_mails SELECT
id, 0,
subject_loc0, subject_loc2, subject_loc3, subject_loc4, subject_loc6, subject_loc8,
text_loc0, text_loc2, text_loc3, text_loc4, text_loc6, text_loc8,
0
FROM dbc_mailtemplate
');
CLI::write('SqlGen::generate() - merging achievement_reward into aowow_mails');
$acvMail = DB::World()->select('
SELECT
-ar.ID,
-ar.ID, 0,
IFNULL(ar.Subject, "") AS s0, IFNULL(arl2.Subject, "") AS s2, IFNULL(arl3.Subject, "") AS s3, IFNULL(arl4.Subject, "") AS s4, IFNULL(arl6.Subject, "") AS s6, IFNULL(arl8.Subject, "") AS s8,
IFNULL(ar.Body, "") AS t0, IFNULL(arl2.Body, "") AS t2, IFNULL(arl3.Body, "") AS t3, IFNULL(arl4.Body, "") AS t4, IFNULL(arl6.Body, "") AS t6, IFNULL(arl8.Body, "") AS t8,
ItemID