projects/lwb6
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Extracted quantities update as soon as possible

Browse source 
* The quantities of resources extracted from mines will now be updated
as soon as they have a reason to. This includes planet assignment,
abandonment, ownership changes, and updates to mining priorities.

* The mining update will now remove the current resource income from the
providers, and only then re-compute all extracted quantities. This is
more logical and corresponds to the way the other game updates work.

* Fixed bug in extraction computation where the size of the planet's
happy population was used instead of the happy/total ratio when
adjusting the mining production for riots.

* The following SQL scripts must be re-executed to upgrade a database:
  -> 040-functions/040-empire.sql
  -> 040-functions/145-resource-providers.sql
  -> 040-functions/147-empire-mining.sql
  -> 050-updates/120-planet-mining.sql
This commit is contained in:
Emmanuel BENOîT 2012-02-09 10:54:00 +01:00
parent f3aa563758
commit bf6bea5a79
35 changed files with 863 additions and 372 deletions

43
legacyworlds-server-data/db-structure/tests/admin/040-functions/147-empire-mining/010-mset-update-start.sql Normal file
View file

@ -0,0 +1,43 @@
/*
* Test the emp.mset_update_start( INT ) function
*/
BEGIN;
/* We need a pair of natural resources and an empire with mining settings. */
\i utils/strings.sql
\i utils/resources.sql
\i utils/accounts.sql
\i utils/naming.sql
\i utils/universe.sql
SELECT _create_natural_resources( 2 , 'natRes' );
SELECT _create_resources( 1 , 'basicRes' );
SELECT _create_raw_planets( 1 , 'testPlanet' );
SELECT _create_emp_names( 1 , 'testEmp' );
SELECT emp.create_empire( _get_emp_name( 'testEmp1' ) ,
_get_map_name( 'testPlanet1' ) ,
200.0 );
/***** TESTS BEGIN HERE *****/
SELECT plan( 6 );
SELECT diag_test_name( 'emp.mset_update_start( INT ) - Return value on bad empire identifier' );
SELECT ok( NOT emp.mset_update_start( _get_bad_emp_name( ) ) );
SELECT diag_test_name( 'emp.mset_update_start( INT ) - Temporary table exists despite bad empire identifier' );
SELECT has_table( 'mset_update' );
DROP TABLE IF EXISTS mset_update;
SELECT diag_test_name( 'emp.mset_update_start( INT ) - Return value on valid empire identifier' );
SELECT ok( emp.mset_update_start( _get_emp_name( 'testEmp1' ) ) );
SELECT diag_test_name( 'emp.mset_update_start( INT ) - Temporary table exists' );
SELECT has_table( 'mset_update' );
SELECT diag_test_name( 'emp.mset_update_start( INT ) - Temporary table contains all required entries' );
SELECT is( COUNT(*)::INT , 2 )
FROM mset_update
WHERE empire_id = _get_emp_name( 'testEmp1' );
SELECT diag_test_name( 'emp.mset_update_start( INT ) - Temporary table does not contain extra entries' );
SELECT is( COUNT(*)::INT , 0 )
FROM mset_update
WHERE empire_id <> _get_emp_name( 'testEmp1' );
SELECT * FROM finish( );
ROLLBACK;

84
legacyworlds-server-data/db-structure/tests/admin/040-functions/147-empire-mining/015-mset-update-start-planet.sql Normal file
View file

@ -0,0 +1,84 @@
/*
* Test the emp.mset_update_start( INT , INT ) function
*/
BEGIN;
/* We need a pair of natural resources, an empire, a pair of planets with
* resource providers. The empire must own one of the planets.
*/
\i utils/strings.sql
\i utils/resources.sql
\i utils/accounts.sql
\i utils/naming.sql
\i utils/universe.sql
SELECT _create_natural_resources( 2 , 'testResource' );
SELECT _create_raw_planets( 3 , 'testPlanet' );
SELECT _create_emp_names( 1 , 'testEmp' );
SELECT emp.create_empire( _get_emp_name( 'testEmp1' ) ,
_get_map_name( 'testPlanet1' ) ,
200.0 );
SELECT _create_resource_provider( 'testPlanet1' , 'testResource1' );
SELECT _create_resource_provider( 'testPlanet2' , 'testResource1' );
INSERT INTO emp.planets ( empire_id , planet_id )
VALUES ( _get_emp_name( 'testEmp1' ) , _get_map_name( 'testPlanet3' ) );
/***** TESTS BEGIN HERE *****/
SELECT plan( 16 );
SELECT diag_test_name( 'emp.mset_update_start( INT , INT ) - Return value on bad empire identifier' );
SELECT ok( NOT emp.mset_update_start( _get_bad_emp_name( ) , _get_map_name( 'testPlanet1' ) ) );
SELECT diag_test_name( 'emp.mset_update_start( INT , INT ) - Temporary table exists despite bad empire identifier' );
SELECT has_table( 'mset_update' );
DROP TABLE IF EXISTS mset_update;
SELECT diag_test_name( 'emp.mset_update_start( INT , INT ) - Return value on bad planet identifier' );
SELECT ok( NOT emp.mset_update_start( _get_emp_name( 'testEmp1' ) , _get_bad_map_name( ) ) );
SELECT diag_test_name( 'emp.mset_update_start( INT , INT ) - Temporary table exists despite bad planet identifier' );
SELECT has_table( 'mset_update' );
DROP TABLE IF EXISTS mset_update;
SELECT diag_test_name( 'emp.mset_update_start( INT , INT ) - Return value on unowned planet identifier' );
SELECT ok( NOT emp.mset_update_start( _get_emp_name( 'testEmp1' ) , _get_map_name( 'testPlanet2' ) ) );
SELECT diag_test_name( 'emp.mset_update_start( INT , INT ) - Temporary table exists despite unowned planet identifier' );
SELECT has_table( 'mset_update' );
DROP TABLE IF EXISTS mset_update;
SELECT diag_test_name( 'emp.mset_update_start( INT , INT ) - Return value on unowned planet identifier' );
SELECT ok( NOT emp.mset_update_start( _get_emp_name( 'testEmp1' ) , _get_map_name( 'testPlanet2' ) ) );
SELECT diag_test_name( 'emp.mset_update_start( INT , INT ) - Temporary table exists despite unowned planet identifier' );
SELECT has_table( 'mset_update' );
DROP TABLE IF EXISTS mset_update;
SELECT diag_test_name( 'emp.mset_update_start( INT , INT ) - Return value on planet with no resource providers' );
SELECT ok( NOT emp.mset_update_start( _get_emp_name( 'testEmp1' ) , _get_map_name( 'testPlanet3' ) ) );
SELECT diag_test_name( 'emp.mset_update_start( INT , INT ) - Temporary table exists despite planet with no resource providers' );
SELECT has_table( 'mset_update' );
DROP TABLE IF EXISTS mset_update;
SELECT diag_test_name( 'emp.mset_update_start( INT , INT ) - Return value on valid identifiers but no existing settings' );
SELECT ok( NOT emp.mset_update_start( _get_emp_name( 'testEmp1' ) , _get_map_name( 'testPlanet1' ) ) );
SELECT diag_test_name( 'emp.mset_update_start( INT , INT ) - Temporary table exists despite lack of settings' );
SELECT has_table( 'mset_update' );
DROP TABLE IF EXISTS mset_update;
INSERT INTO emp.planet_mining_settings( empire_id , planet_id , resource_name_id )
SELECT _get_emp_name( 'testEmp1' ) , planet_id , resource_name_id
FROM verse.resource_providers
WHERE planet_id = _get_map_name( 'testPlanet1' );
SELECT diag_test_name( 'emp.mset_update_start( INT , INT ) - Return value on valid identifiers and existing settings' );
SELECT ok( emp.mset_update_start( _get_emp_name( 'testEmp1' ) , _get_map_name( 'testPlanet1' ) ) );
SELECT diag_test_name( 'emp.mset_update_start( INT , INT ) - Temporary table exists' );
SELECT has_table( 'mset_update' );
SELECT diag_test_name( 'emp.mset_update_start( INT , INT ) - Temporary table contains all required entries' );
SELECT is( COUNT(*)::INT , 1 )
FROM mset_update
WHERE empire_id = _get_emp_name( 'testEmp1' )
AND planet_id = _get_map_name( 'testPlanet1' );
SELECT diag_test_name( 'emp.mset_update_start( INT , INT ) - Temporary table does not contain extra entries' );
SELECT is( COUNT(*)::INT , 0 )
FROM mset_update
WHERE empire_id <> _get_emp_name( 'testEmp1' )
OR planet_id <> _get_map_name( 'testPlanet1' );
SELECT * FROM finish( );
ROLLBACK;

37
legacyworlds-server-data/db-structure/tests/admin/040-functions/147-empire-mining/020-mset-update-set.sql Normal file
View file

@ -0,0 +1,37 @@
/*
* Test the emp.mset_update_set() function
*/
BEGIN;
CREATE TEMPORARY TABLE mset_update(
empire_id INT ,
resource_name TEXT ,
empmset_weight INT
) ON COMMIT DROP;
INSERT INTO mset_update VALUES ( 1 , 'a' , 0 ) , ( 1 , 'b' , 0 );
/***** TESTS BEGIN HERE *****/
SELECT plan( 7 );
SELECT diag_test_name( 'emp.mset_update_set( ) - Valid update' );
SELECT ok( emp.mset_update_set( 'a' , 1 ) );
SELECT diag_test_name( 'emp.mset_update_set( ) - Valid update results (1/2)' );
SELECT is( empmset_weight , 1 ) FROM mset_update WHERE resource_name = 'a';
SELECT diag_test_name( 'emp.mset_update_set( ) - Valid update results (2/2)' );
SELECT is( empmset_weight , 0 ) FROM mset_update WHERE resource_name = 'b';
DELETE FROM mset_update;
INSERT INTO mset_update VALUES ( 1 , 'a' , 0 ) , ( 1 , 'b' , 0 );
SELECT diag_test_name( 'emp.mset_update_set( ) - Update on unknown resource' );
SELECT ok( NOT emp.mset_update_set( 'c' , 1 ) );
SELECT diag_test_name( 'emp.mset_update_set( ) - Unknown resource update results (1/2)' );
SELECT is( empmset_weight , 0 ) FROM mset_update WHERE resource_name = 'a';
SELECT diag_test_name( 'emp.mset_update_set( ) - Unknown resource update results (2/2)' );
SELECT is( empmset_weight , 0 ) FROM mset_update WHERE resource_name = 'b';
DELETE FROM mset_update;
INSERT INTO mset_update VALUES ( 1 , 'a' , 0 ) , ( 1 , 'b' , 0 );
SELECT diag_test_name( 'emp.mset_update_set( ) - Update with invalid weight' );
SELECT ok( emp.mset_update_set( 'a' , -1 ) );
SELECT * FROM finish( );
ROLLBACK;

118
legacyworlds-server-data/db-structure/tests/admin/040-functions/147-empire-mining/030-mset-update-apply.sql Normal file
View file

@ -0,0 +1,118 @@
/*
* Test the emp.mset_update_apply() function
*/
BEGIN;
/*
* Create a pair of strings
*/
INSERT INTO defs.strings (name) VALUES ( 'a' ) , ( 'b' );
/*
* Remove foreign keys from the empire mining settings table, insert some
* data into it.
*/
ALTER TABLE emp.mining_settings
DROP CONSTRAINT fk_empmset_empire ,
DROP CONSTRAINT fk_empmset_resource;
INSERT INTO emp.mining_settings ( empire_id , resource_name_id )
SELECT 1 , id
FROM defs.strings
WHERE name IN ( 'a' , 'b' );
/* Create the temporary table */
CREATE TEMPORARY TABLE mset_update(
empire_id INT ,
resource_name TEXT ,
empmset_weight INT
) ON COMMIT DROP;
INSERT INTO mset_update VALUES ( 1 , 'a' , 0 ) , ( 1 , 'b' , 4 );
/***** TESTS BEGIN HERE *****/
SELECT plan( 8 );
SELECT diag_test_name( 'emp.mset_update_apply() - Applying valid empire update' );
SELECT ok( emp.mset_update_apply( ) );
SELECT diag_test_name( 'emp.mset_update_apply() - Empire update results' );
SELECT set_eq(
$$ SELECT name , empmset_weight
FROM emp.mining_settings
INNER JOIN defs.strings
ON resource_name_id = id $$ ,
$$ VALUES ( 'a' , 0 ) , ( 'b' , 4 ) $$
);
/* Reset temporary table and settings */
DELETE FROM mset_update;
DELETE FROM emp.mining_settings;
INSERT INTO emp.mining_settings ( empire_id , resource_name_id )
SELECT 1 , id
FROM defs.strings
WHERE name IN ( 'a' , 'b' );
INSERT INTO mset_update VALUES ( 1 , 'a' , -1 ) , ( 1 , 'b' , 4 );
SELECT diag_test_name( 'emp.mset_update_apply() - Applying invalid empire update' );
SELECT ok( NOT emp.mset_update_apply( ) );
SELECT diag_test_name( 'emp.mset_update_apply() - Invalid empire update results' );
SELECT set_eq(
$$ SELECT name , empmset_weight
FROM emp.mining_settings
INNER JOIN defs.strings
ON resource_name_id = id $$ ,
$$ VALUES ( 'a' , 2 ) , ( 'b' , 2 ) $$
);
/* Re-create the temporary table to store planet mining settings, remove
* constraints from the planet mining settings table, insert data into
* both.
*/
ALTER TABLE emp.planet_mining_settings
DROP CONSTRAINT fk_emppmset_empire ,
DROP CONSTRAINT fk_emppmset_resource;
INSERT INTO emp.planet_mining_settings ( empire_id , planet_id , resource_name_id )
SELECT 1 , 1 , id
FROM defs.strings
WHERE name IN ( 'a' , 'b' );
DROP TABLE mset_update;
CREATE TEMPORARY TABLE mset_update(
empire_id INT ,
planet_id INT ,
resource_name TEXT ,
empmset_weight INT
) ON COMMIT DROP;
INSERT INTO mset_update VALUES ( 1 , 1 , 'a' , 0 ) , ( 1 , 1 , 'b' , 4 );
SELECT diag_test_name( 'emp.mset_update_apply() - Applying valid planet update' );
SELECT ok( emp.mset_update_apply( ) );
SELECT diag_test_name( 'emp.mset_update_apply() - Planet update results' );
SELECT set_eq(
$$ SELECT name , emppmset_weight
FROM emp.planet_mining_settings
INNER JOIN defs.strings
ON resource_name_id = id $$ ,
$$ VALUES ( 'a' , 0 ) , ( 'b' , 4 ) $$
);
/* Reset temporary table and settings */
DELETE FROM mset_update;
DELETE FROM emp.planet_mining_settings;
INSERT INTO emp.planet_mining_settings ( empire_id , planet_id , resource_name_id )
SELECT 1 , 1 , id
FROM defs.strings
WHERE name IN ( 'a' , 'b' );
INSERT INTO mset_update VALUES ( 1 , 1 , 'a' , -1 ) , ( 1 , 1 , 'b' , 4 );
SELECT diag_test_name( 'emp.mset_update_apply() - Applying invalid planet update' );
SELECT ok( NOT emp.mset_update_apply( ) );
SELECT diag_test_name( 'emp.mset_update_apply() - Invalid planet update results' );
SELECT set_eq(
$$ SELECT name , emppmset_weight
FROM emp.planet_mining_settings
INNER JOIN defs.strings
ON resource_name_id = id $$ ,
$$ VALUES ( 'a' , 2 ) , ( 'b' , 2 ) $$
);
SELECT * FROM finish( );
ROLLBACK;

61
legacyworlds-server-data/db-structure/tests/admin/040-functions/147-empire-mining/040-mset-toggle-source.sql Normal file
View file

@ -0,0 +1,61 @@
/*
* Test the emp.mset_toggle_source( INT , INT ) function
*/
BEGIN;
/*
* Create a pair of natural resources, three planets, an empire owning two
* of the planets, and resource providers for one of the resources on the
* neutral planet and on one of the owned planets.
*/
\i utils/strings.sql
\i utils/resources.sql
\i utils/accounts.sql
\i utils/naming.sql
\i utils/universe.sql
SELECT _create_natural_resources( 2 , 'resource' );
SELECT _create_raw_planets( 3 , 'planet' );
SELECT _create_emp_names( 1 , 'empire' );
SELECT emp.create_empire( _get_emp_name( 'empire1' ) ,
_get_map_name( 'planet1' ) ,
200.0 );
SELECT _create_resource_provider( 'planet1' , 'resource1' );
SELECT _create_resource_provider( 'planet2' , 'resource1' );
INSERT INTO emp.planets ( empire_id , planet_id )
VALUES ( _get_emp_name( 'empire1' ) , _get_map_name( 'planet3' ) );
-- ***** TESTS BEGIN HERE *****
SELECT plan( 8 );
SELECT diag_test_name( 'emp.mset_toggle_source() - Return value on bad empire identifier' );
SELECT ok( NOT emp.mset_toggle_source( _get_bad_emp_name( ) , _get_map_name( 'planet1' ) ) );
SELECT diag_test_name( 'emp.mset_toggle_source() - Return value on bad planbet identifier' );
SELECT ok( NOT emp.mset_toggle_source( _get_emp_name( 'empire1' ) , _get_bad_map_name( ) ) );
SELECT diag_test_name( 'emp.mset_toggle_source() - Return value when the empire does not own the planet' );
SELECT ok( NOT emp.mset_toggle_source( _get_emp_name( 'empire1' ) , _get_map_name( 'planet2' ) ) );
SELECT diag_test_name( 'emp.mset_toggle_source() - Return value when the planet has no resource providers' );
SELECT ok( NOT emp.mset_toggle_source( _get_emp_name( 'empire1' ) , _get_map_name( 'planet3' ) ) );
DELETE FROM emp.planet_mining_settings;
UPDATE emp.mining_settings
SET empmset_weight = 0;
SELECT diag_test_name( 'emp.mset_toggle_source() - Return value when activating' );
SELECT ok( emp.mset_toggle_source( _get_emp_name( 'empire1' ) , _get_map_name( 'planet1' ) ) );
SELECT diag_test_name( 'emp.mset_toggle_source() - Mining settings inserted after activation' );
SELECT set_eq(
$$ SELECT * FROM emp.planet_mining_settings $$ ,
$$ VALUES ( _get_emp_name( 'empire1' ) , _get_map_name( 'planet1' ) , _get_string( 'resource1' ) , 0 ) $$
);
DELETE FROM emp.planet_mining_settings;
INSERT INTO emp.planet_mining_settings VALUES (
_get_emp_name( 'empire1' ) , _get_map_name( 'planet1' ) , _get_string( 'resource1' ) , 2
);
SELECT diag_test_name( 'emp.mset_toggle_source() - Return value when de-activating' );
SELECT ok( emp.mset_toggle_source( _get_emp_name( 'empire1' ) , _get_map_name( 'planet1' ) ) );
SELECT diag_test_name( 'emp.mset_toggle_source() - Mining settings deleted after de-activation' );
SELECT is_empty( $$ SELECT * FROM emp.planet_mining_settings $$ );
SELECT * FROM finish( );
ROLLBACK;