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

Fixed resource extraction

Browse source 
* Formula was mis-copied from the wiki, the result was multiplied by the
provider's current quantity

* Changed extraction per work unit from 1 to 10
This commit is contained in:
Emmanuel BENOîT 2012-01-30 09:18:20 +01:00
parent b9bc5e038c
commit 44b6ec1920
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
legacyworlds-server-beans-system/src/main/java/com/deepclone/lw/beans/sys/ConstantsRegistrarBean.java
View file

@ -66,8 +66,7 @@ public class ConstantsRegistrarBean
defs.add( new ConstantDefinition( "game.resources.weightBase" , "Natural resources" , cDesc , 10.0 , 1.1 , defs.add( new ConstantDefinition( "game.resources.weightBase" , "Natural resources" , cDesc , 10.0 , 1.1 ,
100.0 ) ); 100.0 ) );
cDesc = "Resources extracted per work unit, per (real) day, from a full provider with minimal difficulty."; cDesc = "Resources extracted per work unit, per (real) day, from a full provider with minimal difficulty.";
defs.add( new ConstantDefinition( "game.resources.extraction" , "Natural resources" , cDesc , 1.0 , 1.0 , defs.add( new ConstantDefinition( "game.resources.extraction" , "Natural resources" , cDesc , 10.0 , 1.0 , true ) );
true ) );
// Happiness // Happiness
String[] hcNames = { String[] hcNames = {

6
legacyworlds-server-data/db-structure/parts/050-updates/120-planet-mining.sql
View file

@ -209,7 +209,7 @@ DECLARE
BEGIN BEGIN
_extraction := _input.quantity * verse.get_extraction_factor( _extraction := verse.get_extraction_factor(
_input.quantity / _input.quantity_max , _input.quantity / _input.quantity_max ,
_input.difficulty ); _input.difficulty );
_allocation := _input.weight / _input.total_weight; _allocation := _input.weight / _input.total_weight;
@ -219,7 +219,9 @@ BEGIN
* sys.get_constant( 'game.resources.extraction' ) * sys.get_constant( 'game.resources.extraction' )
/ 1440.0; -- FIXME: hardcoded! / 1440.0; -- FIXME: hardcoded!
RAISE NOTICE 'Extraction % , allocation % , production %' , _extraction , _allocation , _production; PERFORM sys.write_sql_log( 'MiningUpdate' , 'TRACE' , 'Resource #' || _input.resource
|| ' @ planet #' || _input.planet || ': extraction ' || _extraction
|| ', allocation ' || _allocation || ', production ' || _production );
_quantity := _allocation * _production * _extraction; _quantity := _allocation * _production * _extraction;
IF _quantity > _input.quantity THEN IF _quantity > _input.quantity THEN
_quantity := _input.quantity; _quantity := _input.quantity;

8
legacyworlds-server-data/db-structure/tests/admin/050-updates/120-planet-mining/040-gu-pmc-update-resource.sql
View file

@ -60,12 +60,12 @@ BEGIN;
) ); ) );
SELECT diag_test_name( 'sys.gu_pmc_update_resource( ) - Provider udpated' ); SELECT diag_test_name( 'sys.gu_pmc_update_resource( ) - Provider udpated' );
SELECT is( resprov_quantity , 999.0::DOUBLE PRECISION ) SELECT is( resprov_quantity , 999.999::DOUBLE PRECISION )
FROM verse.resource_providers FROM verse.resource_providers
WHERE planet_id = 1 AND resource_name_id = 1; WHERE planet_id = 1 AND resource_name_id = 1;
SELECT diag_test_name( 'sys.gu_pmc_update_resource( ) - Planet resources income udpated' ); SELECT diag_test_name( 'sys.gu_pmc_update_resource( ) - Planet resources income udpated' );
SELECT is( pres_income , 1.0::DOUBLE PRECISION ) SELECT is( pres_income , 0.001::DOUBLE PRECISION )
FROM verse.planet_resources FROM verse.planet_resources
WHERE planet_id = 1 AND resource_name_id = 1; WHERE planet_id = 1 AND resource_name_id = 1;
@ -78,12 +78,12 @@ BEGIN;
) ); ) );
SELECT diag_test_name( 'sys.gu_pmc_update_resource( ) - Bounded extraction quantity (1/2)' ); SELECT diag_test_name( 'sys.gu_pmc_update_resource( ) - Bounded extraction quantity (1/2)' );
SELECT is( resprov_quantity , 0.0::DOUBLE PRECISION ) SELECT is( resprov_quantity , 990.0::DOUBLE PRECISION )
FROM verse.resource_providers FROM verse.resource_providers
WHERE planet_id = 1 AND resource_name_id = 1; WHERE planet_id = 1 AND resource_name_id = 1;
SELECT diag_test_name( 'sys.gu_pmc_update_resource( ) - Bounded extraction quantity (2/2)' ); SELECT diag_test_name( 'sys.gu_pmc_update_resource( ) - Bounded extraction quantity (2/2)' );
SELECT is( pres_income , 1000.0::DOUBLE PRECISION ) SELECT is( pres_income , 10.0::DOUBLE PRECISION )
FROM verse.planet_resources FROM verse.planet_resources
WHERE planet_id = 1 AND resource_name_id = 1; WHERE planet_id = 1 AND resource_name_id = 1;