From: <tz...@us...> - 2006-02-18 07:07:49
|
Revision: 1759 Author: tzlaine Date: 2006-02-17 23:07:40 -0800 (Fri, 17 Feb 2006) ViewCVS: http://svn.sourceforge.net/freeorion?rev=1759&view=rev Log Message: ----------- - Added untested boost.serialization code for all Universe-related classes, for eventual replacement of XMLEncode() methods and XMLElement ctors. - Changed the relationship between Planet and its bases PopCenter and ResourceCenter so that the bases do not require a this pointer during contruction. Modified Paths: -------------- trunk/FreeOrion/default/eng_stringtable.txt trunk/FreeOrion/universe/Building.h trunk/FreeOrion/universe/Fleet.cpp trunk/FreeOrion/universe/Fleet.h trunk/FreeOrion/universe/Meter.h trunk/FreeOrion/universe/Planet.cpp trunk/FreeOrion/universe/Planet.h trunk/FreeOrion/universe/PopCenter.cpp trunk/FreeOrion/universe/PopCenter.h trunk/FreeOrion/universe/ResourceCenter.cpp trunk/FreeOrion/universe/ResourceCenter.h trunk/FreeOrion/universe/Ship.cpp trunk/FreeOrion/universe/Ship.h trunk/FreeOrion/universe/ShipDesign.h trunk/FreeOrion/universe/System.h trunk/FreeOrion/universe/Universe.cpp trunk/FreeOrion/universe/Universe.h trunk/FreeOrion/universe/UniverseObject.cpp trunk/FreeOrion/universe/UniverseObject.h Modified: trunk/FreeOrion/default/eng_stringtable.txt =================================================================== --- trunk/FreeOrion/default/eng_stringtable.txt 2006-02-17 17:24:29 UTC (rev 1758) +++ trunk/FreeOrion/default/eng_stringtable.txt 2006-02-18 07:07:40 UTC (rev 1759) @@ -746,6 +746,10 @@ FW_FOREIGN_FLEET Foreign fleet +# the name that is used for ships the player does not control +FW_FOREIGN_SHIP +Foreign ship + ############### # TechTreeWnd # ############### Modified: trunk/FreeOrion/universe/Building.h =================================================================== --- trunk/FreeOrion/universe/Building.h 2006-02-17 17:24:29 UTC (rev 1758) +++ trunk/FreeOrion/universe/Building.h 2006-02-18 07:07:40 UTC (rev 1759) @@ -49,6 +49,10 @@ std::string m_building_type; bool m_operating; int m_planet_id; + + friend class boost::serialization::access; + template <class Archive> + void serialize(Archive& ar, const unsigned int version); }; /** A specification for a building of a certain type. Each building type must have a \a unique name string, @@ -92,6 +96,16 @@ const BuildingType* GetBuildingType(const std::string& name); +// template implementations +template <class Archive> +void Building::serialize(Archive& ar, const unsigned int version) +{ + ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(UniverseObject) + & BOOST_SERIALIZATION_NVP(m_building_type) + & BOOST_SERIALIZATION_NVP(m_operating) + & BOOST_SERIALIZATION_NVP(m_planet_id); +} + inline std::string BuildingRevision() {return "$Id$";} Modified: trunk/FreeOrion/universe/Fleet.cpp =================================================================== --- trunk/FreeOrion/universe/Fleet.cpp 2006-02-17 17:24:29 UTC (rev 1758) +++ trunk/FreeOrion/universe/Fleet.cpp 2006-02-18 07:07:40 UTC (rev 1759) @@ -82,12 +82,18 @@ } } +const std::string& Fleet::PublicName(int empire_id) const +{ + // Disclose real fleet name only to fleet owners. Rationale: a player might become suspicious if the incoming + // foreign fleet is called "Decoy" + if (ALL_OBJECTS_VISIBLE || empire_id == Universe::ALL_EMPIRES || OwnedBy(empire_id)) + return Name(); + else + return UserString("FW_FOREIGN_FLEET"); +} XMLElement Fleet::XMLEncode(int empire_id/* = Universe::ALL_EMPIRES*/) const { - // Fleets are either visible or not, so there is no - // difference between the full and partial visibilty - // encodings for this class using boost::lexical_cast; using std::string; @@ -97,13 +103,13 @@ // Disclose real fleet name only to fleet owners. Rationale: a player // might become suspicious if the incoming foreign fleet is called "Decoy" if (!ALL_OBJECTS_VISIBLE && - empire_id != Universe::ALL_EMPIRES && !OwnedBy(empire_id)) { - retval.Child("UniverseObject").Child("m_name").SetText(UserString("FW_FOREIGN_FLEET")); - // the player also only sees the immediate destination of the fleet, - // not the entire route. - retval.AppendChild(XMLElement("m_moving_to", lexical_cast<std::string>(m_next_system))); + empire_id != Universe::ALL_EMPIRES && !OwnedBy(empire_id)) { + retval.Child("UniverseObject").Child("m_name").SetText(UserString("FW_FOREIGN_FLEET")); + // the player also only sees the immediate destination of the fleet, + // not the entire route. + retval.AppendChild(XMLElement("m_moving_to", lexical_cast<std::string>(m_next_system))); } else { - retval.AppendChild(XMLElement("m_moving_to", lexical_cast<std::string>(m_moving_to))); + retval.AppendChild(XMLElement("m_moving_to", lexical_cast<std::string>(m_moving_to))); } retval.AppendChild(XMLElement("m_ships", StringFromContainer<ShipIDSet>(m_ships))); retval.AppendChild(XMLElement("m_prev_system", lexical_cast<std::string>(m_prev_system))); Modified: trunk/FreeOrion/universe/Fleet.h =================================================================== --- trunk/FreeOrion/universe/Fleet.h 2006-02-17 17:24:29 UTC (rev 1758) +++ trunk/FreeOrion/universe/Fleet.h 2006-02-18 07:07:40 UTC (rev 1759) @@ -30,10 +30,10 @@ const_iterator begin() const {return m_ships.begin();} ///< returns the begin const_iterator for the ships in the fleet const_iterator end() const {return m_ships.end();} ///< returns the end const_iterator for the ships in the fleet - virtual UniverseObject::Visibility GetVisibility(int empire_id) const; ///< returns the visibility status of this universe object relative to the input empire. + virtual UniverseObject::Visibility GetVisibility(int empire_id) const; + virtual const std::string& PublicName(int empire_id) const; + virtual XMLElement XMLEncode(int empire_id = Universe::ALL_EMPIRES) const; - virtual XMLElement XMLEncode(int empire_id = Universe::ALL_EMPIRES) const; ///< constructs an XMLElement from a Fleet object with visibility limited relative to the input empire - /** Returns the list of systems that this fleet will move through en route to its destination (may be empty). If this fleet is currently at a system, that system will be the first one in the list. */ const std::list<System*>& TravelRoute() const; @@ -97,8 +97,32 @@ // these are filled temporarily and only as needed, and they can be deduced from the other info above; don't put them in the XML encoding mutable std::list<System*> m_travel_route; mutable double m_travel_distance; + + friend class boost::serialization::access; + template <class Archive> + void serialize(Archive& ar, const unsigned int version); }; +// template implementations +template <class Archive> +void Fleet::serialize(Archive& ar, const unsigned int version) +{ + bool visible; + int moving_to; + if (Archive::is_saving::value) + visible = ALL_OBJECTS_VISIBLE || Universe::s_encoding_empire == Universe::ALL_EMPIRES || OwnedBy(Universe::s_encoding_empire); + ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(UniverseObject) + & BOOST_SERIALIZATION_NVP(visible); + if (Archive::is_saving::value) + moving_to = visible ? m_moving_to : m_next_system; + ar & BOOST_SERIALIZATION_NVP(m_ships) + & BOOST_SERIALIZATION_NVP(moving_to) + & BOOST_SERIALIZATION_NVP(m_prev_system) + & BOOST_SERIALIZATION_NVP(m_next_system); + if (Archive::is_loading::value) + m_moving_to = moving_to; +} + inline std::string FleetRevision() {return "$Id$";} Modified: trunk/FreeOrion/universe/Meter.h =================================================================== --- trunk/FreeOrion/universe/Meter.h 2006-02-17 17:24:29 UTC (rev 1758) +++ trunk/FreeOrion/universe/Meter.h 2006-02-18 07:07:40 UTC (rev 1759) @@ -50,8 +50,24 @@ friend class ServerApp; friend class Universe; + + friend class boost::serialization::access; + template <class Archive> + void serialize(Archive& ar, const unsigned int version); }; +// template implementations +template <class Archive> +void Meter::serialize(Archive& ar, const unsigned int version) +{ + ar & BOOST_SERIALIZATION_NVP(m_current) + & BOOST_SERIALIZATION_NVP(m_max) + & BOOST_SERIALIZATION_NVP(m_initial_current) + & BOOST_SERIALIZATION_NVP(m_initial_max) + & BOOST_SERIALIZATION_NVP(m_previous_current) + & BOOST_SERIALIZATION_NVP(m_previous_max); +} + inline std::string MeterRevision() {return "$Id$";} Modified: trunk/FreeOrion/universe/Planet.cpp =================================================================== --- trunk/FreeOrion/universe/Planet.cpp 2006-02-17 17:24:29 UTC (rev 1758) +++ trunk/FreeOrion/universe/Planet.cpp 2006-02-18 07:07:40 UTC (rev 1759) @@ -48,20 +48,22 @@ Planet::Planet() : UniverseObject(), - PopCenter(this, MaxPopMod(SZ_MEDIUM, Environment(PT_TERRAN)), MaxHealthMod(Environment(PT_TERRAN))), - ResourceCenter(PopCenter::PopulationMeter(), this), + PopCenter(MaxPopMod(SZ_MEDIUM, Environment(PT_TERRAN)), MaxHealthMod(Environment(PT_TERRAN))), + ResourceCenter(PopCenter::PopulationMeter()), m_type(PT_TERRAN), m_size(SZ_MEDIUM), m_available_trade(0.0), m_just_conquered(false), m_is_about_to_be_colonized(0) { + GG::Connect(ResourceCenter::GetObjectSignal, &Planet::This, this); + GG::Connect(PopCenter::GetObjectSignal, &Planet::This, this); } Planet::Planet(PlanetType type, PlanetSize size) : UniverseObject(), - PopCenter(this, MaxPopMod(size, Environment(type)), MaxHealthMod(Environment(type))), - ResourceCenter(PopCenter::PopulationMeter(), this), + PopCenter(MaxPopMod(size, Environment(type)), MaxHealthMod(Environment(type))), + ResourceCenter(PopCenter::PopulationMeter()), m_type(PT_TERRAN), m_size(SZ_MEDIUM), m_available_trade(0.0), @@ -71,12 +73,14 @@ SetType(type); SetSize(size); m_def_bases = 0; + GG::Connect(ResourceCenter::GetObjectSignal, &Planet::This, this); + GG::Connect(PopCenter::GetObjectSignal, &Planet::This, this); } Planet::Planet(const XMLElement& elem) : UniverseObject(elem.Child("UniverseObject")), - PopCenter(elem.Child("PopCenter"), this), - ResourceCenter(elem.Child("ResourceCenter"), PopCenter::PopulationMeter(), this), + PopCenter(elem.Child("PopCenter")), + ResourceCenter(elem.Child("ResourceCenter"), PopCenter::PopulationMeter()), m_is_about_to_be_colonized(0), m_def_bases(0) { @@ -102,6 +106,9 @@ Logger().debugStream() << "\n" << osstream.str(); throw; } + + GG::Connect(ResourceCenter::GetObjectSignal, &Planet::This, this); + GG::Connect(PopCenter::GetObjectSignal, &Planet::This, this); } PlanetEnvironment Planet::Environment() const @@ -418,3 +425,8 @@ default: return PE_UNINHABITABLE; } } + +UniverseObject* Planet::This() +{ + return this; +} Modified: trunk/FreeOrion/universe/Planet.h =================================================================== --- trunk/FreeOrion/universe/Planet.h 2006-02-17 17:24:29 UTC (rev 1758) +++ trunk/FreeOrion/universe/Planet.h 2006-02-18 07:07:40 UTC (rev 1759) @@ -24,7 +24,10 @@ /** a class representing a FreeOrion planet.*/ -class Planet : public UniverseObject, public PopCenter, public ResourceCenter +class Planet : + public UniverseObject, + public PopCenter, + public ResourceCenter { public: /** \name Structors */ //@{ @@ -101,6 +104,8 @@ static PlanetEnvironment Environment(PlanetType type); ///< returns the environment that corresponds to each planet type private: + UniverseObject* This(); + PlanetType m_type; PlanetSize m_size; std::set<int> m_buildings; @@ -111,12 +116,39 @@ int m_is_about_to_be_colonized; ///////////////////////////////////////////////////////////////////////////// - // V0.2 ONLY!!!! + // V0.3 ONLY!!!! int m_def_bases; - // V0.2 ONLY!!!! + // V0.3 ONLY!!!! ///////////////////////////////////////////////////////////////////////////// + + friend class boost::serialization::access; + template <class Archive> + void serialize(Archive& ar, const unsigned int version); }; +// template implementations +template <class Archive> +void Planet::serialize(Archive& ar, const unsigned int version) +{ + Visibility vis; + if (Archive::is_saving::value) + vis = GetVisibility(Universe::s_encoding_empire); + ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(UniverseObject) + & BOOST_SERIALIZATION_BASE_OBJECT_NVP(PopCenter) + & BOOST_SERIALIZATION_BASE_OBJECT_NVP(ResourceCenter) + & BOOST_SERIALIZATION_NVP(vis) + & BOOST_SERIALIZATION_NVP(m_type) + & BOOST_SERIALIZATION_NVP(m_size) + & BOOST_SERIALIZATION_NVP(m_just_conquered); + if (ALL_OBJECTS_VISIBLE || + vis == FULL_VISIBILITY) { + ar & BOOST_SERIALIZATION_NVP(m_buildings) + & BOOST_SERIALIZATION_NVP(m_available_trade) + & BOOST_SERIALIZATION_NVP(m_is_about_to_be_colonized) + & BOOST_SERIALIZATION_NVP(m_def_bases); + } +} + inline std::string PlanetRevision() {return "$Id$";} Modified: trunk/FreeOrion/universe/PopCenter.cpp =================================================================== --- trunk/FreeOrion/universe/PopCenter.cpp 2006-02-17 17:24:29 UTC (rev 1758) +++ trunk/FreeOrion/universe/PopCenter.cpp 2006-02-18 07:07:40 UTC (rev 1759) @@ -44,26 +44,19 @@ bool temp_source_bool = RecordSourceFile("$Id$"); } -PopCenter::PopCenter(UniverseObject* object, double max_pop_mod, double max_health_mod) : - m_object(object) +PopCenter::PopCenter(double max_pop_mod, double max_health_mod) { - assert(m_object); Reset(max_pop_mod, max_health_mod); } -PopCenter::PopCenter(int race, UniverseObject* object, double max_pop_mod, double max_health_mod) : - m_object(object) +PopCenter::PopCenter(int race, double max_pop_mod, double max_health_mod) { - assert(m_object); Reset(max_pop_mod, max_health_mod); m_race = race; } -PopCenter::PopCenter(const XMLElement& elem, UniverseObject* object) : - m_object(object) +PopCenter::PopCenter(const XMLElement& elem) { - assert(m_object); - if (elem.Tag() != "PopCenter") throw std::invalid_argument("Attempted to construct a PopCenter from an XMLElement that had a tag other than \"PopCenter\""); @@ -146,25 +139,29 @@ void PopCenter::AdjustMaxMeters() { + UniverseObject* object = GetObjectSignal(); + assert(object); // determine meter maxes; they should have been previously reset to 0, then adjusted by Specials, Building effects, etc. - m_pop.AdjustMax(MaxPopModFromObject(m_object)); - m_health.AdjustMax(MaxHealthModFromObject(m_object)); + m_pop.AdjustMax(MaxPopModFromObject(object)); + m_health.AdjustMax(MaxHealthModFromObject(object)); } void PopCenter::PopGrowthProductionResearchPhase() { + UniverseObject* object = GetObjectSignal(); + assert(object); m_pop.AdjustCurrent(FuturePopGrowth()); if (AvailableFood() < m_pop.Current()) { // starvation - m_object->AddSpecial("STARVATION_SPECIAL"); + object->AddSpecial("STARVATION_SPECIAL"); m_health.AdjustMax(PlanetDataTables()["NutrientHealthMod"][0][0]); } else if (m_available_food < 2 * m_pop.Current()) { // "minimal" nutrient levels - m_object->RemoveSpecial("STARVATION_SPECIAL"); + object->RemoveSpecial("STARVATION_SPECIAL"); m_health.AdjustMax(PlanetDataTables()["NutrientHealthMod"][0][1]); } else if (m_available_food < 4 * m_pop.Current()) { // "normal" nutrient levels - m_object->RemoveSpecial("STARVATION_SPECIAL"); + object->RemoveSpecial("STARVATION_SPECIAL"); m_health.AdjustMax(PlanetDataTables()["NutrientHealthMod"][0][2]); } else { // food orgy! - m_object->RemoveSpecial("STARVATION_SPECIAL"); + object->RemoveSpecial("STARVATION_SPECIAL"); m_health.AdjustMax(PlanetDataTables()["NutrientHealthMod"][0][3]); } m_health.AdjustCurrent(m_health.Current() * (((m_health.Max() + 1.0) - m_health.Current()) / (m_health.Max() + 1.0))); @@ -178,4 +175,3 @@ m_race = -1; m_available_food = 0.0; } - Modified: trunk/FreeOrion/universe/PopCenter.h =================================================================== --- trunk/FreeOrion/universe/PopCenter.h 2006-02-17 17:24:29 UTC (rev 1758) +++ trunk/FreeOrion/universe/PopCenter.h 2006-02-18 07:07:40 UTC (rev 1759) @@ -26,10 +26,14 @@ SUPERDENSE }; // others TBD (these are from the Public Review: Population & Econ Model thread on the forums) + /** \name Signal Types */ //@{ + typedef boost::signal<UniverseObject* (), Default0Combiner> GetObjectSignalType; ///< emitted as a request for the UniverseObject to which this PopCenter is attached + //@} + /** \name Structors */ //@{ - PopCenter(UniverseObject* object, double max_pop_mod, double max_health_mod); ///< basic ctor - PopCenter(int race, UniverseObject* object, double max_pop_mod, double max_health_mod); ///< basic ctor - PopCenter(const XMLElement& elem, UniverseObject* object); ///< ctor that constructs a PopCenter object from an XMLElement. \throw std::invalid_argument May throw std::invalid_argument if \a elem does not encode a PopCenter object + PopCenter(double max_pop_mod, double max_health_mod); ///< basic ctor + PopCenter(int race, double max_pop_mod, double max_health_mod); ///< basic ctor + PopCenter(const XMLElement& elem); ///< ctor that constructs a PopCenter object from an XMLElement. \throw std::invalid_argument May throw std::invalid_argument if \a elem does not encode a PopCenter object virtual ~PopCenter(); ///< dtor //@} @@ -68,7 +72,10 @@ /// Resets the meters, etc. This should be called when a PopCenter is wiped out due to starvation, etc. void Reset(double max_pop_mod, double max_health_mod); //@} - + +protected: + mutable GetObjectSignalType GetObjectSignal; ///< the UniverseObject-retreiving signal object for this PopCenter + private: Meter m_pop; Meter m_health; @@ -76,9 +83,22 @@ int m_race; ///< the id of the race that occupies this planet double m_available_food; - UniverseObject* const m_object; ///< the UniverseObject of which this center is a part + friend class boost::serialization::access; + template <class Archive> + void serialize(Archive& ar, const unsigned int version); }; +// template implementations +template <class Archive> +void PopCenter::serialize(Archive& ar, const unsigned int version) +{ + ar & BOOST_SERIALIZATION_NVP(m_pop) + & BOOST_SERIALIZATION_NVP(m_health) + & BOOST_SERIALIZATION_NVP(m_growth) + & BOOST_SERIALIZATION_NVP(m_race) + & BOOST_SERIALIZATION_NVP(m_available_food); +} + inline std::string PopCenterRevision() {return "$Id$";} Modified: trunk/FreeOrion/universe/ResourceCenter.cpp =================================================================== --- trunk/FreeOrion/universe/ResourceCenter.cpp 2006-02-17 17:24:29 UTC (rev 1758) +++ trunk/FreeOrion/universe/ResourceCenter.cpp 2006-02-18 07:07:40 UTC (rev 1759) @@ -82,22 +82,17 @@ bool temp_source_bool = RecordSourceFile("$Id$"); } -ResourceCenter::ResourceCenter(const Meter& pop, UniverseObject* object) : - m_pop(pop), - m_object(object) +ResourceCenter::ResourceCenter(const Meter& pop) : + m_pop(pop) { - assert(m_object); Reset(); } -ResourceCenter::ResourceCenter(const XMLElement& elem, const Meter& pop, UniverseObject* object) : +ResourceCenter::ResourceCenter(const XMLElement& elem, const Meter& pop) : m_primary(FOCUS_UNKNOWN), m_secondary(FOCUS_UNKNOWN), - m_pop(pop), - m_object(object) + m_pop(pop) { - assert(m_object); - if (elem.Tag() != "ResourceCenter") throw std::invalid_argument("Attempted to construct a ResourceCenter from an XMLElement that had a tag other than \"ResourceCenter\""); @@ -264,8 +259,10 @@ double primary_balanced_factor = ProductionDataTables()["FocusMods"][2][0]; double secondary_balanced_factor = ProductionDataTables()["FocusMods"][3][0]; m_construction.AdjustMax(20.0); // default construction max is 20 - m_farming.AdjustMax(MaxFarmingModFromObject(m_object)); - m_industry.AdjustMax(MaxIndustryModFromObject(m_object)); + UniverseObject* object = GetObjectSignal(); + assert(object); + m_farming.AdjustMax(MaxFarmingModFromObject(object)); + m_industry.AdjustMax(MaxIndustryModFromObject(object)); switch (m_primary) { case FOCUS_BALANCED: m_farming.AdjustMax(primary_balanced_factor); Modified: trunk/FreeOrion/universe/ResourceCenter.h =================================================================== --- trunk/FreeOrion/universe/ResourceCenter.h 2006-02-17 17:24:29 UTC (rev 1758) +++ trunk/FreeOrion/universe/ResourceCenter.h 2006-02-18 07:07:40 UTC (rev 1759) @@ -27,11 +27,12 @@ public: /** \name Signal Types */ //@{ typedef boost::signal<void ()> ResourceCenterChangedSignalType; ///< emitted when the ResourceCenter is altered in any way + typedef boost::signal<UniverseObject* (), Default0Combiner> GetObjectSignalType; ///< emitted as a request for the UniverseObject to which this ResourceCenter is attached //@} /** \name Structors */ //@{ - ResourceCenter(const Meter& pop, UniverseObject* object); ///< default ctor - ResourceCenter(const XMLElement& elem, const Meter& pop, UniverseObject* object); ///< ctor that constructs a ResourceCenter object from an XMLElement. \throw std::invalid_argument May throw std::invalid_argument if \a elem does not encode a ResourceCenter object + ResourceCenter(const Meter& pop); ///< default ctor + ResourceCenter(const XMLElement& elem, const Meter& pop); ///< ctor that constructs a ResourceCenter object from an XMLElement. \throw std::invalid_argument May throw std::invalid_argument if \a elem does not encode a ResourceCenter object virtual ~ResourceCenter(); ///< dtor //@} @@ -57,7 +58,7 @@ virtual XMLElement XMLEncode(UniverseObject::Visibility vis) const; ///< constructs an XMLElement from a ResourceCenter object with the given visibility - mutable ResourceCenterChangedSignalType ResourceCenterChangedSignal; ///< the state changed signal object for this UniverseObject + mutable ResourceCenterChangedSignalType ResourceCenterChangedSignal; ///< the state changed signal object for this ResourceCenter //@} /** \name Mutators */ //@{ @@ -78,6 +79,9 @@ void Reset(); //@} +protected: + mutable GetObjectSignalType GetObjectSignal; ///< the UniverseObject-retreiving signal object for this ResourceCenter + private: FocusType m_primary; FocusType m_secondary; @@ -89,13 +93,39 @@ Meter m_trade; Meter m_construction; - const Meter& m_pop; ///< current / max pop present in this center (may be the one from m_object, e.g. if m_object is a Planet) - UniverseObject* const m_object; ///< the UniverseObject of which this center is a part + const Meter& m_pop; ///< current / max pop present in this center (may be the one from m_object, e.g. if m_object is a Planet) + + friend class boost::serialization::access; + template <class Archive> + void serialize(Archive& ar, const unsigned int version); }; +// template implementations +template <class Archive> +void ResourceCenter::serialize(Archive& ar, const unsigned int version) +{ + UniverseObject::Visibility vis; + if (Archive::is_saving::value) { + UniverseObject* object = GetObjectSignal(); + assert(object); + vis = object->GetVisibility(Universe::s_encoding_empire); + } + ar & BOOST_SERIALIZATION_NVP(vis); + if (UniverseObject::ALL_OBJECTS_VISIBLE || + vis == UniverseObject::FULL_VISIBILITY) { + ar & BOOST_SERIALIZATION_NVP(m_primary) + & BOOST_SERIALIZATION_NVP(m_secondary) + & BOOST_SERIALIZATION_NVP(m_farming) + & BOOST_SERIALIZATION_NVP(m_industry) + & BOOST_SERIALIZATION_NVP(m_mining) + & BOOST_SERIALIZATION_NVP(m_research) + & BOOST_SERIALIZATION_NVP(m_trade) + & BOOST_SERIALIZATION_NVP(m_construction) + & BOOST_SERIALIZATION_NVP(m_pop); + } +} + inline std::string ResourceCenterRevision() {return "$Id$";} #endif // _ResourceCenter_h_ - - Modified: trunk/FreeOrion/universe/Ship.cpp =================================================================== --- trunk/FreeOrion/universe/Ship.cpp 2006-02-17 17:24:29 UTC (rev 1758) +++ trunk/FreeOrion/universe/Ship.cpp 2006-02-18 07:07:40 UTC (rev 1759) @@ -87,6 +87,16 @@ return Design()->attack > 0; } +const std::string& Ship::PublicName(int empire_id) const +{ + // Disclose real ship name only to fleet owners. Rationale: a player who doesn't know the design for a particular + // ship can easily guess it if the ship's name is "Scout" + if (ALL_OBJECTS_VISIBLE || empire_id == Universe::ALL_EMPIRES || OwnedBy(empire_id)) + return Name(); + else + return UserString("FW_FOREIGN_SHIP"); +} + XMLElement Ship::XMLEncode(int empire_id/* = Universe::ALL_EMPIRES*/) const { using boost::lexical_cast; Modified: trunk/FreeOrion/universe/Ship.h =================================================================== --- trunk/FreeOrion/universe/Ship.h 2006-02-17 17:24:29 UTC (rev 1758) +++ trunk/FreeOrion/universe/Ship.h 2006-02-18 07:07:40 UTC (rev 1759) @@ -24,8 +24,9 @@ int FleetID() const; ///< returns the ID of the fleet the ship is residing in Fleet* GetFleet() const; ///< returns the ID of the fleet the ship is residing in - virtual UniverseObject::Visibility GetVisibility(int empire_id) const; ///< returns the visibility status of this universe object relative to the input empire. - virtual XMLElement XMLEncode(int empire_id = Universe::ALL_EMPIRES) const; ///< constructs an XMLElement from a Ship object with visibility limited relative to the input empire + virtual UniverseObject::Visibility GetVisibility(int empire_id) const; + virtual const std::string& PublicName(int empire_id) const; + virtual XMLElement XMLEncode(int empire_id = Universe::ALL_EMPIRES) const; bool IsArmed() const; @@ -41,8 +42,21 @@ private: std::string m_design_name; int m_fleet_id; + + friend class boost::serialization::access; + template <class Archive> + void serialize(Archive& ar, const unsigned int version); }; +// template implementations +template <class Archive> +void Ship::serialize(Archive& ar, const unsigned int version) +{ + ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(UniverseObject) + & BOOST_SERIALIZATION_NVP(m_design_name) + & BOOST_SERIALIZATION_NVP(m_fleet_id); +} + inline std::string ShipRevision() {return "$Id$";} Modified: trunk/FreeOrion/universe/ShipDesign.h =================================================================== --- trunk/FreeOrion/universe/ShipDesign.h 2006-02-17 17:24:29 UTC (rev 1758) +++ trunk/FreeOrion/universe/ShipDesign.h 2006-02-18 07:07:40 UTC (rev 1759) @@ -4,6 +4,9 @@ #include "../util/XMLDoc.h" +#include <boost/serialization/access.hpp> +#include <boost/serialization/nvp.hpp> + #include <string> /** a class representing a ship design */ @@ -32,10 +35,30 @@ /** \name Accessors */ //@{ XMLElement XMLEncode() const; ///< constructs an XMLElement from a ShipDesign object //@} + +private: + friend class boost::serialization::access; + template <class Archive> + void serialize(Archive& ar, const unsigned int version); }; const ShipDesign* GetShipDesign(int empire_id, const std::string& name); +// template implementations +template <class Archive> +void ShipDesign::serialize(Archive& ar, const unsigned int version) +{ + ar & BOOST_SERIALIZATION_NVP(empire) + & BOOST_SERIALIZATION_NVP(name) + & BOOST_SERIALIZATION_NVP(description) + & BOOST_SERIALIZATION_NVP(cost) + & BOOST_SERIALIZATION_NVP(speed) + & BOOST_SERIALIZATION_NVP(colonize) + & BOOST_SERIALIZATION_NVP(attack) + & BOOST_SERIALIZATION_NVP(defense) + & BOOST_SERIALIZATION_NVP(graphic); +} + inline std::string ShipDesignRevision() {return "$Id$";} Modified: trunk/FreeOrion/universe/System.h =================================================================== --- trunk/FreeOrion/universe/System.h 2006-02-17 17:24:29 UTC (rev 1758) +++ trunk/FreeOrion/universe/System.h 2006-02-18 07:07:40 UTC (rev 1759) @@ -182,13 +182,13 @@ int m_orbits; ObjectMultimap m_objects; ///< each key value represents an orbit (-1 represents general system contents not in any orbit); there may be many or no objects at each orbit (including -1) StarlaneMap m_starlanes_wormholes; ///< the ints represent the IDs of other connected systems; the bools indicate whether the connection is a wormhole (true) or a starlane (false) + + friend class boost::serialization::access; + template <class Archive> + void serialize(Archive& ar, const unsigned int version); }; -inline std::string SystemRevision() -{return "$Id$";} - - // template implementations template <class T> @@ -266,6 +266,42 @@ return retval; } +template <class Archive> +void System::serialize(Archive& ar, const unsigned int version) +{ + Visibility vis; + int orbits; + ObjectMultimap objects; + StarlaneMap starlanes_wormholes; + if (Archive::is_saving::value) { + vis = GetVisibility(Universe::s_encoding_empire); + if (ALL_OBJECTS_VISIBLE || + vis == FULL_VISIBILITY) { + orbits = m_orbits; + objects = m_objects; + starlanes_wormholes = m_starlanes_wormholes; + } else if (vis == PARTIAL_VISIBILITY) { + orbits = m_orbits; + objects = PartiallyVisibleObjects(Universe::s_encoding_empire); + starlanes_wormholes = VisibleStarlanes(Universe::s_encoding_empire); + } + } + ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(UniverseObject) + & BOOST_SERIALIZATION_NVP(vis); + if (ALL_OBJECTS_VISIBLE || + vis == PARTIAL_VISIBILITY || vis == FULL_VISIBILITY) { + ar & BOOST_SERIALIZATION_NVP(orbits) + & BOOST_SERIALIZATION_NVP(objects) + & BOOST_SERIALIZATION_NVP(starlanes_wormholes); + } + if (Archive::is_loading::value) { + m_orbits = orbits; + m_objects = objects; + m_starlanes_wormholes = starlanes_wormholes; + } +} +inline std::string SystemRevision() +{return "$Id$";} + #endif // _System_h_ - Modified: trunk/FreeOrion/universe/Universe.cpp =================================================================== --- trunk/FreeOrion/universe/Universe.cpp 2006-02-17 17:24:29 UTC (rev 1758) +++ trunk/FreeOrion/universe/Universe.cpp 2006-02-18 07:07:40 UTC (rev 1759) @@ -871,6 +871,7 @@ // static(s) double Universe::s_universe_width = 1000.0; bool Universe::s_inhibit_universe_object_signals = false; +int Universe::s_encoding_empire = Universe::ALL_EMPIRES; Universe::Universe() { Modified: trunk/FreeOrion/universe/Universe.h =================================================================== --- trunk/FreeOrion/universe/Universe.h 2006-02-17 17:24:29 UTC (rev 1758) +++ trunk/FreeOrion/universe/Universe.h 2006-02-18 07:07:40 UTC (rev 1759) @@ -40,6 +40,8 @@ #include <boost/graph/filtered_graph.hpp> #endif +#include <boost/serialization/access.hpp> +#include <boost/serialization/nvp.hpp> #include <boost/type_traits/remove_const.hpp> #include <vector> @@ -249,6 +251,11 @@ static const bool& InhibitUniverseObjectSignals() {return s_inhibit_universe_object_signals;} + /** HACK! This must be set to the encoding empire's id when serializing a Universe, so that only the relevant parts + of the Universe are serialized. The use of this global variable is done just so I don't have to rewrite any + custom boost::serialization classes that implement empire-dependent visibility. */ + static int s_encoding_empire; + protected: typedef std::vector< std::vector<double> > DistanceMatrix; @@ -341,9 +348,22 @@ private: static bool s_inhibit_universe_object_signals; + + friend class boost::serialization::access; + template <class Archive> + void serialize(Archive& ar, const unsigned int version); }; +// template implementations +template <class Archive> +void Universe::serialize(Archive& ar, const unsigned int version) +{ + ar & BOOST_SERIALIZATION_NVP(s_universe_width) + & BOOST_SERIALIZATION_NVP(m_objects) + & BOOST_SERIALIZATION_NVP(m_last_allocated_id); +} + inline std::string UniverseRevision() {return "$Id$";} Modified: trunk/FreeOrion/universe/UniverseObject.cpp =================================================================== --- trunk/FreeOrion/universe/UniverseObject.cpp 2006-02-17 17:24:29 UTC (rev 1758) +++ trunk/FreeOrion/universe/UniverseObject.cpp 2006-02-18 07:07:40 UTC (rev 1759) @@ -32,8 +32,7 @@ m_x(INVALID_POSITION), m_y(INVALID_POSITION), m_system_id(INVALID_OBJECT_ID) -{ -} +{} UniverseObject::UniverseObject(const std::string name, double x, double y, const std::set<int>& owners/* = std::set<int>()*/) : @@ -80,8 +79,7 @@ } UniverseObject::~UniverseObject() -{ -} +{} int UniverseObject::ID() const { @@ -148,6 +146,11 @@ return (ALL_OBJECTS_VISIBLE || empire_id == Universe::ALL_EMPIRES || m_owners.find(empire_id) != m_owners.end()) ? FULL_VISIBILITY : NO_VISIBILITY; } +const std::string& UniverseObject::PublicName(int empire_id) const +{ + return m_name; +} + XMLElement UniverseObject::XMLEncode(int empire_id/* = Universe::ALL_EMPIRES*/) const { // limited visibility object -- no owner info @@ -251,8 +254,7 @@ } void UniverseObject::AdjustMaxMeters() -{ -} +{} void UniverseObject::ClampMeters() { Modified: trunk/FreeOrion/universe/UniverseObject.h =================================================================== --- trunk/FreeOrion/universe/UniverseObject.h 2006-02-17 17:24:29 UTC (rev 1758) +++ trunk/FreeOrion/universe/UniverseObject.h 2006-02-18 07:07:40 UTC (rev 1759) @@ -13,10 +13,21 @@ #include "InhibitableSignal.h" #endif +#include <boost/serialization/is_abstract.hpp> + #include <set> #include <string> #include <vector> +/** Signal return value combiner used by ResourceCenter, PopCenter, and any other UniverseObject decorator that needs + access to its UniverseObject subclass. */ +struct Default0Combiner +{ + typedef UniverseObject* result_type; + template <class Iter> + UniverseObject* operator()(Iter first, Iter last); +}; + class Meter; class System; class SitRepEntry; @@ -75,7 +86,7 @@ int SystemID() const; ///< returns the ID number of the system in which this object can be found, or INVALID_OBJECT_ID if the object is not within any system System* GetSystem() const; ///< returns system in which this object can be found, or null if the object is not within any system const std::set<std::string>& - Specials() const; ///< returns the set of names of the Specials attached to this object + Specials() const; ///< returns the set of names of the Specials attached to this object virtual const Meter* GetMeter(MeterType type) const; ///< returns the requested Meter, or 0 if no such Meter of that type is found in this object @@ -84,7 +95,7 @@ bool WhollyOwnedBy(int empire) const; ///< returns true iff the empire with id \a empire is the only owner of this object virtual Visibility GetVisibility(int empire_id) const; ///< returns the visibility status of this universe object relative to the input empire. - + virtual const std::string& PublicName(int empire_id) const; ///< returns the name of this objectas it appears to empire \a empire_id virtual XMLElement XMLEncode(int empire_id = Universe::ALL_EMPIRES) const; ///< constructs an XMLElement from a UniverseObject object with visibility limited relative to the input empire /** accepts a visitor object \see UniverseObjectVisitor */ @@ -115,7 +126,7 @@ /** performs the movement that this object is responsible for this object's actions during the movement phase of a turn. */ - virtual void MovementPhase( ) = 0; + virtual void MovementPhase() = 0; /** sets all the max meter values for all meters in this UniverseObject to Meter::METER_MIN. This should be done before any Effects act on the object. */ @@ -130,7 +141,7 @@ /** performs the movement that this object is responsible for this object's actions during the pop growth/production/research phase of a turn. */ - virtual void PopGrowthProductionResearchPhase( ) = 0; + virtual void PopGrowthProductionResearchPhase() = 0; //@} static const double INVALID_POSITION; ///< the position in x and y at which default-constructed objects are placed @@ -145,8 +156,49 @@ std::set<int> m_owners; int m_system_id; std::set<std::string> m_specials; + + friend class boost::serialization::access; + template <class Archive> + void serialize(Archive& ar, const unsigned int version); }; +BOOST_IS_ABSTRACT(UniverseObject) +// template implementations +template <class Iter> +UniverseObject* Default0Combiner::operator()(Iter first, Iter last) +{ + UniverseObject* retval = 0; + while (first != last) { + assert(!retval); // ensure we retrieve at most one UniverseObject + retval = *first++; + } + return retval; +} + +template <class Archive> +void UniverseObject::serialize(Archive& ar, const unsigned int version) +{ + Visibility vis; + if (Archive::is_saving::value) + vis = GetVisibility(Universe::s_encoding_empire); + ar & BOOST_SERIALIZATION_NVP(vis) + & BOOST_SERIALIZATION_NVP(m_id) + & BOOST_SERIALIZATION_NVP(m_x) + & BOOST_SERIALIZATION_NVP(m_y) + & BOOST_SERIALIZATION_NVP(m_system_id); + if (ALL_OBJECTS_VISIBLE || + vis == PARTIAL_VISIBILITY || vis == FULL_VISIBILITY) { + // We don't disclose the real object name for some types of objects, cinve it would look funny if e.g. the user + // saw an incoming enemy cleet called "Decoy". + std::string name = PublicName(); + ar & BOOST_SERIALIZATION_NVP(name) + & BOOST_SERIALIZATION_NVP(m_owners) + & BOOST_SERIALIZATION_NVP(m_specials); + if (Archive::is_loading::value) + m_name = name; + } +} + inline std::string UniverseObjectRevision() {return "$Id$";} |
From: <geo...@us...> - 2007-03-04 11:05:31
|
Revision: 2020 http://svn.sourceforge.net/freeorion/revision/?rev=2020&view=rev Author: geoffthemedio Date: 2007-03-04 03:05:31 -0800 (Sun, 04 Mar 2007) Log Message: ----------- General tech tree maintenance / enhancement: -Made numerous theories into applications, in order to reduce total number of theories and to be more logical. More needs to be done along these lines... -Put links to tech icons into definitions of several techs that didn't have them -Renamed a few techs -Tweaked some tech dependencies -Added Planned Economics tech icon. Not sure why this wasn't added before... Modified Paths: -------------- trunk/FreeOrion/default/eng_stringtable.txt trunk/FreeOrion/default/techs.txt Added Paths: ----------- trunk/FreeOrion/default/data/art/tech_icons/Planned_Economics.png Added: trunk/FreeOrion/default/data/art/tech_icons/Planned_Economics.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/tech_icons/Planned_Economics.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/FreeOrion/default/eng_stringtable.txt =================================================================== --- trunk/FreeOrion/default/eng_stringtable.txt 2007-03-03 20:07:15 UTC (rev 2019) +++ trunk/FreeOrion/default/eng_stringtable.txt 2007-03-04 11:05:31 UTC (rev 2020) @@ -2106,7 +2106,7 @@ The discovery of interstellar travel via starlanes ushers in a new era of development of society. Old political squabbles between minor factions become insignificant when the entire civilization is faced with the limitless potential of the stars... for growth and prosperity, or utter destruction. LRN_TRANSLING_THT -Translinguistic Thought +Translinguistics LRN_TRANSLING_THT_DESC Lesser minds struggle with, or accept the confines of the language they have learned. Adequate minds reach and feel constrained by the concepts they are given ways to express. Truely great minds break free of the bounds of language, forming and analyzing thoughts that verge on the transcendental. But merely great minds are left isolated and futile, for without language to express thoughts, how can they share their insights? @@ -2165,12 +2165,6 @@ LRN_NDIM_SUBSPACE_DESC Early superstring theorists spoke of 10, 11 or 26 dimensional universes, with all but the 4 macrodimensions "curled up" so tightly as to be unseen. These and other dimensions may now be uncurled and opened, and the very surface of space itself stretched and pierced by shifting matter to or from levels of existance previously hidden below the surface of our limited perception, or creating layers or bubbles where none existed before. -LRN_MATTER_ENERGY -Matter-Energy Conversion - -LRN_MATTER_ENERGY_DESC -At appropriate scales and under specific conditions, matter-energy becomes a unified phenomenon. Applied at larger scales, complete control over the structure of matter and the dynamics of energy becomes possible, as does the interchange between the two. Transmutation and replication, at limited scales, become possible. However, despite the enormous rest mass energy equivalence of matter, converting directly to energy for bulk power generation is generally less effective than comparatively simple fusion generation. - LRN_UNIF_CONC Unified Consciousness @@ -2297,18 +2291,6 @@ PRO_FUSION_GEN_DESC Explosive or uncontrolled thermonuclear reactions are comparatively simple to cause at scales ranging from small tactical warheads to supergiant stellar furnaces. Controllable, stable and practical power generation from the reaction is somewhat more difficult. The process remains attractive, however, due to the near-limitless supply of fuel and potential for emissions-free operation. -PRO_ASTEROID_MINE -Asteroid Mining - -PRO_ASTEROID_MINE_DESC -Mineral resource extraction from subplanetoid-sized bodies involves challenges, and provides opportunities quite distinct from those of full-fledged planets. Lacking sufficient mass to self-liquify and differentiate, asteroids can provide much easier access to some heavier elements, and lack of a gravity can make extraction for use in space much more efficient. Conversely, the limited size of each source asteroid requires fully portable self-sufficient extraction facilities. As well, the challenges of any microgravity environment must be overcome, requiring redesign of many traditional methods. - -PRO_CORE_MINE -Deep Core Mining - -PRO_CORE_MINE_DESC -The pressure and temperatures in terrestrial planet mantles and cores create large quantities of crystal and mineral formations that only appear on upper crust layers due to vulcanism. The lower atmospheric layers and core materials of gascious planet contain even more exotic materials, in greater concentrations. Accessing these regions to extract the materials is difficult and treacherous, but eminently rewarding, compared to traditional surface mining activities. - PRO_NANOTECH_PROD Nanotech Production @@ -2321,12 +2303,6 @@ PRO_ORBITAL_GEN_DESC Low orbit of planetary bodies provides numerous benefits for power generation compared to planetary surfaces. Direct exposure to nearby solar radiation without atmospheric attenuation, and the orders of magnitude larger structures that may be assembled in microgravity to collect it are significant advantages. The resulting power may be used in orbit, or may be beamed to the planet to support surface industry. As well, new mechanisms of energy conversion become available in orbit, including planetary magnetic field coupling, orbital momentum exchange, and frictional heating with planetary atmospheres, which are uniquely beneficial for specialized applications. -PRO_ORBITAL_MINE -Orbital Mining - -PRO_ORBITAL_MINE_DESC -On solid, habitable planets, traditional bulk surface mining is effective and relatively efficient. For gas giants and terrestrial planets that are unable to support a sizable population however, the ability to extract usable minearals with space-based facilities is far more practical. A primary challenge to this method is overcoming the planetary gravity well, but once this is accomplished, vast new sources of minerals become available. As well, specialized resources on uninhabitable planets become accessible for the first time. - PRO_SENTIENT_AUTOMATION Sentient Automation @@ -2358,7 +2334,7 @@ As matter is drawn towards a singularity by the intense spacetime curvature, or gravitational field, the matter forms an accretion disk and is greatly compressed and heated. High energy radiation emitted from the disk may be captured and harnessed for power generation. The event horizon of the singularity itself also emits radiation do to annihilation of virtual particle-antiparticle pairs that form in its vicinity. This method of power generation is significantly more delicate and unstable than that with the accretion disk method, but can produce even greater output as well. PRO_MATENG_REPLIC -Matter-Energy Replication +Replication PRO_MATENG_REPLIC_DESC Previous iterations of assembly techniques were essentially ways to avoid or remove particularly vexing problems with manipulation of matter. None of these techniques fundamentally changed the basic method however, which was to assemble larger objects out of smaller parts, be they prefabricated subsections, or individual atoms. By converting pure energy directly into the desired material object, eliminating the need for precursor parts or supplied materials, the ultimate level of flexible and efficient assembly is achieved. @@ -2566,7 +2542,7 @@ Improves Infrastructure POPULATION_SHORT_DESC -Increases Planet Population Limits +Increases Planet Population CON_GRAVITY_WELLS Controlled gravity wells @@ -2778,12 +2754,24 @@ PRO_ENVIRO_MINING_I_DESC Many mining methods are incompatiable with highly populous planets, due to environmental damage. Careful consideration of Planetary Ecology is required to permit limited mining techniques to be employed without such downsides. Minerals production is less per unit of population than more extreme methods, however additional population may somewhat offset this. Additionaly, these limited techniques are only applicable to worlds capable of supporting high populations: Superb or Optimal for a given race.\n\nIncreases minerals production by +2 per 10 population on primary mining focused worlds.\nIncreases minreals production by +1 per 10 population on primary balanced and secondary mining focused worlds.\nMultiple focus balances are cumulative: primary and secondary mining focus provides +3 to mineral production per 10 population. -PRO_ASTEROID_MINE_I -Basic Asteroid Mines +PRO_ASTEROID_MINE +Asteroid Mining -PRO_ASTEROID_MINE_I_DESC -The initial implementation of asteroid mining techniques yields moderate gains to mineral production in systems with suitable asteroid belts to exploit. Increased mining output occurs on all planets in system, allowing planets with environments normally difficult to mine, which often also allow larger populations, to produce large amounts of minerals per unit of population. Normally large mining output per unit population is limited to low-population capacity worlds, limiting actual mineral output. +PRO_ASTEROID_MINE_DESC +Mineral resource extraction from subplanetoid-sized bodies involves challenges, and provides opportunities quite distinct from those of full-fledged planets. Lacking sufficient mass to self-liquify and differentiate, asteroids can provide much easier access to some heavier elements, and lack of a gravity can make extraction for use in space much more efficient. Conversely, the limited size of each source asteroid requires fully portable self-sufficient extraction facilities. As well, the challenges of any microgravity environment must be overcome, requiring redesign of many traditional methods. The initial implementation of asteroid mining techniques yields moderate gains to mineral production in systems with suitable asteroid belts to exploit. Increased mining output occurs on all planets in system, allowing planets with environments normally difficult to mine, which often also allow larger populations, to produce large amounts of minerals per unit of population. Normally large mining output per unit population is limited to low-population capacity worlds, limiting actual mineral output. +PRO_ORBITAL_MINE +Orbital Mining + +PRO_ORBITAL_MINE_DESC +On solid, habitable planets, traditional bulk surface mining is effective and relatively efficient. For gas giants and terrestrial planets that are unable to support a sizable population however, the ability to extract usable minearals with space-based facilities is far more practical. A primary challenge to this method is overcoming the planetary gravity well, but once this is accomplished, vast new sources of minerals become available. As well, specialized resources on uninhabitable planets become accessible for the first time. + +PRO_CORE_MINE +Deep Core Mining + +PRO_CORE_MINE_DESC +The pressure and temperatures in terrestrial planet mantles and cores create large quantities of crystal and mineral formations that only appear on upper crust layers due to vulcanism. The lower atmospheric layers and core materials of gascious planet contain even more exotic materials, in greater concentrations. Accessing these regions to extract the materials is difficult and treacherous, but eminently rewarding, compared to traditional surface mining activities. + PRO_ART_BLACK_HOLE Artificial Black Hole @@ -2826,6 +2814,13 @@ PRO_INDUSTRY_CENTRE_I_DESC Coordinating industrial activity between planets and star systems can be effectively accomplished at large centralized complexes.\n\nFacility's large cost and build time, as well as significant future range growth potential, require strong planning to produce in location with ideal future utility. Large industrial benefits come with large up-front cost, in both production resources and time, but with minimal research prerequisites, making facility useful for high-production strategies, but unattractive for research-focused empires. +PRO_ENERGY_CONV +Energy Conversion + +PRO_ENERGY_CONV_DESC +At appropriate scales and under specific conditions, matter-energy becomes a unified phenomenon. Applied at larger scales, complete control over the structure of matter and the dynamics of energy becomes possible, as does the interchange between the two. Transmutation and replication, at limited scales, become possible. However, despite the enormous rest mass energy equivalence of matter, converting directly to energy for bulk power generation is generally less effective than comparatively simple fusion generation. + + ######################################## # Tech Refinement Names & Descriptions # ######################################## Modified: trunk/FreeOrion/default/techs.txt =================================================================== --- trunk/FreeOrion/default/techs.txt 2007-03-03 20:07:15 UTC (rev 2019) +++ trunk/FreeOrion/default/techs.txt 2007-03-04 11:05:31 UTC (rev 2020) @@ -179,18 +179,6 @@ graphic = "tech_icons/N-Dimensional_Subspace.png" Tech - name = "LRN_MATTER_ENERGY" - description = "LRN_MATTER_ENERGY_DESC" - short_description = "THEORY_SHORT_DESC" - techtype = Theory - category = "LEARNING_CATEGORY" - researchcost = 300 - researchturns = 20 - prerequisites = "LRN_EVERYTHING" - unlock = [] - graphic = "tech_icons/Matter-Energy_Conversion.png" - -Tech name = "LRN_UNIF_CONC" description = "LRN_UNIF_CONC_DESC" short_description = "THEORY_SHORT_DESC" @@ -226,7 +214,7 @@ Tech name = "LRN_STELLAR_TOMOGRAPHY" description = "LRN_STELLAR_TOMOGRAPHY_DESC" - short_description = "LRN_STELLAR_TOMOGRAPHY_SHORT_DESC" + short_description = "RESEARCH_SHORT_DESC" techtype = Application category = "LEARNING_CATEGORY" researchcost = 1 @@ -456,18 +444,6 @@ graphic = "tech_icons/Medical_Pathology.png" Tech - name = "GRO_INDUSTY_FARM" - description = "GRO_INDUSTY_FARM_DESC" - short_description = "THEORY_SHORT_DESC" - techtype = Theory - category = "GROWTH_CATEGORY" - researchcost = 20 - researchturns = 5 - prerequisites = [] - unlock = [] - graphic = "tech_icons/Industrial_Farming.png" - -Tech name = "GRO_ENV_ENCAPSUL" description = "GRO_ENV_ENCAPSUL_DESC" short_description = "THEORY_SHORT_DESC" @@ -553,37 +529,6 @@ graphic = "tech_icons/Nanotech_Medicine.png" Tech - name = "GRO_ORBIT_FARMING" - description = "GRO_ORBIT_FARMING_DESC" - short_description = "THEORY_SHORT_DESC" - techtype = Theory - category = "GROWTH_CATEGORY" - researchcost = 80 - researchturns = 15 - prerequisites = [ - "CON_ORBITAL_CON" - "GRO_ENV_ENCAPSUL" - "GRO_INDUSTY_FARM" - ] - unlock = [] - graphic = "tech_icons/Orbital_Farming.png" - -Tech - name = "GRO_INDUSRY_CLONE" - description = "GRO_INDUSRY_CLONE_DESC" - short_description = "THEORY_SHORT_DESC" - techtype = Theory - category = "GROWTH_CATEGORY" - researchcost = 300 - researchturns = 20 - prerequisites = [ - "GRO_LIFECYCLE_MAN" - "GRO_NANOTECH_MED" - ] - unlock = [] - graphic = "tech_icons/Industrial_Cloning.png" - -Tech name = "GRO_XENO_HYBRIDS" description = "GRO_XENO_HYBRIDS_DESC" short_description = "THEORY_SHORT_DESC" @@ -627,6 +572,18 @@ graphic = "tech_icons/Pure-Energy_Metabolism.png" Tech + name = "GRO_INDUSTY_FARM" + description = "GRO_INDUSTY_FARM_DESC" + short_description = "DOES_NOTHING_SHORT_DESC" + techtype = Application + category = "GROWTH_CATEGORY" + researchcost = 1 + researchturns = 1 + prerequisites = "GRO_PLANET_ECOL" + unlock = [] + graphic = "tech_icons/Industrial_Farming.png" + +Tech name = "GRO_SELF_ROTATING_CROPS" description = "GRO_SELF_ROTATING_CROPS_DESC" short_description = "FARMING_SHORT_DESC" @@ -759,7 +716,36 @@ SetMaxFarming value = Target.MaxFarming + 2 graphic = "" +Tech + name = "GRO_ORBIT_FARMING" + description = "GRO_ORBIT_FARMING_DESC" + short_description = "DOES_NOTHING_SHORT_DESC" + techtype = Application + category = "GROWTH_CATEGORY" + researchcost = 80 + researchturns = 15 + prerequisites = [ + "CON_ORBITAL_CON" + "GRO_ENV_ENCAPSUL" + "GRO_INDUSTY_FARM" + ] + unlock = [] + graphic = "tech_icons/Orbital_Farming.png" +Tech + name = "GRO_INDUSRY_CLONE" + description = "GRO_INDUSRY_CLONE_DESC" + short_description = "DOES_NOTHING_SHORT_DESC" + techtype = Application + category = "GROWTH_CATEGORY" + researchcost = 300 + researchturns = 20 + prerequisites = [ + "GRO_LIFECYCLE_MAN" + "GRO_NANOTECH_MED" + ] + unlock = [] + graphic = "tech_icons/Industrial_Cloning.png" TechCategory "PRODUCTION_CATEGORY" @@ -835,36 +821,6 @@ graphic = "tech_icons/Fusion_Generation.png" Tech - name = "PRO_ASTEROID_MINE" - description = "PRO_ASTEROID_MINE_DESC" - short_description = "THEORY_SHORT_DESC" - techtype = Theory - category = "PRODUCTION_CATEGORY" - researchcost = 1 - researchturns = 1 - prerequisites = [ - "PRO_MICROGRAV_MAN" - "PRO_PLANET_GEOL" - ] - unlock = [] - graphic = "tech_icons/Asteroid_Mining.png" - -Tech - name = "PRO_CORE_MINE" - description = "PRO_CORE_MINE_DESC" - short_description = "THEORY_SHORT_DESC" - techtype = Theory - category = "PRODUCTION_CATEGORY" - researchcost = 50 - researchturns = 10 - prerequisites = [ - "PRO_PLANET_GEOL" - "PRO_ROBOTIC_PROD" - ] - unlock = [] - graphic = "tech_icons/Deep_Core_Mining.png" - -Tech name = "PRO_NANOTECH_PROD" description = "PRO_NANOTECH_PROD_DESC" short_description = "THEORY_SHORT_DESC" @@ -893,21 +849,6 @@ graphic = "tech_icons/Orbital_Generation.png" Tech - name = "PRO_ORBITAL_MINE" - description = "PRO_ORBITAL_MINE_DESC" - short_description = "THEORY_SHORT_DESC" - techtype = Theory - category = "PRODUCTION_CATEGORY" - researchcost = 80 - researchturns = 15 - prerequisites = [ - "PRO_ASTEROID_MINE" - "PRO_CORE_MINE" - ] - unlock = [] - graphic = "tech_icons/Orbital_Mining.png" - -Tech name = "PRO_SENTIENT_AUTOMATION" description = "PRO_SENTIENT_AUTOMATION_DESC" short_description = "THEORY_SHORT_DESC" @@ -935,7 +876,7 @@ "PRO_NANOTECH_PROD" ] unlock = [] - graphic = "" + graphic = "tech_icons/Force-Field_Assembly.png" Tech name = "PRO_INTSTEL_COPRO" @@ -981,21 +922,6 @@ graphic = "tech_icons/Singularity_Generation.png" Tech - name = "PRO_MATENG_REPLIC" - description = "PRO_MATENG_REPLIC_DESC" - short_description = "THEORY_SHORT_DESC" - techtype = Theory - category = "PRODUCTION_CATEGORY" - researchcost = 500 - researchturns = 25 - prerequisites = [ - "LRN_MATTER_ENERGY" - "PRO_FRC_FLD_ASSMB" - ] - unlock = [] - graphic = "tech_icons/Matter-Energy_Replication.png" - -Tech name = "PRO_ZERO_GEN" description = "PRO_ZERO_GEN_DESC" short_description = "THEORY_SHORT_DESC" @@ -1087,16 +1013,35 @@ graphic = "" Tech - name = "PRO_ASTEROID_MINE_I" - description = "PRO_ASTEROID_MINE_I_DESC" + name = "PRO_ORBITAL_MINE" + description = "PRO_ORBITAL_MINE_DESC" + short_description = "DOES_NOTHING_SHORT_DESC" + techtype = Application + category = "PRODUCTION_CATEGORY" + researchcost = 80 + researchturns = 15 + prerequisites = [ + "PRO_ASTEROID_MINE" + "CON_ORBITAL_CON" + ] + unlock = [] + graphic = "tech_icons/Orbital_Mining.png" + + +Tech + name = "PRO_ASTEROID_MINE" + description = "PRO_ASTEROID_MINE_DESC" short_description = "BUILDING_UNLOCK_SHORT_DESC" techtype = Application category = "PRODUCTION_CATEGORY" researchcost = 1 researchturns = 1 - prerequisites = "PRO_ASTEROID_MINE" + prerequisites = [ + "PRO_MICROGRAV_MAN" + "PRO_PLANET_GEOL" + ] unlock = Item type = Building name = "BLD_ASTEROID_MINE" - graphic = "" + graphic = "tech_icons/Asteroid_Mining.png" Tech name = "PRO_ASTEROID_MINE_II" @@ -1106,11 +1051,27 @@ category = "PRODUCTION_CATEGORY" researchcost = 1 researchturns = 1 - prerequisites = "PRO_ASTEROID_MINE_I" + prerequisites = "PRO_ASTEROID_MINE" unlock = [] graphic = "" Tech + name = "PRO_CORE_MINE" + description = "PRO_CORE_MINE_DESC" + short_description = "DOES_NOTHING_SHORT_DESC" + techtype = Application + category = "PRODUCTION_CATEGORY" + researchcost = 50 + researchturns = 10 + prerequisites = [ + "PRO_PLANET_GEOL" + "CON_SUBTER_CONST" + "PRO_ROBOTIC_PROD" + ] + unlock = [] + graphic = "tech_icons/Deep_Core_Mining.png" + +Tech name = "PRO_INDUSTRY_CENTRE_I" description = "PRO_INDUSTRY_CENTRE_I_DESC" short_description = "BUILDING_UNLOCK_SHORT_DESC" @@ -1274,6 +1235,33 @@ graphic = "" Tech + name = "PRO_ENERGY_CONV" + description = "PRO_ENERGY_CONV_DESC" + short_description = "DOES_NOTHING_SHORT_DESC" + techtype = Application + category = "PRODUCTION_CATEGORY" + researchcost = 300 + researchturns = 20 + prerequisites = "LRN_EVERYTHING" + unlock = [] + graphic = "tech_icons/Matter-Energy_Conversion.png" + +Tech + name = "PRO_MATENG_REPLIC" + description = "PRO_MATENG_REPLIC_DESC" + short_description = "DOES_NOTHING_SHORT_DESC" + techtype = Application + category = "PRODUCTION_CATEGORY" + researchcost = 500 + researchturns = 25 + prerequisites = [ + "PRO_ENERGY_CONV" + "PRO_FRC_FLD_ASSMB" + ] + unlock = [] + graphic = "tech_icons/Matter-Energy_Replication.png" + +Tech name = "PRO_HYPER_DAM" description = "PRO_HYPER_DAM_DESC" short_description = "BUILDING_UNLOCK_SHORT_DESC" @@ -1309,7 +1297,7 @@ researchturns = 1 prerequisites = [] unlock = [] - graphic = "" + graphic = "tech_icons/Orbital_Construction.png" Tech name = "CON_ARCH_PSYCH" @@ -1333,7 +1321,7 @@ researchturns = 1 prerequisites = [] unlock = [] - graphic = "" + graphic = "tech_icons/Infrastructure_Ecology.png" Tech name = "CON_ORGANIC_STRC" @@ -1356,6 +1344,7 @@ researchcost = 45 researchturns = 10 prerequisites = [ + "PRO_PLANET_GEOL" "CON_ARCH_PSYCH" "CON_INFRA_ECOL" ] @@ -1672,7 +1661,7 @@ "LRN_ALGO_ELEGANCE" ] unlock = [] - graphic = "" + graphic = "tech_icons/Economic_Spectroscopy.png" Tech name = "ECO_INTSTEL_TRADE" |
From: <geo...@us...> - 2007-03-09 13:30:45
|
Revision: 2021 http://svn.sourceforge.net/freeorion/revision/?rev=2021&view=rev Author: geoffthemedio Date: 2007-03-09 05:30:42 -0800 (Fri, 09 Mar 2007) Log Message: ----------- -Added Zomg star name: Arguably funny internet reference. -Tweaked low-end starlane frequency values. Notably, the highest starlane frequency now has more lanes. Modified Paths: -------------- trunk/FreeOrion/default/starnames.txt trunk/FreeOrion/default/universe_tables.txt Modified: trunk/FreeOrion/default/starnames.txt =================================================================== --- trunk/FreeOrion/default/starnames.txt 2007-03-04 11:05:31 UTC (rev 2020) +++ trunk/FreeOrion/default/starnames.txt 2007-03-09 13:30:42 UTC (rev 2021) @@ -535,5 +535,6 @@ Zaurak Zavijava Zen +Zomg Zosma Zwicky Modified: trunk/FreeOrion/default/universe_tables.txt =================================================================== --- trunk/FreeOrion/default/universe_tables.txt 2007-03-04 11:05:31 UTC (rev 2020) +++ trunk/FreeOrion/default/universe_tables.txt 2007-03-09 13:30:42 UTC (rev 2021) @@ -84,7 +84,7 @@ # This one is a bit misleading. With the exception of "None", larger values mean more starlanes, which is why VeryMany has the lowest value. <1x6> MaxJumpsBetweenSystems None Few Some Several Many VeryMany -Max 0 8 6 4 3 2 +Max 0 8 5 3 2 1 <1x1> MaxStarlaneLength 120 |
From: <geo...@us...> - 2007-04-22 10:56:05
|
Revision: 2037 http://svn.sourceforge.net/freeorion/revision/?rev=2037&view=rev Author: geoffthemedio Date: 2007-04-22 03:55:31 -0700 (Sun, 22 Apr 2007) Log Message: ----------- -Added icon to Artificial Heavenly Bodies -Tweaked some tech description stringtable entries Modified Paths: -------------- trunk/FreeOrion/default/eng_stringtable.txt trunk/FreeOrion/default/techs.txt Modified: trunk/FreeOrion/default/eng_stringtable.txt =================================================================== --- trunk/FreeOrion/default/eng_stringtable.txt 2007-04-17 00:28:34 UTC (rev 2036) +++ trunk/FreeOrion/default/eng_stringtable.txt 2007-04-22 10:55:31 UTC (rev 2037) @@ -2572,7 +2572,7 @@ Space Elevator CON_SPACE_ELEVATOR_DESC -The materials and methods of nano-construction open up the possibility of building a cable strong enough to reach into low orbit. Shuttles magnetically lifted up the cable are superior to the expensive, inefficient, and highly dangerous rocket launches to escape velocity. +Nano-construction enables production of tensile cables strong enough to reach beyond geostationary orbit. Shuttles magnetically lifted up the cable are superior to the expensive, inefficient, and highly dangerous rocket launches to escape velocity. CON_SUBTER_CONST Subterranean Construction @@ -2590,7 +2590,7 @@ Colonial Economic Blueprinting ECO_COLONIAL_ECO_DESC -With advanced economic planning now a reality, the economy for an entire developing world can be blueprinted with the same precision as a physical building. Upstart markets can now tap into their raw potential for growth, without getting mired in the traditionally immature "wild frontier" mentality. +With advanced economic planning now a reality, the economy for an entire developing world can be blueprinted with the precision of a physical building. Upstart markets tap their raw potential for growth, without risk of being mired in traditionally immature "wild frontier" mentalities. ECO_COMM_UNION Commercial Union of the Colonies Modified: trunk/FreeOrion/default/techs.txt =================================================================== --- trunk/FreeOrion/default/techs.txt 2007-04-17 00:28:34 UTC (rev 2036) +++ trunk/FreeOrion/default/techs.txt 2007-04-22 10:55:31 UTC (rev 2037) @@ -1480,7 +1480,7 @@ "CON_GAL_INFRA" ] unlock = [] - graphic = "" + graphic = "tech_icons/Artificial_Heavenly_Bodies.png" Tech name = "CON_TRANS_ARCH" |
From: <geo...@us...> - 2007-05-08 05:15:41
|
Revision: 2051 http://svn.sourceforge.net/freeorion/revision/?rev=2051&view=rev Author: geoffthemedio Date: 2007-05-07 22:15:42 -0700 (Mon, 07 May 2007) Log Message: ----------- -Updated various tech icons with new transparent backgrounds -Design credit for eleazar, graphics credit for The Silent One -Minor tweak to research queue stringtable entry: removing " left" from "turns left" Modified Paths: -------------- trunk/FreeOrion/default/credits.xml trunk/FreeOrion/default/data/art/tech_icons/Genetic_Engineering.png trunk/FreeOrion/default/data/art/tech_icons/Genetic_Medicine.png trunk/FreeOrion/default/data/art/tech_icons/Infrastructure_Ecology.png trunk/FreeOrion/default/data/art/tech_icons/Pure-Energy_Metabolism.png trunk/FreeOrion/default/data/art/tech_icons/Singularity_Generation.png trunk/FreeOrion/default/data/art/tech_icons/Symbiosis_Biology.png trunk/FreeOrion/default/data/art/tech_icons/Temporal_Mechanics.png trunk/FreeOrion/default/data/art/tech_icons/Translingustic_Thought.png trunk/FreeOrion/default/data/art/tech_icons/Xenoarchaeology.png trunk/FreeOrion/default/data/art/tech_icons/Xenological_Genetics.png trunk/FreeOrion/default/eng_stringtable.txt Modified: trunk/FreeOrion/default/credits.xml =================================================================== --- trunk/FreeOrion/default/credits.xml 2007-05-04 09:26:51 UTC (rev 2050) +++ trunk/FreeOrion/default/credits.xml 2007-05-08 05:15:42 UTC (rev 2051) @@ -44,7 +44,7 @@ <PERSON name="Tomi Hartikka" nick="Mystiqq" task="Graphics"/> <PERSON name="Brendan Mauro" nick="BreadMan" task="Graphics"/> <PERSON name="Karel Kalvoda" nick="Solid Liquid" task="Graphics"/> - <PERSON name="J. W. Bjerk" nick="eleazar" task="Graphics"/> + <PERSON name="J. W. Bjerk" nick="eleazar" task="Graphics, Game Design"/> </GROUP> <GROUP name ="AUDIO"> <PERSON name="Shannon Roberts" nick="Guiguibaah" task="Audio"/> @@ -53,7 +53,7 @@ <PERSON name="_Robbob_" nick="" task="Audio"/> </GROUP> <GROUP name ="TRANSLATION"> - <PERSON name="Martin Wuttke" nick="The Silent One" task="German Translation"/> + <PERSON name="Martin Wuttke" nick="The Silent One" task="German Translation, Graphics"/> <PERSON name="Ivan Sanchez" nick="Ivan s c" task="Spanish Translation"/> </GROUP> </CREDITS> Modified: trunk/FreeOrion/default/data/art/tech_icons/Genetic_Engineering.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Genetic_Medicine.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Infrastructure_Ecology.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Pure-Energy_Metabolism.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Singularity_Generation.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Symbiosis_Biology.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Temporal_Mechanics.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Translingustic_Thought.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Xenoarchaeology.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Xenological_Genetics.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/eng_stringtable.txt =================================================================== --- trunk/FreeOrion/default/eng_stringtable.txt 2007-05-04 09:26:51 UTC (rev 2050) +++ trunk/FreeOrion/default/eng_stringtable.txt 2007-05-08 05:15:42 UTC (rev 2051) @@ -1111,7 +1111,7 @@ %1% RP / %2% Turns TECH_TURNS_LEFT_STR -%1% Turns left +%1% Turns TECH_TURNS_LEFT_NEVER Never |
From: <geo...@us...> - 2007-05-14 18:55:50
|
Revision: 2052 http://svn.sourceforge.net/freeorion/revision/?rev=2052&view=rev Author: geoffthemedio Date: 2007-05-14 11:54:20 -0700 (Mon, 14 May 2007) Log Message: ----------- Updated old and added new tech icons Modified Paths: -------------- trunk/FreeOrion/default/data/art/tech_icons/Architectural_Monofilaments.png trunk/FreeOrion/default/data/art/tech_icons/Artificial_Black_Hole.png trunk/FreeOrion/default/data/art/tech_icons/Artificial_Minds.png trunk/FreeOrion/default/data/art/tech_icons/Enviromental_Adaptation.png trunk/FreeOrion/default/data/art/tech_icons/Environmental_Encapsulation.png trunk/FreeOrion/default/data/art/tech_icons/Force-Field_Assembly.png trunk/FreeOrion/default/data/art/tech_icons/Force-Field_Harmonics.png trunk/FreeOrion/default/data/art/tech_icons/Galactic_Exploration.png trunk/FreeOrion/default/data/art/tech_icons/Mind_of_the_Void.png trunk/FreeOrion/default/techs.txt Added Paths: ----------- trunk/FreeOrion/default/data/art/tech_icons/Asymptotic_Materials.png trunk/FreeOrion/default/data/art/tech_icons/Stellar_Navigation.png trunk/FreeOrion/default/data/art/tech_icons/Stellar_Tomography.png Modified: trunk/FreeOrion/default/data/art/tech_icons/Architectural_Monofilaments.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Artificial_Black_Hole.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Artificial_Minds.png =================================================================== (Binary files differ) Added: trunk/FreeOrion/default/data/art/tech_icons/Asymptotic_Materials.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/tech_icons/Asymptotic_Materials.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/FreeOrion/default/data/art/tech_icons/Enviromental_Adaptation.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Environmental_Encapsulation.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Force-Field_Assembly.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Force-Field_Harmonics.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Galactic_Exploration.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Mind_of_the_Void.png =================================================================== (Binary files differ) Added: trunk/FreeOrion/default/data/art/tech_icons/Stellar_Navigation.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/tech_icons/Stellar_Navigation.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/FreeOrion/default/data/art/tech_icons/Stellar_Tomography.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/tech_icons/Stellar_Tomography.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/FreeOrion/default/techs.txt =================================================================== --- trunk/FreeOrion/default/techs.txt 2007-05-08 05:15:42 UTC (rev 2051) +++ trunk/FreeOrion/default/techs.txt 2007-05-14 18:54:20 UTC (rev 2052) @@ -265,7 +265,7 @@ activation = Source effects = SetMaxResearch Target.MaxResearch + 1 ] - graphic = "" + graphic = "tech_icons/Stellar_Tomography.png" Tech name = "LRN_AUTOLAB_I" @@ -319,7 +319,7 @@ researchturns = 1 prerequisites = "LRN_GAL_EXPLO" unlock = [] - graphic = "" + graphic = "tech_icons/Stellar_Navigation.png" Tech name = "LRN_COLLECTIVE_NET" @@ -1120,7 +1120,7 @@ researchturns = 10 prerequisites = "PRO_SINGULAR_GEN" unlock = Item type = Building name = "BLD_ART_BLACK_HOLE" - graphic = "" + graphic = "tech_icons/Artificial_Black_Hole.png" Tech name = "PRO_MINING_ENGINEERING" @@ -1407,7 +1407,7 @@ "CON_TRANS_STRC" ] unlock = [] - graphic = "" + graphic = "tech_icons/Asymptotic_Materials.png" Tech name = "CON_STRC_INT_FLDS" |
From: <ele...@us...> - 2007-06-01 17:49:57
|
Revision: 2064 http://svn.sourceforge.net/freeorion/revision/?rev=2064&view=rev Author: eleazzaar Date: 2007-06-01 10:49:58 -0700 (Fri, 01 Jun 2007) Log Message: ----------- Several new and modified tech icons from Silent One. I wired them in to tech.txt. Modified Paths: -------------- trunk/FreeOrion/default/data/art/tech_icons/Artificial_Heavenly_Bodies.png trunk/FreeOrion/default/data/art/tech_icons/Asteroid_Mining_I.png trunk/FreeOrion/default/data/art/tech_icons/Asteroid_Mining_II.png trunk/FreeOrion/default/data/art/tech_icons/Economic_Hegemony.png trunk/FreeOrion/default/data/art/tech_icons/Fusion_Generation.png trunk/FreeOrion/default/data/art/tech_icons/Genome_Bank.png trunk/FreeOrion/default/data/art/tech_icons/Gravitonics.png trunk/FreeOrion/default/data/art/tech_icons/Habitation_Domes.png trunk/FreeOrion/default/data/art/tech_icons/Industrial_Centre_I.png trunk/FreeOrion/default/data/art/tech_icons/Industrial_Centre_II.png trunk/FreeOrion/default/data/art/tech_icons/Industrial_Centre_III.png trunk/FreeOrion/default/data/art/tech_icons/Interstellar_Co-Production.png trunk/FreeOrion/default/data/art/tech_icons/Interstellar_Trade.png trunk/FreeOrion/default/data/art/tech_icons/Matter-Energy_Replication.png trunk/FreeOrion/default/data/art/tech_icons/Orbital_Generation.png trunk/FreeOrion/default/data/art/tech_icons/Planetary_Colonialism.png trunk/FreeOrion/default/data/art/tech_icons/Robotic_Production.png trunk/FreeOrion/default/data/art/tech_icons/Stellar_Tomography.png trunk/FreeOrion/default/data/art/tech_icons/Urban_Farming.png trunk/FreeOrion/default/techs.txt Added Paths: ----------- trunk/FreeOrion/default/data/art/tech_icons/Force_Energy_Structures.png trunk/FreeOrion/default/data/art/tech_icons/Hyperspatial_Dam.png trunk/FreeOrion/default/data/art/tech_icons/Looking_Glass.png trunk/FreeOrion/default/data/art/tech_icons/Transcendent_Architecture.png Modified: trunk/FreeOrion/default/data/art/tech_icons/Artificial_Heavenly_Bodies.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Asteroid_Mining_I.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Asteroid_Mining_II.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Economic_Hegemony.png =================================================================== (Binary files differ) Added: trunk/FreeOrion/default/data/art/tech_icons/Force_Energy_Structures.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/tech_icons/Force_Energy_Structures.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/FreeOrion/default/data/art/tech_icons/Fusion_Generation.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Genome_Bank.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Gravitonics.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Habitation_Domes.png =================================================================== (Binary files differ) Added: trunk/FreeOrion/default/data/art/tech_icons/Hyperspatial_Dam.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/tech_icons/Hyperspatial_Dam.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/FreeOrion/default/data/art/tech_icons/Industrial_Centre_I.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Industrial_Centre_II.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Industrial_Centre_III.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Interstellar_Co-Production.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Interstellar_Trade.png =================================================================== (Binary files differ) Added: trunk/FreeOrion/default/data/art/tech_icons/Looking_Glass.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/tech_icons/Looking_Glass.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/FreeOrion/default/data/art/tech_icons/Matter-Energy_Replication.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Orbital_Generation.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Planetary_Colonialism.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Robotic_Production.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/tech_icons/Stellar_Tomography.png =================================================================== (Binary files differ) Added: trunk/FreeOrion/default/data/art/tech_icons/Transcendent_Architecture.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/tech_icons/Transcendent_Architecture.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/FreeOrion/default/data/art/tech_icons/Urban_Farming.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/techs.txt =================================================================== --- trunk/FreeOrion/default/techs.txt 2007-05-29 04:52:25 UTC (rev 2063) +++ trunk/FreeOrion/default/techs.txt 2007-06-01 17:49:58 UTC (rev 2064) @@ -379,7 +379,7 @@ researchturns = 10 prerequisites = "LRN_TIME_MECH" unlock = Item type = Building name = "BLD_LOOKING_GLASS" - graphic = "" + graphic = "tech_icons/Looking_Glass.png" Tech name = "LRN_MONUMENT_EXODUS" @@ -615,7 +615,8 @@ researchcost = 1 researchturns = 1 prerequisites = "GRO_ENV_ENCAPSUL" - unlock = [] + unlock = [] + graphic = "tech_icons/Habitation_Domes.png" effectsgroups = EffectsGroup scope = And [ @@ -626,7 +627,6 @@ ] activation = Source effects = SetMaxPopulation Target.MaxPopulation + 2 - graphic = "" Tech name = "GRO_CADUCEAN" @@ -665,7 +665,7 @@ researchturns = 10 prerequisites = "GRO_GENETIC_MED" unlock = Item type = Building name = "BLD_GENOME_BANK" - graphic = "" + graphic = "tech_icons/Genome_Bank.png" Tech name = "GRO_LIVING_PLANET" @@ -700,7 +700,8 @@ researchcost = 50 researchturns = 10 prerequisites = "GRO_INDUSTY_FARM" - unlock = [] + unlock = [] + graphic = "tech_icons/Urban_Farming.png" effectsgroups = EffectsGroup scope = @@ -1041,7 +1042,7 @@ "PRO_PLANET_GEOL" ] unlock = Item type = Building name = "BLD_ASTEROID_MINE" - graphic = "tech_icons/Asteroid_Mining.png" + graphic = "tech_icons/Asteroid_Mining_I.png" Tech name = "PRO_ASTEROID_MINE_II" @@ -1053,7 +1054,7 @@ researchturns = 1 prerequisites = "PRO_ASTEROID_MINE" unlock = [] - graphic = "" + graphic = "tech_icons/Asteroid_Mining_II.png" Tech name = "PRO_CORE_MINE" @@ -1084,7 +1085,7 @@ "ECO_PLANNED_ECON" ] unlock = Item type = Building name = "BLD_INDUSTRY_CENTRE" - graphic = "" + graphic = "tech_icons/Industrial_Centre_I.png" Tech name = "PRO_INDUSTRY_CENTRE_II" @@ -1096,7 +1097,7 @@ researchturns = 1 prerequisites = "PRO_INDUSTRY_CENTRE_I" unlock = [] - graphic = "" + graphic = "tech_icons/Industrial_Centre_II.png" Tech name = "PRO_INDUSTRY_CENTRE_III" @@ -1108,7 +1109,7 @@ researchturns = 1 prerequisites = "PRO_INDUSTRY_CENTRE_II" unlock = [] - graphic = "" + graphic = "tech_icons/Industrial_Centre_III.png" Tech name = "PRO_ART_BLACK_HOLE" @@ -1271,7 +1272,7 @@ researchturns = 10 prerequisites = "PRO_NDIM_ASSMB" unlock = Item type = Building name = "BLD_HYPER_DAM" - graphic = "" + graphic = "tech_icons/Hyperspatial_Dam.png" Tech name = "PRO_MINI_SUN" @@ -1465,7 +1466,7 @@ "CON_STRC_INT_FLDS" ] unlock = [] - graphic = "" + graphic = "tech_icons/Force_Energy_Structures.png" Tech name = "CON_ART_HEAVENLY" @@ -1495,7 +1496,7 @@ "CON_GAL_INFRA" ] unlock = [] - graphic = "" + graphic = "tech_icons/Transcendent_Architecture.png" Tech name = "CON_NDIM_STRC" |
From: <geo...@us...> - 2007-06-25 11:03:25
|
Revision: 2093 http://svn.sourceforge.net/freeorion/revision/?rev=2093&view=rev Author: geoffthemedio Date: 2007-06-25 04:03:22 -0700 (Mon, 25 Jun 2007) Log Message: ----------- -Added maelstrom512 to credits -Updated python AI script with newer version I've had sitting around for a while. Should actually send fleets to explore now. Modified Paths: -------------- trunk/FreeOrion/default/AI/FreeOrionAI.py trunk/FreeOrion/default/credits.xml Modified: trunk/FreeOrion/default/AI/FreeOrionAI.py =================================================================== --- trunk/FreeOrion/default/AI/FreeOrionAI.py 2007-06-25 01:09:06 UTC (rev 2092) +++ trunk/FreeOrion/default/AI/FreeOrionAI.py 2007-06-25 11:03:22 UTC (rev 2093) @@ -1,7 +1,6 @@ import foaiint # globals -systems_to_explore = [] systems_being_explored = [] @@ -27,15 +26,23 @@ for fleet_id in fleet_ids_list: fleet = universe.GetFleet(fleet_id) if (fleet == None): continue + + foaiint.LogOutput("Fleet: " + str(fleet_id)); start_system_id = fleet.SystemID() if (start_system_id == fleet.INVALID_OBJECT_ID): continue + + foaiint.LogOutput("in system: " + str(start_system_id)); system_ids_list = GetExplorableSystemIDs(start_system_id, empire_id) - - foaiint.LogOutput("system_ids_list: " + str(system_ids_list)) - + foaiint.LogOutput("can explore: " + str(system_ids_list)); + + if (len(system_ids_list) > 0): + destination_id = system_ids_list[0] + foaiint.IssueFleetMoveOrder(fleet_id, destination_id) + + foaiint.DoneTurn() @@ -91,30 +98,3 @@ return fleet_ids_list - -#def GetExplorableSystemID(start_system_id, object_ids_list): -# foaiint.LogOutput("GetExplorableSystemID") -# universe = foaiint.GetUniverse() -# empire_id = foaiint.EmpireID() -# -# system_ids_list = [] -# -# foaiint.LogOutput("A") -# for obj_id in object_ids_list: -# foaiint.LogOutput("B") -# - # system = universe.GetSystem(obj_id) - # if (system == None): continue - # - # foaiint.LogOutput("C") -# - # if (not universe.SystemsConnected(start_system_id, obj_id, empire_id)): continue - # - # foaiint.LogOutput("D") - # - # system_ids_list = system_ids_list + [obj_id] - # - # foaiint.LogOutput("E") - # - # foaiint.LogOutput("F") - # return system_ids_list Modified: trunk/FreeOrion/default/credits.xml =================================================================== --- trunk/FreeOrion/default/credits.xml 2007-06-25 01:09:06 UTC (rev 2092) +++ trunk/FreeOrion/default/credits.xml 2007-06-25 11:03:22 UTC (rev 2093) @@ -18,6 +18,7 @@ <PERSON name="Michael J. Agostini" nick="" task="Programming"/> <PERSON name="Geoff Topping" nick="Geoff the Medio" task="Programming, Game Design"/> <PERSON name="Karol Szumski" nick="MareviQ" task="Programming"/> + <PERSON name="Mike Dotterer" nick="maelstrom512" task="Programming"/> </GROUP> <GROUP name ="GAMEDESIGN"> <PERSON name="Krum Stanoev" nick="" task="Game Design"/> |
From: <ele...@us...> - 2007-07-14 03:44:26
|
Revision: 2143 http://svn.sourceforge.net/freeorion/revision/?rev=2143&view=rev Author: eleazzaar Date: 2007-07-13 20:44:24 -0700 (Fri, 13 Jul 2007) Log Message: ----------- adding in Silent's special icons and wiring them in. Modified Paths: -------------- trunk/FreeOrion/default/planet_specials.txt trunk/FreeOrion/default/specials.txt Added Paths: ----------- trunk/FreeOrion/default/data/art/icons/specials_tiny/ancient_ruins.png trunk/FreeOrion/default/data/art/icons/specials_tiny/eccentric_orbit.png trunk/FreeOrion/default/data/art/icons/specials_tiny/high_axial_tilt.png trunk/FreeOrion/default/data/art/icons/specials_tiny/homeworld.png trunk/FreeOrion/default/data/art/icons/specials_tiny/minerals.png trunk/FreeOrion/default/data/art/icons/specials_tiny/slow_rotation.png trunk/FreeOrion/default/data/art/icons/specials_tiny/solid_core.png trunk/FreeOrion/default/data/art/icons/specials_tiny/starvation.png trunk/FreeOrion/default/data/art/icons/specials_tiny/techtonic_instability.png trunk/FreeOrion/default/data/art/icons/specials_tiny/tidal_lock.png trunk/FreeOrion/default/data/art/icons/specials_tiny/tunnels.png Added: trunk/FreeOrion/default/data/art/icons/specials_tiny/ancient_ruins.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/icons/specials_tiny/ancient_ruins.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/FreeOrion/default/data/art/icons/specials_tiny/eccentric_orbit.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/icons/specials_tiny/eccentric_orbit.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/FreeOrion/default/data/art/icons/specials_tiny/high_axial_tilt.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/icons/specials_tiny/high_axial_tilt.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/FreeOrion/default/data/art/icons/specials_tiny/homeworld.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/icons/specials_tiny/homeworld.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/FreeOrion/default/data/art/icons/specials_tiny/minerals.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/icons/specials_tiny/minerals.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/FreeOrion/default/data/art/icons/specials_tiny/slow_rotation.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/icons/specials_tiny/slow_rotation.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/FreeOrion/default/data/art/icons/specials_tiny/solid_core.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/icons/specials_tiny/solid_core.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/FreeOrion/default/data/art/icons/specials_tiny/starvation.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/icons/specials_tiny/starvation.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/FreeOrion/default/data/art/icons/specials_tiny/techtonic_instability.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/icons/specials_tiny/techtonic_instability.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/FreeOrion/default/data/art/icons/specials_tiny/tidal_lock.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/icons/specials_tiny/tidal_lock.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/FreeOrion/default/data/art/icons/specials_tiny/tunnels.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/icons/specials_tiny/tunnels.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/FreeOrion/default/planet_specials.txt =================================================================== --- trunk/FreeOrion/default/planet_specials.txt 2007-07-14 00:03:36 UTC (rev 2142) +++ trunk/FreeOrion/default/planet_specials.txt 2007-07-14 03:44:24 UTC (rev 2143) @@ -9,7 +9,7 @@ SetMaxResearch value = Source.MaxResearch + 3 SetMaxConstruction value = Source.MaxConstruction - 3 ] - graphic = "" + graphic = "icons/specials_tiny/eccentric_orbit.png" Special name = "TIDAL_LOCK_SPECIAL" @@ -21,7 +21,7 @@ SetMaxConstruction value = Source.MaxConstruction - 5 SetMaxIndustry value = Source.MaxIndustry + 5 ] - graphic = "" + graphic = "icons/specials_tiny/tidal_lock.png" Special name = "SLOW_ROTATION_SPECIAL" @@ -34,7 +34,7 @@ SetMaxConstruction value = Source.MaxConstruction - 5 SetMaxPopulation value = Source.MaxPopulation * 0.5 ] - graphic = "" + graphic = "icons/specials_tiny/slow_rotation.png" Special name = "HIGH_AXIAL_TILT_SPECIAL" @@ -43,7 +43,7 @@ scope = Source activation = Source effects = SetMaxConstruction value = Source.MaxConstruction - 8 - graphic = "" + graphic = "icons/specials_tiny/high_axial_tilt.png" Special name = "SOLID_CORE_SPECIAL" @@ -55,7 +55,7 @@ SetMaxFarming value = Source.MaxFarming - 5 SetMaxHealth value = Source.MaxHealth - 5 ] - graphic = "" + graphic = "icons/specials_tiny/solid_core.png" Special name = "TECHTONIC_INSTABILITY_SPECIAL" @@ -64,7 +64,7 @@ scope = Source activation = Source effects = SetMaxConstruction value = Source.MaxConstruction - 5 - graphic = "" + graphic = "icons/specials_tiny/techtonic_instability.png" Special name = "ANCIENT_RUINS_SPECIAL" @@ -73,7 +73,7 @@ scope = Source activation = Source effects = SetMaxResearch value = Source.MaxResearch + 4 - graphic = "" + graphic = "icons/specials_tiny/ancient_ruins.png" Special name = "MINERALS_SPECIAL" @@ -85,7 +85,7 @@ SetMaxMining value = Source.MaxMining + 3 SetMaxTrade value = Source.MaxTrade + 1 ] - graphic = "" + graphic = "icons/specials_tiny/minerals.png" Special name = "TUNNELS_SPECIAL" @@ -94,5 +94,5 @@ scope = Source activation = Source effects = SetMaxPopulation value = Source.MaxPopulation + 3 - graphic = "" + graphic = "icons/specials_tiny/tunnels.png" Modified: trunk/FreeOrion/default/specials.txt =================================================================== --- trunk/FreeOrion/default/specials.txt 2007-07-14 00:03:36 UTC (rev 2142) +++ trunk/FreeOrion/default/specials.txt 2007-07-14 03:44:24 UTC (rev 2143) @@ -13,7 +13,7 @@ SetMaxIndustry value = Source.MaxIndustry + 5 SetMaxTrade value = Source.MaxTrade + 2 ] - graphic = "" + graphic = "icons/specials_tiny/homeworld.png" Special name = "STARVATION_SPECIAL" @@ -32,4 +32,4 @@ SetMaxTrade value = Source.MaxTrade / 2 SetMaxHealth value = Source.MaxHealth / 2 ] - graphic = "" \ No newline at end of file + graphic = "icons/specials_tiny/starvation.png" |
From: <ele...@us...> - 2007-07-14 05:01:23
|
Revision: 2146 http://svn.sourceforge.net/freeorion/revision/?rev=2146&view=rev Author: eleazzaar Date: 2007-07-13 22:01:25 -0700 (Fri, 13 Jul 2007) Log Message: ----------- removed problematic returns from the ends of files. Modified Paths: -------------- trunk/FreeOrion/default/planet_specials.txt trunk/FreeOrion/default/specials.txt Modified: trunk/FreeOrion/default/planet_specials.txt =================================================================== --- trunk/FreeOrion/default/planet_specials.txt 2007-07-14 04:49:48 UTC (rev 2145) +++ trunk/FreeOrion/default/planet_specials.txt 2007-07-14 05:01:25 UTC (rev 2146) @@ -94,5 +94,4 @@ scope = Source activation = Source effects = SetMaxPopulation value = Source.MaxPopulation + 3 - graphic = "icons/specials_tiny/tunnels.png" - + graphic = "icons/specials_tiny/tunnels.png" \ No newline at end of file Modified: trunk/FreeOrion/default/specials.txt =================================================================== --- trunk/FreeOrion/default/specials.txt 2007-07-14 04:49:48 UTC (rev 2145) +++ trunk/FreeOrion/default/specials.txt 2007-07-14 05:01:25 UTC (rev 2146) @@ -32,4 +32,4 @@ SetMaxTrade value = Source.MaxTrade / 2 SetMaxHealth value = Source.MaxHealth / 2 ] - graphic = "icons/specials_tiny/starvation.png" + graphic = "icons/specials_tiny/starvation.png" \ No newline at end of file |
From: <ele...@us...> - 2007-07-14 22:14:25
|
Revision: 2152 http://svn.sourceforge.net/freeorion/revision/?rev=2152&view=rev Author: eleazzaar Date: 2007-07-14 15:14:23 -0700 (Sat, 14 Jul 2007) Log Message: ----------- moved some tech icons to a subfolder, and changed the names to lowercase. Modified Paths: -------------- trunk/FreeOrion/default/techs.txt Added Paths: ----------- trunk/FreeOrion/default/data/art/icons/tech/Artificial_black_hole.png trunk/FreeOrion/default/data/art/icons/tech/algorithmic_elegance.png trunk/FreeOrion/default/data/art/icons/tech/architectural_monofilaments.png trunk/FreeOrion/default/data/art/icons/tech/architecture_psychology.png Removed Paths: ------------- trunk/FreeOrion/default/data/art/tech_icons/Algorithmic_Elegance.png trunk/FreeOrion/default/data/art/tech_icons/Architectural_Monofilaments.png trunk/FreeOrion/default/data/art/tech_icons/Architecture_Psychology.png trunk/FreeOrion/default/data/art/tech_icons/Artificial_Black_Hole.png Copied: trunk/FreeOrion/default/data/art/icons/tech/Artificial_black_hole.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Artificial_Black_Hole.png) =================================================================== (Binary files differ) Copied: trunk/FreeOrion/default/data/art/icons/tech/algorithmic_elegance.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Algorithmic_Elegance.png) =================================================================== (Binary files differ) Copied: trunk/FreeOrion/default/data/art/icons/tech/architectural_monofilaments.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Architectural_Monofilaments.png) =================================================================== (Binary files differ) Copied: trunk/FreeOrion/default/data/art/icons/tech/architecture_psychology.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Architecture_Psychology.png) =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Algorithmic_Elegance.png =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Architectural_Monofilaments.png =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Architecture_Psychology.png =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Artificial_Black_Hole.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/techs.txt =================================================================== --- trunk/FreeOrion/default/techs.txt 2007-07-14 21:53:37 UTC (rev 2151) +++ trunk/FreeOrion/default/techs.txt 2007-07-14 22:14:23 UTC (rev 2152) @@ -22,7 +22,7 @@ researchturns = 1 prerequisites = [] unlock = [] - graphic = "tech_icons/Algorithmic_Elegance.png" + graphic = "icons/tech/algorithmic_elegance.png" Tech name = "LRN_GAL_EXPLO" @@ -391,7 +391,7 @@ researchturns = 5 prerequisites = "LRN_GAL_EXPLO" unlock = Item type = Building name = "BLD_MONUMENT_EXODUS" - graphic = "" + graphic = "icons/tech/monument_to_exodus.png" Tech name = "LRN_PSICORP" @@ -935,7 +935,7 @@ "PRO_SINGULAR_GEN" ] unlock = [] - graphic = "" + graphic = "icons/tech/zero_point_energy.png" Tech name = "PRO_AUTOFACTORY_I" @@ -1121,7 +1121,7 @@ researchturns = 10 prerequisites = "PRO_SINGULAR_GEN" unlock = Item type = Building name = "BLD_ART_BLACK_HOLE" - graphic = "tech_icons/Artificial_Black_Hole.png" + graphic = "icons/tech/Artificial_black_hole.png" Tech name = "PRO_MINING_ENGINEERING" @@ -1310,7 +1310,7 @@ researchturns = 5 prerequisites = [] unlock = [] - graphic = "tech_icons/Architecture_Psychology.png" + graphic = "icons/tech/architecture_psychology.png" Tech name = "CON_INFRA_ECOL" @@ -1377,7 +1377,7 @@ researchturns = 10 prerequisites = "PRO_NANOTECH_PROD" unlock = [] - graphic = "tech_icons/Architectural_Monofilaments.png" + graphic = "icons/tech/architectural_monofilaments.png" Tech name = "CON_SELFGRAV_STRC" |
From: <ele...@us...> - 2007-07-14 22:56:39
|
Revision: 2153 http://svn.sourceforge.net/freeorion/revision/?rev=2153&view=rev Author: eleazzaar Date: 2007-07-14 15:56:41 -0700 (Sat, 14 Jul 2007) Log Message: ----------- more renameing and moving of tech icons. Modified Paths: -------------- trunk/FreeOrion/default/techs.txt Added Paths: ----------- trunk/FreeOrion/default/data/art/icons/tech/artificial_heavenly_bodies.png trunk/FreeOrion/default/data/art/icons/tech/artificial_minds.png trunk/FreeOrion/default/data/art/icons/tech/asymptotic_materials.png trunk/FreeOrion/default/data/art/icons/tech/deep_core_mining.png trunk/FreeOrion/default/data/art/icons/tech/fusion_generation.png trunk/FreeOrion/default/data/art/icons/tech/genome_bank.png trunk/FreeOrion/default/data/art/icons/tech/gravitonics.png trunk/FreeOrion/default/data/art/icons/tech/infrastructure_ecology.png trunk/FreeOrion/default/data/art/icons/tech/lifecycle_manipulation.png trunk/FreeOrion/default/data/art/icons/tech/medical_pathology.png trunk/FreeOrion/default/data/art/icons/tech/metroplex_infrastructure.png trunk/FreeOrion/default/data/art/icons/tech/mind_of_the_void.png trunk/FreeOrion/default/data/art/icons/tech/miniature_suns.png trunk/FreeOrion/default/data/art/icons/tech/psionics.png trunk/FreeOrion/default/data/art/icons/tech/pure-energy_metabolism.png trunk/FreeOrion/default/data/art/icons/tech/robotic_production.png trunk/FreeOrion/default/data/art/icons/tech/sentient_autofactories.png trunk/FreeOrion/default/data/art/icons/tech/stellar_tomography.png trunk/FreeOrion/default/data/art/icons/tech/symbiosis_biology.png trunk/FreeOrion/default/data/art/icons/tech/temporal_mechanics.png trunk/FreeOrion/default/data/art/icons/tech/translingustic_thought.png trunk/FreeOrion/default/data/art/icons/tech/unified_conscious.png trunk/FreeOrion/default/data/art/icons/tech/urban_farming.png trunk/FreeOrion/default/data/art/icons/tech/xenoarchaeology.png Removed Paths: ------------- trunk/FreeOrion/default/data/art/tech_icons/Artificial_Heavenly_Bodies.png trunk/FreeOrion/default/data/art/tech_icons/Artificial_Minds.png trunk/FreeOrion/default/data/art/tech_icons/Asymptotic_Materials.png trunk/FreeOrion/default/data/art/tech_icons/Deep_Core_Mining.png trunk/FreeOrion/default/data/art/tech_icons/Fusion_Generation.png trunk/FreeOrion/default/data/art/tech_icons/Genome_Bank.png trunk/FreeOrion/default/data/art/tech_icons/Gravitonics.png trunk/FreeOrion/default/data/art/tech_icons/Infrastructure_Ecology.png trunk/FreeOrion/default/data/art/tech_icons/Lifecycle_Manipulation.png trunk/FreeOrion/default/data/art/tech_icons/Medical_Pathology.png trunk/FreeOrion/default/data/art/tech_icons/Metroplex_Infrastructure.png trunk/FreeOrion/default/data/art/tech_icons/Mind_of_the_Void.png trunk/FreeOrion/default/data/art/tech_icons/Miniature_Suns.png trunk/FreeOrion/default/data/art/tech_icons/Psionics.png trunk/FreeOrion/default/data/art/tech_icons/Pure-Energy_Metabolism.png trunk/FreeOrion/default/data/art/tech_icons/Robotic_Production.png trunk/FreeOrion/default/data/art/tech_icons/Sentient_Autofactories.png trunk/FreeOrion/default/data/art/tech_icons/Stellar_Tomography.png trunk/FreeOrion/default/data/art/tech_icons/Symbiosis_Biology.png trunk/FreeOrion/default/data/art/tech_icons/Temporal_Mechanics.png trunk/FreeOrion/default/data/art/tech_icons/Translingustic_Thought.png trunk/FreeOrion/default/data/art/tech_icons/Unified_Conscious.png trunk/FreeOrion/default/data/art/tech_icons/Urban_Farming.png trunk/FreeOrion/default/data/art/tech_icons/Xenoarchaeology.png Copied: trunk/FreeOrion/default/data/art/icons/tech/artificial_heavenly_bodies.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Artificial_Heavenly_Bodies.png) =================================================================== (Binary files differ) Copied: trunk/FreeOrion/default/data/art/icons/tech/artificial_minds.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Artificial_Minds.png) =================================================================== (Binary files differ) Copied: trunk/FreeOrion/default/data/art/icons/tech/asymptotic_materials.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Asymptotic_Materials.png) =================================================================== (Binary files differ) Copied: trunk/FreeOrion/default/data/art/icons/tech/deep_core_mining.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Deep_Core_Mining.png) =================================================================== (Binary files differ) Copied: trunk/FreeOrion/default/data/art/icons/tech/fusion_generation.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Fusion_Generation.png) =================================================================== (Binary files differ) Copied: trunk/FreeOrion/default/data/art/icons/tech/genome_bank.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Genome_Bank.png) =================================================================== (Binary files differ) Copied: trunk/FreeOrion/default/data/art/icons/tech/gravitonics.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Gravitonics.png) =================================================================== (Binary files differ) Copied: trunk/FreeOrion/default/data/art/icons/tech/infrastructure_ecology.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Infrastructure_Ecology.png) =================================================================== (Binary files differ) Copied: trunk/FreeOrion/default/data/art/icons/tech/lifecycle_manipulation.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Lifecycle_Manipulation.png) =================================================================== (Binary files differ) Copied: trunk/FreeOrion/default/data/art/icons/tech/medical_pathology.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Medical_Pathology.png) =================================================================== (Binary files differ) Copied: trunk/FreeOrion/default/data/art/icons/tech/metroplex_infrastructure.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Metroplex_Infrastructure.png) =================================================================== (Binary files differ) Copied: trunk/FreeOrion/default/data/art/icons/tech/mind_of_the_void.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Mind_of_the_Void.png) =================================================================== (Binary files differ) Copied: trunk/FreeOrion/default/data/art/icons/tech/miniature_suns.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Miniature_Suns.png) =================================================================== (Binary files differ) Copied: trunk/FreeOrion/default/data/art/icons/tech/psionics.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Psionics.png) =================================================================== (Binary files differ) Copied: trunk/FreeOrion/default/data/art/icons/tech/pure-energy_metabolism.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Pure-Energy_Metabolism.png) =================================================================== (Binary files differ) Copied: trunk/FreeOrion/default/data/art/icons/tech/robotic_production.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Robotic_Production.png) =================================================================== (Binary files differ) Copied: trunk/FreeOrion/default/data/art/icons/tech/sentient_autofactories.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Sentient_Autofactories.png) =================================================================== (Binary files differ) Copied: trunk/FreeOrion/default/data/art/icons/tech/stellar_tomography.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Stellar_Tomography.png) =================================================================== (Binary files differ) Copied: trunk/FreeOrion/default/data/art/icons/tech/symbiosis_biology.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Symbiosis_Biology.png) =================================================================== (Binary files differ) Copied: trunk/FreeOrion/default/data/art/icons/tech/temporal_mechanics.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Temporal_Mechanics.png) =================================================================== (Binary files differ) Copied: trunk/FreeOrion/default/data/art/icons/tech/translingustic_thought.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Translingustic_Thought.png) =================================================================== (Binary files differ) Copied: trunk/FreeOrion/default/data/art/icons/tech/unified_conscious.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Unified_Conscious.png) =================================================================== (Binary files differ) Copied: trunk/FreeOrion/default/data/art/icons/tech/urban_farming.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Urban_Farming.png) =================================================================== (Binary files differ) Copied: trunk/FreeOrion/default/data/art/icons/tech/xenoarchaeology.png (from rev 2146, trunk/FreeOrion/default/data/art/tech_icons/Xenoarchaeology.png) =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Artificial_Heavenly_Bodies.png =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Artificial_Minds.png =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Asymptotic_Materials.png =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Deep_Core_Mining.png =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Fusion_Generation.png =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Genome_Bank.png =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Gravitonics.png =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Infrastructure_Ecology.png =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Lifecycle_Manipulation.png =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Medical_Pathology.png =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Metroplex_Infrastructure.png =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Mind_of_the_Void.png =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Miniature_Suns.png =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Psionics.png =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Pure-Energy_Metabolism.png =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Robotic_Production.png =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Sentient_Autofactories.png =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Stellar_Tomography.png =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Symbiosis_Biology.png =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Temporal_Mechanics.png =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Translingustic_Thought.png =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Unified_Conscious.png =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Urban_Farming.png =================================================================== (Binary files differ) Deleted: trunk/FreeOrion/default/data/art/tech_icons/Xenoarchaeology.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/techs.txt =================================================================== --- trunk/FreeOrion/default/techs.txt 2007-07-14 22:14:23 UTC (rev 2152) +++ trunk/FreeOrion/default/techs.txt 2007-07-14 22:56:41 UTC (rev 2153) @@ -50,7 +50,7 @@ "LRN_PHYS_BRAIN" ] unlock = [] - graphic = "tech_icons/Translingustic_Thought.png" + graphic = "icons/tech/translingustic_thought.png" Tech name = "LRN_PSIONICS" @@ -62,7 +62,7 @@ researchturns = 10 prerequisites = "LRN_PHYS_BRAIN" unlock = [] - graphic = "tech_icons/Psionics.png" + graphic = "icons/tech/psionics.png" Tech name = "LRN_ARTIF_MINDS" @@ -77,7 +77,7 @@ "LRN_PHYS_BRAIN" ] unlock = [] - graphic = "tech_icons/Artificial_Minds.png" + graphic = "icons/tech/artificial_minds.png" Tech name = "LRN_XENOARCH" @@ -89,7 +89,7 @@ researchturns = 10 prerequisites = "LRN_GAL_EXPLO" unlock = [] - graphic = "tech_icons/Xenoarchaeology.png" + graphic = "icons/tech/xenoarchaeology.png" Tech name = "LRN_GRAVITONICS" @@ -101,7 +101,7 @@ researchturns = 15 prerequisites = "LRN_TRANSLING_THT" unlock = [] - graphic = "tech_icons/Gravitonics.png" + graphic = "icons/tech/gravitonics.png" Tech name = "LRN_EVERYTHING" @@ -146,7 +146,7 @@ "LRN_XENOARCH" ] unlock = [] - graphic = "tech_icons/Mind_of_the_Void.png" + graphic = "icons/mind_of_the_void.png" Tech name = "LRN_TIME_MECH" @@ -161,7 +161,7 @@ "LRN_GRAVITONICS" ] unlock = [] - graphic = "tech_icons/Temporal_Mechanics.png" + graphic = "icons/tech/temporal_mechanics.png" Tech name = "LRN_NDIM_SUBSPACE" @@ -191,7 +191,7 @@ "LRN_MIND_VOID" ] unlock = [] - graphic = "tech_icons/Unified_Conscious.png" + graphic = "icons/tech/unified_conscious.png" Tech name = "LRN_TRANSCEND" @@ -265,7 +265,7 @@ activation = Source effects = SetMaxResearch Target.MaxResearch + 1 ] - graphic = "tech_icons/Stellar_Tomography.png" + graphic = "icons/tech/stellar_tomography.png" Tech name = "LRN_AUTOLAB_I" @@ -441,7 +441,7 @@ researchturns = 1 prerequisites = [] unlock = [] - graphic = "tech_icons/Medical_Pathology.png" + graphic = "icons/tech/medical_pathology.png" Tech name = "GRO_ENV_ENCAPSUL" @@ -468,7 +468,7 @@ "GRO_PLANET_ECOL" ] unlock = [] - graphic = "tech_icons/Symbiosis_Biology.png" + graphic = "icons/tech/symbiosis_biology.png" Tech name = "GRO_GENETIC_MED" @@ -495,7 +495,7 @@ researchturns = 15 prerequisites = "GRO_SYMBIOTIC_BIO" unlock = [] - graphic = "tech_icons/Lifecycle_Manipulation.png" + graphic = "icons/tech/lifecycle_manipulation.png" Tech name = "GRO_XENO_GENETICS" @@ -569,7 +569,7 @@ "PRO_FUSION_GEN" ] unlock = [] - graphic = "tech_icons/Pure-Energy_Metabolism.png" + graphic = "icons/tech/pure-energy_metabolism.png" Tech name = "GRO_INDUSTY_FARM" @@ -666,7 +666,7 @@ researchturns = 10 prerequisites = "GRO_GENETIC_MED" unlock = Item type = Building name = "BLD_GENOME_BANK" - graphic = "tech_icons/Genome_Bank.png" + graphic = "icons/tech/genome_bank.png" Tech name = "GRO_LIVING_PLANET" @@ -715,7 +715,7 @@ Source effects = SetMaxFarming value = Target.MaxFarming + 2 - graphic = "tech_icons/Urban_Farming.png" + graphic = "icons/tech/urban_farming.png" Tech name = "GRO_ORBIT_FARMING" @@ -807,7 +807,7 @@ researchturns = 1 prerequisites = [] unlock = [] - graphic = "tech_icons/Robotic_Production.png" + graphic = "icons/tech/robotic_production.png" Tech name = "PRO_FUSION_GEN" @@ -819,7 +819,7 @@ researchturns = 5 prerequisites = [] unlock = [] - graphic = "tech_icons/Fusion_Generation.png" + graphic = "icons/tech/fusion_generation.png" Tech name = "PRO_NANOTECH_PROD" @@ -862,7 +862,7 @@ "PRO_NANOTECH_PROD" ] unlock = [] - graphic = "tech_icons/Sentient_Autofactories.png" + graphic = "icons/tech/sentient_autofactories.png" Tech name = "PRO_FRC_FLD_ASSMB" @@ -1070,7 +1070,7 @@ "PRO_ROBOTIC_PROD" ] unlock = [] - graphic = "tech_icons/Deep_Core_Mining.png" + graphic = "icons/tech/deep_core_mining.png" Tech name = "PRO_INDUSTRY_CENTRE_I" @@ -1284,7 +1284,7 @@ researchturns = 5 prerequisites = "PRO_ORBITAL_GEN" unlock = Item type = Building name = "BLD_MINI_SUN" - graphic = "tech_icons/Miniature_Suns.png" + graphic = "icons/tech/miniature_suns.png" TechCategory "CONSTRUCTION_CATEGORY" @@ -1322,7 +1322,7 @@ researchturns = 1 prerequisites = [] unlock = [] - graphic = "tech_icons/Infrastructure_Ecology.png" + graphic = "icons/tech/infrastructure_ecology.png" Tech name = "CON_ORGANIC_STRC" @@ -1350,7 +1350,7 @@ "CON_INFRA_ECOL" ] unlock = [] - graphic = "tech_icons/Metroplex_Infrastructure.png" + graphic = "icons/tech/metroplex_infrastructure.png" Tech name = "CON_TRANS_STRC" @@ -1408,7 +1408,7 @@ "CON_TRANS_STRC" ] unlock = [] - graphic = "tech_icons/Asymptotic_Materials.png" + graphic = "icons/tech/asymptotic_materials.png" Tech name = "CON_STRC_INT_FLDS" @@ -1481,7 +1481,7 @@ "CON_GAL_INFRA" ] unlock = [] - graphic = "tech_icons/Artificial_Heavenly_Bodies.png" + graphic = "icons/tech/artificial_heavenly_bodies.png" Tech name = "CON_TRANS_ARCH" |
From: <tz...@us...> - 2007-07-15 01:01:05
|
Revision: 2154 http://svn.sourceforge.net/freeorion/revision/?rev=2154&view=rev Author: tzlaine Date: 2007-07-14 18:00:45 -0700 (Sat, 14 Jul 2007) Log Message: ----------- Changed a tech icon filename recently erroneously committed with an uppercase character to all-lowercase. Modified Paths: -------------- trunk/FreeOrion/default/techs.txt Added Paths: ----------- trunk/FreeOrion/default/data/art/icons/tech/artificial_black_hole.png Removed Paths: ------------- trunk/FreeOrion/default/data/art/icons/tech/Artificial_black_hole.png Deleted: trunk/FreeOrion/default/data/art/icons/tech/Artificial_black_hole.png =================================================================== (Binary files differ) Copied: trunk/FreeOrion/default/data/art/icons/tech/artificial_black_hole.png (from rev 2153, trunk/FreeOrion/default/data/art/icons/tech/Artificial_black_hole.png) =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/techs.txt =================================================================== --- trunk/FreeOrion/default/techs.txt 2007-07-14 22:56:41 UTC (rev 2153) +++ trunk/FreeOrion/default/techs.txt 2007-07-15 01:00:45 UTC (rev 2154) @@ -1121,7 +1121,7 @@ researchturns = 10 prerequisites = "PRO_SINGULAR_GEN" unlock = Item type = Building name = "BLD_ART_BLACK_HOLE" - graphic = "icons/tech/Artificial_black_hole.png" + graphic = "icons/tech/artificial_black_hole.png" Tech name = "PRO_MINING_ENGINEERING" |
From: <geo...@us...> - 2007-08-04 23:20:10
|
Revision: 2210 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=2210&view=rev Author: geoffthemedio Date: 2007-08-04 16:20:12 -0700 (Sat, 04 Aug 2007) Log Message: ----------- Changed name and description of test tech, because I'm tired of people researching it and then being surprised and confused when it does what it's supposed to. Modified Paths: -------------- trunk/FreeOrion/default/eng_stringtable.txt trunk/FreeOrion/default/techs.txt Modified: trunk/FreeOrion/default/eng_stringtable.txt =================================================================== --- trunk/FreeOrion/default/eng_stringtable.txt 2007-08-04 21:51:13 UTC (rev 2209) +++ trunk/FreeOrion/default/eng_stringtable.txt 2007-08-04 23:20:12 UTC (rev 2210) @@ -2180,6 +2180,17 @@ Economics #################################### +# Misc / Debug Tech Stuff # +#################################### + +TEST_TECH +Test Tech + +TEST_TECH_DESC +This is a test tech. Research at your own risk, and don't be surprised, complain on the forums or post bug reports if weird things happen after you do. + + +#################################### # Theory Tech Names & Descriptions # #################################### Modified: trunk/FreeOrion/default/techs.txt =================================================================== --- trunk/FreeOrion/default/techs.txt 2007-08-04 21:51:13 UTC (rev 2209) +++ trunk/FreeOrion/default/techs.txt 2007-08-04 23:20:12 UTC (rev 2210) @@ -751,8 +751,8 @@ TechCategory "PRODUCTION_CATEGORY" Tech - name = "THEORY_SHORT_DESC" - description = "TEST_DESC" + name = "TEST_TECH" + description = "TEST_TECH_DESC" short_description = "THEORY_SHORT_DESC" techtype = Application category = "PRODUCTION_CATEGORY" |
From: <ele...@us...> - 2007-08-05 18:26:53
|
Revision: 2215 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=2215&view=rev Author: eleazzaar Date: 2007-08-05 11:26:14 -0700 (Sun, 05 Aug 2007) Log Message: ----------- fixed two broken link typos pointed out by MirelSK Modified Paths: -------------- trunk/FreeOrion/default/buildings.txt trunk/FreeOrion/default/techs.txt Modified: trunk/FreeOrion/default/buildings.txt =================================================================== --- trunk/FreeOrion/default/buildings.txt 2007-08-05 07:28:58 UTC (rev 2214) +++ trunk/FreeOrion/default/buildings.txt 2007-08-05 18:26:14 UTC (rev 2215) @@ -472,7 +472,7 @@ BuildingType name = "BLD_PARADISE" - description = "BLD_DEEP_GREEN_DESC" + description = "BLD_PARADISE_DESC" buildcost = 100 buildtime = 10 maintenancecost = 0 Modified: trunk/FreeOrion/default/techs.txt =================================================================== --- trunk/FreeOrion/default/techs.txt 2007-08-05 07:28:58 UTC (rev 2214) +++ trunk/FreeOrion/default/techs.txt 2007-08-05 18:26:14 UTC (rev 2215) @@ -146,7 +146,7 @@ "LRN_XENOARCH" ] unlock = [] - graphic = "icons/mind_of_the_void.png" + graphic = "icons/tech/mind_of_the_void.png" Tech name = "LRN_TIME_MECH" |
From: <geo...@us...> - 2007-12-17 16:05:24
|
Revision: 2262 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=2262&view=rev Author: geoffthemedio Date: 2007-12-17 08:05:26 -0800 (Mon, 17 Dec 2007) Log Message: ----------- Removed a few lingering references to the gaian planet type from universe table and planet and atmosphere xml files, in the hopes if fixing a crash on linux Modified Paths: -------------- trunk/FreeOrion/default/data/art/planets/atmospheres.xml trunk/FreeOrion/default/data/art/planets/planets.xml trunk/FreeOrion/default/universe_tables.txt Modified: trunk/FreeOrion/default/data/art/planets/atmospheres.xml =================================================================== --- trunk/FreeOrion/default/data/art/planets/atmospheres.xml 2007-12-14 19:10:08 UTC (rev 2261) +++ trunk/FreeOrion/default/data/art/planets/atmospheres.xml 2007-12-17 16:05:26 UTC (rev 2262) @@ -28,15 +28,6 @@ </atmosphere> </PlanetAtmosphereData> <PlanetAtmosphereData> - <planet_filename>planets/Gaia.png</planet_filename> - <atmospheres> - <Atmosphere> - <filename>planets/atmospheres/blue_atmosphere.png</filename> - <alpha>204</alpha> - </Atmosphere> - </atmosphere> - </PlanetAtmosphereData> - <PlanetAtmosphereData> <planet_filename>planets/GasGiant01.png</planet_filename> <atmospheres> <Atmosphere> Modified: trunk/FreeOrion/default/data/art/planets/planets.xml =================================================================== --- trunk/FreeOrion/default/data/art/planets/planets.xml 2007-12-14 19:10:08 UTC (rev 2261) +++ trunk/FreeOrion/default/data/art/planets/planets.xml 2007-12-17 16:05:26 UTC (rev 2262) @@ -296,15 +296,6 @@ <RotatingPlanetData> - <planet_type>PT_GAIA</planet_type> - <filename>planets/Gaia.png</filename> - <RPM>1.0</RPM> - <axis_angle>23.0</axis_angle> - <shininess>0.0</shininess> - </RotatingPlanetData> - - - <RotatingPlanetData> <planet_type>PT_GASGIANT</planet_type> <filename>planets/GasGiant01.png</filename> <RPM>1.5</RPM> Modified: trunk/FreeOrion/default/universe_tables.txt =================================================================== --- trunk/FreeOrion/default/universe_tables.txt 2007-12-14 19:10:08 UTC (rev 2261) +++ trunk/FreeOrion/default/universe_tables.txt 2007-12-17 16:05:26 UTC (rev 2262) @@ -38,38 +38,38 @@ Slot10 10 20 10 0 0 0 5 10 <8x12> -PlanetSizeModToPlanetTypeDist Swamp Toxic Inferno Radiated Barren Tundra Desert Terran Ocean Gaian AsteroidField GasGiant -NoWorld 0 0 0 0 0 0 0 0 0 0 0 0 -Planetoid 0 0 0 10 20 0 0 0 0 -20 0 0 -Small 0 0 0 10 10 0 0 0 0 -10 0 0 -Medium 5 0 0 0 0 5 5 10 10 0 0 0 -Large 0 10 10 0 0 0 0 0 0 -10 0 0 -Massive 0 10 10 0 0 0 0 0 0 -20 0 0 -Asteroid 0 0 0 0 0 0 0 0 0 0 0 0 -GasGiant 0 0 0 0 0 0 0 0 0 0 0 0 +PlanetSizeModToPlanetTypeDist Swamp Toxic Inferno Radiated Barren Tundra Desert Terran Ocean AsteroidField GasGiant +NoWorld 0 0 0 0 0 0 0 0 0 0 0 +Planetoid 0 0 0 10 20 0 0 0 0 0 0 +Small 0 0 0 10 10 0 0 0 0 0 0 +Medium 5 0 0 0 0 5 5 10 10 0 0 +Large 0 10 10 0 0 0 0 0 0 0 0 +Massive 0 10 10 0 0 0 0 0 0 0 0 +Asteroid 0 0 0 0 0 0 0 0 0 0 0 +GasGiant 0 0 0 0 0 0 0 0 0 0 0 <10x12> -SlotModToPlanetTypeDist Swamp Toxic Inferno Radiated Barren Tundra Desert Terran Ocean Gaian AsteroidField GasGiant -Slot1 0 5 20 30 15 -20 15 -5 -5 -50 0 0 -Slot2 20 15 20 10 10 -10 20 10 10 -40 0 0 -Slot3 10 0 5 0 0 0 15 30 25 -40 0 0 -Slot4 0 0 0 0 0 5 10 25 25 -40 0 0 -Slot5 5 5 0 0 0 5 0 10 10 -40 0 0 -Slot6 5 10 0 0 5 10 0 5 10 -40 0 0 -Slot7 0 0 0 0 10 10 0 0 0 -40 0 0 -Slot8 -5 0 -5 0 15 10 -5 -5 -5 -50 0 0 -Slot9 -10 -5 -10 -10 20 10 -10 -10 -10 -60 0 0 -Slot10 -20 -10 -20 -20 25 5 -20 -20 -20 -70 0 0 +SlotModToPlanetTypeDist Swamp Toxic Inferno Radiated Barren Tundra Desert Terran Ocean AsteroidField GasGiant +Slot1 0 5 20 30 15 -20 15 -5 -5 0 0 +Slot2 20 15 20 10 10 -10 20 10 10 0 0 +Slot3 10 0 5 0 0 0 15 30 25 0 0 +Slot4 0 0 0 0 0 5 10 25 25 0 0 +Slot5 5 5 0 0 0 5 0 10 10 0 0 +Slot6 5 10 0 0 5 10 0 5 10 0 0 +Slot7 0 0 0 0 10 10 0 0 0 0 0 +Slot8 -5 0 -5 0 15 10 -5 -5 -5 0 0 +Slot9 -10 -5 -10 -10 20 10 -10 -10 -10 0 0 +Slot10 -20 -10 -20 -20 25 5 -20 -20 -20 0 0 <7x12> -StarColorModToPlanetTypeDist Swamp Toxic Inferno Radiated Barren Tundra Desert Terran Ocean Gaian AsteroidField GasGiant -Blue 0 10 15 20 15 0 5 0 0 -5 0 0 -White 5 5 10 5 10 0 15 0 0 0 0 0 -Yellow 20 0 0 0 0 5 20 30 25 0 0 0 -Orange 5 5 0 0 10 10 0 0 5 0 0 0 -Red 0 10 0 0 20 10 0 0 0 -5 0 0 -Neutron -10 5 5 30 20 0 5 -30 -30 -10 0 0 -Blackhole -10 -10 -10 15 30 0 -30 -30 -30 -15 0 0 +StarColorModToPlanetTypeDist Swamp Toxic Inferno Radiated Barren Tundra Desert Terran Ocean AsteroidField GasGiant +Blue 0 10 15 20 15 0 5 0 0 0 0 +White 5 5 10 5 10 0 15 0 0 0 0 +Yellow 20 0 0 0 0 5 20 30 25 0 0 +Orange 5 5 0 0 10 10 0 0 5 0 0 +Red 0 10 0 0 20 10 0 0 0 0 0 +Neutron -10 5 5 30 20 0 5 -30 -30 0 0 +Blackhole -10 -10 -10 15 30 0 -30 -30 -30 0 0 <3x7> UniverseAgeModToStarTypeDist Blue White Yellow Orange Red Neutron Blackhole |
From: <tz...@us...> - 2007-12-18 17:04:50
|
Revision: 2265 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=2265&view=rev Author: tzlaine Date: 2007-12-18 09:04:44 -0800 (Tue, 18 Dec 2007) Log Message: ----------- Removed endlines from the end of default/specials.txt and default/techs.txt to prevent wonky parser from complaining. Modified Paths: -------------- trunk/FreeOrion/default/specials.txt trunk/FreeOrion/default/techs.txt Modified: trunk/FreeOrion/default/specials.txt =================================================================== --- trunk/FreeOrion/default/specials.txt 2007-12-17 21:09:54 UTC (rev 2264) +++ trunk/FreeOrion/default/specials.txt 2007-12-18 17:04:44 UTC (rev 2265) @@ -13,4 +13,4 @@ SetMaxIndustry value = Source.MaxIndustry + 5 SetMaxTrade value = Source.MaxTrade + 2 ] - graphic = "icons/specials_tiny/homeworld.png" + graphic = "icons/specials_tiny/homeworld.png" \ No newline at end of file Modified: trunk/FreeOrion/default/techs.txt =================================================================== --- trunk/FreeOrion/default/techs.txt 2007-12-17 21:09:54 UTC (rev 2264) +++ trunk/FreeOrion/default/techs.txt 2007-12-18 17:04:44 UTC (rev 2265) @@ -1883,4 +1883,4 @@ researchturns = 20 prerequisites = "ECO_ECON_FLUIDITY" unlock = Item type = Building name = "BLD_ECON_SINKHOLE" - graphic = "" + graphic = "" \ No newline at end of file |
From: <pd...@us...> - 2008-03-05 00:16:12
|
Revision: 2376 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=2376&view=rev Author: pd_ Date: 2008-03-04 16:16:16 -0800 (Tue, 04 Mar 2008) Log Message: ----------- Some new tech icons Modified Paths: -------------- trunk/FreeOrion/default/data/art/icons/tech/orbital_farming.png trunk/FreeOrion/default/data/art/icons/tech/psicorp.png trunk/FreeOrion/default/techs.txt Added Paths: ----------- trunk/FreeOrion/default/data/art/icons/tech/commercial_uniion_of_the_colonies.png trunk/FreeOrion/default/data/art/icons/tech/externality_integration.png trunk/FreeOrion/default/data/art/icons/tech/orbital_gardens.png trunk/FreeOrion/default/data/art/icons/tech/space_elevator.png Added: trunk/FreeOrion/default/data/art/icons/tech/commercial_uniion_of_the_colonies.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/icons/tech/commercial_uniion_of_the_colonies.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/FreeOrion/default/data/art/icons/tech/externality_integration.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/icons/tech/externality_integration.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/FreeOrion/default/data/art/icons/tech/orbital_farming.png =================================================================== --- trunk/FreeOrion/default/data/art/icons/tech/orbital_farming.png 2008-03-05 00:06:42 UTC (rev 2375) +++ trunk/FreeOrion/default/data/art/icons/tech/orbital_farming.png 2008-03-05 00:16:16 UTC (rev 2376) @@ -1,27 +1,27 @@ \x89PNG |
From: <pd...@us...> - 2008-03-23 01:35:24
|
Revision: 2417 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=2417&view=rev Author: pd_ Date: 2008-03-22 18:35:29 -0700 (Sat, 22 Mar 2008) Log Message: ----------- Adding Organic Structures and Subterranean Construction icons/tech/organic_structures.png(Josh) Modified Paths: -------------- trunk/FreeOrion/default/techs.txt Added Paths: ----------- trunk/FreeOrion/default/data/art/icons/tech/organic_structures.png trunk/FreeOrion/default/data/art/icons/tech/subterranean_construction.png Added: trunk/FreeOrion/default/data/art/icons/tech/organic_structures.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/icons/tech/organic_structures.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/FreeOrion/default/data/art/icons/tech/subterranean_construction.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/icons/tech/subterranean_construction.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/FreeOrion/default/techs.txt =================================================================== --- trunk/FreeOrion/default/techs.txt 2008-03-21 23:28:59 UTC (rev 2416) +++ trunk/FreeOrion/default/techs.txt 2008-03-23 01:35:29 UTC (rev 2417) @@ -1305,7 +1305,7 @@ researchturns = 1 prerequisites = [] unlock = [] - graphic = "" + graphic = "icons/tech/organic_structures.png" Tech name = "CON_METRO_INFRA" @@ -1579,7 +1579,7 @@ Source effects = SetMaxConstruction value = Target.MaxConstruction + 5 - graphic = "" + graphic = "icons/tech/subterranean_construction.png" Tech name = "ECO_MARKET_ECON" |
From: <ele...@us...> - 2008-03-30 19:54:11
|
Revision: 2435 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=2435&view=rev Author: eleazzaar Date: 2008-03-30 12:54:15 -0700 (Sun, 30 Mar 2008) Log Message: ----------- revised gaseious images. back to 256x256. I'm trying some different effects. Modified Paths: -------------- trunk/FreeOrion/default/data/art/galaxy_decoration/gaseous01.png trunk/FreeOrion/default/data/art/galaxy_decoration/gaseous02.png trunk/FreeOrion/default/data/art/galaxy_decoration/gaseous03.png trunk/FreeOrion/default/data/art/galaxy_decoration/gaseous04.png trunk/FreeOrion/default/data/art/galaxy_decoration/gaseous05.png trunk/FreeOrion/default/universe_tables.txt Modified: trunk/FreeOrion/default/data/art/galaxy_decoration/gaseous01.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/galaxy_decoration/gaseous02.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/galaxy_decoration/gaseous03.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/galaxy_decoration/gaseous04.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/galaxy_decoration/gaseous05.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/universe_tables.txt =================================================================== --- trunk/FreeOrion/default/universe_tables.txt 2008-03-30 18:56:59 UTC (rev 2434) +++ trunk/FreeOrion/default/universe_tables.txt 2008-03-30 19:54:15 UTC (rev 2435) @@ -21,7 +21,7 @@ Yellow 0 0 0 0 0 0 0 0 Orange 0 0 0 0 0 0 0 0 Red 0 0 0 0 0 0 0 0 -Neutron 5 5 0 0 0 0 20 0 +Neutron 5 15 10 0 0 0 20 0 Blackhole 30 0 0 -5 -5 -5 10 -5 <10x8> @@ -40,46 +40,46 @@ <8x11> PlanetSizeModToPlanetTypeDist Swamp Toxic Inferno Radiated Barren Tundra Desert Terran Ocean AsteroidField GasGiant NoWorld 0 0 0 0 0 0 0 0 0 0 0 -Planetoid 0 0 0 10 20 0 0 0 0 0 0 -Small 0 0 0 10 10 0 0 0 0 0 0 -Medium 5 0 0 0 0 5 5 10 10 0 0 -Large 0 10 10 0 0 0 0 0 0 0 0 -Massive 0 10 10 0 0 0 0 0 0 0 0 +Planetoid 0 0 0 0 0 0 0 0 0 0 0 +Small 0 0 0 0 0 0 0 0 0 0 0 +Medium 10 10 10 10 10 10 10 10 10 0 0 +Large 0 0 0 0 0 0 0 0 0 0 0 +Massive 0 0 0 0 0 0 0 0 0 0 0 Asteroid 0 0 0 0 0 0 0 0 0 0 0 GasGiant 0 0 0 0 0 0 0 0 0 0 0 <10x11> SlotModToPlanetTypeDist Swamp Toxic Inferno Radiated Barren Tundra Desert Terran Ocean AsteroidField GasGiant -Slot1 0 5 20 30 15 -20 15 -5 -5 0 0 -Slot2 20 15 20 10 10 -10 20 10 10 0 0 -Slot3 10 0 5 0 0 0 15 30 25 0 0 -Slot4 0 0 0 0 0 5 10 25 25 0 0 -Slot5 5 5 0 0 0 5 0 10 10 0 0 -Slot6 5 10 0 0 5 10 0 5 10 0 0 -Slot7 0 0 0 0 10 10 0 0 0 0 0 -Slot8 -5 0 -5 0 15 10 -5 -5 -5 0 0 -Slot9 -10 -5 -10 -10 20 10 -10 -10 -10 0 0 -Slot10 -20 -10 -20 -20 25 5 -20 -20 -20 0 0 +Slot1 0 0 0 0 0 0 0 0 0 0 0 +Slot2 0 0 0 0 0 0 0 0 0 0 0 +Slot3 0 0 0 0 0 0 0 0 0 0 0 +Slot4 0 0 0 0 0 0 0 0 0 0 0 +Slot5 0 0 0 0 0 0 0 0 0 0 0 +Slot6 0 0 0 0 0 0 0 0 0 0 0 +Slot7 0 0 0 0 0 0 0 0 0 0 0 +Slot8 -5 -5 -5 -5 -5 -5 -5 -5 -5 0 0 +Slot9 -10 -10 -10 -10 -10 -10 -10 -10 -10 0 0 +Slot10 -20 -20 -20 -20 -20 -20 -20 -20 -20 0 0 <7x11> StarColorModToPlanetTypeDist Swamp Toxic Inferno Radiated Barren Tundra Desert Terran Ocean AsteroidField GasGiant -Blue 0 10 15 20 15 0 5 0 0 0 0 -White 5 5 10 5 10 0 15 0 0 0 0 -Yellow 20 0 0 0 0 5 20 30 25 0 0 -Orange 5 5 0 0 10 10 0 0 5 0 0 -Red 0 10 0 0 20 10 0 0 0 0 0 -Neutron -10 5 5 30 20 0 5 -30 -30 0 0 -Blackhole -10 -10 -10 15 30 0 -30 -30 -30 0 0 +Blue 5 20 40 10 5 -8 -10 -10 2 0 0 +White 39 20 0 -10 -10 -10 0 5 20 0 0 +Yellow 4 -5 -10 -10 -5 4 18 40 18 0 0 +Orange -10 -10 -10 0 20 39 20 5 0 0 0 +Red -8 5 10 40 20 5 2 -10 -10 0 0 +Neutron -20 -20 -20 -20 -20 -20 -20 -20 -20 0 0 +Blackhole -30 -30 -30 -30 -30 -30 -30 -30 -30 0 0 <3x7> UniverseAgeModToStarTypeDist Blue White Yellow Orange Red Neutron Blackhole -Young 10 20 0 0 0 0 0 -Mature 0 0 10 0 0 10 10 -Ancient 0 0 0 10 10 20 20 +Young 0 0 0 0 0 0 0 +Mature 0 0 0 0 0 10 10 +Ancient 0 0 0 0 0 20 20 <1x7> BaseStarTypeDist Blue White Yellow Orange Red Neutron Blackhole -Base 30 40 50 40 30 0 0 +Base 33 33 33 33 33 0 0 # This one is a bit misleading. With the exception of "None", larger values mean more starlanes, which is why VeryMany has the lowest value. <1x6> |
From: <ele...@us...> - 2008-03-30 22:29:41
|
Revision: 2436 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=2436&view=rev Author: eleazzaar Date: 2008-03-30 15:29:17 -0700 (Sun, 30 Mar 2008) Log Message: ----------- reverting accidental chance to universe tables and distinguishing tiny stars from background. Modified Paths: -------------- trunk/FreeOrion/default/data/art/starfield1.png trunk/FreeOrion/default/data/art/starfield2.png trunk/FreeOrion/default/data/art/starfield3.png trunk/FreeOrion/default/universe_tables.txt Modified: trunk/FreeOrion/default/data/art/starfield1.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/starfield2.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/data/art/starfield3.png =================================================================== (Binary files differ) Modified: trunk/FreeOrion/default/universe_tables.txt =================================================================== --- trunk/FreeOrion/default/universe_tables.txt 2008-03-30 19:54:15 UTC (rev 2435) +++ trunk/FreeOrion/default/universe_tables.txt 2008-03-30 22:29:17 UTC (rev 2436) @@ -21,7 +21,7 @@ Yellow 0 0 0 0 0 0 0 0 Orange 0 0 0 0 0 0 0 0 Red 0 0 0 0 0 0 0 0 -Neutron 5 15 10 0 0 0 20 0 +Neutron 5 5 0 0 0 0 20 0 Blackhole 30 0 0 -5 -5 -5 10 -5 <10x8> @@ -40,46 +40,46 @@ <8x11> PlanetSizeModToPlanetTypeDist Swamp Toxic Inferno Radiated Barren Tundra Desert Terran Ocean AsteroidField GasGiant NoWorld 0 0 0 0 0 0 0 0 0 0 0 -Planetoid 0 0 0 0 0 0 0 0 0 0 0 -Small 0 0 0 0 0 0 0 0 0 0 0 -Medium 10 10 10 10 10 10 10 10 10 0 0 -Large 0 0 0 0 0 0 0 0 0 0 0 -Massive 0 0 0 0 0 0 0 0 0 0 0 +Planetoid 0 0 0 10 20 0 0 0 0 0 0 +Small 0 0 0 10 10 0 0 0 0 0 0 +Medium 5 0 0 0 0 5 5 10 10 0 0 +Large 0 10 10 0 0 0 0 0 0 0 0 +Massive 0 10 10 0 0 0 0 0 0 0 0 Asteroid 0 0 0 0 0 0 0 0 0 0 0 GasGiant 0 0 0 0 0 0 0 0 0 0 0 <10x11> SlotModToPlanetTypeDist Swamp Toxic Inferno Radiated Barren Tundra Desert Terran Ocean AsteroidField GasGiant -Slot1 0 0 0 0 0 0 0 0 0 0 0 -Slot2 0 0 0 0 0 0 0 0 0 0 0 -Slot3 0 0 0 0 0 0 0 0 0 0 0 -Slot4 0 0 0 0 0 0 0 0 0 0 0 -Slot5 0 0 0 0 0 0 0 0 0 0 0 -Slot6 0 0 0 0 0 0 0 0 0 0 0 -Slot7 0 0 0 0 0 0 0 0 0 0 0 -Slot8 -5 -5 -5 -5 -5 -5 -5 -5 -5 0 0 -Slot9 -10 -10 -10 -10 -10 -10 -10 -10 -10 0 0 -Slot10 -20 -20 -20 -20 -20 -20 -20 -20 -20 0 0 +Slot1 0 5 20 30 15 -20 15 -5 -5 0 0 +Slot2 20 15 20 10 10 -10 20 10 10 0 0 +Slot3 10 0 5 0 0 0 15 30 25 0 0 +Slot4 0 0 0 0 0 5 10 25 25 0 0 +Slot5 5 5 0 0 0 5 0 10 10 0 0 +Slot6 5 10 0 0 5 10 0 5 10 0 0 +Slot7 0 0 0 0 10 10 0 0 0 0 0 +Slot8 -5 0 -5 0 15 10 -5 -5 -5 0 0 +Slot9 -10 -5 -10 -10 20 10 -10 -10 -10 0 0 +Slot10 -20 -10 -20 -20 25 5 -20 -20 -20 0 0 <7x11> StarColorModToPlanetTypeDist Swamp Toxic Inferno Radiated Barren Tundra Desert Terran Ocean AsteroidField GasGiant -Blue 5 20 40 10 5 -8 -10 -10 2 0 0 -White 39 20 0 -10 -10 -10 0 5 20 0 0 -Yellow 4 -5 -10 -10 -5 4 18 40 18 0 0 -Orange -10 -10 -10 0 20 39 20 5 0 0 0 -Red -8 5 10 40 20 5 2 -10 -10 0 0 -Neutron -20 -20 -20 -20 -20 -20 -20 -20 -20 0 0 -Blackhole -30 -30 -30 -30 -30 -30 -30 -30 -30 0 0 +Blue 0 10 15 20 15 0 5 0 0 0 0 +White 5 5 10 5 10 0 15 0 0 0 0 +Yellow 20 0 0 0 0 5 20 30 25 0 0 +Orange 5 5 0 0 10 10 0 0 5 0 0 +Red 0 10 0 0 20 10 0 0 0 0 0 +Neutron -10 5 5 30 20 0 5 -30 -30 0 0 +Blackhole -10 -10 -10 15 30 0 -30 -30 -30 0 0 <3x7> UniverseAgeModToStarTypeDist Blue White Yellow Orange Red Neutron Blackhole -Young 0 0 0 0 0 0 0 -Mature 0 0 0 0 0 10 10 -Ancient 0 0 0 0 0 20 20 +Young 10 20 0 0 0 0 0 +Mature 0 0 10 0 0 10 10 +Ancient 0 0 0 10 10 20 20 <1x7> BaseStarTypeDist Blue White Yellow Orange Red Neutron Blackhole -Base 33 33 33 33 33 0 0 +Base 30 40 50 40 30 0 0 # This one is a bit misleading. With the exception of "None", larger values mean more starlanes, which is why VeryMany has the lowest value. <1x6> |
From: <ele...@us...> - 2008-04-02 23:25:34
|
Revision: 2449 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=2449&view=rev Author: eleazzaar Date: 2008-04-02 16:25:33 -0700 (Wed, 02 Apr 2008) Log Message: ----------- adding basic terraforming techs Modified Paths: -------------- trunk/FreeOrion/default/eng_stringtable.txt trunk/FreeOrion/default/techs.txt Modified: trunk/FreeOrion/default/eng_stringtable.txt =================================================================== --- trunk/FreeOrion/default/eng_stringtable.txt 2008-04-02 03:53:19 UTC (rev 2448) +++ trunk/FreeOrion/default/eng_stringtable.txt 2008-04-02 23:25:33 UTC (rev 2449) @@ -2874,6 +2874,24 @@ FLEET_RANGE_DESC Improves Fleet Supply +CON_TERRAFORM +Terraforming + +CON_TERRAFORM_DESC +Changing the environmental type of a planet is a massive undertaking, the challenge of this process is to a large degree logistical. The precise method depends greatly on the type of planet to be changed and the desired result. However in all cases much of the surface of the entire planet and it's atmosphere needs to be converted to other types of molecules, vented into space or buried under the crust. The process takes years. + +CON_TERRAFORM_SHORT_DESC +Allows terraforming to improve planets + +CON_RAPID_TERRAFORM +Rapid Terraforming + +CON_RAPID_TERRAFORM_DESC +Advances in orbital deployment now enable any terrestrial planet in an inhabited system to be terraformed to any environmental preference. Nanites can accomplish the transformation in half the time of conventional methods. + +CON_RAPID_TERRAFORM_SHORT_DESC +Allows rapid and remote terraforming to improve planets + CON_GRAVITY_WELLS Controlled gravity wells Modified: trunk/FreeOrion/default/techs.txt =================================================================== --- trunk/FreeOrion/default/techs.txt 2008-04-02 03:53:19 UTC (rev 2448) +++ trunk/FreeOrion/default/techs.txt 2008-04-02 23:25:33 UTC (rev 2449) @@ -1271,6 +1271,8 @@ unlock = [] graphic = "icons/tech/orbital_construction.png" + + Tech name = "CON_ARCH_PSYCH" description = "CON_ARCH_PSYCH_DESC" @@ -1483,8 +1485,38 @@ ] unlock = [] graphic = "icons/tech/n-dimensional_structures.png" +Tech + name = "CON_TERRAFORM" + description = "CON_TERRAFORM_DESC" + short_description = "CON_TERRAFORM_SHORT_DESC" + techtype = Application + category = "CONSTRUCTION_CATEGORY" + researchcost = 1 + researchturns = 1 + prerequisites = [ + "PRO_PLANET_GEOL" + "GRO_PLANET_ECOL" + ] + unlock = [] + graphic = "icons/tech/terraform.png" Tech + name = "CON_RAPID_TERRAFORM" + description = "CON_RAPID_TERRAFORM_DESC" + short_description = "CON_RAPID_TERRAFORM_SHORT_DESC" + techtype = Application + category = "CONSTRUCTION_CATEGORY" + researchcost = 1 + researchturns = 1 + prerequisites = [ + "CON_TERRAFORM" + "PRO_NANOTECH_PROD" + "CON_ORBITAL_INFRA" + ] + unlock = [] + graphic = "icons/tech/terraform_rapid.png" + +Tech name = "CON_GRAVITY_WELLS" description = "CON_GRAVITY_WELLS_DESC" short_description = "BUILDING_UNLOCK_SHORT_DESC" |
From: <pd...@us...> - 2008-04-15 10:03:21
|
Revision: 2491 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=2491&view=rev Author: pd_ Date: 2008-04-15 03:03:25 -0700 (Tue, 15 Apr 2008) Log Message: ----------- Adding 3 ship part icons by ssalamass and updating techs.txt(The Living Planet icon). Modified Paths: -------------- trunk/FreeOrion/default/ship_parts.txt trunk/FreeOrion/default/techs.txt Added Paths: ----------- trunk/FreeOrion/default/data/art/icons/ship_parts/antimatter_tank.png trunk/FreeOrion/default/data/art/icons/ship_parts/deuterium_tank.png trunk/FreeOrion/default/data/art/icons/ship_parts/nuclear_missile.png Added: trunk/FreeOrion/default/data/art/icons/ship_parts/antimatter_tank.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/icons/ship_parts/antimatter_tank.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/FreeOrion/default/data/art/icons/ship_parts/deuterium_tank.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/icons/ship_parts/deuterium_tank.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/FreeOrion/default/data/art/icons/ship_parts/nuclear_missile.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/icons/ship_parts/nuclear_missile.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/FreeOrion/default/ship_parts.txt =================================================================== --- trunk/FreeOrion/default/ship_parts.txt 2008-04-14 11:11:58 UTC (rev 2490) +++ trunk/FreeOrion/default/ship_parts.txt 2008-04-15 10:03:25 UTC (rev 2491) @@ -1,133 +1,133 @@ -Part - name = "SR_LASER" - description = "SR_LASER_DESC" - class = ShortRange - power = 1 - buildcost = 4 - buildtime = 1 - mountableSlotTypes = External - location = OwnedBy TheEmpire Source.Owner - graphic = "" - -Part - name = "SR_ION_CANNON" - description = "SR_ION_CANNON_DESC" - class = ShortRange - power = 2 - buildcost = 8 - buildtime = 2 - mountableSlotTypes = External - location = OwnedBy TheEmpire Source.Owner - graphic = "" - -Part - name = "LR_NUCLEAR_MISSILE" - description = "LR_NUCLEAR_MISSILE" - class = Missiles - power = 3 - buildcost = 12 - buildtime = 4 - mountableSlotTypes = External - location = OwnedBy TheEmpire Source.Owner - graphic = "" - -Part - name = "AR_LEAD_PLATE" - description = "AR_LEAD_PLATE_DESC" - class = Armour - power = 1 - buildcost = 6 - buildtime = 1 - mountableSlotTypes = External - location = OwnedBy TheEmpire Source.Owner - graphic = "icons/ship_parts/lead_armor_plating.png" - -Part - name = "SH_DEFENSE_GRID" - description = "SH_DEFENSE_GRID_DESC" - class = Shield - power = 1 - buildcost = 4 - buildtime = 0 - mountableSlotTypes = External - location = OwnedBy TheEmpire Source.Owner - graphic = "icons/ship_parts/defense_grid.png" - -Part - name = "SH_DEFLECTOR" - description = "SH_DEFLECTOR_DESC" - class = Shield - power = 3 - buildcost = 12 - buildtime = 2 - mountableSlotTypes = [External Internal] - location = OwnedBy TheEmpire Source.Owner - graphic = "icons/ship_parts/deflector_shield.png" - -Part - name = "DT_ACTIVE_RADAR" - description = "DT_ACTIVE_RADAR_DESC" - class = Detection - power = 3 - buildcost = 12 - buildtime = 4 - mountableSlotTypes = External - location = OwnedBy TheEmpire Source.Owner - graphic = "" - -Part - name = "FU_DEUTERIUM_TANK" - description = "FU_DEUTERIUM_TANK_DESC" - class = Fuel - power = 3 - buildcost = 8 - buildtime = 1 - mountableSlotTypes = [External Internal] - location = OwnedBy TheEmpire Source.Owner - graphic = "" - -Part - name = "FU_ANTIMATTER_TANK" - description = "FU_ANTIMATTER_TANK_DESC" - class = Fuel - power = 8 - buildcost = 20 - buildtime = 6 - mountableSlotTypes = [External Internal] - location = OwnedBy TheEmpire Source.Owner - graphic = "" - -Part - name = "ST_EM_DAMPER" - description = "ST_EM_DAMPER_DESC" - class = Stealth - power = 2 - buildcost = 20 - buildtime = 6 - mountableSlotTypes = Internal - location = OwnedBy TheEmpire Source.Owner - graphic = "" - -Part - name = "CO_COLONY_POD" - description = "CO_COLONY_POD_DESC" - class = Colony - power = 1 - buildcost = 40 - buildtime = 10 - mountableSlotTypes = Internal - location = And [OwnedBy TheEmpire Source.Owner - CurrentPopulation low = 3 high = 999] - graphic = "" - -Part - name = "CO_SUSPEND_ANIM_POD" - description = "CO_SUSPEND_ANIM_POD_DESC" - class = Colony - power = 5 - buildcost = 80 - buildtime = 12 - mountableSlotTypes = Internal - location = And [OwnedBy TheEmpire Source.Owner - CurrentPopulation low = 3 high = 999] - graphic = "" +Part + name = "SR_LASER" + description = "SR_LASER_DESC" + class = ShortRange + power = 1 + buildcost = 4 + buildtime = 1 + mountableSlotTypes = External + location = OwnedBy TheEmpire Source.Owner + graphic = "" + +Part + name = "SR_ION_CANNON" + description = "SR_ION_CANNON_DESC" + class = ShortRange + power = 2 + buildcost = 8 + buildtime = 2 + mountableSlotTypes = External + location = OwnedBy TheEmpire Source.Owner + graphic = "" + +Part + name = "LR_NUCLEAR_MISSILE" + description = "LR_NUCLEAR_MISSILE" + class = Missiles + power = 3 + buildcost = 12 + buildtime = 4 + mountableSlotTypes = External + location = OwnedBy TheEmpire Source.Owner + graphic = ""icons/ship_parts/nuclear_missile.png" + +Part + name = "AR_LEAD_PLATE" + description = "AR_LEAD_PLATE_DESC" + class = Armour + power = 1 + buildcost = 6 + buildtime = 1 + mountableSlotTypes = External + location = OwnedBy TheEmpire Source.Owner + graphic = "icons/ship_parts/lead_armor_plating.png" + +Part + name = "SH_DEFENSE_GRID" + description = "SH_DEFENSE_GRID_DESC" + class = Shield + power = 1 + buildcost = 4 + buildtime = 0 + mountableSlotTypes = External + location = OwnedBy TheEmpire Source.Owner + graphic = "icons/ship_parts/defense_grid.png" + +Part + name = "SH_DEFLECTOR" + description = "SH_DEFLECTOR_DESC" + class = Shield + power = 3 + buildcost = 12 + buildtime = 2 + mountableSlotTypes = [External Internal] + location = OwnedBy TheEmpire Source.Owner + graphic = "icons/ship_parts/deflector_shield.png" + +Part + name = "DT_ACTIVE_RADAR" + description = "DT_ACTIVE_RADAR_DESC" + class = Detection + power = 3 + buildcost = 12 + buildtime = 4 + mountableSlotTypes = External + location = OwnedBy TheEmpire Source.Owner + graphic = "" + +Part + name = "FU_DEUTERIUM_TANK" + description = "FU_DEUTERIUM_TANK_DESC" + class = Fuel + power = 3 + buildcost = 8 + buildtime = 1 + mountableSlotTypes = [External Internal] + location = OwnedBy TheEmpire Source.Owner + graphic = "icons/ship_parts/deuterium_tank.png" + +Part + name = "FU_ANTIMATTER_TANK" + description = "FU_ANTIMATTER_TANK_DESC" + class = Fuel + power = 8 + buildcost = 20 + buildtime = 6 + mountableSlotTypes = [External Internal] + location = OwnedBy TheEmpire Source.Owner + graphic = "icons/ship_parts/antimatter_tank.png" + +Part + name = "ST_EM_DAMPER" + description = "ST_EM_DAMPER_DESC" + class = Stealth + power = 2 + buildcost = 20 + buildtime = 6 + mountableSlotTypes = Internal + location = OwnedBy TheEmpire Source.Owner + graphic = "" + +Part + name = "CO_COLONY_POD" + description = "CO_COLONY_POD_DESC" + class = Colony + power = 1 + buildcost = 40 + buildtime = 10 + mountableSlotTypes = Internal + location = And [OwnedBy TheEmpire Source.Owner + CurrentPopulation low = 3 high = 999] + graphic = "" + +Part + name = "CO_SUSPEND_ANIM_POD" + description = "CO_SUSPEND_ANIM_POD_DESC" + class = Colony + power = 5 + buildcost = 80 + buildtime = 12 + mountableSlotTypes = Internal + location = And [OwnedBy TheEmpire Source.Owner + CurrentPopulation low = 3 high = 999] + graphic = "" Modified: trunk/FreeOrion/default/techs.txt =================================================================== --- trunk/FreeOrion/default/techs.txt 2008-04-14 11:11:58 UTC (rev 2490) +++ trunk/FreeOrion/default/techs.txt 2008-04-15 10:03:25 UTC (rev 2491) @@ -660,7 +660,7 @@ researchturns = 1 prerequisites = "GRO_PLANET_ECOL" unlock = Item type = Building name = "BLD_LIVING_PLANET" - graphic = "" + graphic = "icons/tech/the_living_planet.png" Tech name = "GRO_ORBITAL_GARDENS" |
From: <geo...@us...> - 2008-04-15 10:55:49
|
Revision: 2492 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=2492&view=rev Author: geoffthemedio Date: 2008-04-15 03:55:47 -0700 (Tue, 15 Apr 2008) Log Message: ----------- -Fixed double-quote typo in ship_parts.txt -Fixed typos / errors in eng_stringtable.txt -Added shrinkshooter to credits Modified Paths: -------------- trunk/FreeOrion/default/credits.xml trunk/FreeOrion/default/eng_stringtable.txt trunk/FreeOrion/default/ship_parts.txt Modified: trunk/FreeOrion/default/credits.xml =================================================================== --- trunk/FreeOrion/default/credits.xml 2008-04-15 10:03:25 UTC (rev 2491) +++ trunk/FreeOrion/default/credits.xml 2008-04-15 10:55:47 UTC (rev 2492) @@ -50,6 +50,7 @@ <PERSON name="Karel Kalvoda" nick="Solid Liquid" task="Graphics"/> <PERSON name="J. W. Bjerk" nick="eleazar" task="Graphics, Game Design"/> <PERSON name="Josh Combs" nick="Josh" task="Graphics"/> + <PERSON name="Michael T. Young" nick="shrinkshooter" task="Graphics"/> </GROUP> <GROUP name ="AUDIO"> <PERSON name="Kenneth Welch" nick="LithiumMongoose" task="Audio"/> Modified: trunk/FreeOrion/default/eng_stringtable.txt =================================================================== --- trunk/FreeOrion/default/eng_stringtable.txt 2008-04-15 10:03:25 UTC (rev 2491) +++ trunk/FreeOrion/default/eng_stringtable.txt 2008-04-15 10:55:47 UTC (rev 2492) @@ -815,10 +815,10 @@ Video Mode (restart for changes to take effect) OPTIONS_VIDEO_MODE_LIST_DESCRIPTION -Enables fullscreen mode, sets screen resolution, and sets bits per pixel in one step; set this to "Custom" to set width, height, and bits per pixel individually. +Sets screen resolution and bits per pixel in one step; set this to "Custom" to set width, height, and bits per pixel individually. OPTIONS_VIDEO_MODE_LIST_CUSTOM_OPTION -Custom Windowed +Custom OPTIONS_VIDEO_SETTINGS Video Settings @@ -3308,8 +3308,8 @@ BLD_AUTOLAB_CONTROL_DESC Provides +2 to max research output per 10 population and -2 to max health on primary research focused worlds.\nProvides additional +1 to max research output per 10 population and -1 to max health on secondary research focused worlds. -BLD_THEORM_PROVER -Automatic Theorm Prover +BLD_THEOREM_PROVER +Automatic Theorem Prover BLD_THEORM_PROVER_DESC Provides +5 to max research output per 10 population on primary research focused worlds, non-stacking.\nProvides additional +1 to max research output per 10 population on secondary research focused worlds, non-stacking. Modified: trunk/FreeOrion/default/ship_parts.txt =================================================================== --- trunk/FreeOrion/default/ship_parts.txt 2008-04-15 10:03:25 UTC (rev 2491) +++ trunk/FreeOrion/default/ship_parts.txt 2008-04-15 10:55:47 UTC (rev 2492) @@ -29,7 +29,7 @@ buildtime = 4 mountableSlotTypes = External location = OwnedBy TheEmpire Source.Owner - graphic = ""icons/ship_parts/nuclear_missile.png" + graphic = "icons/ship_parts/nuclear_missile.png" Part name = "AR_LEAD_PLATE" |
From: <pd...@us...> - 2008-04-15 19:37:07
|
Revision: 2493 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=2493&view=rev Author: pd_ Date: 2008-04-15 12:37:08 -0700 (Tue, 15 Apr 2008) Log Message: ----------- Adding a bunch of tech icons(Josh + Silent) Modified Paths: -------------- trunk/FreeOrion/default/data/art/icons/tech/controlled_gravity_architecture.png trunk/FreeOrion/default/data/art/icons/tech/fusion_plants.png trunk/FreeOrion/default/techs.txt Added Paths: ----------- trunk/FreeOrion/default/data/art/icons/tech/collective_thought_network.png trunk/FreeOrion/default/data/art/icons/tech/controlled_gravity_wells.png trunk/FreeOrion/default/data/art/icons/tech/economic_etherealization.png trunk/FreeOrion/default/data/art/icons/tech/enclave_of_the_void.png trunk/FreeOrion/default/data/art/icons/tech/paradise_planet.png trunk/FreeOrion/default/data/art/icons/tech/transforming_structures.png Added: trunk/FreeOrion/default/data/art/icons/tech/collective_thought_network.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/icons/tech/collective_thought_network.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/FreeOrion/default/data/art/icons/tech/controlled_gravity_architecture.png =================================================================== (Binary files differ) Added: trunk/FreeOrion/default/data/art/icons/tech/controlled_gravity_wells.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/icons/tech/controlled_gravity_wells.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/FreeOrion/default/data/art/icons/tech/economic_etherealization.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/icons/tech/economic_etherealization.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/FreeOrion/default/data/art/icons/tech/enclave_of_the_void.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/icons/tech/enclave_of_the_void.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/FreeOrion/default/data/art/icons/tech/fusion_plants.png =================================================================== (Binary files differ) Added: trunk/FreeOrion/default/data/art/icons/tech/paradise_planet.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/icons/tech/paradise_planet.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/FreeOrion/default/data/art/icons/tech/transforming_structures.png =================================================================== (Binary files differ) Property changes on: trunk/FreeOrion/default/data/art/icons/tech/transforming_structures.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/FreeOrion/default/techs.txt =================================================================== --- trunk/FreeOrion/default/techs.txt 2008-04-15 10:55:47 UTC (rev 2492) +++ trunk/FreeOrion/default/techs.txt 2008-04-15 19:37:08 UTC (rev 2493) @@ -316,7 +316,7 @@ researchturns = 1 prerequisites = "LRN_PHYS_BRAIN" unlock = Item type = Building name = "BLD_COLLECTIVE_NET" - graphic = "" + graphic = "icons/tech/collective_thought_network.png" Tech name = "LRN_DISTRIB_THOUGHT" @@ -352,7 +352,7 @@ researchturns = 1 prerequisites = "LRN_MIND_VOID" unlock = Item type = Building name = "BLD_ENCLAVE_VOID" - graphic = "" + graphic = "icons/tech/enclave_of_the_void.png" Tech name = "LRN_LOOKING_GLASS" @@ -1338,7 +1338,7 @@ "CON_ORGANIC_STRC" ] unlock = [] - graphic = "" + graphic = "icons/tech/transforming_structures.png" Tech name = "CON_ARCH_MONOFILS" @@ -1408,7 +1408,7 @@ "LRN_GRAVITONICS" ] unlock = [] - graphic = "" + graphic = "icons/tech/controlled_gravity_architecture.png" Tech name = "CON_GAL_INFRA" @@ -1526,7 +1526,7 @@ researchturns = 1 prerequisites = "CON_CONTGRAV_ARCH" unlock = Item type = Building name = "BLD_GRAVITY_WELLS" - graphic = "" + graphic = "icons/tech/controlled_gravity_wells.png" Tech name = "CON_MEGALITH" @@ -1861,7 +1861,7 @@ SetMaxTrade value = Target.MaxTrade + 5 SetMaxConstruction value = Target.MaxConstruction - 2 ] - graphic = "" + graphic = "icons/tech/economic_etherealization.png" Tech name = "ECO_PARADISE" @@ -1873,7 +1873,7 @@ researchturns = 1 prerequisites = "ECO_ENV_ADAPTION" unlock = Item type = Building name = "BLD_PARADISE" - graphic = "" + graphic = "icons/tech/paradise_planet.png" Tech name = "ECO_SINKHOLE" |