From 51ff7d5d906b9bf757d7a8b6eca5b7490f81cd92 Mon Sep 17 00:00:00 2001 From: lemming552 Date: Thu, 1 Jan 2015 20:23:43 -0700 Subject: [PATCH] Fixed up puppets --- bin/puppet/add_spaceports.js | 11 -- bin/puppet/colony_setup.js | 198 +++++++++++++++++++++------------- bin/puppet/setup_colony.pl | 8 +- lib/Lacuna/DB/Result/Spies.pm | 4 +- var/www/public/changes.txt | 1 + 5 files changed, 128 insertions(+), 94 deletions(-) delete mode 100644 bin/puppet/add_spaceports.js diff --git a/bin/puppet/add_spaceports.js b/bin/puppet/add_spaceports.js deleted file mode 100644 index 7c797496..00000000 --- a/bin/puppet/add_spaceports.js +++ /dev/null @@ -1,11 +0,0 @@ -[ - { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "10" }, - { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "10" }, - { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "10" }, - { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "10" }, - { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "10" }, - { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "10" }, - { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "10" }, - { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "10" }, - { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "10" } -] diff --git a/bin/puppet/colony_setup.js b/bin/puppet/colony_setup.js index a58c2324..d34d8ac6 100644 --- a/bin/puppet/colony_setup.js +++ b/bin/puppet/colony_setup.js @@ -1,79 +1,123 @@ [ - { "class" : "Lacuna::DB::Result::Building::Archaeology", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Capitol", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::CloakingLab", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Development", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::DistributionCenter", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::DistributionCenter", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Espionage", "level" : "15" }, - { "class" : "Lacuna::DB::Result::Building::Intelligence", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::MunitionsLab", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Observatory", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Oversight", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Permanent::AlgaePond", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Permanent::AmalgusMeadow", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Permanent::BeeldebanNest", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Permanent::DentonBrambles", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Permanent::GeoThermalVent", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Permanent::GratchsGauntlet", "level" : "10" }, - { "class" : "Lacuna::DB::Result::Building::Permanent::GreatBallOfJunk", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Permanent::InterDimensionalRift", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Permanent::NaturalSpring", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Permanent::Volcano", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::PilotTraining", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::PoliticsTraining", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Propulsion", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Security", "level" : "10" }, - { "class" : "Lacuna::DB::Result::Building::Shipyard", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Shipyard", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Shipyard", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Stockpile", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Trade", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Waste::Exchanger", "level" : "25" }, - { "class" : "Lacuna::DB::Result::Building::Waste::Exchanger", "level" : "25" }, - { "class" : "Lacuna::DB::Result::Building::Waste::Sequestration", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Waste::Sequestration", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Waste::Sequestration", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Waste::Sequestration", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Waste::Sequestration", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Water::AtmosphericEvaporator", "level" : "25" }, - { "class" : "Lacuna::DB::Result::Building::Water::AtmosphericEvaporator", "level" : "25" }, - { "class" : "Lacuna::DB::Result::Building::Water::Storage", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Water::Storage", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Ore::Storage", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Ore::Storage", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Energy::Reserve", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Energy::Reserve", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Food::Reserve", "level" : "30" }, - { "class" : "Lacuna::DB::Result::Building::Food::Reserve", "level" : "30" } + { "class" : "Lacuna::DB::Result::Building::Permanent::BlackHoleGenerator", "level" : "30", "x" : "-5", "y" : "-5" }, + { "class" : "Lacuna::DB::Result::Building::Permanent::GratchsGauntlet", "level" : "30", "x" : "-5", "y" : "-4" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-5", "y" : "-3" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-5", "y" : "-2" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-5", "y" : "-1" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-5", "y" : "0" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-5", "y" : "1" }, + { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30", "x" : "-5", "y" : "2" }, + { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30", "x" : "-5", "y" : "3" }, + { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30", "x" : "-5", "y" : "4" }, + { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30", "x" : "-5", "y" : "5" }, + { "class" : "Lacuna::DB::Result::Building::Shipyard", "level" : "30", "x" : "-4", "y" : "-5" }, + { "class" : "Lacuna::DB::Result::Building::Shipyard", "level" : "30", "x" : "-4", "y" : "-4" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-4", "y" : "-3" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-4", "y" : "-2" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-4", "y" : "-1" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-4", "y" : "0" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-4", "y" : "1" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-4", "y" : "2" }, + { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30", "x" : "-4", "y" : "3" }, + { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30", "x" : "-4", "y" : "4" }, + { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30", "x" : "-4", "y" : "5" }, + { "class" : "Lacuna::DB::Result::Building::Shipyard", "level" : "30", "x" : "-3", "y" : "-5" }, + { "class" : "Lacuna::DB::Result::Building::Shipyard", "level" : "30", "x" : "-3", "y" : "-4" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-3", "y" : "-3" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-3", "y" : "-2" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-3", "y" : "-1" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-3", "y" : "0" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-3", "y" : "1" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-3", "y" : "2" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-3", "y" : "3" }, + { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30", "x" : "-3", "y" : "4" }, + { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30", "x" : "-3", "y" : "5" }, + { "class" : "Lacuna::DB::Result::Building::Shipyard", "level" : "30", "x" : "-2", "y" : "-5" }, + { "class" : "Lacuna::DB::Result::Building::Shipyard", "level" : "30", "x" : "-2", "y" : "-4" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-2", "y" : "-3" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-2", "y" : "-2" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-2", "y" : "-1" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-2", "y" : "0" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-2", "y" : "1" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-2", "y" : "2" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-2", "y" : "3" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-2", "y" : "4" }, + { "class" : "Lacuna::DB::Result::Building::SAW", "level" : "30", "x" : "-2", "y" : "5" }, + { "class" : "Lacuna::DB::Result::Building::LCOTi", "level" : "30", "x" : "-1", "y" : "-5" }, + { "class" : "Lacuna::DB::Result::Building::LCOTb", "level" : "30", "x" : "-1", "y" : "-4" }, + { "class" : "Lacuna::DB::Result::Building::LCOTc", "level" : "30", "x" : "-1", "y" : "-3" }, + { "class" : "Lacuna::DB::Result::Building::Intelligence", "level" : "30", "x" : "-1", "y" : "-2" }, + { "class" : "Lacuna::DB::Result::Building::Observatory", "level" : "30", "x" : "-1", "y" : "-1" }, + { "class" : "Lacuna::DB::Result::Building::Development", "level" : "30", "x" : "-1", "y" : "0" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-1", "y" : "1" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-1", "y" : "2" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-1", "y" : "3" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-1", "y" : "4" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "-1", "y" : "5" }, + { "class" : "Lacuna::DB::Result::Building::LCOTh", "level" : "30", "x" : "0", "y" : "-5" }, + { "class" : "Lacuna::DB::Result::Building::LCOTa", "level" : "30", "x" : "0", "y" : "-4" }, + { "class" : "Lacuna::DB::Result::Building::LCOTd", "level" : "30", "x" : "0", "y" : "-3" }, + { "class" : "Lacuna::DB::Result::Building::Security", "level" : "30", "x" : "0", "y" : "-2" }, + { "class" : "Lacuna::DB::Result::Building::Archaeology", "level" : "30", "x" : "0", "y" : "-1" }, + { "class" : "Lacuna::DB::Result::Building::PlanetaryCommand", "level" : "30", "x" : "0", "y" : "0" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "0", "y" : "1" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "0", "y" : "2" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "0", "y" : "3" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "0", "y" : "4" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "0", "y" : "5" }, + { "class" : "Lacuna::DB::Result::Building::LCOTg", "level" : "30", "x" : "1", "y" : "-5" }, + { "class" : "Lacuna::DB::Result::Building::LCOTf", "level" : "30", "x" : "1", "y" : "-4" }, + { "class" : "Lacuna::DB::Result::Building::LCOTe", "level" : "30", "x" : "1", "y" : "-3" }, + { "class" : "Lacuna::DB::Result::Building::Espionage", "level" : "30", "x" : "1", "y" : "-2" }, + { "class" : "Lacuna::DB::Result::Building::Transporter", "level" : "30", "x" : "1", "y" : "-1" }, + { "class" : "Lacuna::DB::Result::Building::Trade", "level" : "30", "x" : "1", "y" : "0" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "1", "y" : "1" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "1", "y" : "2" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "1", "y" : "3" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "1", "y" : "4" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "1", "y" : "5" }, + { "class" : "Lacuna::DB::Result::Building::Waste::Sequestration", "level" : "30", "x" : "2", "y" : "-5" }, + { "class" : "Lacuna::DB::Result::Building::PilotTraining", "level" : "30", "x" : "2", "y" : "-4" }, + { "class" : "Lacuna::DB::Result::Building::MunitionsLab", "level" : "30", "x" : "2", "y" : "-3" }, + { "class" : "Lacuna::DB::Result::Building::Propulsion", "level" : "30", "x" : "2", "y" : "-2" }, + { "class" : "Lacuna::DB::Result::Building::CloakingLab", "level" : "30", "x" : "2", "y" : "-1" }, + { "class" : "Lacuna::DB::Result::Building::Oversight", "level" : "30", "x" : "2", "y" : "0" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "2", "y" : "1" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "2", "y" : "2" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "2", "y" : "3" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "2", "y" : "4" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "2", "y" : "5" }, + { "class" : "Lacuna::DB::Result::Building::TheftTraining", "level" : "30", "x" : "3", "y" : "-5" }, + { "class" : "Lacuna::DB::Result::Building::PoliticsTraining", "level" : "30", "x" : "3", "y" : "-4" }, + { "class" : "Lacuna::DB::Result::Building::MayhemTraining", "level" : "30", "x" : "3", "y" : "-3" }, + { "class" : "Lacuna::DB::Result::Building::IntelTraining", "level" : "30", "x" : "3", "y" : "-2" }, + { "class" : "Lacuna::DB::Result::Building::Permanent::CitadelOfKnope", "level" : "30", "x" : "3", "y" : "-1" }, + { "class" : "Lacuna::DB::Result::Building::Permanent::OracleOfAnid", "level" : "30", "x" : "3", "y" : "0" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "3", "y" : "1" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "3", "y" : "2" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "3", "y" : "3" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "3", "y" : "4" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "3", "y" : "5" }, + { "class" : "Lacuna::DB::Result::Building::Permanent::Ravine", "level" : "30", "x" : "4", "y" : "-5" }, + { "class" : "Lacuna::DB::Result::Building::Permanent::SpaceJunkPark", "level" : "30", "x" : "4", "y" : "-4" }, + { "class" : "Lacuna::DB::Result::Building::Permanent::GreatBallOfJunk", "level" : "30", "x" : "4", "y" : "-3" }, + { "class" : "Lacuna::DB::Result::Building::Permanent::KalavianRuins", "level" : "30", "x" : "4", "y" : "-2" }, + { "class" : "Lacuna::DB::Result::Building::Permanent::GeoThermalVent", "level" : "30", "x" : "4", "y" : "-1" }, + { "class" : "Lacuna::DB::Result::Building::Permanent::Volcano", "level" : "30", "x" : "4", "y" : "0" }, + { "class" : "Lacuna::DB::Result::Building::Permanent::AlgaePond", "level" : "30", "x" : "4", "y" : "1" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "4", "y" : "2" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "4", "y" : "3" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "4", "y" : "4" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "4", "y" : "5" }, + { "class" : "Lacuna::DB::Result::Building::Permanent::InterDimensionalRift", "level" : "30", "x" : "5", "y" : "-5" }, + { "class" : "Lacuna::DB::Result::Building::Permanent::PyramidJunkSculpture", "level" : "30", "x" : "5", "y" : "-4" }, + { "class" : "Lacuna::DB::Result::Building::Permanent::MetalJunkArches", "level" : "30", "x" : "5", "y" : "-3" }, + { "class" : "Lacuna::DB::Result::Building::Permanent::JunkHengeSculpture", "level" : "30", "x" : "5", "y" : "-2" }, + { "class" : "Lacuna::DB::Result::Building::Permanent::CrashedShipSite", "level" : "30", "x" : "5", "y" : "-1" }, + { "class" : "Lacuna::DB::Result::Building::Permanent::NaturalSpring", "level" : "30", "x" : "5", "y" : "0" }, + { "class" : "Lacuna::DB::Result::Building::Permanent::MalcudField", "level" : "30", "x" : "5", "y" : "1" }, + { "class" : "Lacuna::DB::Result::Building::Permanent::PantheonOfHagness", "level" : "30", "x" : "5", "y" : "2" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "5", "y" : "3" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "5", "y" : "4" }, + { "class" : "Lacuna::DB::Result::Building::SpacePort", "level" : "30", "x" : "5", "y" : "5" } ] diff --git a/bin/puppet/setup_colony.pl b/bin/puppet/setup_colony.pl index 3267665c..68efc5c6 100755 --- a/bin/puppet/setup_colony.pl +++ b/bin/puppet/setup_colony.pl @@ -60,16 +60,16 @@ our $quiet; say "Adding to ".$body->name; for my $build (@$builds) { next if ($build->{level} < 1 or $build->{level} > 30); - my ($x, $y) = $body->find_free_space; +# my ($x, $y) = $body->find_free_space; # next if $y > -1; my $bld = Lacuna->db->resultset('Lacuna::DB::Result::Building')->new({ body_id => $body->id, - x => $x, - y => $y, + x => $build->{x}, + y => $build->{y}, class => $build->{class}, level => $build->{level} - 1, }); - say sprintf("%2d:%2d L:%2d %s", $x, $y, $bld->level, $bld->name); + say sprintf("%2d:%2d L:%2d %s", $bld->x, $bld->y, $bld->level, $bld->name); $body->build_building($bld); $bld->finish_upgrade; } diff --git a/lib/Lacuna/DB/Result/Spies.pm b/lib/Lacuna/DB/Result/Spies.pm index 2c1d0fe4..d1a0c754 100644 --- a/lib/Lacuna/DB/Result/Spies.pm +++ b/lib/Lacuna/DB/Result/Spies.pm @@ -460,9 +460,9 @@ sub is_available { my $now = DateTime->now; my $pol_time = $now->subtract_datetime_absolute($self->started_assignment); my $minutes = int($pol_time->seconds/60); - my $mission_count_add = int($minutes/240); + my $mission_count_add = int($minutes/360); if ($mission_count_add > 0) { - my $remain_min = $minutes - ($mission_count_add * 240); + my $remain_min = $minutes - ($mission_count_add * 360); $self->started_assignment($now->clone->subtract(minutes => $remain_min)); # Put time at now with remainder my $fskill = $self->politics_xp + $mission_count_add; $fskill = 2600 if ($fskill > 2600); diff --git a/var/www/public/changes.txt b/var/www/public/changes.txt index 71c3b24b..1aa64e4b 100644 --- a/var/www/public/changes.txt +++ b/var/www/public/changes.txt @@ -9,6 +9,7 @@ - Fix: Buildings should no longer get stuck in upgrading state. - Add: Allow login with "#". - Mod: "#" no longer permitted as leading character in empire names. + - Mod: Propaganda doesn't count as often for missions. 3.0908: - Mod: trash_messages_where now defaults to not returning deleted message IDs. -- 2.51.2