Menu
▾
▴
[Freeorion-programmers] SF.net SVN: freeorion:[4891] trunk/FreeOrion
|
From: <bi...@us...> - 2012-06-02 15:41:45
|
Revision: 4891
http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4891&view=rev
Author: bigjoe5
Date: 2012-06-02 15:41:37 +0000 (Sat, 02 Jun 2012)
Log Message:
-----------
-Removed minerals. PP now consumes 1 Industry point.
Modified Paths:
--------------
trunk/FreeOrion/Empire/Empire.cpp
trunk/FreeOrion/Empire/Empire.h
trunk/FreeOrion/UI/ClientUI.cpp
trunk/FreeOrion/UI/InfoPanels.cpp
trunk/FreeOrion/UI/InfoPanels.h
trunk/FreeOrion/UI/MapWnd.cpp
trunk/FreeOrion/UI/MapWnd.h
trunk/FreeOrion/UI/ProductionWnd.cpp
trunk/FreeOrion/UI/SidePanel.cpp
trunk/FreeOrion/default/buildings.txt
trunk/FreeOrion/default/specials.txt
trunk/FreeOrion/default/species.txt
trunk/FreeOrion/default/techs.txt
trunk/FreeOrion/parse/ConditionParser3.cpp
trunk/FreeOrion/parse/DoubleValueRefParser.cpp
trunk/FreeOrion/parse/EffectParser.cpp
trunk/FreeOrion/parse/EnumParser.cpp
trunk/FreeOrion/python/PythonEnumWrapper.cpp
trunk/FreeOrion/universe/Condition.cpp
trunk/FreeOrion/universe/Effect.cpp
trunk/FreeOrion/universe/Enums.cpp
trunk/FreeOrion/universe/Enums.h
trunk/FreeOrion/universe/Names.h
trunk/FreeOrion/universe/Planet.cpp
trunk/FreeOrion/universe/ResourceCenter.cpp
trunk/FreeOrion/universe/UniverseServer.cpp
trunk/FreeOrion/universe/ValueRef.cpp
Modified: trunk/FreeOrion/Empire/Empire.cpp
===================================================================
--- trunk/FreeOrion/Empire/Empire.cpp 2012-05-21 13:23:07 UTC (rev 4890)
+++ trunk/FreeOrion/Empire/Empire.cpp 2012-06-02 15:41:37 UTC (rev 4891)
@@ -514,7 +514,7 @@
std::map<std::set<int>, double> available_pp;
// get resource pools used for production...
- boost::shared_ptr<ResourcePool> industry_pool, minerals_pool;
+ boost::shared_ptr<ResourcePool> industry_pool;
std::map<ResourceType, boost::shared_ptr<ResourcePool> >::const_iterator pool_it = resource_pools.find(RE_INDUSTRY);
if (pool_it != resource_pools.end()) {
industry_pool = pool_it->second;
@@ -522,32 +522,18 @@
Logger().errorStream() << "ProductionQueue::AvailablePP couldn't get an industry resource pool from passed resource pools";
return available_pp;
}
- pool_it = resource_pools.find(RE_MINERALS);
- if (pool_it != resource_pools.end()) {
- minerals_pool = pool_it->second;
- } else {
- Logger().errorStream() << "ProductionQueue::AvailablePP couldn't get a minerals resource pool from passed resource pools";
- return available_pp;
- }
- // determine available PP in each resource sharing group of systems for this empire. PP are minimum of available minerals
- // and industry in each resource-sharing group of systems
+ // determine available PP in each resource sharing group of systems for this empire. PP are available
+ // industry in each resource-sharing group of systems
std::map<std::set<int>, double> available_industry = industry_pool->Available();
- std::map<std::set<int>, double> available_minerals = minerals_pool->Available();
for (std::map<std::set<int>, double>::const_iterator ind_it = available_industry.begin(); ind_it != available_industry.end(); ++ind_it) {
// get group of systems in industry pool
const std::set<int>& group = ind_it->first;
- // find same group in minerals pool
- std::map<std::set<int>, double>::const_iterator min_it = available_minerals.find(group);
-
- if (min_it == available_minerals.end())
- continue; // this group doesn't appear in both pools, so has no PP production
-
- available_pp[group] = std::min(ind_it->second, min_it->second); // available pp needs minerals and industry. whichever is less is the available pp
+ available_pp[group] = ind_it->second;
}
return available_pp;
@@ -951,7 +937,6 @@
}
void Empire::Init() {
- m_resource_pools[RE_MINERALS] = boost::shared_ptr<ResourcePool>(new ResourcePool(RE_MINERALS));
m_resource_pools[RE_RESEARCH] = boost::shared_ptr<ResourcePool>(new ResourcePool(RE_RESEARCH));
m_resource_pools[RE_INDUSTRY] = boost::shared_ptr<ResourcePool>(new ResourcePool(RE_INDUSTRY));
m_resource_pools[RE_TRADE] = boost::shared_ptr<ResourcePool>(new ResourcePool(RE_TRADE));
@@ -986,7 +971,6 @@
int Empire::StockpileID(ResourceType res) const {
switch (res) {
- case RE_MINERALS:
case RE_TRADE:
return m_capital_id;
break;
@@ -1872,7 +1856,7 @@
{ return m_sitrep_entries.end(); }
double Empire::ProductionPoints() const
-{ return std::min(GetResourcePool(RE_INDUSTRY)->TotalAvailable(), GetResourcePool(RE_MINERALS)->TotalAvailable()); }
+{ return GetResourcePool(RE_INDUSTRY)->TotalAvailable(); }
const ResourcePool* Empire::GetResourcePool(ResourceType resource_type) const {
std::map<ResourceType, boost::shared_ptr<ResourcePool> >::const_iterator it = m_resource_pools.find(resource_type);
@@ -2513,57 +2497,6 @@
m_production_progress.erase(m_production_progress.begin() + *it);
m_production_queue.erase(*it);
}
-
-
- // update minerals stockpile
-
- // get minerals resource pool and stockpile location
- boost::shared_ptr<ResourcePool> pool = m_resource_pools[RE_MINERALS];
- int stockpile_object_id = pool->StockpileObjectID();
-
-
- if (stockpile_object_id == INVALID_OBJECT_ID) {
- // empire has nowhere to stockpile production, so has no stockpile.
- pool->SetStockpile(0.0);
- //Logger().debugStream() << "no mineral stockpile location. stockpile is set to 0.0";
-
- } else {
- // find minerals (PP) allocated to production elements located in systems in the group of
- // resource-sharing objects that has access to stockpile
- double stockpile_group_pp_allocation = 0.0;
-
- // find the set of objects that contains the stopile object, from the map of PP allocated within each group
- std::map<std::set<int>, double> allocated_pp = m_production_queue.AllocatedPP();
-
- //Logger().debugStream() << "trying to find stockpile object group... stockpile object has id: " << stockpile_object_id;
- for (std::map<std::set<int>, double>::const_iterator it = allocated_pp.begin(); it != allocated_pp.end(); ++it) {
- const std::set<int>& group = it->first; // get group
- //Logger().debugStream() << "potential group:";
- for (std::set<int>::const_iterator qit = group.begin(); qit != group.end(); ++qit)
- Logger().debugStream() << "...." << *qit;
-
- if (group.find(stockpile_object_id) != group.end()) { // check for stockpile object
- stockpile_group_pp_allocation = it->second; // record allocation for this group
- //Logger().debugStream() << "Empire::CheckProductionProgress found group of objects for stockpile object. size: " << it->first.size();
- break;
- }
-
- //Logger().debugStream() << "didn't find in group... trying next.";
- }
- // if the stockpile object is not found in any group of systems with allocated pp, assuming this is fine and that the
- // stockpile object's group of systems didn't have any allocated pp...
-
-
- double stockpile_object_group_available = pool->GroupAvailable(stockpile_object_id);
- //Logger().debugStream() << "minerals available in stockpile group is: " << stockpile_object_group_available;
- //Logger().debugStream() << "minerals allocation in stockpile group is: " << stockpile_group_pp_allocation; // as of this writing, PP consume one mineral and one industry point, so PP allocation is equal to minerals allocation
-
- //Logger().debugStream() << "Old stockpile was " << pool->Stockpile();
-
- double new_stockpile = stockpile_object_group_available - stockpile_group_pp_allocation;
- pool->SetStockpile(new_stockpile);
- //Logger().debugStream() << "New stockpile is: " << new_stockpile;
- }
}
void Empire::CheckTradeSocialProgress()
@@ -2592,14 +2525,12 @@
popcenter_ids_vec.push_back(obj->ID());
}
m_population_pool.SetPopCenters(popcenter_ids_vec);
- m_resource_pools[RE_MINERALS]->SetObjects(object_ids_vec);
m_resource_pools[RE_RESEARCH]->SetObjects(object_ids_vec);
m_resource_pools[RE_INDUSTRY]->SetObjects(object_ids_vec);
m_resource_pools[RE_TRADE]->SetObjects(object_ids_vec);
// inform the blockadeable resource pools about systems that can share
- m_resource_pools[RE_MINERALS]->SetConnectedSupplyGroups(m_resource_supply_groups);
m_resource_pools[RE_INDUSTRY]->SetConnectedSupplyGroups(m_resource_supply_groups);
@@ -2616,7 +2547,6 @@
// set stockpile object locations for each resource, ensuring those systems exist
std::vector<ResourceType> res_type_vec;
- res_type_vec.push_back(RE_MINERALS);
res_type_vec.push_back(RE_INDUSTRY);
res_type_vec.push_back(RE_TRADE);
res_type_vec.push_back(RE_RESEARCH);
@@ -2649,10 +2579,8 @@
void Empire::UpdateProductionQueue() {
Logger().debugStream() << "========= Production Update for empire: " << EmpireID() << " ========";
- m_resource_pools[RE_MINERALS]->Update();
m_resource_pools[RE_INDUSTRY]->Update();
m_production_queue.Update(this, m_resource_pools, m_production_progress);
- m_resource_pools[RE_MINERALS]->ChangedSignal();
m_resource_pools[RE_INDUSTRY]->ChangedSignal();
}
Modified: trunk/FreeOrion/Empire/Empire.h
===================================================================
--- trunk/FreeOrion/Empire/Empire.h 2012-05-21 13:23:07 UTC (rev 4890)
+++ trunk/FreeOrion/Empire/Empire.h 2012-06-02 15:41:37 UTC (rev 4891)
@@ -220,7 +220,7 @@
/** \name Mutators */ //@{
/** Recalculates the PPs spent on and number of turns left for each project in the queue. Also
- * determines the number of projects in progress, and the minerals and industry consumed by projects
+ * determines the number of projects in progress, and the industry consumed by projects
* in each resource-sharing group of systems. Does not actually "spend" the PP; a later call to
* empire->CheckProductionProgress() will actually spend PP, remove items from queue and create them
* in the universe. */
@@ -346,8 +346,8 @@
const std::set<std::pair<int, int> >& FleetSupplyStarlaneTraversals() const; ///< returns set of directed starlane traversals along which supply can flow. results are pairs of system ids of start and end system of traversal
const std::map<int, int>& FleetSupplyRanges() const; ///< returns map from system id to number of starlane jumps away the system can deliver fleet supply
- const std::set<std::set<int> >& ResourceSupplyGroups() const; ///< returns set of sets of systems that can share industry and minerals (systems in separate groups are blockaded or otherwise separated)
- const std::set<std::pair<int, int> >& ResourceSupplyStarlaneTraversals() const; ///< returns set of directed starlane traversals along which system resource exchange (industry, minerals) can flow. results are pairs of system ids of start and end of traversal
+ const std::set<std::set<int> >& ResourceSupplyGroups() const; ///< returns set of sets of systems that can share industry (systems in separate groups are blockaded or otherwise separated)
+ const std::set<std::pair<int, int> >& ResourceSupplyStarlaneTraversals() const; ///< returns set of directed starlane traversals along which system resource exchange (industry) can flow. results are pairs of system ids of start and end of traversal
const std::set<std::pair<int, int> >& ResourceSupplyOstructedStarlaneTraversals() const; ///< returns set of directed starlane traversals along which system resources could flow for this empire, but which can't due to some obstruction in the destination system
const std::map<int, int>& ResourceSupplyRanges() const; ///< returns map from system id to number of starlane jumps away the system can exchange resources
@@ -374,7 +374,7 @@
SitRepItr SitRepBegin() const; ///< starting iterator for sitrep entries for this empire
SitRepItr SitRepEnd() const; ///< end iterator for sitreps
- double ProductionPoints() const; ///< Returns the number of production points available to the empire (this is the minimum of available industry and available minerals)
+ double ProductionPoints() const; ///< Returns the number of production points available to the empire (this is available industry)
/** Returns amount of trade empire will spend this turn. Assumes
* Empire::UpdateTradeSpending() has previously been called to determine
@@ -485,9 +485,7 @@
* production sites. Which projects have been completed is determined by the results of
* previously-called Update() on the production queue (which determines how much PP each project
* receives, but does not actually spend them). This function spends the PP, removes complete
- * items from the queue and creates the results in the universe. Also updates the empire's
- * minerals stockpile to account for any excess not used or any shortfall that was made up by
- * taking from the stockpile. */
+ * items from the queue and creates the results in the universe. */
void CheckProductionProgress();
/** Checks for tech projects that have been completed, and adds them to the known techs list. */
Modified: trunk/FreeOrion/UI/ClientUI.cpp
===================================================================
--- trunk/FreeOrion/UI/ClientUI.cpp 2012-05-21 13:23:07 UTC (rev 4890)
+++ trunk/FreeOrion/UI/ClientUI.cpp 2012-06-02 15:41:37 UTC (rev 4891)
@@ -110,9 +110,6 @@
case METER_TRADE:
case METER_TARGET_TRADE:
icon_filename = "trade.png"; break;
- case METER_MINING:
- case METER_TARGET_MINING:
- icon_filename = "mining.png"; break;
case METER_CONSTRUCTION:
case METER_TARGET_CONSTRUCTION:
icon_filename = "construction.png"; break;
Modified: trunk/FreeOrion/UI/InfoPanels.cpp
===================================================================
--- trunk/FreeOrion/UI/InfoPanels.cpp 2012-05-21 13:23:07 UTC (rev 4890)
+++ trunk/FreeOrion/UI/InfoPanels.cpp 2012-06-02 15:41:37 UTC (rev 4891)
@@ -47,10 +47,6 @@
* (such as meter bars) for the indicated \a meter_type */
GG::Clr MeterColor(MeterType meter_type) {
switch (meter_type) {
- case METER_MINING:
- case METER_TARGET_MINING:
- return GG::CLR_RED;
- break;
case METER_INDUSTRY:
case METER_TARGET_INDUSTRY:
return GG::Clr(0, 100, 255, 255); // a bit greener / brighter than blue, at pd's suggestion on forums (sort of)
@@ -118,7 +114,6 @@
const Building* building = 0;
switch (resource_type) {
- case RE_MINERALS:
case RE_INDUSTRY:
// PP (equal to mineral and industry) cost of objects on production queue at this object's location
if (empire) {
@@ -461,7 +456,6 @@
Wnd(GG::X0, GG::Y0, w, GG::Y(ClientUI::Pts()*9), GG::INTERACTIVE),
m_rescenter_id(object_id),
m_pop_mod_stat(0),
- m_mining_stat(0),
m_industry_stat(0),
m_research_stat(0),
m_trade_stat(0),
@@ -498,10 +492,6 @@
// small resource indicators - for use when panel is collapsed
- m_mining_stat = new StatisticIcon(GG::X0, GG::Y0, MeterIconSize().x, MeterIconSize().y,
- ClientUI::MeterIcon(METER_MINING), 0, 3, false);
- AttachChild(m_mining_stat);
-
m_industry_stat = new StatisticIcon(GG::X0, GG::Y0, MeterIconSize().x, MeterIconSize().y,
ClientUI::MeterIcon(METER_INDUSTRY), 0, 3, false);
AttachChild(m_industry_stat);
@@ -521,7 +511,6 @@
// meter and production indicators
std::vector<std::pair<MeterType, MeterType> > meters;
- meters.push_back(std::make_pair(METER_MINING, METER_TARGET_MINING));
meters.push_back(std::make_pair(METER_INDUSTRY, METER_TARGET_INDUSTRY));
meters.push_back(std::make_pair(METER_RESEARCH, METER_TARGET_RESEARCH));
meters.push_back(std::make_pair(METER_TRADE, METER_TARGET_TRADE));
@@ -544,7 +533,6 @@
delete m_multi_meter_status_bar;
delete m_pop_mod_stat;
- delete m_mining_stat;
delete m_industry_stat;
delete m_research_stat;
delete m_trade_stat;
@@ -567,9 +555,8 @@
void ResourcePanel::DoExpandCollapseLayout() {
// initially detach everything (most things?). Some will be reattached later.
- DetachChild(m_mining_stat); DetachChild(m_industry_stat);
- DetachChild(m_research_stat); DetachChild(m_trade_stat);
- DetachChild(m_pop_mod_stat);
+ DetachChild(m_industry_stat); DetachChild(m_research_stat);
+ DetachChild(m_trade_stat); DetachChild(m_pop_mod_stat);
DetachChild(m_focus_drop);
@@ -586,7 +573,6 @@
// determine which two resource icons to display while collapsed: the two with the highest production.
// sort by insereting into multimap keyed by production amount, then taking the first two icons therein.
std::multimap<double, StatisticIcon*> res_prod_icon_map;
- res_prod_icon_map.insert(std::pair<double, StatisticIcon*>(m_mining_stat->GetValue(), m_mining_stat));
res_prod_icon_map.insert(std::pair<double, StatisticIcon*>(m_industry_stat->GetValue(), m_industry_stat));
res_prod_icon_map.insert(std::pair<double, StatisticIcon*>(m_research_stat->GetValue(), m_research_stat));
res_prod_icon_map.insert(std::pair<double, StatisticIcon*>(m_trade_stat->GetValue(), m_trade_stat));
@@ -714,9 +700,6 @@
void ResourcePanel::Update() {
// remove any old browse wnds
- m_mining_stat->ClearBrowseInfoWnd();
- m_multi_icon_value_indicator->ClearToolTip(METER_MINING);
-
m_industry_stat->ClearBrowseInfoWnd();
m_multi_icon_value_indicator->ClearToolTip(METER_INDUSTRY);
@@ -773,7 +756,6 @@
m_multi_meter_status_bar->Update();
m_multi_icon_value_indicator->Update();
- m_mining_stat->SetValue(res->InitialMeterValue(METER_MINING));
m_industry_stat->SetValue(res->InitialMeterValue(METER_INDUSTRY));
m_research_stat->SetValue(res->InitialMeterValue(METER_RESEARCH));
m_trade_stat->SetValue(res->InitialMeterValue(METER_TRADE));
@@ -785,10 +767,6 @@
// browse wnd on these indicators
boost::shared_ptr<GG::BrowseInfoWnd> browse_wnd;
- browse_wnd = boost::shared_ptr<GG::BrowseInfoWnd>(new MeterBrowseWnd(m_rescenter_id, METER_MINING, METER_TARGET_MINING));
- m_mining_stat->SetBrowseInfoWnd(browse_wnd);
- m_multi_icon_value_indicator->SetToolTip(METER_MINING, browse_wnd);
-
browse_wnd = boost::shared_ptr<GG::BrowseInfoWnd>(new MeterBrowseWnd(m_rescenter_id, METER_INDUSTRY, METER_TARGET_INDUSTRY));
m_industry_stat->SetBrowseInfoWnd(browse_wnd);
m_multi_icon_value_indicator->SetToolTip(METER_INDUSTRY, browse_wnd);
@@ -2300,8 +2278,6 @@
// set production label
std::string resource_text = "";
switch (m_resource_type) {
- case RE_MINERALS:
- resource_text = UserString("MINERALS_PRODUCTION"); break;
case RE_INDUSTRY:
resource_text = UserString("INDUSTRY_PRODUCTION"); break;
case RE_RESEARCH:
@@ -2383,7 +2359,7 @@
// amount_text = ColourWrappedtext(amount_text, text_colour);
// }
- // TODO: for minerals and industry, consider something similar as colouring text for food above.
+ // TODO: for industry, consider something similar as colouring text for food above.
GG::TextControl* label = new GG::TextControl(GG::X0, top, LABEL_WIDTH, row_height,
@@ -2424,8 +2400,6 @@
// set consumption / allocation label
std::string resource_text = "";
switch (m_resource_type) {
- case RE_MINERALS:
- resource_text = UserString("MINERALS_CONSUMPTION"); break;
case RE_INDUSTRY:
resource_text = UserString("INDUSTRY_CONSUMPTION"); break;
case RE_RESEARCH:
@@ -2475,7 +2449,6 @@
double difference = m_production - m_allocation;
switch (m_resource_type) {
- case RE_MINERALS:
case RE_TRADE:
case RE_INDUSTRY:
if (difference > 0.0) {
Modified: trunk/FreeOrion/UI/InfoPanels.h
===================================================================
--- trunk/FreeOrion/UI/InfoPanels.h 2012-05-21 13:23:07 UTC (rev 4890)
+++ trunk/FreeOrion/UI/InfoPanels.h 2012-06-02 15:41:37 UTC (rev 4891)
@@ -118,7 +118,6 @@
int m_rescenter_id; ///< object id for the UniverseObject that is also a PopCenter which is being displayed in this panel
MeterModifiersIndicator* m_pop_mod_stat; ///< indicator of modifiers to other objects' population
- StatisticIcon* m_mining_stat; ///< icon and number of minerals production
StatisticIcon* m_industry_stat; ///< icon and number of industry production
StatisticIcon* m_research_stat; ///< icon and number of research production
StatisticIcon* m_trade_stat; ///< icon and number of trade production
Modified: trunk/FreeOrion/UI/MapWnd.cpp
===================================================================
--- trunk/FreeOrion/UI/MapWnd.cpp 2012-05-21 13:23:07 UTC (rev 4890)
+++ trunk/FreeOrion/UI/MapWnd.cpp 2012-06-02 15:41:37 UTC (rev 4891)
@@ -755,10 +755,6 @@
ClientUI::MeterIcon(METER_TRADE),
0, 0, 3, 3, false, true);
- m_mineral = new StatisticIcon(GG::X0, GG::Y0, ICON_DUAL_WIDTH, m_turn_update->Height(),
- ClientUI::MeterIcon(METER_MINING),
- 0, 0, 3, 3, false, true);
-
m_menu_showing = false;
int layout_column(0);
@@ -1734,7 +1730,6 @@
// empire is recreated each turn based on turn update from server, so connections of signals emitted from
// the empire must be remade each turn (unlike connections to signals from the sidepanel)
if (this_client_empire) {
- GG::Connect(this_client_empire->GetResourcePool(RE_MINERALS)->ChangedSignal, &MapWnd::RefreshMineralsResourceIndicator, this, 0);
GG::Connect(this_client_empire->GetResourcePool(RE_TRADE)->ChangedSignal, &MapWnd::RefreshTradeResourceIndicator, this, 0);
GG::Connect(this_client_empire->GetResourcePool(RE_RESEARCH)->ChangedSignal, &MapWnd::RefreshResearchResourceIndicator, this, 0);
GG::Connect(this_client_empire->GetResourcePool(RE_INDUSTRY)->ChangedSignal, &MapWnd::RefreshIndustryResourceIndicator, this, 0);
@@ -3854,79 +3849,6 @@
return true;
}
-void MapWnd::RefreshMineralsResourceIndicator() {
- Empire* empire = HumanClientApp::GetApp()->Empires().Lookup( HumanClientApp::GetApp()->EmpireID() );
- if (!empire) {
- Logger().errorStream() << "MapWnd::RefreshMineralsResourceIndicator couldn't get an empire";
- m_mineral->SetValue(0.0);
- m_mineral->SetValue(0.0, 1);
- return;
- }
-
- const ResourcePool* pool = empire->GetResourcePool(RE_MINERALS);
- if (!pool) {
- Logger().errorStream() << "MapWnd::RefreshMineralsResourceIndicator couldn't get a minerals resourepool";
- m_mineral->SetValue(0.0);
- m_mineral->SetValue(0.0, 1);
- return;
- }
-
- int stockpile_object_id = pool->StockpileObjectID();
-
- if (stockpile_object_id == INVALID_OBJECT_ID) {
- // empire has nowhere to stockpile minerals, so has no stockpile.
- m_mineral->SetValue(0.0);
- m_mineral->SetValue(0.0, 1); // TODO: Make StatisticIcon able to change number of numbers shown, and remove second number here
- return;
- }
-
- // empire has a stockpile. Show stockpiled amount for first number
-
- m_mineral->SetValue(pool->Stockpile()); // set first value to stockpiled minerals
-
-
- // find minerals (PP) allocated to production elements located in systems in the group of
- // resource-sharing systems that has access to stockpile
- double stockpile_group_pp_allocation = 0.0;
-
- // find the set of systems that contains the stopile system, from the map of PP allocated within each group
- const ProductionQueue& queue = empire->GetProductionQueue();
- std::map<std::set<int>, double> allocated_pp = queue.AllocatedPP();
-
- Logger().debugStream() << "trying to find stockpile object group... stockpile object has id: " << stockpile_object_id;
- for (std::map<std::set<int>, double>::const_iterator it = allocated_pp.begin(); it != allocated_pp.end(); ++it) {
- const std::set<int>& group = it->first; // get group
- Logger().debugStream() << "potential group:";
- for (std::set<int>::const_iterator qit = group.begin(); qit != group.end(); ++qit)
- Logger().debugStream() << "...." << *qit;
-
- if (group.find(stockpile_object_id) != group.end()) { // check for stockpile object
- stockpile_group_pp_allocation = it->second; // record allocation for this group
- Logger().debugStream() << "MapWnd::RefreshMineralsResourceIndicator found group of systems for stockpile object. size: " << it->first.size();
- break;
- }
-
- Logger().debugStream() << "didn't find in group... trying next.";
- }
- // if the stockpile object is not found in any group of systems with allocated pp, assuming this is fine and that the
- // stockpile object's group of systems didn't have any allocated pp...
-
-
- double stockpile_object_group_available = pool->GroupAvailable(stockpile_object_id);
- Logger().debugStream() << "minerals available in stockpile group is: " << stockpile_object_group_available;
- Logger().debugStream() << "minerals allocation in stockpile group is: " << stockpile_group_pp_allocation; // as of this writing, PP consume one mineral and one industry point, so PP allocation is equal to minerals allocation
-
- double new_stockpile = stockpile_object_group_available - stockpile_group_pp_allocation;
- Logger().debugStream() << "Predicted stockpile is: " << new_stockpile;
-
- Logger().debugStream() << "Old stockpile is " << pool->Stockpile();
-
- double stockpile_change = new_stockpile - pool->Stockpile();
- Logger().debugStream() << "Stockpile change is: " << stockpile_change;
-
- m_mineral->SetValue(stockpile_change, 1);
-}
-
void MapWnd::RefreshTradeResourceIndicator() {
Empire *empire = HumanClientApp::GetApp()->Empires().Lookup( HumanClientApp::GetApp()->EmpireID() );
Modified: trunk/FreeOrion/UI/MapWnd.h
===================================================================
--- trunk/FreeOrion/UI/MapWnd.h 2012-05-21 13:23:07 UTC (rev 4890)
+++ trunk/FreeOrion/UI/MapWnd.h 2012-06-02 15:41:37 UTC (rev 4891)
@@ -169,7 +169,6 @@
virtual bool EventFilter(GG::Wnd* w, const GG::WndEvent& event);
private:
- void RefreshMineralsResourceIndicator();
void RefreshTradeResourceIndicator();
void RefreshResearchResourceIndicator();
void RefreshIndustryResourceIndicator();
Modified: trunk/FreeOrion/UI/ProductionWnd.cpp
===================================================================
--- trunk/FreeOrion/UI/ProductionWnd.cpp 2012-05-21 13:23:07 UTC (rev 4890)
+++ trunk/FreeOrion/UI/ProductionWnd.cpp 2012-06-02 15:41:37 UTC (rev 4891)
@@ -369,11 +369,6 @@
ProductionQueue::const_iterator underfunded_it = queue.UnderfundedProject(empire);
double PPs_to_underfunded_projects = underfunded_it == queue.end() ? 0.0 : underfunded_it->allocated_pp;
m_production_info_panel->Reset(PPs, total_queue_cost, queue.ProjectsInProgress(), PPs_to_underfunded_projects, queue.size());
- /* Altering production queue may have freed up or required more PP, which may require extra
- or free up excess minerals. Signalling that the MineralResPool has changed causes the
- MapWnd to be signalled that that pool has changed, which causes the resource indicator
- to be updated (which polls the ProductionQueue to determine how many PPs are being spent) */
- empire->GetResourcePool(RE_MINERALS)->ChangedSignal();
}
void ProductionWnd::AddBuildToQueueSlot(BuildType build_type, const std::string& name, int number, int location)
Modified: trunk/FreeOrion/UI/SidePanel.cpp
===================================================================
--- trunk/FreeOrion/UI/SidePanel.cpp 2012-05-21 13:23:07 UTC (rev 4890)
+++ trunk/FreeOrion/UI/SidePanel.cpp 2012-06-02 15:41:37 UTC (rev 4891)
@@ -2216,7 +2216,6 @@
// specify which meter types to include in resource summary. Oddly enough, these are the resource meters.
std::vector<std::pair<MeterType, MeterType> > meter_types;
- meter_types.push_back(std::make_pair(METER_MINING, METER_TARGET_MINING));
meter_types.push_back(std::make_pair(METER_INDUSTRY, METER_TARGET_INDUSTRY));
meter_types.push_back(std::make_pair(METER_RESEARCH, METER_TARGET_RESEARCH));
meter_types.push_back(std::make_pair(METER_TRADE, METER_TARGET_TRADE));
Modified: trunk/FreeOrion/default/buildings.txt
===================================================================
--- trunk/FreeOrion/default/buildings.txt 2012-05-21 13:23:07 UTC (rev 4890)
+++ trunk/FreeOrion/default/buildings.txt 2012-06-02 15:41:37 UTC (rev 4891)
@@ -17,7 +17,6 @@
]
effects = [
SetTargetResearch Value + Target.Construction * [[PRODUCTION_PER_INFRA]]
- SetTargetMining Value + Target.Construction * [[PRODUCTION_PER_INFRA]]
SetTargetIndustry Value + Target.Construction * 2 * [[PRODUCTION_PER_INFRA]]
]
@@ -30,7 +29,6 @@
]
effects = [
SetTargetResearch Value + Target.Population * [[PRODUCTION_PER_POP]]
- SetTargetMining Value + Target.Population * [[PRODUCTION_PER_POP]]
SetTargetIndustry Value + Target.Population * 2 * [[PRODUCTION_PER_POP]]
]
]
@@ -502,7 +500,6 @@
effects = [
SetTargetConstruction Value + 30
SetEmpireCapital
- SetMining Target.TargetMining
SetIndustry Target.TargetIndustry
SetTrade Target.TargetTrade
SetResearch Target.TargetResearch
@@ -584,19 +581,6 @@
]
stackinggroup = "BLD_COLLECTIVE_NET_RESEARCH_EFFECT"
effects = SetTargetResearch Value + Target.Population * 3.0 * [[POP_PRODUCTION_PER_POP]]
-
- EffectsGroup
- scope = And [
- PopulationCenter
- OwnedBy TheEmpire Source.Owner
- Focus "FOCUS_MINING"
- ]
- activation = Not WithinDistance 500 And [
- Ship
- Not Stationary
- ]
- stackinggroup = "BLD_COLLECTIVE_NET_MINING_EFFECT"
- effects = SetTargetMining Value + 2.0 * [[BASIC_PRODUCTION]]
]
icon = ""
@@ -1113,7 +1097,7 @@
EffectsGroup
scope = ContainedBy Contains Source
activation = Source
- effects = SetStealth 100
+ effects = SetStealth 1500
]
icon = ""
Modified: trunk/FreeOrion/default/specials.txt
===================================================================
--- trunk/FreeOrion/default/specials.txt 2012-05-21 13:23:07 UTC (rev 4890)
+++ trunk/FreeOrion/default/specials.txt 2012-06-02 15:41:37 UTC (rev 4891)
@@ -745,53 +745,7 @@
]
graphic = "icons/specials_huge/void.png"
-
Special
- name = "DERELICT_SPECIAL" // MINERALS
- description = "DERELICT_SPECIAL_DESC"
- spawnrate = 0.5
- spawnlimit = 100
- location = And [
- System
- Not Contains Capital
- ]
- effectsgroups = [
- EffectsGroup
- scope = NumberOf 1 And [
- Ship
- ContainedBy Source
- OwnedBy AnyEmpire
- ]
- activation = And [
- System
- Contains And [
- Ship
- OwnedBy AnyEmpire
- ]
- ]
- effects = [
- SetEmpireMineralStockpile value = Value + 2.0 * [[BASIC_PRODUCTION]]
- GenerateSitRepMessage
- message = "EFFECT_DERELICT_MINERALS"
- parameters = [
- tag = "system" data = Source.ID
- ]
- ]
-
- EffectsGroup
- scope = Source
- activation = And [
- System
- Contains And [
- Ship
- OwnedBy AnyEmpire
- ]
- ]
- effects = RemoveSpecial "DERELICT_SPECIAL"
- ]
- graphic = "icons/specials_huge/derelict.png"
-
-Special
name = "DERELICT_SPECIAL2" // MAP / DETECTION
description = "DERELICT_SPECIAL_DESC"
spawnrate = 0.5
@@ -1228,7 +1182,7 @@
]
effectsgroups = [
[[STANDARD_MINERAL_BOOST]]
-
+
EffectsGroup
scope = And [
Planet
@@ -1269,7 +1223,7 @@
]
effectsgroups = [
[[STANDARD_MINERAL_BOOST]]
-
+
EffectsGroup
scope = And [
Planet
@@ -1311,7 +1265,7 @@
]
effectsgroups = [
[[STANDARD_MINERAL_BOOST]]
-
+
EffectsGroup
scope = And [
Planet
@@ -1345,16 +1299,27 @@
STANDARD_MINERAL_BOOST
'''EffectsGroup
scope = Source
- activation = Focus "FOCUS_MINING"
- effects = SetTargetMining Value + 5.0 * [[BASIC_PRODUCTION]]
+ activation = And [
+ Focus "FOCUS_MINING"
+ [[STANDARD_CONDITION_INFRA]]
+ ]
+ effects = SetTargetIndustry Value + Target.Construction * [[PRODUCTION_PER_INFRA]]
EffectsGroup
scope = Source
activation = And [
+ Focus "FOCUS_MINING"
+ [[STANDARD_CONDITION_POP]]
+ ]
+ effects = SetTargetIndustry Value + Target.Population * [[PRODUCTION_PER_POP]]
+
+ EffectsGroup
+ scope = Source
+ activation = And [
Focus "FOCUS_HEAVY_MINING"
[[STANDARD_CONDITION_INFRA]]
]
- effects = SetTargetMining Value + Target.Construction * 4 * [[PRODUCTION_PER_INFRA]]
+ effects = SetTargetIndustry Value + Target.Construction * 4 * [[PRODUCTION_PER_INFRA]]
EffectsGroup
scope = Source
@@ -1362,7 +1327,7 @@
Focus "FOCUS_HEAVY_MINING"
[[STANDARD_CONDITION_POP]]
]
- effects = SetTargetMining Value + Target.Population * 4 * [[PRODUCTION_PER_POP]]
+ effects = SetTargetIndustry Value + Target.Population * 4 * [[PRODUCTION_PER_POP]]
'''
STANDARD_INDUSTRY_BOOST
Modified: trunk/FreeOrion/default/species.txt
===================================================================
--- trunk/FreeOrion/default/species.txt 2012-05-21 13:23:07 UTC (rev 4890)
+++ trunk/FreeOrion/default/species.txt 2012-06-02 15:41:37 UTC (rev 4891)
@@ -24,7 +24,6 @@
]
effectsgroups = [
- [[AVERAGE_MINING]]
[[AVERAGE_INDUSTRY]]
[[AVERAGE_RESEARCH]]
@@ -60,7 +59,6 @@
]
effectsgroups = [
- [[AVERAGE_MINING]]
[[AVERAGE_INDUSTRY]]
[[GREAT_RESEARCH]]
@@ -96,7 +94,6 @@
]
effectsgroups = [
- [[AVERAGE_MINING]]
[[GREAT_INDUSTRY]]
[[GOOD_RESEARCH]]
@@ -133,7 +130,6 @@
]
effectsgroups = [
- [[GREAT_MINING]]
[[AVERAGE_INDUSTRY]]
[[GREAT_RESEARCH]]
@@ -172,7 +168,6 @@
[[GREAT_DETECTION]]
[[GOOD_STEALTH]]
- [[AVERAGE_MINING]]
[[AVERAGE_INDUSTRY]]
[[AVERAGE_RESEARCH]]
@@ -209,7 +204,6 @@
]
effectsgroups = [
- [[BAD_MINING]]
[[AVERAGE_INDUSTRY]]
[[AVERAGE_RESEARCH]]
@@ -247,7 +241,6 @@
]
effectsgroups = [
- [[AVERAGE_MINING]]
[[AVERAGE_INDUSTRY]]
[[AVERAGE_RESEARCH]]
@@ -288,7 +281,6 @@
[[GOOD_DETECTION]]
[[GREAT_STEALTH]]
- [[BAD_MINING]]
[[BAD_INDUSTRY]]
[[BAD_RESEARCH]]
@@ -324,7 +316,6 @@
]
effectsgroups = [
- [[GOOD_MINING]]
[[GOOD_INDUSTRY]]
[[BAD_RESEARCH]]
@@ -361,7 +352,6 @@
]
effectsgroups = [
- [[AVERAGE_MINING]]
[[BAD_INDUSTRY]]
[[GOOD_RESEARCH]]
@@ -397,7 +387,6 @@
]
effectsgroups = [
- [[AVERAGE_MINING]]
[[GREAT_INDUSTRY]]
[[BAD_RESEARCH]]
@@ -441,7 +430,6 @@
]
effectsgroups = [
- [[AVERAGE_MINING]]
[[AVERAGE_INDUSTRY]]
[[AVERAGE_RESEARCH]]
@@ -477,7 +465,6 @@
]
effectsgroups = [
- [[GOOD_MINING]]
[[GOOD_INDUSTRY]]
[[AVERAGE_RESEARCH]]
@@ -512,7 +499,6 @@
]
effectsgroups = [
- [[AVERAGE_MINING]]
[[AVERAGE_INDUSTRY]]
[[BAD_RESEARCH]]
@@ -549,7 +535,6 @@
]
effectsgroups = [
- [[AVERAGE_MINING]]
[[BAD_INDUSTRY]]
[[AVERAGE_RESEARCH]]
@@ -584,7 +569,6 @@
]
effectsgroups = [
- [[NO_MINING]]
[[NO_INDUSTRY]]
[[AVERAGE_RESEARCH]]
@@ -616,7 +600,6 @@
]
effectsgroups = [
- [[AVERAGE_MINING]]
[[AVERAGE_INDUSTRY]]
[[NO_RESEARCH]]
@@ -650,7 +633,6 @@
]
effectsgroups = [
- [[AVERAGE_MINING]]
[[BAD_INDUSTRY]]
[[AVERAGE_RESEARCH]]
@@ -681,7 +663,6 @@
]
effectsgroups = [
- [[NO_MINING]]
[[NO_INDUSTRY]]
[[ULTIMATE_RESEARCH]]
@@ -719,7 +700,6 @@
effectsgroups = [
[[GREAT_STEALTH]]
- [[BAD_MINING]]
[[BAD_INDUSTRY]]
[[AVERAGE_RESEARCH]]
@@ -753,7 +733,6 @@
[[GREAT_DETECTION]]
[[GOOD_STEALTH]]
- [[NO_MINING]]
[[NO_INDUSTRY]]
[[AVERAGE_RESEARCH]]
@@ -779,13 +758,12 @@
Tags = "ROBOTIC"
foci = [
- [[HAS_MINING_FOCUS]]
+ [[HAS_INDUSTRY_FOCUS]]
[[HAS_ADVANCED_FOCI]]
]
effectsgroups = [
- [[AVERAGE_MINING]]
- [[NO_INDUSTRY]]
+ [[GOOD_INDUSTRY]]
[[NO_RESEARCH]]
[[BAD_GROUND_TROOPS]]
@@ -817,7 +795,6 @@
]
effectsgroups = [
- [[AVERAGE_MINING]]
[[BAD_INDUSTRY]]
[[NO_RESEARCH]]
@@ -846,7 +823,6 @@
]
effectsgroups = [
- [[NO_MINING]]
[[GREAT_INDUSTRY]]
[[NO_RESEARCH]]
@@ -881,7 +857,6 @@
]
effectsgroups = [
- [[AVERAGE_MINING]]
[[NO_INDUSTRY]]
[[BAD_RESEARCH]]
@@ -918,7 +893,6 @@
]
effectsgroups = [
- [[GOOD_MINING]]
[[GREAT_INDUSTRY]]
[[AVERAGE_RESEARCH]]
@@ -954,7 +928,6 @@
]
effectsgroups = [
- [[AVERAGE_MINING]]
[[GOOD_INDUSTRY]]
[[BAD_RESEARCH]]
@@ -989,7 +962,6 @@
]
effectsgroups = [
- [[AVERAGE_MINING]]
[[BAD_INDUSTRY]]
[[GOOD_RESEARCH]]
@@ -1023,7 +995,6 @@
effectsgroups = [
[[GOOD_STEALTH]]
- [[NO_MINING]]
[[NO_INDUSTRY]]
[[NO_RESEARCH]]
@@ -1060,7 +1031,6 @@
]
effectsgroups = [
- [[GREAT_MINING]]
[[AVERAGE_INDUSTRY]]
[[BAD_RESEARCH]]
@@ -1097,7 +1067,6 @@
]
effectsgroups = [
- [[AVERAGE_MINING]]
[[GREAT_INDUSTRY]]
[[GOOD_RESEARCH]]
@@ -1156,7 +1125,6 @@
effectsgroups = [
[[ULTIMATE_DETECTION]]
- [[BAD_MINING]]
[[BAD_INDUSTRY]]
[[AVERAGE_RESEARCH]]
@@ -1188,7 +1156,6 @@
]
effectsgroups = [
- [[BAD_MINING]]
[[AVERAGE_INDUSTRY]]
[[AVERAGE_RESEARCH]]
@@ -1223,7 +1190,6 @@
]
effectsgroups = [
- [[AVERAGE_MINING]]
[[AVERAGE_INDUSTRY]]
[[BAD_RESEARCH]]
@@ -1263,7 +1229,6 @@
]
effectsgroups = [
- [[NO_MINING]]
[[NO_INDUSTRY]]
[[ULTIMATE_RESEARCH]]
@@ -1306,7 +1271,6 @@
scope = Source
effects = SetEmpireMeter Source.Owner "METER_DETECTION" 10000 // Omniscient Detection
- [[GREAT_MINING]]
[[GREAT_INDUSTRY]]
[[GREAT_RESEARCH]]
@@ -1342,7 +1306,6 @@
]
effectsgroups = [
- [[AVERAGE_MINING]]
[[AVERAGE_INDUSTRY]]
[[AVERAGE_RESEARCH]]
@@ -1830,12 +1793,19 @@
'''Focus
name = "FOCUS_MINING"
description = "FOCUS_MINING_DESC"
- location = Or [
- Not Planet type = [Asteroids GasGiant]
- And [
- OwnerHasTech "PRO_ASTEROID_MINE"
- Planet type = Asteroids
+ location = And [
+ Or [
+ HasSpecial "MINERALS_SPECIAL"
+ HasSpecial "CRYSTALS_SPECIAL"
+ HasSpecial "METALOIDS_SPECIAL"
]
+ Or [
+ Not Planet type = [Asteroids GasGiant]
+ And [
+ OwnerHasTech "PRO_ASTEROID_MINE"
+ Planet type = Asteroids
+ ]
+ ]
]
graphic = "icons/focus/mining.png"
@@ -1849,6 +1819,11 @@
Building "BLD_HEAVY_MINE_PROCESSOR"
OwnedBy TheEmpire Source.Owner
]
+ Or [
+ HasSpecial "MINERALS_SPECIAL"
+ HasSpecial "CRYSTALS_SPECIAL"
+ HasSpecial "METALOIDS_SPECIAL"
+ ]
]
graphic = "icons/building/heavy_mining_processor.png"
'''
@@ -2268,201 +2243,6 @@
effects = SetSupply Value + Target.Population * 0.5
'''
-//##### M I N I N G #####//
-
-NO_MINING
-'''
-'''
-
-BAD_MINING
-'''[[AVERAGE_MINING]]
-
- EffectsGroup
- scope = Source
- accountinglabel = "BAD_MINING_LABEL"
- effects = SetTargetMining Value*[[BAD_MULTIPLIER]]
-'''
-
-AVERAGE_MINING
-'''EffectsGroup
- scope = Source
- activation = And [
- Focus type = "FOCUS_MINING"
- Planet size = Tiny
- [[STANDARD_CONDITION_INFRA]]
- ]
- accountinglabel = "FOCUS_MINING_LABEL"
- effects = SetTargetMining Value + 4.0 * [[BASIC_PRODUCTION]] + Target.Construction * 0.4 * [[PRODUCTION_PER_INFRA]]
-
- EffectsGroup
- scope = Source
- activation = And [
- Focus type = "FOCUS_MINING"
- Planet size = Tiny
- [[STANDARD_CONDITION_POP]]
- ]
- accountinglabel = "FOCUS_MINING_LABEL"
- effects = SetTargetMining Value + 4.0 * [[BASIC_PRODUCTION]] + Target.Population * 0.4 * [[PRODUCTION_PER_POP]]
-
- EffectsGroup
- scope = Source
- activation = And [
- Focus type = "FOCUS_MINING"
- Planet size = Small
- [[STANDARD_CONDITION_INFRA]]
- ]
- accountinglabel = "FOCUS_MINING_LABEL"
- effects = SetTargetMining Value + 3.0 * [[BASIC_PRODUCTION]] + Target.Construction * 0.4 * [[PRODUCTION_PER_INFRA]]
-
- EffectsGroup
- scope = Source
- activation = And [
- Focus type = "FOCUS_MINING"
- Planet size = Small
- [[STANDARD_CONDITION_POP]]
- ]
- accountinglabel = "FOCUS_MINING_LABEL"
- effects = SetTargetMining Value + 3.0 * [[BASIC_PRODUCTION]] + Target.Population * 0.4 * [[PRODUCTION_PER_POP]]
-
- EffectsGroup
- scope = Source
- activation = And [
- Focus type = "FOCUS_MINING"
- Planet size = Medium
- [[STANDARD_CONDITION_INFRA]]
- ]
- accountinglabel = "FOCUS_MINING_LABEL"
- effects = SetTargetMining Value + 2.0 * [[BASIC_PRODUCTION]] + Target.Construction * 0.4 * [[PRODUCTION_PER_INFRA]]
-
- EffectsGroup
- scope = Source
- activation = And [
- Focus type = "FOCUS_MINING"
- Planet size = Medium
- [[STANDARD_CONDITION_POP]]
- ]
- accountinglabel = "FOCUS_MINING_LABEL"
- effects = SetTargetMining Value + 2.0 * [[BASIC_PRODUCTION]] + Target.Population * 0.4 * [[PRODUCTION_PER_POP]]
-
- EffectsGroup
- scope = Source
- activation = And [
- Focus type = "FOCUS_MINING"
- Planet size = Large
- [[STANDARD_CONDITION_INFRA]]
- ]
- accountinglabel = "FOCUS_MINING_LABEL"
- effects = SetTargetMining Value + 1.0 * [[BASIC_PRODUCTION]] + Target.Construction * 0.4 * [[PRODUCTION_PER_INFRA]]
-
- EffectsGroup
- scope = Source
- activation = And [
- Focus type = "FOCUS_MINING"
- Planet size = Large
- [[STANDARD_CONDITION_POP]]
- ]
- accountinglabel = "FOCUS_MINING_LABEL"
- effects = SetTargetMining Value + 1.0 * [[BASIC_PRODUCTION]] + Target.Population * 0.4 * [[PRODUCTION_PER_POP]]
-
- EffectsGroup
- scope = Source
- activation = And [
- Focus type = "FOCUS_MINING"
- Planet size = [Huge GasGiant]
- [[STANDARD_CONDITION_INFRA]]
- ]
- accountinglabel = "FOCUS_MINING_LABEL"
- effects = SetTargetMining Value + Target.Construction * 0.4 * [[PRODUCTION_PER_INFRA]]
-
- EffectsGroup
- scope = Source
- activation = And [
- Focus type = "FOCUS_MINING"
- Planet size = [Huge GasGiant]
- [[STANDARD_CONDITION_POP]]
- ]
- accountinglabel = "FOCUS_MINING_LABEL"
- effects = SetTargetMining Value + Target.Population * 0.4 * [[PRODUCTION_PER_POP]]
-
- EffectsGroup
- scope = Source
- activation = And [
- Focus "FOCUS_MINING"
- Planet type = Asteroids
- ]
- accountinglabel = "ASTEROID_MINING_LABEL"
- effects = SetTargetMining Value + 3 * [[BASIC_PRODUCTION]]
-
- EffectsGroup
- scope = Source
- activation = And [
- Focus "FOCUS_HEAVY_MINING"
- [[STANDARD_CONDITION_INFRA]]
- ]
- accountinglabel = "FOCUS_HEAVY_MINING_LABEL"
- effects = SetTargetMining Value + Target.Construction * 8 * [[PRODUCTION_PER_INFRA]]
-
- EffectsGroup
- scope = Source
- activation = And [
- Focus "FOCUS_HEAVY_MINING"
- [[STANDARD_CONDITION_POP]]
- ]
- accountinglabel = "FOCUS_HEAVY_MINING_LABEL"
- effects = SetTargetMining Value + Target.Population * 8 * [[PRODUCTION_PER_POP]]
-
- EffectsGroup
- scope = Source
- activation = And [
- Focus "FOCUS_HEAVY_MINING"
- Not OwnerHasTech "PRO_ENVIRO_MINING"
- ]
- accountinglabel = "FOCUS_HEAVY_MINING_LABEL"
- effects = [
- SetTargetPopulation Value - 5
- SetTargetPopulation Value * 0.5
- ]
-
- EffectsGroup
- scope = Source
- activation = And [
- Focus "FOCUS_HEAVY_MINING"
- OwnerHasTech "PRO_ENVIRO_MINING"
- ]
- accountinglabel = "FOCUS_HEAVY_MINING_LABEL"
- effects = [
- SetTargetPopulation Value - 5
- SetTargetPopulation Value * 0.75
- ]
-'''
-
-GOOD_MINING
-'''[[AVERAGE_MINING]]
-
- EffectsGroup
- scope = Source
- accountinglabel = "GOOD_MINING_LABEL"
- effects = SetTargetMining Value*[[GOOD_MULTIPLIER]]
-'''
-
-GREAT_MINING
-'''[[AVERAGE_MINING]]
-
- EffectsGroup
- scope = Source
- accountinglabel = "GREAT_MINING_LABEL"
- effects = SetTargetMining Value*[[GREAT_MULTIPLIER]]
-'''
-
-ULTIMATE_MINING
-'''[[AVERAGE_MINING]]
-
- EffectsGroup
- scope = Source
- accountinglabel = "BAD_MINING_LABEL"
- effects = SetTargetMining Value*[[ULTIMATE_MULTIPLIER]]
-'''
-
//##### I N D U S T R Y #####//
NO_INDUSTRY
Modified: trunk/FreeOrion/default/techs.txt
===================================================================
--- trunk/FreeOrion/default/techs.txt 2012-05-21 13:23:07 UTC (rev 4890)
+++ trunk/FreeOrion/default/techs.txt 2012-06-02 15:41:37 UTC (rev 4891)
@@ -1021,14 +1021,6 @@
scope = And [
OwnedBy TheEmpire Source.Owner
ProductionCenter
- Focus "FOCUS_MINING"
- ]
- effects = SetTargetMining Value + 1.0 * [[BASIC_PRODUCTION]]
-
- EffectsGroup
- scope = And [
- OwnedBy TheEmpire Source.Owner
- ProductionCenter
Focus "FOCUS_INDUSTRY"
[[POP_CONDITION_INFRA]]
]
@@ -1223,14 +1215,6 @@
[[INFRA_CONDITION_POP]]
]
effects = SetTargetIndustry Value + Target.Population * 0.4 * [[INFRA_PRODUCTION_PER_POP]]
-
- EffectsGroup
- scope = And [
- OwnedBy TheEmpire Source.Owner
- ProductionCenter
- Focus "FOCUS_MINING"
- ]
- effects = SetTargetMining Value + 1.0 * [[BASIC_PRODUCTION]]
]
graphic = "icons/tech/robotic_production.png"
@@ -1428,70 +1412,13 @@
graphic = "icons/tech/asteroid_mining_i.png"
Tech
- name = "PRO_ASTEROID_MINE_II"
- description = "PRO_ASTEROID_MINE_II_DESC"
- short_description = "BUILDING_REFINE_SHORT_DESC"
- techtype = Refinement
- category = "PRODUCTION_CATEGORY"
- researchcost = 2
- researchturns = 1
- prerequisites = "PRO_ASTEROID_MINE"
- effectsgroups =
- EffectsGroup
- scope = And [
- OwnedBy TheEmpire Source.Owner
- Planet type = Asteroids
- Focus "FOCUS_MINING"
- ]
- activation = OwnerHasTech "PRO_ASTEROID_MINE"
- effects = SetTargetMining Value + 1.0 * [[BASIC_PRODUCTION]]
- graphic = "icons/tech/asteroid_mining_ii.png"
-
-Tech
name = "PRO_CORE_MINE"
description = "PRO_CORE_MINE_DESC"
- short_description = "MINING_SHORT_DESC"
+ short_description = "DOES_NOTHING_SHORT_DESC"
techtype = Application
category = "PRODUCTION_CATEGORY"
researchcost = 30
researchturns = 1
- effectsgroups = [
- EffectsGroup
- scope = And [
- OwnedBy TheEmpire Source.Owner
- ProductionCenter
- Planet size = Tiny
- Focus "FOCUS_MINING"
- ]
- effects = SetTargetMining Value + 2.0 * [[BASIC_PRODUCTION]]
-
- EffectsGroup
- scope = And [
- OwnedBy TheEmpire Source.Owner
- ProductionCenter
- Planet size = Small
- Focus "FOCUS_MINING"
- ]
- effects = SetTargetMining Value + 1.5 * [[BASIC_PRODUCTION]]
-
- EffectsGroup
- scope = And [
- OwnedBy TheEmpire Source.Owner
- ProductionCenter
- Planet size = Medium
- Focus "FOCUS_MINING"
- ]
- effects = SetTargetMining Value + 1.0 * [[BASIC_PRODUCTION]]
-
- EffectsGroup
- scope = And [
- OwnedBy TheEmpire Source.Owner
- ProductionCenter
- Planet size = Large
- Focus "FOCUS_MINING"
- ]
- effects = SetTargetMining Value + .5 * [[BASIC_PRODUCTION]]
- ]
graphic = "icons/tech/deep_core_mining.png"
Tech
@@ -1616,14 +1543,6 @@
scope = And [
OwnedBy TheEmpire Source.Owner
ProductionCenter
- Mining high = RootCandidate.TargetMining - 3
- ]
- effects = SetMining Value + 2
-
- EffectsGroup
- scope = And [
- OwnedBy TheEmpire Source.Owner
- ProductionCenter
Industry high = RootCandidate.TargetIndustry - 3
]
effects = SetIndustry Value + 2
@@ -1648,14 +1567,6 @@
scope = And [
OwnedBy TheEmpire Source.Owner
ProductionCenter
- Mining low = RootCandidate.TargetMining - 3 high = RootCandidate.TargetMining
- ]
- effects = SetMining Target.TargetMining
-
- EffectsGroup
- scope = And [
- OwnedBy TheEmpire Source.Owner
- ProductionCenter
Industry low = RootCandidate.TargetIndustry - 3 high = RootCandidate.TargetIndustry
]
effects = SetIndustry Target.TargetIndustry
@@ -1680,14 +1591,6 @@
scope = And [
OwnedBy TheEmpire Source.Owner
ProductionCenter
- Mining low = RootCandidate.TargetMining + 5
- ]
- effects = SetMining Value - 3
-
- EffectsGroup
- scope = And [
- OwnedBy TheEmpire Source.Owner
- ProductionCenter
Industry low = RootCandidate.TargetIndustry + 5
]
effects = SetIndustry Value - 3
@@ -1712,14 +1615,6 @@
scope = And [
OwnedBy TheEmpire Source.Owner
ProductionCenter
- Mining low = RootCandidate.TargetMining high = RootCandidate.TargetMining + 5
- ]
- effects = SetMining Target.TargetMining
-
- EffectsGroup
- scope = And [
- OwnedBy TheEmpire Source.Owner
- ProductionCenter
Industry low = RootCandidate.TargetIndustry high = RootCandidate.TargetIndustry + 5
]
effects = SetIndustry Target.TargetIndustry
Modified: trunk/FreeOrion/parse/ConditionParser3.cpp
===================================================================
--- trunk/FreeOrion/parse/ConditionParser3.cpp 2012-05-21 13:23:07 UTC (rev 4890)
+++ trunk/FreeOrion/parse/ConditionParser3.cpp 2012-06-02 15:41:37 UTC (rev 4891)
@@ -134,8 +134,7 @@
owner_stockpile
= (
- tok.OwnerMineralStockpile_ [ _a = RE_MINERALS ]
- | tok.OwnerTradeStockpile_ [ _a = RE_TRADE ]
+ tok.OwnerTradeStockpile_ [ _a = RE_TRADE ]
)
> parse::label(Low_name) > double_value_ref [ _b = _1 ]
> parse::label(High_name) > double_value_ref [ _val = new_<Condition::EmpireStockpileValue>(_a, _b, _1) ]
Modified: trunk/FreeOrion/parse/DoubleValueRefParser.cpp
===================================================================
--- trunk/FreeOrion/parse/DoubleValueRefParser.cpp 2012-05-21 13:23:07 UTC (rev 4890)
+++ trunk/FreeOrion/parse/DoubleValueRefParser.cpp 2012-06-02 15:41:37 UTC (rev 4891)
@@ -24,8 +24,6 @@
| tok.TargetResearch_
| tok.Trade_
| tok.TargetTrade_
- | tok.Mining_
- | tok.TargetMining_
| tok.Construction_
| tok.TargetConstruction_
| tok.Population_
@@ -46,7 +44,6 @@
| tok.BattleSpeed_
| tok.StarlaneSpeed_
| tok.TradeStockpile_
- | tok.MineralStockpile_
| tok.DistanceToSource_
;
Modified: trunk/FreeOrion/parse/EffectParser.cpp
===================================================================
--- trunk/FreeOrion/parse/EffectParser.cpp 2012-05-21 13:23:07 UTC (rev 4890)
+++ trunk/FreeOrion/parse/EffectParser.cpp 2012-06-02 15:41:37 UTC (rev 4891)
@@ -93,8 +93,7 @@
set_empire_stockpile
= (
- tok.SetEmpireMineralStockpile_ [ _a = RE_MINERALS ]
- | tok.SetEmpireTradeStockpile_ [ _a = RE_TRADE ]
+ tok.SetEmpireTradeStockpile_ [ _a = RE_TRADE ]
)
>> (
(
Modified: trunk/FreeOrion/parse/EnumParser.cpp
===================================================================
--- trunk/FreeOrion/parse/EnumParser.cpp 2012-05-21 13:23:07 UTC (rev 4890)
+++ trunk/FreeOrion/parse/EnumParser.cpp 2012-06-02 15:41:37 UTC (rev 4891)
@@ -317,7 +317,6 @@
static enum_parser_rule<MeterType>::type retval
= tok.TargetConstruction_ [ _val = METER_TARGET_CONSTRUCTION ]
| tok.TargetIndustry_ [ _val = METER_TARGET_INDUSTRY ]
- | tok.TargetMining_ [ _val = METER_TARGET_MINING ]
| tok.TargetPopulation_ [ _val = METER_TARGET_POPULATION ]
| tok.TargetResearch_ [ _val = METER_TARGET_RESEARCH ]
| tok.TargetTrade_ [ _val = METER_TARGET_TRADE ]
@@ -330,7 +329,6 @@
| tok.Construction_ [ _val = METER_CONSTRUCTION ]
| tok.Industry_ [ _val = METER_INDUSTRY ]
- | tok.Mining_ [ _val = METER_MINING ]
| tok.Population_ [ _val = METER_POPULATION ]
| tok.Research_ [ _val = METER_RESEARCH ]
| tok.Trade_ [ _val = METER_TRADE ]
@@ -363,7 +361,6 @@
static enum_parser_rule<MeterType>::type retval
= tok.SetTargetConstruction_ [ _val = METER_TARGET_CONSTRUCTION ]
| tok.SetTargetIndustry_ [ _val = METER_TARGET_INDUSTRY ]
- | tok.SetTargetMining_ [ _val = METER_TARGET_MINING ]
| tok.SetTargetPopulation_ [ _val = METER_TARGET_POPULATION ]
| tok.SetTargetResearch_ [ _val = METER_TARGET_RESEARCH ]
| tok.SetTargetTrade_ [ _val = METER_TARGET_TRADE ]
@@ -376,7 +373,6 @@
| tok.SetConstruction_ [ _val = METER_CONSTRUCTION ]
| tok.SetIndustry_ [ _val = METER_INDUSTRY ]
- | tok.SetMining_ [ _val = METER_MINING ]
| tok.SetPopulation_ [ _val = METER_POPULATION ]
| tok.SetResearch_ [ _val = METER_RESEARCH ]
| tok.SetTrade_ [ _val = METER_TRADE ]
Modified: trunk/FreeOrion/python/PythonEnumWrapper.cpp
===================================================================
--- trunk/FreeOrion/python/PythonEnumWrapper.cpp 2012-05-21 13:23:07 UTC (rev 4890)
+++ trunk/FreeOrion/python/PythonEnumWrapper.cpp 2012-06-02 15:41:37 UTC (rev 4891)
@@ -60,7 +60,6 @@
...
[truncated message content] |