diff --git a/docs/ErrorCodes.pod b/docs/ErrorCodes.pod index c855f9b6..e4542662 100644 --- a/docs/ErrorCodes.pod +++ b/docs/ErrorCodes.pod @@ -46,5 +46,17 @@ The items in the range don't fit the rules for the range. For example, habitable The authenticated empire doesn't have the privileges to complete the requested action. +=head2 1011 Not enough resources in storage. + +The empire/planet/station doesn't have enough resources in storage to complete the requested action. Build more wealth to fix the problem. + +=head2 1012 Not enough resources in production. + +The empire/planet/station isn't producing enough resources to keep up with the demands of this action. If the action were allowed to complete it would bankrupt the empire. + +=head2 1013 Missing prerequisites. + +The empire/planet/station hasn't completed building the prerequisite buildings in order to build something new. + =cut diff --git a/lib/Lacuna/DB/Building.pm b/lib/Lacuna/DB/Building.pm index 04408f8b..050cd1dc 100644 --- a/lib/Lacuna/DB/Building.pm +++ b/lib/Lacuna/DB/Building.pm @@ -3,9 +3,17 @@ package Lacuna::DB::Building; use Moose; extends 'SimpleDB::Class::Item'; +use constant INFLATION => 1.8847; +use constant GROWTH => 1.292; +use constant FOOD_TYPES => (qw(lapis potato apple root corn cider wheat bread soup chip pie pancake milk meal algae syrup fungus burger shake beetle)); +use constant ORE_TYPES => (qw(rutile chromite chalcopyrite galena gold uraninite bauxite limonite halite gypsum trona kerogen petroleum anthracite sulfate zircon monazite fluorite beryl magnetite)); + + + __PACKAGE__->add_attributes( date_created => { isa => 'DateTime' }, body_id => { isa => 'Str' }, + empire_id => { isa => 'Str' }, x => { isa => 'Int' }, y => { isa => 'Int' }, level => { isa => 'Int' }, @@ -55,6 +63,36 @@ has waste_to_build => ( default => 0, ); +has happiness_consumption => ( + is => 'ro', + default => 0, +); + +has energy_consumption => ( + is => 'ro', + default => 0, +); + +has water_consumption => ( + is => 'ro', + default => 0, +); + +has waste_consumption => ( + is => 'ro', + default => 0, +); + +has food_consumption => ( + is => 'ro', + default => 0, +); + +has ore_consumption => ( + is => 'ro', + default => 0, +); + has happiness_production => ( is => 'ro', default => 0, @@ -75,14 +113,104 @@ has waste_production => ( default => 0, ); -has food_production => ( +has beetle_production => ( is => 'ro', default => 0, ); -has food_prodced => ( +has shake_production => ( is => 'ro', - default => undef, + default => 0, +); + +has burger_production => ( + is => 'ro', + default => 0, +); + +has fungus_production => ( + is => 'ro', + default => 0, +); + +has syrup_production => ( + is => 'ro', + default => 0, +); + +has algae_production => ( + is => 'ro', + default => 0, +); + +has meal_production => ( + is => 'ro', + default => 0, +); + +has milk_production => ( + is => 'ro', + default => 0, +); + +has pancake_production => ( + is => 'ro', + default => 0, +); + +has pie_production => ( + is => 'ro', + default => 0, +); + +has chip_production => ( + is => 'ro', + default => 0, +); + +has soup_production => ( + is => 'ro', + default => 0, +); + +has bread_production => ( + is => 'ro', + default => 0, +); + +has wheat_production => ( + is => 'ro', + default => 0, +); + +has cider_production => ( + is => 'ro', + default => 0, +); + +has corn_production => ( + is => 'ro', + default => 0, +); + +has root_production => ( + is => 'ro', + default => 0, +); + +has apple_production => ( + is => 'ro', + default => 0, +); + +has lapis_production => ( + is => 'ro', + default => 0, +); + +has potato_production => ( + is => 'ro', + default => 0, ); has ore_production => ( @@ -115,5 +243,67 @@ has waste_storage => ( default => 0, ); + +sub food_per_tick { + my ($self) = @_; + return $self->food_production; +} + +sub energy_per_tick { + my ($self) = @_; + return $self->energy_production; +} + +sub ore_per_tick { + my ($self) = @_; + return $self->ore_production; +} + +sub water_per_tick { + my ($self) = @_; + return $self->water_production; +} + +sub waste_per_tick { + my ($self) = @_; + return $self->waste_production; +} + +sub food_to_upgrade { + my ($self) = @_; + my $next_level = $self->level + 1; + return $self->food_to_build * (INFLATION ** ($next_level - 1)); +} + +sub energy_to_upgrade { + my ($self) = @_; + my $next_level = $self->level + 1; + return $self->energy_to_build * $next_level; +} + +sub ore_to_upgrade { + my ($self) = @_; + my $next_level = $self->level + 1; + return $self->ore_to_build * $next_level; +} + +sub water_to_upgrade { + my ($self) = @_; + my $next_level = $self->level + 1; + return $self->water_to_build * $next_level; +} + +sub waste_to_upgrade { + my ($self) = @_; + my $next_level = $self->level + 1; + return $self->waste_to_build * $next_level; +} + +sub food_production_delta_after_upgrade { + my ($self) = @_; + my $next_level = $self->level + 1; + return $self->waste_to_build * $next_level; +} + no Moose; __PACKAGE__->meta->make_immutable; diff --git a/lib/Lacuna/DB/Building/Development.pm b/lib/Lacuna/DB/Building/Development.pm index 24d999a2..7381cbc1 100644 --- a/lib/Lacuna/DB/Building/Development.pm +++ b/lib/Lacuna/DB/Building/Development.pm @@ -35,20 +35,20 @@ has '+time_to_build' => ( default => 60, ); -has '+food_production' => ( - default => -25, +has '+food_consumption' => ( + default => 25, ); -has '+energy_production' => ( - default => -50, +has '+energy_consumption' => ( + default => 50, ); -has '+ore_production' => ( - default => -10, +has '+ore_consumption' => ( + default => 10, ); -has '+water_production' => ( - default => -25, +has '+water_consumption' => ( + default => 25, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Embassy.pm b/lib/Lacuna/DB/Building/Embassy.pm index 2afd324c..9c9985ba 100644 --- a/lib/Lacuna/DB/Building/Embassy.pm +++ b/lib/Lacuna/DB/Building/Embassy.pm @@ -35,20 +35,20 @@ has '+time_to_build' => ( default => 60, ); -has '+food_production' => ( - default => -25, +has '+food_consumption' => ( + default => 25, ); -has '+energy_production' => ( - default => -30, +has '+energy_consumption' => ( + default => 30, ); -has '+ore_production' => ( - default => -5, +has '+ore_consumption' => ( + default => 5, ); -has '+water_production' => ( - default => -25, +has '+water_consumption' => ( + default => 25, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Energy/Fission.pm b/lib/Lacuna/DB/Building/Energy/Fission.pm index 3ee313ce..5090b5bf 100644 --- a/lib/Lacuna/DB/Building/Energy/Fission.pm +++ b/lib/Lacuna/DB/Building/Energy/Fission.pm @@ -35,20 +35,24 @@ has '+time_to_build' => ( default => 155, ); -has '+food_production' => ( - default => -5, +has '+food_consumption' => ( + default => 5, +); + +has '+energy_consumption' => ( + default => 70, ); has '+energy_production' => ( - default => 380, + default => 450, ); -has '+ore_production' => ( - default => -35, +has '+ore_consumption' => ( + default => 35, ); -has '+water_production' => ( - default => -50, +has '+water_consumption' => ( + default => 50, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Energy/Fusion.pm b/lib/Lacuna/DB/Building/Energy/Fusion.pm index f043f357..1ceccab6 100644 --- a/lib/Lacuna/DB/Building/Energy/Fusion.pm +++ b/lib/Lacuna/DB/Building/Energy/Fusion.pm @@ -35,20 +35,24 @@ has '+time_to_build' => ( default => 790, ); -has '+food_production' => ( - default => -5, +has '+food_consumption' => ( + default => 5, +); + +has '+energy_consumption' => ( + default => 50, ); has '+energy_production' => ( - default => 467, + default => 517, ); -has '+ore_production' => ( - default => -30, +has '+ore_consumption' => ( + default => 30, ); -has '+water_production' => ( - default => -60, +has '+water_consumption' => ( + default => 60, ); has '+waste_production' => ( @@ -56,6 +60,5 @@ has '+waste_production' => ( ); - no Moose; __PACKAGE__->meta->make_immutable; diff --git a/lib/Lacuna/DB/Building/Energy/Geo.pm b/lib/Lacuna/DB/Building/Energy/Geo.pm index 0cdf2cd3..a4c822d2 100644 --- a/lib/Lacuna/DB/Building/Energy/Geo.pm +++ b/lib/Lacuna/DB/Building/Energy/Geo.pm @@ -35,20 +35,24 @@ has '+time_to_build' => ( default => 130, ); -has '+food_production' => ( - default => -2, +has '+food_consumption' => ( + default => 2, +); + +has '+energy_consumption' => ( + default => 40, ); has '+energy_production' => ( - default => 101, + default => 141, ); -has '+ore_production' => ( - default => -12, +has '+ore_consumption' => ( + default => 12, ); -has '+water_production' => ( - default => -7, +has '+water_consumption' => ( + default => 7, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Energy/Hydrocarbon.pm b/lib/Lacuna/DB/Building/Energy/Hydrocarbon.pm index 217be9ef..e649b6ce 100644 --- a/lib/Lacuna/DB/Building/Energy/Hydrocarbon.pm +++ b/lib/Lacuna/DB/Building/Energy/Hydrocarbon.pm @@ -35,20 +35,24 @@ has '+time_to_build' => ( default => 70, ); -has '+food_production' => ( - default => -15, +has '+food_consumption' => ( + default => 15, +); + +has '+energy_consumption' => ( + default => 120, ); has '+energy_production' => ( - default => 370, + default => 490, ); -has '+ore_production' => ( - default => -90, +has '+ore_consumption' => ( + default => 90, ); -has '+water_production' => ( - default => -15, +has '+water_consumption' => ( + default => 15, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Energy/Reserve.pm b/lib/Lacuna/DB/Building/Energy/Reserve.pm index dd1532a4..7d49f03c 100644 --- a/lib/Lacuna/DB/Building/Energy/Reserve.pm +++ b/lib/Lacuna/DB/Building/Energy/Reserve.pm @@ -35,20 +35,20 @@ has '+time_to_build' => ( default => 200, ); -has '+food_production' => ( - default => -2, +has '+food_consumption' => ( + default => 2, ); -has '+energy_production' => ( - default => -10, +has '+energy_consumption' => ( + default => 10, ); -has '+ore_production' => ( - default => -3, +has '+ore_consumption' => ( + default => 3, ); -has '+water_production' => ( - default => -1, +has '+water_consumption' => ( + default => 1, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Energy/Singularity.pm b/lib/Lacuna/DB/Building/Energy/Singularity.pm index aaf65c89..f86b6922 100644 --- a/lib/Lacuna/DB/Building/Energy/Singularity.pm +++ b/lib/Lacuna/DB/Building/Energy/Singularity.pm @@ -35,20 +35,24 @@ has '+time_to_build' => ( default => 1300, ); -has '+food_production' => ( - default => -27, +has '+food_consumption' => ( + default => 27, +); + +has '+energy_consumption' => ( + default => 350, ); has '+energy_production' => ( - default => 449, + default => 799, ); -has '+ore_production' => ( - default => -23, +has '+ore_consumption' => ( + default => 23, ); -has '+water_production' => ( - default => -25, +has '+water_consumption' => ( + default => 25, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Energy/Waste.pm b/lib/Lacuna/DB/Building/Energy/Waste.pm index 52efe467..1daf6b91 100644 --- a/lib/Lacuna/DB/Building/Energy/Waste.pm +++ b/lib/Lacuna/DB/Building/Energy/Waste.pm @@ -35,24 +35,32 @@ has '+time_to_build' => ( default => 95, ); -has '+food_production' => ( - default => -10, +has '+food_consumption' => ( + default => 10, +); + +has '+energy_consumption' => ( + default => 110, ); has '+energy_production' => ( - default => 145, + default => 255, ); -has '+ore_production' => ( - default => -5, +has '+ore_consumption' => ( + default => 5, ); -has '+water_production' => ( - default => -10, +has '+water_consumption' => ( + default => 10, +); + +has '+waste_consumption' => ( + default => 100, ); has '+waste_production' => ( - default => -90, + default => 10, ); diff --git a/lib/Lacuna/DB/Building/EntertainmentDistrict.pm b/lib/Lacuna/DB/Building/EntertainmentDistrict.pm index b8a541b9..f4cef8e4 100644 --- a/lib/Lacuna/DB/Building/EntertainmentDistrict.pm +++ b/lib/Lacuna/DB/Building/EntertainmentDistrict.pm @@ -35,20 +35,20 @@ has '+time_to_build' => ( default => 250, ); -has '+food_production' => ( - default => -100, +has '+food_consumption' => ( + default => 100, ); -has '+energy_production' => ( - default => -100, +has '+energy_consumption' => ( + default => 100, ); -has '+ore_production' => ( - default => -10, +has '+ore_consumption' => ( + default => 10, ); -has '+water_production' => ( - default => -100, +has '+water_consumption' => ( + default => 100, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Espionage.pm b/lib/Lacuna/DB/Building/Espionage.pm index 6b12103f..0143d795 100644 --- a/lib/Lacuna/DB/Building/Espionage.pm +++ b/lib/Lacuna/DB/Building/Espionage.pm @@ -35,20 +35,20 @@ has '+time_to_build' => ( default => 60, ); -has '+food_production' => ( - default => -25, +has '+food_consumption' => ( + default => 25, ); -has '+energy_production' => ( - default => -50, +has '+energy_consumption' => ( + default => 50, ); -has '+ore_production' => ( - default => -10, +has '+ore_consumption' => ( + default => 10, ); -has '+water_production' => ( - default => -25, +has '+water_consumption' => ( + default => 25, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Food/Factory/Bread.pm b/lib/Lacuna/DB/Building/Food/Factory/Bread.pm index edd3e9c7..6fe3cc69 100644 --- a/lib/Lacuna/DB/Building/Food/Factory/Bread.pm +++ b/lib/Lacuna/DB/Building/Food/Factory/Bread.pm @@ -11,18 +11,6 @@ has '+name' => ( default => 'Bread Bakery', ); -has '+food_produced' ( - default => 'Bread', -); - -has '+converts_food' = ( - default => 'Wheat', -); - -has '+conversion_ratio' = ( - default => sub { [75, 150] }, -); - has '+food_to_build' => ( default => -100, ); @@ -47,20 +35,20 @@ has '+time_to_build' => ( default => 200, ); -has '+food_production' => ( +has '+food_consumption' => ( default => 150, ); -has '+energy_production' => ( - default => -50, +has '+bread_production' => ( + default => 75, ); -has '+ore_production' => ( - default => 0, +has '+energy_consumption' => ( + default => 50, ); -has '+water_production' => ( - default => -25, +has '+water_consumption' => ( + default => 25, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Food/Factory/Burger.pm b/lib/Lacuna/DB/Building/Food/Factory/Burger.pm index f60382f6..95997812 100644 --- a/lib/Lacuna/DB/Building/Food/Factory/Burger.pm +++ b/lib/Lacuna/DB/Building/Food/Factory/Burger.pm @@ -11,18 +11,6 @@ has '+name' => ( default => 'Malcud Burger Packer', ); -has '+food_produced' ( - default => 'Malcud Burgers', -); - -has '+converts_food' = ( - default => 'Malcud Fungus', -); - -has '+conversion_ratio' = ( - default => sub { [100, 150] }, -); - has '+food_to_build' => ( default => -100, ); @@ -47,20 +35,24 @@ has '+time_to_build' => ( default => 200, ); -has '+food_production' => ( +has '+food_consumption' => ( default => 150, ); -has '+energy_production' => ( - default => -40, +has '+burger_production' => ( + default => 100, +); + +has '+energy_consumption' => ( + default => 40, ); -has '+ore_production' => ( - default => 0, +has '+ore_consumption' => ( + default => 1, ); -has '+water_production' => ( - default => -10, +has '+water_consumption' => ( + default => 10, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Food/Factory/Cheese.pm b/lib/Lacuna/DB/Building/Food/Factory/Cheese.pm index 286a8f30..13237d77 100644 --- a/lib/Lacuna/DB/Building/Food/Factory/Cheese.pm +++ b/lib/Lacuna/DB/Building/Food/Factory/Cheese.pm @@ -11,18 +11,6 @@ has '+name' => ( default => 'Cheese Maker', ); -has '+food_produced' ( - default => 'Cheese', -); - -has '+converts_food' = ( - default => 'Milk', -); - -has '+conversion_ratio' = ( - default => sub { [100, 150] }, -); - has '+food_to_build' => ( default => -100, ); @@ -47,20 +35,24 @@ has '+time_to_build' => ( default => 200, ); -has '+food_production' => ( +has '+food_consumption' => ( default => 150, ); -has '+energy_production' => ( - default => -75, +has '+cheese_production' => ( + default => 100, +); + +has '+energy_consumption' => ( + default => 75, ); -has '+ore_production' => ( - default => 0, +has '+ore_consumption' => ( + default => 2, ); -has '+water_production' => ( - default => -75, +has '+water_consumption' => ( + default => 75, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Food/Factory/Chip.pm b/lib/Lacuna/DB/Building/Food/Factory/Chip.pm index be78f217..bab74fcb 100644 --- a/lib/Lacuna/DB/Building/Food/Factory/Chip.pm +++ b/lib/Lacuna/DB/Building/Food/Factory/Chip.pm @@ -11,18 +11,6 @@ has '+name' => ( default => 'Denton Root Chip Frier', ); -has '+food_produced' ( - default => 'Denton Chips', -); - -has '+converts_food' = ( - default => 'Denton Roots', -); - -has '+conversion_ratio' = ( - default => sub { [100, 150] }, -); - has '+food_to_build' => ( default => -100, ); @@ -47,20 +35,24 @@ has '+time_to_build' => ( default => 200, ); -has '+food_production' => ( +has '+food_consumption' => ( default => 150, ); -has '+energy_production' => ( - default => -25, +has '+chip_production' => ( + default => 100, +); + +has '+energy_consumption' => ( + default => 25, ); -has '+ore_production' => ( - default => -25, +has '+ore_consumption' => ( + default => 25, ); -has '+water_production' => ( - default => -25, +has '+water_consumption' => ( + default => 25, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Food/Factory/Cider.pm b/lib/Lacuna/DB/Building/Food/Factory/Cider.pm index 6203eb93..8675f28f 100644 --- a/lib/Lacuna/DB/Building/Food/Factory/Cider.pm +++ b/lib/Lacuna/DB/Building/Food/Factory/Cider.pm @@ -11,18 +11,6 @@ has '+name' => ( default => 'Apple Cider Bottler', ); -has '+food_produced' ( - default => 'Apple Cider', -); - -has '+converts_food' = ( - default => 'Apples', -); - -has '+conversion_ratio' = ( - default => sub { [75, 150] }, -); - has '+food_to_build' => ( default => -100, ); @@ -47,20 +35,20 @@ has '+time_to_build' => ( default => 200, ); -has '+food_production' => ( +has '+food_consumption' => ( default => 150, ); -has '+energy_production' => ( - default => -50, +has '+cider_consumption' => ( + default => 75, ); -has '+ore_production' => ( - default => 0, +has '+energy_consumption' => ( + default => 50, ); -has '+water_production' => ( - default => -50, +has '+water_consumption' => ( + default => 50, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Food/Factory/CornMeal.pm b/lib/Lacuna/DB/Building/Food/Factory/CornMeal.pm index c3c837d9..d391aa11 100644 --- a/lib/Lacuna/DB/Building/Food/Factory/CornMeal.pm +++ b/lib/Lacuna/DB/Building/Food/Factory/CornMeal.pm @@ -11,18 +11,6 @@ has '+name' => ( default => 'Corn Meal Grinder', ); -has '+food_produced' ( - default => 'Corn Meal', -); - -has '+converts_food' = ( - default => 'Corn', -); - -has '+conversion_ratio' = ( - default => sub { [100, 150] }, -); - has '+food_to_build' => ( default => -100, ); @@ -47,20 +35,20 @@ has '+time_to_build' => ( default => 200, ); -has '+food_production' => ( +has '+food_consumption' => ( default => 150, ); -has '+energy_production' => ( - default => -50, +has '+food_production' => ( + default => 125, ); -has '+ore_production' => ( - default => 0, +has '+energy_consumption' => ( + default => 50, ); -has '+water_production' => ( - default => -25, +has '+water_consumption' => ( + default => 25, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Food/Factory/Pancake.pm b/lib/Lacuna/DB/Building/Food/Factory/Pancake.pm index 8cdb5c8c..56dd84bb 100644 --- a/lib/Lacuna/DB/Building/Food/Factory/Pancake.pm +++ b/lib/Lacuna/DB/Building/Food/Factory/Pancake.pm @@ -11,18 +11,6 @@ has '+name' => ( default => 'Potato Pancake Factory', ); -has '+food_produced' ( - default => 'Potato Pancakes', -); - -has '+converts_food' = ( - default => 'Potatos', -); - -has '+conversion_ratio' = ( - default => sub { [100, 150] }, -); - has '+food_to_build' => ( default => -100, ); @@ -47,20 +35,20 @@ has '+time_to_build' => ( default => 200, ); -has '+food_production' => ( +has '+food_consumption' => ( default => 150, ); -has '+energy_production' => ( - default => -25, +has '+pancake_production' => ( + default => 90, ); -has '+ore_production' => ( - default => 0, +has '+energy_consumption' => ( + default => 25, ); -has '+water_production' => ( - default => -25, +has '+water_consumption' => ( + default => 25, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Food/Factory/Pie.pm b/lib/Lacuna/DB/Building/Food/Factory/Pie.pm index 2bce2e01..70a0d77d 100644 --- a/lib/Lacuna/DB/Building/Food/Factory/Pie.pm +++ b/lib/Lacuna/DB/Building/Food/Factory/Pie.pm @@ -11,18 +11,6 @@ has '+name' => ( default => 'Lapis Pie Bakery', ); -has '+food_produced' ( - default => 'Lapis Pies', -); - -has '+converts_food' = ( - default => 'Lapis', -); - -has '+conversion_ratio' = ( - default => sub { [100, 150] }, -); - has '+food_to_build' => ( default => -100, ); @@ -47,20 +35,20 @@ has '+time_to_build' => ( default => 200, ); -has '+food_production' => ( +has '+food_consumption' => ( default => 150, ); -has '+energy_production' => ( - default => -50, +has '+pie_production' => ( + default => 100, ); -has '+ore_production' => ( - default => 0, +has '+energy_consumption' => ( + default => 50, ); -has '+water_production' => ( - default => -25, +has '+water_consumption' => ( + default => 20, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Food/Factory/Shake.pm b/lib/Lacuna/DB/Building/Food/Factory/Shake.pm index ca54a28c..9189e396 100644 --- a/lib/Lacuna/DB/Building/Food/Factory/Shake.pm +++ b/lib/Lacuna/DB/Building/Food/Factory/Shake.pm @@ -11,18 +11,6 @@ has '+name' => ( default => 'Beeldeban Protein Shake Factory', ); -has '+food_produced' ( - default => 'Protein Shake', -); - -has '+converts_food' = ( - default => 'Beeldeban Beetles', -); - -has '+conversion_ratio' = ( - default => sub { [100, 150] }, -); - has '+food_to_build' => ( default => -100, ); @@ -47,24 +35,28 @@ has '+time_to_build' => ( default => 200, ); -has '+food_production' => ( +has '+food_consumption' => ( default => 150, ); -has '+energy_production' => ( - default => -25, +has '+shake_production' => ( + default => 100, ); -has '+ore_production' => ( - default => 0, +has '+energy_consumption' => ( + default => 25, ); -has '+water_production' => ( - default => -25, +has '+ore_consumption' => ( + default => 5, +); + +has '+water_consumption' => ( + default => 40, ); has '+waste_production' => ( - default => 25, + default => 20, ); diff --git a/lib/Lacuna/DB/Building/Food/Factory/Soup.pm b/lib/Lacuna/DB/Building/Food/Factory/Soup.pm index dd425cbe..3712b713 100644 --- a/lib/Lacuna/DB/Building/Food/Factory/Soup.pm +++ b/lib/Lacuna/DB/Building/Food/Factory/Soup.pm @@ -11,18 +11,6 @@ has '+name' => ( default => 'Amalgus Bean Soup Cannery', ); -has '+food_produced' ( - default => 'Amalgus Bean Soup', -); - -has '+converts_food' = ( - default => 'Amalgus Beans', -); - -has '+conversion_ratio' = ( - default => sub { [100, 150] }, -); - has '+food_to_build' => ( default => -100, ); @@ -47,20 +35,24 @@ has '+time_to_build' => ( default => 200, ); -has '+food_production' => ( +has '+food_consumption' => ( default => 150, ); -has '+energy_production' => ( - default => -20, +has '+soup_produced' => ( + default => 110, +); + +has '+energy_consumption' => ( + default => 20, ); -has '+ore_production' => ( - default => 0, +has '+ore_consumption' => ( + default => 3, ); -has '+water_production' => ( - default => -30, +has '+water_consumption' => ( + default => 30, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Food/Factory/Syrup.pm b/lib/Lacuna/DB/Building/Food/Factory/Syrup.pm index 62a1596e..dceecd0c 100644 --- a/lib/Lacuna/DB/Building/Food/Factory/Syrup.pm +++ b/lib/Lacuna/DB/Building/Food/Factory/Syrup.pm @@ -11,18 +11,6 @@ has '+name' => ( default => 'Algae Syrup Bottler', ); -has '+food_produced' ( - default => 'Algae Syrup', -); - -has '+converts_food' = ( - default => 'Algae', -); - -has '+conversion_ratio' = ( - default => sub { [100, 150] }, -); - has '+food_to_build' => ( default => -100, ); @@ -47,20 +35,20 @@ has '+time_to_build' => ( default => 200, ); -has '+food_production' => ( +has '+food_consumption' => ( default => 150, ); -has '+energy_production' => ( - default => -75, +has '+syrup_production' => ( + default => 100, ); -has '+ore_production' => ( - default => 0, +has '+energy_consumption' => ( + default => 75, ); -has '+water_production' => ( - default => -25, +has '+water_consumption' => ( + default => 25, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Food/Farm/Algae.pm b/lib/Lacuna/DB/Building/Food/Farm/Algae.pm index 9ed33676..48fc9452 100644 --- a/lib/Lacuna/DB/Building/Food/Farm/Algae.pm +++ b/lib/Lacuna/DB/Building/Food/Farm/Algae.pm @@ -11,10 +11,6 @@ has '+name' => ( default => 'Algae Cropper', ); -has '+food_produced' ( - default => 'Algae', -); - has '+food_to_build' => ( default => -10, ); @@ -39,24 +35,32 @@ has '+time_to_build' => ( default => 60, ); -has '+food_production' => ( +has '+food_consumption' => ( default => 5, ); +has '+algae_production' => ( + default => 10, +); + has '+energy_production' => ( default => 3, ); -has '+ore_production' => ( - default => -1, +has '+ore_consumption' => ( + default => 1, ); -has '+water_production' => ( - default => -2, +has '+water_consumption' => ( + default => 2, +); + +has '+waste_consumption' => ( + default => 5, ); has '+waste_production' => ( - default => 1, + default => 6, ); diff --git a/lib/Lacuna/DB/Building/Food/Farm/Apple.pm b/lib/Lacuna/DB/Building/Food/Farm/Apple.pm index 3bb76190..eb5f50d4 100644 --- a/lib/Lacuna/DB/Building/Food/Farm/Apple.pm +++ b/lib/Lacuna/DB/Building/Food/Farm/Apple.pm @@ -11,10 +11,6 @@ has '+name' => ( default => 'Apple Orchard', ); -has '+food_produced' ( - default => 'Apples', -); - has '+food_to_build' => ( default => -10, ); @@ -39,24 +35,32 @@ has '+time_to_build' => ( default => 60, ); -has '+food_production' => ( - default => 41, +has '+food_consumption' => ( + default => 5, ); -has '+energy_production' => ( - default => -1, +has '+apple_production' => ( + default => 46, ); -has '+ore_production' => ( - default => -1, +has '+energy_consumption' => ( + default => 1, ); -has '+water_production' => ( - default => -9, +has '+ore_consumption' => ( + default => 1, +); + +has '+water_consumption' => ( + default => 9, ); has '+waste_production' => ( - default => 13, + default => 16, +); + +has '+waste_consumption' => ( + default => 3, ); diff --git a/lib/Lacuna/DB/Building/Food/Farm/Bean.pm b/lib/Lacuna/DB/Building/Food/Farm/Bean.pm index 4552b80d..2495377d 100644 --- a/lib/Lacuna/DB/Building/Food/Farm/Bean.pm +++ b/lib/Lacuna/DB/Building/Food/Farm/Bean.pm @@ -11,10 +11,6 @@ has '+name' => ( default => 'Amalgus Bean Plantation', ); -has '+food_produced' ( - default => 'Amalgus Beans', -); - has '+food_to_build' => ( default => -10, ); @@ -39,20 +35,24 @@ has '+time_to_build' => ( default => 60, ); -has '+food_production' => ( - default => 45, +has '+food_consumption' => ( + default => 5, +); + +has '+bean_production' => ( + default => 60, ); -has '+energy_production' => ( - default => -1, +has '+energy_consumption' => ( + default => 1, ); -has '+ore_production' => ( - default => -3, +has '+ore_consumption' => ( + default => 10, ); -has '+water_production' => ( - default => -7, +has '+water_consumption' => ( + default => 7, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Food/Farm/Beeldeban.pm b/lib/Lacuna/DB/Building/Food/Farm/Beeldeban.pm index 09458bac..fbfa89e9 100644 --- a/lib/Lacuna/DB/Building/Food/Farm/Beeldeban.pm +++ b/lib/Lacuna/DB/Building/Food/Farm/Beeldeban.pm @@ -11,10 +11,6 @@ has '+name' => ( default => 'Beeldeban Herder', ); -has '+food_produced' ( - default => 'Beeldeban Beetles', -); - has '+food_to_build' => ( default => -100, ); @@ -39,26 +35,34 @@ has '+time_to_build' => ( default => 80, ); -has '+food_production' => ( - default => 22, +has '+food_consumption' => ( + default => 5, ); -has '+energy_production' => ( - default => -2, +has '+beetle_production' => ( + default => 35, ); -has '+ore_production' => ( - default => -4, +has '+energy_consumption' => ( + default => 2, ); -has '+water_production' => ( - default => -3, +has '+ore_consumption' => ( + default => 4, +); + +has '+water_consumption' => ( + default => 3, ); has '+waste_production' => ( default => 23, ); +has '+waste_consumption' => ( + default => 15, +); + no Moose; diff --git a/lib/Lacuna/DB/Building/Food/Farm/Corn.pm b/lib/Lacuna/DB/Building/Food/Farm/Corn.pm index 302ed299..ed350b00 100644 --- a/lib/Lacuna/DB/Building/Food/Farm/Corn.pm +++ b/lib/Lacuna/DB/Building/Food/Farm/Corn.pm @@ -11,10 +11,6 @@ has '+name' => ( default => 'Corn Plantation', ); -has '+food_produced' ( - default => 'Corn', -); - has '+food_to_build' => ( default => -10, ); @@ -39,19 +35,23 @@ has '+time_to_build' => ( default => 60, ); -has '+food_production' => ( - default => 28, +has '+food_consumption' => ( + default => 5, +); + +has '+corn_production' => ( + default => 44, ); -has '+energy_production' => ( - default => -1, +has '+energy_consumption' => ( + default => 1, ); -has '+ore_production' => ( - default => 0, +has '+ore_consumption' => ( + default => 11, ); -has '+water_production' => ( +has '+water_consumption' => ( default => -10, ); diff --git a/lib/Lacuna/DB/Building/Food/Farm/Dairy.pm b/lib/Lacuna/DB/Building/Food/Farm/Dairy.pm index eb93244e..4cee256a 100644 --- a/lib/Lacuna/DB/Building/Food/Farm/Dairy.pm +++ b/lib/Lacuna/DB/Building/Food/Farm/Dairy.pm @@ -11,10 +11,6 @@ has '+name' => ( default => 'Dairy Farm', ); -has '+food_produced' ( - default => 'Milk', -); - has '+food_to_build' => ( default => -200, ); @@ -39,20 +35,24 @@ has '+time_to_build' => ( default => 80, ); -has '+food_production' => ( - default => 32, +has '+food_consumption' => ( + default => 5, +); + +has '+milk_production' => ( + default => 47, ); -has '+energy_production' => ( - default => -3, +has '+energy_consumption' => ( + default => 8, ); -has '+ore_production' => ( - default => -3, +has '+ore_consumption' => ( + default => 3, ); -has '+water_production' => ( - default => -10, +has '+water_consumption' => ( + default => 15, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Food/Farm/Lapis.pm b/lib/Lacuna/DB/Building/Food/Farm/Lapis.pm index 8215b67a..a7c0a4a9 100644 --- a/lib/Lacuna/DB/Building/Food/Farm/Lapis.pm +++ b/lib/Lacuna/DB/Building/Food/Farm/Lapis.pm @@ -11,10 +11,6 @@ has '+name' => ( default => 'Lapis Orchard', ); -has '+food_produced' ( - default => 'Lapis', -); - has '+food_to_build' => ( default => -10, ); @@ -39,20 +35,24 @@ has '+time_to_build' => ( default => 60, ); -has '+food_production' => ( - default => 70, +has '+food_consumption' => ( + default => 5, ); -has '+energy_production' => ( - default => -2, +has '+lapis_production' => ( + default => 75, ); -has '+ore_production' => ( - default => -10, +has '+energy_consumption' => ( + default => 2, ); -has '+water_production' => ( - default => -10, +has '+ore_consumption' => ( + default => 10, +); + +has '+water_consumption' => ( + default => 10, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Food/Farm/Malcud.pm b/lib/Lacuna/DB/Building/Food/Farm/Malcud.pm index 7798cfcb..b3fff498 100644 --- a/lib/Lacuna/DB/Building/Food/Farm/Malcud.pm +++ b/lib/Lacuna/DB/Building/Food/Farm/Malcud.pm @@ -11,10 +11,6 @@ has '+name' => ( default => 'Malcud Fungus Farm', ); -has '+food_produced' ( - default => 'Malcud Fungus', -); - has '+food_to_build' => ( default => -10, ); @@ -39,24 +35,28 @@ has '+time_to_build' => ( default => 60, ); -has '+food_production' => ( - default => 26, +has '+food_consumption' => ( + default => 5, ); -has '+energy_production' => ( - default => -1, +has '+fungus_production' => ( + default => 31, +); + +has '+energy_consumption' => ( + default => 1, ); has '+ore_production' => ( default => 4, ); -has '+water_production' => ( - default => -4, +has '+water_consumption' => ( + default => 4, ); -has '+waste_production' => ( - default => -1, +has '+waste_consumption' => ( + default => 1, ); diff --git a/lib/Lacuna/DB/Building/Food/Farm/Potato.pm b/lib/Lacuna/DB/Building/Food/Farm/Potato.pm index 89921701..6d2134ac 100644 --- a/lib/Lacuna/DB/Building/Food/Farm/Potato.pm +++ b/lib/Lacuna/DB/Building/Food/Farm/Potato.pm @@ -11,10 +11,6 @@ has '+name' => ( default => 'Potato Patch', ); -has '+food_produced' ( - default => 'Potatos', -); - has '+food_to_build' => ( default => -10, ); @@ -39,20 +35,24 @@ has '+time_to_build' => ( default => 60, ); -has '+food_production' => ( - default => 57, +has '+food_consumption' => ( + default => 5, ); -has '+energy_production' => ( - default => -1, +has '+potato_production' => ( + default => 62, ); -has '+ore_production' => ( - default => -2, +has '+energy_consumption' => ( + default => 1, ); -has '+water_production' => ( - default => -10, +has '+ore_consumption' => ( + default => 2, +); + +has '+water_consumption' => ( + default => 10, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Food/Farm/Root.pm b/lib/Lacuna/DB/Building/Food/Farm/Root.pm index 7456f19a..d4f8fe79 100644 --- a/lib/Lacuna/DB/Building/Food/Farm/Root.pm +++ b/lib/Lacuna/DB/Building/Food/Farm/Root.pm @@ -11,10 +11,6 @@ has '+name' => ( default => 'Denton Root Patch', ); -has '+food_produced' ( - default => 'Denton Roots', -); - has '+food_to_build' => ( default => -10, ); @@ -39,20 +35,24 @@ has '+time_to_build' => ( default => 60, ); -has '+food_production' => ( - default => 43, +has '+food_consumption' => ( + default => 5, +); + +has '+root_production' => ( + default => 48, ); -has '+energy_production' => ( - default => -1, +has '+energy_consumption' => ( + default => 1, ); -has '+ore_production' => ( - default => -1, +has '+ore_consumption' => ( + default => 1, ); -has '+water_production' => ( - default => -8, +has '+water_consumption' => ( + default => 8, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Food/Farm/Wheat.pm b/lib/Lacuna/DB/Building/Food/Farm/Wheat.pm index 723629c1..348fa1f2 100644 --- a/lib/Lacuna/DB/Building/Food/Farm/Wheat.pm +++ b/lib/Lacuna/DB/Building/Food/Farm/Wheat.pm @@ -11,10 +11,6 @@ has '+name' => ( default => 'Wheat Farm', ); -has '+food_produced' ( - default => 'Wheat', -); - has '+food_to_build' => ( default => -10, ); @@ -39,20 +35,24 @@ has '+time_to_build' => ( default => 60, ); -has '+food_production' => ( - default => 33, +has '+food_consumption' => ( + default => 5, ); -has '+energy_production' => ( - default => -1, +has '+wheat_production' => ( + default => 38, ); -has '+ore_production' => ( - default => -1, +has '+energy_consumption' => ( + default => 1, ); -has '+water_production' => ( - default => -10, +has '+ore_consumption' => ( + default => 1, +); + +has '+water_consumption' => ( + default => 10, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Food/Reserve.pm b/lib/Lacuna/DB/Building/Food/Reserve.pm index 575ac5aa..033f45a9 100644 --- a/lib/Lacuna/DB/Building/Food/Reserve.pm +++ b/lib/Lacuna/DB/Building/Food/Reserve.pm @@ -35,20 +35,16 @@ has '+time_to_build' => ( default => 100, ); -has '+food_production' => ( - default => -1, -); - -has '+energy_production' => ( - default => -10, +has '+food_consumption' => ( + default => 1, ); -has '+ore_production' => ( - default => 0, +has '+energy_consumption' => ( + default => 10, ); -has '+water_production' => ( - default => -1, +has '+water_consumption' => ( + default => 1, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/GasGiantLab.pm b/lib/Lacuna/DB/Building/GasGiantLab.pm index fe176970..f455633c 100644 --- a/lib/Lacuna/DB/Building/GasGiantLab.pm +++ b/lib/Lacuna/DB/Building/GasGiantLab.pm @@ -35,20 +35,20 @@ has '+time_to_build' => ( default => 900, ); -has '+food_production' => ( - default => -50, +has '+food_consumption' => ( + default => 50, ); -has '+energy_production' => ( - default => -50, +has '+energy_consumption' => ( + default => 50, ); -has '+ore_production' => ( - default => -50, +has '+ore_consumption' => ( + default => 50, ); -has '+water_production' => ( - default => -50, +has '+water_consumption' => ( + default => 50, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/GasGiantPlatform.pm b/lib/Lacuna/DB/Building/GasGiantPlatform.pm index 07a2e947..8a5d1d48 100644 --- a/lib/Lacuna/DB/Building/GasGiantPlatform.pm +++ b/lib/Lacuna/DB/Building/GasGiantPlatform.pm @@ -35,20 +35,20 @@ has '+time_to_build' => ( default => 600, ); -has '+food_production' => ( - default => -45, +has '+food_consumption' => ( + default => 45, ); -has '+energy_production' => ( - default => -45, +has '+energy_consumption' => ( + default => 45, ); -has '+ore_production' => ( - default => -45, +has '+ore_consumption' => ( + default => 45, ); -has '+water_production' => ( - default => -45, +has '+water_consumption' => ( + default => 45, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Intelligence.pm b/lib/Lacuna/DB/Building/Intelligence.pm index 996effd2..1220e326 100644 --- a/lib/Lacuna/DB/Building/Intelligence.pm +++ b/lib/Lacuna/DB/Building/Intelligence.pm @@ -35,20 +35,20 @@ has '+time_to_build' => ( default => 60, ); -has '+food_production' => ( - default => -25, +has '+food_consumption' => ( + default => 25, ); -has '+energy_production' => ( - default => -50, +has '+energy_consumption' => ( + default => 50, ); -has '+ore_production' => ( - default => -10, +has '+ore_consumption' => ( + default => 10, ); -has '+water_production' => ( - default => -25, +has '+water_consumption' => ( + default => 35, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Network19.pm b/lib/Lacuna/DB/Building/Network19.pm index 5e3fb0a8..d0cba1ff 100644 --- a/lib/Lacuna/DB/Building/Network19.pm +++ b/lib/Lacuna/DB/Building/Network19.pm @@ -35,24 +35,24 @@ has '+time_to_build' => ( default => 200, ); -has '+food_production' => ( - default => -30, +has '+food_consumption' => ( + default => 30, ); -has '+energy_production' => ( - default => -95, +has '+energy_consumption' => ( + default => 95, ); -has '+ore_production' => ( - default => -2, +has '+ore_consumption' => ( + default => 2, ); -has '+water_production' => ( - default => -5, +has '+water_consumption' => ( + default => 45, ); has '+waste_production' => ( - default => 5, + default => 15, ); has '+happiness_production' => ( diff --git a/lib/Lacuna/DB/Building/Observatory.pm b/lib/Lacuna/DB/Building/Observatory.pm index 598ee4ba..ffb6d525 100644 --- a/lib/Lacuna/DB/Building/Observatory.pm +++ b/lib/Lacuna/DB/Building/Observatory.pm @@ -35,20 +35,20 @@ has '+time_to_build' => ( default => 250, ); -has '+food_production' => ( - default => -5, +has '+food_consumption' => ( + default => 5, ); -has '+energy_production' => ( +has '+energy_consumption' => ( default => -50, ); -has '+ore_production' => ( - default => -5, +has '+ore_consumption' => ( + default => 5, ); -has '+water_production' => ( - default => -5, +has '+water_consumption' => ( + default => 15, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Ore/Mine.pm b/lib/Lacuna/DB/Building/Ore/Mine.pm index 15770306..523fbb87 100644 --- a/lib/Lacuna/DB/Building/Ore/Mine.pm +++ b/lib/Lacuna/DB/Building/Ore/Mine.pm @@ -35,24 +35,24 @@ has '+time_to_build' => ( default => 100, ); -has '+food_production' => ( - default => -1, +has '+food_consumption' => ( + default => 10, ); -has '+energy_production' => ( - default => -10, +has '+energy_consumption' => ( + default => 10, ); has '+ore_production' => ( - default => 10, + default => 125, ); -has '+water_production' => ( - default => -10, +has '+water_consumption' => ( + default => 10, ); has '+waste_production' => ( - default => 3, + default => 25, ); diff --git a/lib/Lacuna/DB/Building/Ore/Ministry.pm b/lib/Lacuna/DB/Building/Ore/Ministry.pm index a18c160f..3f47d6d1 100644 --- a/lib/Lacuna/DB/Building/Ore/Ministry.pm +++ b/lib/Lacuna/DB/Building/Ore/Ministry.pm @@ -35,20 +35,20 @@ has '+time_to_build' => ( default => 60, ); -has '+food_production' => ( - default => -25, +has '+food_consumption' => ( + default => 25, ); -has '+energy_production' => ( - default => -50, +has '+energy_consumption' => ( + default => 50, ); -has '+ore_production' => ( - default => -10, +has '+ore_consumption' => ( + default => 10, ); -has '+water_production' => ( - default => -25, +has '+water_consumption' => ( + default => 35, ); has '+waste_production' => ( @@ -56,6 +56,5 @@ has '+waste_production' => ( ); - no Moose; __PACKAGE__->meta->make_immutable; diff --git a/lib/Lacuna/DB/Building/Ore/Platform.pm b/lib/Lacuna/DB/Building/Ore/Platform.pm index 973ea54f..14101c92 100644 --- a/lib/Lacuna/DB/Building/Ore/Platform.pm +++ b/lib/Lacuna/DB/Building/Ore/Platform.pm @@ -35,27 +35,27 @@ has '+time_to_build' => ( default => 500, ); -has '+food_production' => ( - default => -5, +has '+food_consumption' => ( + default => 10, ); -has '+energy_production' => ( - default => -50, +has '+energy_consumption' => ( + default => 50, ); has '+ore_production' => ( - default => 10, + default => 280, ); -has '+water_production' => ( - default => -50, +has '+water_consumption' => ( + default => 50, ); has '+waste_production' => ( - default => 15, + default => 50, ); - no Moose; __PACKAGE__->meta->make_immutable; + diff --git a/lib/Lacuna/DB/Building/Ore/Refinery.pm b/lib/Lacuna/DB/Building/Ore/Refinery.pm index 0e9e14a4..bb57b9e1 100644 --- a/lib/Lacuna/DB/Building/Ore/Refinery.pm +++ b/lib/Lacuna/DB/Building/Ore/Refinery.pm @@ -35,20 +35,20 @@ has '+time_to_build' => ( default => 200, ); -has '+food_production' => ( - default => -25, +has '+food_consumption' => ( + default => 15, ); -has '+energy_production' => ( - default => -80, +has '+energy_consumption' => ( + default => 80, ); -has '+ore_production' => ( - default => 0, +has '+ore_consumption' => ( + default => 100, ); -has '+water_production' => ( - default => -15, +has '+water_consumption' => ( + default => 100, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Ore/Storage.pm b/lib/Lacuna/DB/Building/Ore/Storage.pm index ee9fac86..203b7440 100644 --- a/lib/Lacuna/DB/Building/Ore/Storage.pm +++ b/lib/Lacuna/DB/Building/Ore/Storage.pm @@ -35,27 +35,6 @@ has '+time_to_build' => ( default => 100, ); -has '+food_production' => ( - default => 0, -); - -has '+energy_production' => ( - default => 0, -); - -has '+ore_production' => ( - default => 0, -); - -has '+water_production' => ( - default => 0, -); - -has '+waste_production' => ( - default => 0, -); - - no Moose; __PACKAGE__->meta->make_immutable; diff --git a/lib/Lacuna/DB/Building/Park.pm b/lib/Lacuna/DB/Building/Park.pm index 53b0bdc4..01de9c95 100644 --- a/lib/Lacuna/DB/Building/Park.pm +++ b/lib/Lacuna/DB/Building/Park.pm @@ -35,20 +35,20 @@ has '+time_to_build' => ( default => 100, ); -has '+food_production' => ( - default => -10, +has '+food_consumption' => ( + default => 10, ); -has '+energy_production' => ( - default => -10, +has '+energy_consumption' => ( + default => 10, ); -has '+ore_production' => ( - default => -20, +has '+ore_consumption' => ( + default => 20, ); -has '+water_production' => ( - default => -50, +has '+water_consumption' => ( + default => 60, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Propulsion.pm b/lib/Lacuna/DB/Building/Propulsion.pm index 0802011a..b94433d3 100644 --- a/lib/Lacuna/DB/Building/Propulsion.pm +++ b/lib/Lacuna/DB/Building/Propulsion.pm @@ -35,20 +35,20 @@ has '+time_to_build' => ( default => 125, ); -has '+food_production' => ( - default => -10, +has '+food_consumption' => ( + default => 10, ); -has '+energy_production' => ( - default => -100, +has '+energy_consumption' => ( + default => 100, ); -has '+ore_production' => ( - default => -100, +has '+ore_consumption' => ( + default => 100, ); -has '+water_production' => ( - default => -50, +has '+water_consumption' => ( + default => 50, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/RND.pm b/lib/Lacuna/DB/Building/RND.pm index a0d29610..29ddc0e4 100644 --- a/lib/Lacuna/DB/Building/RND.pm +++ b/lib/Lacuna/DB/Building/RND.pm @@ -35,20 +35,20 @@ has '+time_to_build' => ( default => 120, ); -has '+food_production' => ( - default => -10, +has '+food_consumption' => ( + default => 10, ); -has '+energy_production' => ( - default => -25, +has '+energy_consumption' => ( + default => 25, ); -has '+ore_production' => ( - default => -25, +has '+ore_consumption' => ( + default => 25, ); -has '+water_production' => ( - default => -10, +has '+water_consumption' => ( + default => 10, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Security.pm b/lib/Lacuna/DB/Building/Security.pm index 71bd2d03..51cb5654 100644 --- a/lib/Lacuna/DB/Building/Security.pm +++ b/lib/Lacuna/DB/Building/Security.pm @@ -35,26 +35,30 @@ has '+time_to_build' => ( default => 60, ); -has '+food_production' => ( - default => -25, +has '+food_consumption' => ( + default => 25, ); -has '+energy_production' => ( - default => -50, +has '+energy_consumption' => ( + default => 50, ); -has '+ore_production' => ( - default => -10, +has '+ore_consumption' => ( + default => 10, ); -has '+water_production' => ( - default => -25, +has '+water_consumption' => ( + default => 35, ); has '+waste_production' => ( default => 5, ); +has '+happiness_consumption' => ( + default => 10, +); + no Moose; __PACKAGE__->meta->make_immutable; diff --git a/lib/Lacuna/DB/Building/Shipyard.pm b/lib/Lacuna/DB/Building/Shipyard.pm index f89d4775..24979bd6 100644 --- a/lib/Lacuna/DB/Building/Shipyard.pm +++ b/lib/Lacuna/DB/Building/Shipyard.pm @@ -35,20 +35,20 @@ has '+time_to_build' => ( default => 120, ); -has '+food_production' => ( - default => -5, +has '+food_consumption' => ( + default => 5, ); -has '+energy_production' => ( - default => -10, +has '+energy_consumption' => ( + default => 10, ); -has '+ore_production' => ( - default => -5, +has '+ore_consumption' => ( + default => 5, ); -has '+water_production' => ( - default => -5, +has '+water_consumption' => ( + default => 7, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/SpacePort.pm b/lib/Lacuna/DB/Building/SpacePort.pm index bc74d33e..2fe26f47 100644 --- a/lib/Lacuna/DB/Building/SpacePort.pm +++ b/lib/Lacuna/DB/Building/SpacePort.pm @@ -35,24 +35,24 @@ has '+time_to_build' => ( default => 850, ); -has '+food_production' => ( - default => -100, +has '+food_consumption' => ( + default => 100, ); -has '+energy_production' => ( - default => -100, +has '+energy_consumption' => ( + default => 100, ); -has '+ore_production' => ( - default => -20, +has '+ore_consumption' => ( + default => 120, ); -has '+water_production' => ( - default => -20, +has '+water_consumption' => ( + default => 150, ); has '+waste_production' => ( - default => 20, + default => 100, ); diff --git a/lib/Lacuna/DB/Building/TerraformingLab.pm b/lib/Lacuna/DB/Building/TerraformingLab.pm index 285a4482..6c29a591 100644 --- a/lib/Lacuna/DB/Building/TerraformingLab.pm +++ b/lib/Lacuna/DB/Building/TerraformingLab.pm @@ -35,20 +35,20 @@ has '+time_to_build' => ( default => 900, ); -has '+food_production' => ( - default => -50, +has '+food_consumption' => ( + default => 50, ); -has '+energy_production' => ( - default => -50, +has '+energy_consumption' => ( + default => 50, ); -has '+ore_production' => ( - default => -50, +has '+ore_consumption' => ( + default => 50, ); -has '+water_production' => ( - default => -50, +has '+water_consumption' => ( + default => 50, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/TerraformingPlatform.pm b/lib/Lacuna/DB/Building/TerraformingPlatform.pm index 7e89ae69..c1bc7a94 100644 --- a/lib/Lacuna/DB/Building/TerraformingPlatform.pm +++ b/lib/Lacuna/DB/Building/TerraformingPlatform.pm @@ -35,20 +35,20 @@ has '+time_to_build' => ( default => 600, ); -has '+food_production' => ( - default => -45, +has '+food_consumption' => ( + default => 45, ); -has '+energy_production' => ( - default => -45, +has '+energy_consumption' => ( + default => 45, ); -has '+ore_production' => ( - default => -45, +has '+ore_consumption' => ( + default => 45, ); -has '+water_production' => ( - default => -45, +has '+water_consumption' => ( + default => 45, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Trade.pm b/lib/Lacuna/DB/Building/Trade.pm index d62c914d..e3f7f59e 100644 --- a/lib/Lacuna/DB/Building/Trade.pm +++ b/lib/Lacuna/DB/Building/Trade.pm @@ -35,20 +35,20 @@ has '+time_to_build' => ( default => 60, ); -has '+food_production' => ( - default => -25, +has '+food_consumption' => ( + default => 25, ); -has '+energy_production' => ( - default => -50, +has '+energy_consumption' => ( + default => 50, ); -has '+ore_production' => ( - default => -10, +has '+ore_consumption' => ( + default => 10, ); -has '+water_production' => ( - default => -25, +has '+water_consumption' => ( + default => 25, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Transporter.pm b/lib/Lacuna/DB/Building/Transporter.pm index 3638b798..9fe9d568 100644 --- a/lib/Lacuna/DB/Building/Transporter.pm +++ b/lib/Lacuna/DB/Building/Transporter.pm @@ -35,20 +35,20 @@ has '+time_to_build' => ( default => 1150, ); -has '+food_production' => ( - default => -5, +has '+food_consumption' => ( + default => 5, ); -has '+energy_production' => ( - default => -20, +has '+energy_consumption' => ( + default => 20, ); -has '+ore_production' => ( - default => -13, +has '+ore_consumption' => ( + default => 13, ); -has '+water_production' => ( - default => -20, +has '+water_consumption' => ( + default => 20, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/University.pm b/lib/Lacuna/DB/Building/University.pm index 6845bbbe..fe70663e 100644 --- a/lib/Lacuna/DB/Building/University.pm +++ b/lib/Lacuna/DB/Building/University.pm @@ -35,20 +35,20 @@ has '+time_to_build' => ( default => 130, ); -has '+food_production' => ( - default => -50, +has '+food_consumption' => ( + default => 50, ); -has '+energy_production' => ( - default => -50, +has '+energy_consumption' => ( + default => 50, ); -has '+ore_production' => ( - default => -10, +has '+ore_consumption' => ( + default => 10, ); -has '+water_production' => ( - default => -50, +has '+water_consumption' => ( + default => 50, ); has '+waste_production' => ( diff --git a/lib/Lacuna/DB/Building/Waste/Recycling.pm b/lib/Lacuna/DB/Building/Waste/Recycling.pm index 3ff64274..7c964a2e 100644 --- a/lib/Lacuna/DB/Building/Waste/Recycling.pm +++ b/lib/Lacuna/DB/Building/Waste/Recycling.pm @@ -35,24 +35,24 @@ has '+time_to_build' => ( default => 95, ); -has '+food_production' => ( - default => -5, +has '+food_consumption' => ( + default => 5, ); -has '+energy_production' => ( - default => -10, +has '+energy_consumption' => ( + default => 10, ); -has '+ore_production' => ( - default => -5, +has '+ore_consumption' => ( + default => 5, ); -has '+water_production' => ( - default => -5, +has '+water_consumption' => ( + default => 5, ); -has '+waste_production' => ( - default => -5, +has '+waste_consumption' => ( + default => 5, ); diff --git a/lib/Lacuna/DB/Building/Waste/Sequestration.pm b/lib/Lacuna/DB/Building/Waste/Sequestration.pm index d12695d5..c24096d8 100644 --- a/lib/Lacuna/DB/Building/Waste/Sequestration.pm +++ b/lib/Lacuna/DB/Building/Waste/Sequestration.pm @@ -35,26 +35,6 @@ has '+time_to_build' => ( default => 100, ); -has '+food_production' => ( - default => 0, -); - -has '+energy_production' => ( - default => 0, -); - -has '+ore_production' => ( - default => 0, -); - -has '+water_production' => ( - default => 0, -); - -has '+waste_production' => ( - default => 0, -); - has '+waste_storage' => ( default => 1500, ); diff --git a/lib/Lacuna/DB/Building/Waste/Treatment.pm b/lib/Lacuna/DB/Building/Waste/Treatment.pm index 68d5e202..a43c6b84 100644 --- a/lib/Lacuna/DB/Building/Waste/Treatment.pm +++ b/lib/Lacuna/DB/Building/Waste/Treatment.pm @@ -35,24 +35,40 @@ has '+time_to_build' => ( default => 95, ); -has '+food_production' => ( - default => -5, +has '+food_consumption' => ( + default => 5, +); + +has '+energy_consumption' => ( + default => 10, ); has '+energy_production' => ( - default => 20, + default => 30, +); + +has '+ore_consumption' => ( + default => 10, ); has '+ore_production' => ( - default => 20, + default => 30, +); + +has '+water_consumption' => ( + default => 10, ); has '+water_production' => ( - default => 20, + default => 30, +); + +has '+waste_consumption' => ( + default => 110, ); has '+waste_production' => ( - default => -100, + default => 10, ); diff --git a/lib/Lacuna/DB/Building/Water/Production.pm b/lib/Lacuna/DB/Building/Water/Production.pm index 7807dac2..8bd6d7b1 100644 --- a/lib/Lacuna/DB/Building/Water/Production.pm +++ b/lib/Lacuna/DB/Building/Water/Production.pm @@ -35,24 +35,24 @@ has '+time_to_build' => ( default => 95, ); -has '+food_production' => ( - default => -10, +has '+food_consumption' => ( + default => 10, ); -has '+energy_production' => ( - default => -50, +has '+energy_consumption' => ( + default => 100, ); -has '+ore_production' => ( - default => -50, +has '+ore_consumption' => ( + default => 100, ); has '+water_production' => ( - default => 280, + default => 170, ); has '+waste_production' => ( - default => 50, + default => 20, ); diff --git a/lib/Lacuna/DB/Building/Water/Purification.pm b/lib/Lacuna/DB/Building/Water/Purification.pm index ee2ad4c1..ee4b96ec 100644 --- a/lib/Lacuna/DB/Building/Water/Purification.pm +++ b/lib/Lacuna/DB/Building/Water/Purification.pm @@ -35,16 +35,16 @@ has '+time_to_build' => ( default => 95, ); -has '+food_production' => ( - default => -5, +has '+food_consumption' => ( + default => 5, ); -has '+energy_production' => ( - default => -15, +has '+energy_consumption' => ( + default => 15, ); -has '+ore_production' => ( - default => -15, +has '+ore_consumption' => ( + default => 15, ); has '+water_production' => ( diff --git a/lib/Lacuna/DB/Building/Water/Reclamation.pm b/lib/Lacuna/DB/Building/Water/Reclamation.pm index dbc79a3f..3ac29bd5 100644 --- a/lib/Lacuna/DB/Building/Water/Reclamation.pm +++ b/lib/Lacuna/DB/Building/Water/Reclamation.pm @@ -35,24 +35,24 @@ has '+time_to_build' => ( default => 95, ); -has '+food_production' => ( - default => -5, +has '+food_consumption' => ( + default => 5, ); -has '+energy_production' => ( - default => -5, +has '+energy_consumption' => ( + default => 5, ); -has '+ore_production' => ( - default => -5, +has '+ore_consumption' => ( + default => 5, ); has '+water_production' => ( default => 200, ); -has '+waste_production' => ( - default => -100, +has '+waste_consumption' => ( + default => 100, ); diff --git a/lib/Lacuna/DB/Building/Water/Storage.pm b/lib/Lacuna/DB/Building/Water/Storage.pm index 9ed9887c..ec5c01d4 100644 --- a/lib/Lacuna/DB/Building/Water/Storage.pm +++ b/lib/Lacuna/DB/Building/Water/Storage.pm @@ -35,20 +35,20 @@ has '+time_to_build' => ( default => 100, ); -has '+food_production' => ( - default => -2, +has '+food_consumption' => ( + default => 2, ); -has '+energy_production' => ( - default => -5, +has '+energy_consumption' => ( + default => 5, ); -has '+ore_production' => ( - default => -5, +has '+ore_consumption' => ( + default => 5, ); -has '+water_production' => ( - default => -1, +has '+water_consumption' => ( + default => 1, ); has '+waste_production' => ( diff --git a/t/get_stars.json b/t/get_stars.json index 50e01549..b7812608 100644 --- a/t/get_stars.json +++ b/t/get_stars.json @@ -1 +1 @@ - {"id":1,"method":"get_stars","jsonrpc":"2.0","params":["0e61c104-b4a9-432e-add9-726d4e8e677d",-5,1,1,-5,3]} + {"id":1,"method":"get_stars","jsonrpc":"2.0","params":["70e88dd7-14e4-49d5-88d9-9b39412df6f1",-5,1,1,-5,3]}