From 839918d822550c37245829bcddfaa7b678b68812 Mon Sep 17 00:00:00 2001 From: "st.pa" Date: Thu, 6 Jan 2022 19:16:09 +0100 Subject: [PATCH] =?UTF-8?q?-=20adding=20Nymmmn-description=20as=20per=20ht?= =?UTF-8?q?tps://github.com/freeorion/freeorion/issues/3207=20-=20degender?= =?UTF-8?q?ing=20the=20Raaagh-description=20(he=20->=20it/they)=20-=20typo?= =?UTF-8?q?=20corrections=20in=20existing=20texts=20-=20beautifications=20?= =?UTF-8?q?of=20species-descriptions-tooltips=20/=20pedia-pages:=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20--=20less=20wrapped=20lines=20->=20easier=20r?= =?UTF-8?q?eadable=20in=20game=20start=20screen=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?--=20added=20a=20neutral=20symbol=20o=20to=20preexisting=20posi?= =?UTF-8?q?tive=20+=20and=20negative=20-=20=20=20=20=20=20=20=20=20--=20ad?= =?UTF-8?q?ded=20nonprintable=20=E2=88=98=20character=20to=20facilitate=20?= =?UTF-8?q?search/replace=20for=20o=E2=88=98=20-=20applied=20patch=20from?= =?UTF-8?q?=20https://github.com/freeorion/freeorion/issues/2304=20-->=20m?= =?UTF-8?q?ore=20elaborate=20noob-greetings=20(with=20minor=20typo=20and?= =?UTF-8?q?=20style=20adjustments)=20-=20make=20pedia=20page=20'Building?= =?UTF-8?q?=20Types'=20a=20little=20less=20redundant=20by=20removing=20spe?= =?UTF-8?q?cies'=20colonies=20-->=20see=20also=20https://github.com/freeor?= =?UTF-8?q?ion/freeorion/issues/3579?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- UI/EncyclopediaDetailPanel.cpp | 2 +- default/scripting/species/SP_LAENFA.focs.txt | 1 + default/scripting/species/SP_NYMNMN.focs.txt | 2 +- default/stringtables/en.txt | 109 ++++++++++++------- 4 files changed, 75 insertions(+), 39 deletions(-) diff --git a/UI/EncyclopediaDetailPanel.cpp b/UI/EncyclopediaDetailPanel.cpp index 66612ad419f..caaa894772d 100644 --- a/UI/EncyclopediaDetailPanel.cpp +++ b/UI/EncyclopediaDetailPanel.cpp @@ -260,7 +260,7 @@ namespace { } else if (dir_name == "ENC_BUILDING_TYPE") { for (const auto& [building_name, building_type] : GetBuildingTypeManager()) { - if (!exclude_custom_categories_from_dir_name || DetermineCustomCategory(building_type->Tags()).empty()) { + if (!boost::starts_with(building_name,"BLD_COL_") && (!exclude_custom_categories_from_dir_name || DetermineCustomCategory(building_type->Tags()).empty())) { auto& us_name{UserString(building_name)}; retval.emplace( us_name, diff --git a/default/scripting/species/SP_LAENFA.focs.txt b/default/scripting/species/SP_LAENFA.focs.txt index 480a86cb89b..02e9fc366ea 100644 --- a/default/scripting/species/SP_LAENFA.focs.txt +++ b/default/scripting/species/SP_LAENFA.focs.txt @@ -44,6 +44,7 @@ Species // replenish fuel in suitably coloured star systems EffectsGroup + description = "PHOTOTROP_DESC" scope = Source activation = And [ Ship diff --git a/default/scripting/species/SP_NYMNMN.focs.txt b/default/scripting/species/SP_NYMNMN.focs.txt index 0adc7633a09..dea3c5bf9e5 100644 --- a/default/scripting/species/SP_NYMNMN.focs.txt +++ b/default/scripting/species/SP_NYMNMN.focs.txt @@ -14,7 +14,7 @@ Species [[HAS_ADVANCED_FOCI]] ] - likes = ["BLD_NEUTRONIUM_SYNTH" "BLD_NEUTRONIUM_FORGE" "BLD_NEUTRONIUM_EXTRACTOR" "POSITRONIUM_SPECIAL" "MONOPOLE_SPECIAL" "MINERALS_SPECIAL" ] + likes = ["BLD_NEUTRONIUM_SYNTH" "BLD_NEUTRONIUM_FORGE" "BLD_NEUTRONIUM_EXTRACTOR" "POSITRONIUM_SPECIAL" "MONOPOLE_SPECIAL" "MINERALS_SPECIAL" "PANOPTICON_SPECIAL" ] dislikes = ["PLC_DESIGN_SIMPLICITY" "FRACTAL_GEODES_SPECIAL" "SPARK_FOSSILS_SPECIAL" "BLD_GAS_GIANT_GEN" "BLD_SOL_ORB_GEN" "BLD_SOL_ACCEL" "BLD_GAS_GIANT_GEN" "BLD_SPATIAL_DISTORT_GEN" "ECCENTRIC_ORBIT_SPECIAL" "FORTRESS_SPECIAL" "GAIA_SPECIAL" ] effectsgroups = [ diff --git a/default/stringtables/en.txt b/default/stringtables/en.txt index fff60f172bc..49a6ab91c9a 100644 --- a/default/stringtables/en.txt +++ b/default/stringtables/en.txt @@ -6646,27 +6646,37 @@ GREETINGS_INTRO Greetings Esteemed Entity, and Welcome to the FreeOrion Universe! GREETINGS_GUIDE_REFERENCE -Newcomers to this universe may particularly wish to consult the [[encyclopedia QUICK_START_GUIDE_TITLE]]. +To help you understand how these three areas of government - ships, planets, and research - are managed in your empire, please have a look at the [[encyclopedia QUICK_START_GUIDE_TITLE]] which we have prepared for you. GREETINGS_GUIDE_TEXT '''[[GREETINGS_INTRO]] -[[DETAILED_PEDIA_REFERENCE]] +You may be as surprised as we are, but you have just been elected Emperor of our new-founded empire. You certainly can't wait to command our fleet of spaceships, to direct our research, and to govern our worlds... Oh well, admittedly our one and only world so far, but that's likely among the things you came here to change, isn't it? + [[GREETINGS_GUIDE_REFERENCE]] FreeOrion is a free, open source, turn-based space empire and galactic conquest (4X) computer game being designed and built by the FreeOrion project. FreeOrion is inspired by the tradition of the Master of Orion games, but is not a clone or remake of that series or any other game. -Further information is available at freeorion.org -''' +Further information is available at freeorion.org''' QUICK_START_GUIDE_TITLE **Quick Start Guide** QUICK_START_GUIDE_TEXT -'''This is a brief introduction to FreeOrion gameplay. A somewhat less brief Quick Play Guide is available at freeorion.org (current URL: freeorion.org/index.php/V0.4_Quick_Play_Guide ). +'''So, you are our new Emperor? Welcome, it is about time you showed up! + +We heard about three urgent problems that we need your help with. + +1. All our starships are currently idle, orbiting our home world. In the [[encyclopedia MAP_WINDOW_ARTICLE_TITLE]] right in front of you, you can see our star map, with our home system highlighted in the center, and if you look closely, you may even be able to see the ships next to it - a bit up and to the right. Yes, you are right, a handful of ships looks tiny on a star map. Anyway, your captains are unsure what the ships should do and they ask for your commands. Please have a brief look at our instructions for [[encyclopedia FLEET_MOVEMENT_ARTICLE_TITLE]], decide where each ship should go, then come back here to address the second area we need help with. + +2. Industry on our home planet has come to a grinding halt because people have no idea what to manufacture next, and they ask for your advice. Please click on the red cogwheel in the title bar, schedule one or more entries from the list of "Producible Items" for construction by double-clicking on them, then come back here by clicking the red cogwheel again and the purple question mark in the top right corner. Later on, you may want to study our description of the [[encyclopedia PRODUCTION_WINDOW_ARTICLE_TITLE]] to efficiently supervise the industry on your planets. -[[DETAILED_PEDIA_REFERENCE]] -Important sections include [[encyclopedia CATEGORY_GAME_CONCEPTS]], [[encyclopedia CATEGORY_GUIDES]], and the [[encyclopedia ENC_METER_TYPE]] list. +3. Our researchers are eager for new knowledge, but they are unsure which topics they should focus on, and they ask for your priorities. Please click on the blue Erlenmeyer flask in the title bar and select one or more research topics by double-clicking them, then click the blue flask again (or hit the Escape key) to come back here for final instructions. You may want to start with a topic from the left column - or you may inadvertently trigger elaborate research programs that take long times to complete... + +So you've finally made your decisions about all three areas – fleet movement, production, and research? Excellent, now everybody knows what to do for some time without constantly requiring your input. Now you can click the "Turn" button in the upper left corner to confirm and send out the orders you just wrote down. And then, you can relax, your work is done for this rotation... The Empire Intelligence Agency will contact you again, telling you about the results of your orders and about new events that require your attention, by sending you new sets of situation reports. Whenever new reports arrive, it is time for you to review and possibly amend your orders. + + +This is a brief introduction to FreeOrion gameplay. A somewhat less brief Quick Play Guide is available at freeorion.org (current URL: freeorion.org/index.php/V0.4_Quick_Play_Guide). ''' SITREP_IGNORE_BLOCK_TITLE @@ -7197,7 +7207,9 @@ SITREP_SHOWALL_TEMPLATES Show all blocked SitReps SITREP_WELCOME -[[encyclopedia GREETINGS_GUIDE_TITLE]] [[GREETINGS_GUIDE_REFERENCE]] +'''[[encyclopedia GREETINGS_GUIDE_TITLE]] [[GREETINGS_INTRO]] +If you are a newcomer to this universe, please click on the word "[[GREETINGS_GUIDE_TITLE]]" to help us get you started. +''' SITREP_WELCOME_LABEL Welcome @@ -8343,7 +8355,6 @@ SP_LAENFA_GAMEPLAY_DESC ''' Sneaky, telepathic, sentient vines. Prefer [[PT_OCEAN]] planets. -Ships regenerate 1 fuel per turn at white stars, and 2 fuel per turn a blue stars. [[encyclopedia PHOTOTROPHIC_SPECIES_TITLE]], [[encyclopedia TELEPATHIC_TITLE]] ''' @@ -8629,7 +8640,12 @@ Prefer [[PT_DESERT]] planets. ''' SP_NYMNMN_DESC -'''''' +'''Description: +Their ancestral desert world's environment posseses an extremely unlikely combination of fractally recurring storm patterns in the upper ionosphere, paired with constant static electrical discharges produced by solar tides from its neighbouring star system, which enabled the early development of self-replicating electromagnetic wavelets. These wavelets are comparable to the ancient precursors of single celled organisms and continued to evolve into more and more complex wafers over the eons. Since they can only exist in a quite narrow spectral band, there was never much room for the analogue of biodiversity – every more advanced developmental stage totally consumed its predecessors in order to be able to exist at all. + +Social Structure: +Today's nymnmnian society is mainly preoccupied with reviewing and rating, archiving and cataloguing old tv shows and other entertainment broadcasts from foreign civilizations. They can not do otherwise, because those broadcasts touch the very essence of their beings – all their life is a non-stop binge-watching marathon if they want to or not. In consequence, they are the absolute masters of movie mockery in all the galaxies. +''' SP_TRENCHERS Trenchers @@ -8642,7 +8658,10 @@ Prefer [[PT_BARREN]] planets. ''' SP_TRENCHERS_DESC +'''Description: +Coming soon. +''' SP_RAAAGH Raaagh @@ -8654,7 +8673,7 @@ Prefer [[PT_TERRAN]] planets. ''' SP_RAAAGH_DESC -'''The Raaagh are 1.5 meter tall stripe-furred bipeds. The body is held leaning forward at 45 degrees, leaving the fanged jaws, and clawed arms free to fight, build or capture prey. Triangular ears and slit pupils give a cat-like appearance. The tiny young hatch from a clutch of a dozen eggs at once. Little care or attention is paid to the young at this stage - they must survive on their own competing against their siblings for hiding places and stealing food like vermin. After three years usually only one is left, and the surviving young begin to learn to speak. This suddenly activates parental instincts, and the survivor is carefully raised as a member of the Pride. +'''The Raaagh are 1.5 meter tall stripe-furred bipeds. The body is held leaning forward at 45 degrees, leaving the fanged jaws and clawed arms free to fight, build or capture prey. Triangular ears and slit pupils give a cat-like appearance. The tiny young hatch from a clutch of a dozen eggs at once. Little care or attention is paid to the young at this stage – they must survive on their own, competing against their siblings for hiding places and stealing food like vermin. After three years usually only one is left, and the surviving young begin to learn to speak. This suddenly activates parental instincts, and the survivor is carefully raised as a member of the Pride. Personality: Extreme territoriality is the Raaagh's most distinctive trait, woven throughout their daily lives and culture. Related to that is a preference for the familiar and known. Curiosity is minimal, which probably explains their stone age technology. @@ -8663,7 +8682,7 @@ Homeworld: The Raaagh homeworld is of the Terran type. Sea and land are more or less evenly spread out, with the largest continent covering only 4% of planet's surface. The many small continents and large islands encourage a territorial attitude. Reason for Staying: -There's not bit of land big enough for an individual Raaagh to live on that hasn't been fought over for centuries. The genetic compulsion of a Raaagh is to guard his territory with his life, and when possible to expand into adjacent land. Abandoning one's territory is inconceivable, and a Raaagh forcibly removed from his territory goes violently insane. +There's no bit of land big enough for an individual Raaagh to live on that hasn't been fought over for centuries. The genetic compulsion of a Raaagh is to guard its territory with their life, and when possible to expand into adjacent land. Abandoning one's territory is inconceivable, and a Raaagh forcibly removed from their territory goes violently insane. ''' SP_BEIGEGOO @@ -16365,7 +16384,7 @@ BAD_INDUSTRY_DESC − Bad [[metertype METER_INDUSTRY]]: 75% AVERAGE_INDUSTRY_DESC -''' Average [[metertype METER_INDUSTRY]]: 100%''' +••∘ Average [[metertype METER_INDUSTRY]]: 100% GOOD_INDUSTRY_DESC + Good [[metertype METER_INDUSTRY]]: 150% @@ -16386,7 +16405,7 @@ BAD_RESEARCH_DESC − Bad [[metertype METER_RESEARCH]]: 75% AVERAGE_RESEARCH_DESC -''' Average [[metertype METER_RESEARCH]]: 100%''' +••∘ Average [[metertype METER_RESEARCH]]: 100% GOOD_RESEARCH_DESC + Good [[metertype METER_RESEARCH]]: 150% @@ -16407,7 +16426,7 @@ BAD_INFLUENCE_DESC − Bad [[metertype METER_INFLUENCE]]: 75% AVERAGE_INFLUENCE_DESC -''' Average [[metertype METER_INFLUENCE]]: 100%''' +••∘ Average [[metertype METER_INFLUENCE]]: 100% GOOD_INFLUENCE_DESC + Good [[metertype METER_INFLUENCE]]: 150% @@ -16422,7 +16441,7 @@ BAD_HAPPINESS_DESC − Bad [[metertype METER_HAPPINESS]]: [[value BAD_HAPPINESS_VAL]] AVERAGE_HAPPINESS_DESC -''' Average [[metertype METER_HAPPINESS]]: +0''' +••∘ Average [[metertype METER_HAPPINESS]]: +0 GOOD_HAPPINESS_DESC + Good [[metertype METER_HAPPINESS]]: +[[value GOOD_HAPPINESS_VAL]] @@ -16440,7 +16459,7 @@ BAD_DEFENSE_TROOPS_DESC − Bad Defensive Ground [[metertype METER_TROOPS]]: 50% AVERAGE_DEFENSE_TROOPS_DESC -''' Average Defensive Ground [[metertype METER_TROOPS]]: 100%''' +••∘ Average Defensive Ground [[metertype METER_TROOPS]]: 100% GOOD_DEFENSE_TROOPS_DESC + Good Defensive Ground [[metertype METER_TROOPS]]: 150% @@ -16452,7 +16471,7 @@ ULTIMATE_DEFENSE_TROOPS_DESC +++ Ultimate Defensive Ground [[metertype METER_TROOPS]]: 300% ANCIENT_DEFENSE_TROOPS_DESC -+++ Ancient Defensive Ground [[metertype METER_TROOPS]]: 10 per [[metertype METER_POPULATION]] ++++ Ancient Defensive Ground [[metertype METER_TROOPS]]: +10 per [[metertype METER_POPULATION]] NO_OFFENSE_TROOPS_DESC −−− No Offensive Ground [[metertype METER_TROOPS]] @@ -16461,7 +16480,7 @@ BAD_OFFENSE_TROOPS_DESC − Bad Offensive Ground [[metertype METER_TROOPS]]: 50% AVERAGE_OFFENSE_TROOPS_DESC -''' Average Offensive Ground [[metertype METER_TROOPS]]: 100%''' +••∘ Average Offensive Ground [[metertype METER_TROOPS]]: 100% GOOD_OFFENSE_TROOPS_DESC + Good Offensive Ground [[metertype METER_TROOPS]]: 150% @@ -16488,7 +16507,7 @@ BAD_STEALTH_DESC − Bad Planetary [[metertype METER_STEALTH]]: −20 malus AVERAGE_STEALTH_DESC -''' Average Planetary [[metertype METER_STEALTH]]''' +••∘ Average Planetary [[metertype METER_STEALTH]] GOOD_STEALTH_DESC + Good Planetary [[metertype METER_STEALTH]]: +20 bonus @@ -16500,26 +16519,30 @@ ULTIMATE_STEALTH_DESC +++ Ultimate Planetary [[metertype METER_STEALTH]]: +60 bonus BAD_WEAPONS_DESC -− Bad Pilots: Base damage per ship weapon reduced by one level. +− Bad Pilots: weapon damage reduced by one level GOOD_WEAPONS_DESC -+ Good Pilots: Base damage per ship weapon increased by one level. ++ Good Pilots: weapon damage increased by one level GREAT_WEAPONS_DESC -++ Great Pilots: Base damage per ship weapon increased by two levels. +++ Great Pilots: weapon damge increased by two levels ULTIMATE_WEAPONS_DESC -+++ Ultimate Pilots: Base damage per ship weapon increased by three levels. ++++ Ultimate Pilots: weapon damage increased by three levels +PHOTOTROP_DESC ++ Refuel 1.0 per turn at White and 2.0 at Blue Stars + +# 0.1 natural ramscoop-refuelling + 0.1 additional gaseous refueling = 0.2 q.e.d. GASEOUS_DESC '''+ Live on Gas Giants -+ Refuel on Gas Giants 0.1''' ++ Refuel on Gas Giants 0.2 per turn''' BAD_POPULATION_DESC − Bad [[metertype METER_POPULATION]]: 75% AVERAGE_POPULATION_DESC -''' Average [[metertype METER_POPULATION]]: 100%''' +••∘ Average [[metertype METER_POPULATION]]: 100% GOOD_POPULATION_DESC + Good [[metertype METER_POPULATION]]: 125% @@ -16534,7 +16557,7 @@ BAD_SUPPLY_DESC − Bad [[metertype METER_SUPPLY]]: no bonus AVERAGE_SUPPLY_DESC -''' Average [[metertype METER_SUPPLY]]: +1''' +••∘ Average [[metertype METER_SUPPLY]]: +1 GREAT_SUPPLY_DESC + Great [[metertype METER_SUPPLY]]: +2 @@ -16549,7 +16572,7 @@ BAD_STOCKPILE_DESC − Bad [[metertype METER_STOCKPILE]]: +0.01 per [[metertype METER_POPULATION]] AVERAGE_STOCKPILE_DESC -''' Average [[metertype METER_STOCKPILE]]: +0.02 per [[metertype METER_POPULATION]]''' +••∘ Average [[metertype METER_STOCKPILE]]: +0.02 per [[metertype METER_POPULATION]] GOOD_STOCKPILE_DESC + Good [[metertype METER_STOCKPILE]]: +0.06 per [[metertype METER_POPULATION]] @@ -16573,10 +16596,10 @@ GOOD_PLANETARY_DEFENSE_DESC + Good planetary [[metertype METER_DEFENSE]]: +5 BROAD_EP_DESC -+ Broad Planet Tolerance: can tolerate more types. ++ Broad Planet Tolerance: can tolerate more types NARROW_EP_DESC -−− Narrow Planet Tolerance: flourishes on fewer types. +−− Narrow Planet Tolerance: flourishes on fewer types FAST_COLONIZATION_DESC + Fast Colonization: -25% time to build colonies @@ -16591,7 +16614,7 @@ BAD_FUEL_DESC − Bad Maximum [[metertype METER_FUEL]]: -0.5 AVERAGE_FUEL_DESC -''' Average Maximum [[metertype METER_FUEL]]: +0''' +••∘ Average Maximum [[metertype METER_FUEL]]: +0 GOOD_FUEL_DESC + Good Maximum [[metertype METER_FUEL]]: +0.5 @@ -16603,19 +16626,26 @@ ULTIMATE_FUEL_DESC +++ Ultimate Maximum [[metertype METER_FUEL]]: +1.5 GREAT_ASTEROID_INDUSTRY_DESC -+ Good Asteroid Miners: + 0.2 [[metertype METER_INDUSTRY]] per [[metertype METER_POPULATION]] when Industry Focused in systems with owned asteroid belts. +'''+ Good Asteroid Miners: + + 0.2 [[metertype METER_INDUSTRY]] per [[metertype METER_POPULATION]] when + Industry Focused in systems with owned asteroid belts.''' LIGHT_SENSITIVE_DESC -− Light Sensitive: [[metertype METER_POPULATION]] is reduced in systems with [[STAR_BLUE]] and to a lesser extend [[STAR_WHITE]] stars. +'''− Light Sensitive: [[metertype METER_POPULATION]] is reduced‚ + in systems with [[STAR_BLUE]] and to + a lesser extent [[STAR_WHITE]] stars.''' TELEPATHIC_DETECTION_DESC -+ Telepathic Detection: can sense nearby populated planets. +'''+ Telepathic Detection: can sense + nearby populated planets''' PRECOGNITIVE_DETECTION_DESC -+ Procognitive Detection: can sense starlane connected planets. +'''+ Precognitive Detection: can sense + starlane connected planets''' COMMUNAL_VISION_DESC -''' Communal Vision: shares visibility within the same species.''' +'''••∘ Communal Vision: shares visibility within the + same species regardless of affiliation''' ## @@ -17306,7 +17336,7 @@ Invincible''' AI_SHIPDESIGN_NAME_INVALID Invalid Design -# Newline separated list of military ship names owned by AIs. +# Newline separated list of military ship names owned by AIs. { # The usage is determined by a rating defined inside the AI scripts. The names # are roughly ordered by order of appearance in the game. AI_SHIPDESIGN_NAME_MILITARY @@ -17329,6 +17359,7 @@ Hades Nemesis Zeus''' +# } # Newline separated list of local troop transporter names owned by AIs. # The usage is determined by a rating defined inside the AI scripts. The names # are roughly ordered by order of appearance in the game. @@ -18307,6 +18338,7 @@ Grail Gram Gray Grian +Gromphlamm Grotto Grue Gruis @@ -18353,6 +18385,7 @@ Hepsjot Hera Herbert Herbig +Hermelin Hercules Herculis Herschel @@ -19435,6 +19468,7 @@ Dromedary Dugong Elephant Elk +Ermine Fennec Ferret Fox @@ -20832,6 +20866,7 @@ Dalton Descartes Dirac Doppler +Drosten Edison Einstein Euler