xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-07-09 06:06:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: world data generation now returns the correct number of records

Browse Source
This commit is contained in:
Martin Ambrus
2017-10-28 10:30:53 +02:00
parent 540e69c8d1
commit 2cfb84ebe2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
var/db/datagen-world-data.sql
+6 -6
View File
@@ -12,7 +12,7 @@ INSERT INTO %PREFIX%wdata
-- fieldtype is always 3 for the middle and the word border -- fieldtype is always 3 for the middle and the word border
IF ( IF (
(x = 0 AND y = 0) OR (x = 100 AND y = 100), (x = 0 AND y = 0) OR (x = %WORLDSIZE% AND y = %WORLDSIZE%),
3, 3,
-- get a field type based on the random number previously generated -- get a field type based on the random number previously generated
CASE CASE
@@ -34,7 +34,7 @@ INSERT INTO %PREFIX%wdata
-- there are no oasis' in the middle and by the word border -- there are no oasis' in the middle and by the word border
IF ( IF (
(x = 0 AND y = 0) OR (x = 100 AND y = 100), (x = 0 AND y = 0) OR (x = %WORLDSIZE% AND y = %WORLDSIZE%),
0, 0,
-- get an oasis type if the field type generated in the previous IF statement -- get an oasis type if the field type generated in the previous IF statement
-- is 0, based on the random number previously generated -- is 0, based on the random number previously generated
@@ -73,9 +73,9 @@ INSERT INTO %PREFIX%wdata
(select 0 union select 1 union select 2 union select 3 union select 4 union select 5 union select 6 union select 7 union select 8 union select 9) t, (select 0 union select 1 union select 2 union select 3 union select 4 union select 5 union select 6 union select 7 union select 8 union select 9) t,
(select 0 union select 1 union select 2 union select 3 union select 4 union select 5 union select 6 union select 7 union select 8 union select 9) t2, (select 0 union select 1 union select 2 union select 3 union select 4 union select 5 union select 6 union select 7 union select 8 union select 9) t2,
-- in t3, we only need 4 rows of dummy data, as 400 is currently the maximum allowed map size -- in t3, we only need 9 rows of dummy data, as 400 is currently the maximum allowed map size (i.e. -400 to +400)
-- which brings us to `t1` x `t2` x `t3` = 10 x 10 x 4 = 400 -- which brings us to `t1` x `t2` x `t3` = 10 x 10 x 9 = 900 (we need 900 not 800 because coordinates start at 0,0 not 1,1)
(select 0 union select 1 union select 2 union select 3) t3, (select 0 union select 1 union select 2 union select 3 union select 4 union select 5 union select 6 union select 7 union select 8) t3,
-- here we tell MySQL where to start, so if we have a world 100x100, this will set @row to -101 -- here we tell MySQL where to start, so if we have a world 100x100, this will set @row to -101
-- (not -100 because the first select already increments the @row by 1, so we'd start at -99 instead) -- (not -100 because the first select already increments the @row by 1, so we'd start at -99 instead)
@@ -91,7 +91,7 @@ INSERT INTO %PREFIX%wdata
(SELECT @row2 := @row2 + 1 as x FROM (SELECT @row2 := @row2 + 1 as x FROM
(select 0 union select 1 union select 2 union select 3 union select 4 union select 5 union select 6 union select 7 union select 8 union select 9) t, (select 0 union select 1 union select 2 union select 3 union select 4 union select 5 union select 6 union select 7 union select 8 union select 9) t,
(select 0 union select 1 union select 2 union select 3 union select 4 union select 5 union select 6 union select 7 union select 8 union select 9) t2, (select 0 union select 1 union select 2 union select 3 union select 4 union select 5 union select 6 union select 7 union select 8 union select 9) t2,
(select 0 union select 1 union select 2) t3, (select 0 union select 1 union select 2 union select 3 union select 4 union select 5 union select 6 union select 7 union select 8) t3,
(SELECT @row2 := (-%WORLDSIZE% - 1)) as beginning (SELECT @row2 := (-%WORLDSIZE% - 1)) as beginning
WHERE @row2 <= (%WORLDSIZE% - 1)) as x WHERE @row2 <= (%WORLDSIZE% - 1)) as x
) as generator; ) as generator;