Planet mining settings interface
* Modified owned planet view to include a field which indicates whether mining settings are specific to the planet or come from the empire; modified "simple" game components accordingly * Modified stored procedures to only allow planet-specific mining settings updates when the planet actually uses planet-specific settings, and added a stored procedure which toggles the source of a planet's settings * Added corresponding parts to mining settings DAO and resources controller * Added session commands and server command handlers that toggle the source of the settings and that upload the settings * Split planet page template into multiple files for clarity and added the mining priorities form to the natural resources tab
This commit is contained in:
parent
51b529a09f
commit
e64f847ec3
25 changed files with 1009 additions and 152 deletions
legacyworlds-server-data/db-structure/tests/admin/040-functions/045-empire-mining
|
@ -22,7 +22,7 @@ BEGIN;
|
|||
VALUES ( _get_emp_name( 'testEmp1' ) , _get_map_name( 'testPlanet3' ) );
|
||||
|
||||
/***** TESTS BEGIN HERE *****/
|
||||
SELECT plan( 14 );
|
||||
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' ) ) );
|
||||
|
@ -55,7 +55,17 @@ BEGIN;
|
|||
DROP TABLE IF EXISTS mset_update;
|
||||
|
||||
|
||||
SELECT diag_test_name( 'emp.mset_update_start( INT , INT ) - Return value on valid identifiers' );
|
||||
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' );
|
||||
|
|
|
@ -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;
|
Reference in a new issue