Ticket #4669: changes_4669.patch

File changes_4669.patch, 13.3 KB (added by Happy Concepts, 5 years ago)

Patch refs #4669

  • binaries/data/mods/public/gui/credits/texts/programming.json

     
    11{
    22    "Title": "Programming",
    33    "Content": [
    44    {
    55        "Title": "Programming managers",
    66        "List": [
    77            {"nick": "Acumen", "name": "Stuart Walpole"},
    88            {"nick": "Dak Lozar", "name": "Dave Loeser"},
    99            {"nick": "h20", "name": "Daniel Wilhelm"},
    1010            {"nick": "Janwas", "name": "Jan Wassenberg"},
    1111            {"nick": "Raj", "name": "Raj Sharma"}
    1212        ]
    1313    },
    1414    {
    1515        "Subtitle": "Special thanks to",
    1616        "List": [
    1717            {"nick": "Ykkrosh", "name": "Philip Taylor"},
    1818            {"nick": "leper", "name": "Georg Kilzer"}
    1919        ]
    2020    },
    2121    {
    2222        "List": [
    2323            {"nick": "01d55"},
    2424            {"nick": "Acumen", "name": "Stuart Walpole"},
    2525            {"name": "Adrian Fatol"},
    2626            {"nick": "AI-Amsterdam"},
    2727            {"nick": "Alan", "name": "Alan Kemp"},
    2828            {"nick": "aBothe", "name": "Alexander Bothe"},
    2929            {"nick": "alpha123", "name": "Peter P. Cannici"},
    3030            {"nick": "andy5995", "name": "Andy Alt"},
    3131            {"nick": "Angen"},
    3232            {"nick": "ArnH", "name": "Arno Hemelhof"},
    3333            {"nick": "Aurium", "name": "Aurélio Heckert"},
    3434            {"nick": "badmadblacksad", "name": "Martin F"},
    3535            {"name": "Mikołaj \"Bajter\" Korcz"},
    3636            {"nick": "bb", "name": "Bouke Jansen"},
    3737            {"nick": "Ben", "name": "Ben Vinegar"},
    3838            {"nick": "Bird"},
    3939            {"nick": "Blue", "name": "Richard Welsh"},
    4040            {"nick": "bmwiedemann"},
    4141            {"nick": "boeseRaupe", "name": "Michael Kluge"},
    4242            {"nick": "bog_dan_ro", "name": "BogDan Vatra"},
    4343            {"nick": "Bonk", "name": "Christopher Ebbert"},
    4444            {"nick": "borg-", "name": "Estevan Borges Martins"},
    4545            {"nick": "Boudica"},
    4646            {"nick": "Caius", "name": "Lars Kemmann"},
    4747            {"nick": "Calefaction", "name": "Matt Holmes"},
    4848            {"nick": "Calvinh", "name": "Carl-Johan Höiby"},
    4949            {"nick": "causative", "name": "Bart Parkis"},
    5050            {"name": "Cédric Houbart"},
    5151            {"nick": "Chakakhan", "name": "Kenny Long"},
    5252            {"nick": "Clockwork-Muse", "name": "Stephen A. Imhoff"},
    5353            {"nick": "Cracker78", "name": "Chad Heim"},
    5454            {"nick": "Crynux", "name": "Stephen J. Fewer"},
    5555            {"nick": "cwprogger"},
    5656            {"nick": "Dak Lozar", "name": "Dave Loeser"},
    5757            {"nick": "dalerank", "name": "Sergey Kushnirenko"},
    5858            {"nick": "dan", "name": "Dan Strandberg"},
    5959            {"name": "Daniel Trevitz"},
    6060            {"nick": "DanCar", "name": "Daniel Cardenas"},
    6161            {"nick": "danger89", "name": "Melroy van den Berg"},
    6262            {"nick": "Dariost", "name": "Dario Ostuni"},
    6363            {"nick": "Dave", "name": "David Protasowski"},
    6464            {"nick": "dax", "name": "Dacian Fiordean"},
    6565            {"nick": "deebee", "name": "Deepak Anthony"},
    6666            {"nick": "Deiz"},
    6767            {"nick": "Dietger", "name": "Dietger van Antwerpen"},
    6868            {"nick": "dp304"},
    6969            {"nick": "dpiquet", "name": "Damien Piquet"},
    7070            {"nick": "dumbo"},
    7171            {"nick": "Dunedan", "name": "Daniel Roschka"},
    7272            {"nick": "dvangennip", "name": "Doménique"},
    7373            {"nick": "Echelon9", "name": "Rhys Kidd"},
    7474            {"nick": "echotangoecho"},
    7575            {"nick": "eihrul", "name": "Lee Salzman"},
    7676            {"nick": "elexis", "name": "Alexander Heinsius"},
    7777            {"nick": "EmjeR", "name": "Matthijs de Rijk"},
    7878            {"nick": "EMontana"},
    7979            {"nick": "ericb"},
    8080            {"nick": "evanssthomas", "name": "Evans Thomas"},
    8181            {"nick": "Evulant", "name": "Alexander S."},
    8282            {"nick": "fabio", "name": "Fabio Pedretti"},
    8383            {"nick": "falsevision", "name": "Mahdi Khodadadifard"},
    8484            {"nick": "fatherbushido", "name": "Nicolas Tisserand"},
    8585            {"nick": "fcxSanya", "name": "Alexander Olkhovskiy"},
    8686            {"nick": "FeXoR", "name": "Florian Finke"},
    8787            {"nick": "Fire Giant", "name": "Malte Schwarzkopf"},
    8888            {"name": "Fork AD"},
    8989            {"nick": "fpre", "name": "Frederick Stallmeyer"},
    9090            {"nick": "freenity", "name": "Anton Galitch"},
    9191            {"nick": "Gallaecio", "name": "Adrián Chaves"},
    9292            {"nick": "gbish (aka Iny)", "name": "Grant Bishop"},
    9393            {"nick": "Gee", "name": "Gustav Larsson"},
    9494            {"nick": "Gentz", "name": "Hal Gentz"},
    9595            {"nick": "gerbilOFdoom"},
    9696            {"nick": "godlikeldh"},
    9797            {"nick": "greybeard", "name": "Joe Cocovich"},
    9898            {"nick": "grillaz"},
    9999            {"nick": "Grugnas", "name": "Giuseppe Tranchese"},
    100100            {"nick": "gudo"},
    101101            {"nick": "Guuts", "name": "Matthew Guttag"},
    102102            {"name": "Samuel Guarnieri"},
    103103            {"nick": "Hannibal_Baraq", "name": "Clive Juhász S."},
    104104            {"nick": "Haommin"},
     105            {"nick": "happyconcepts", "name": "Ben Bird"},
    105106            {"nick": "h20", "name": "Daniel Wilhelm"},
    106107            {"nick": "historic_bruno", "name": "Ben Brian"},
    107108            {"nick": "idanwin"},
    108109            {"nick": "Imarok", "name": "J. S."},
    109110            {"nick": "infyquest", "name": "Vijay Kiran Kamuju"},
    110111            {"nick": "IronNerd", "name": "Matthew McMullan"},
    111112            {"nick": "Itms", "name": "Nicolas Auvray"},
    112113            {"nick": "Jaison", "name": "Marco tom Suden"},
    113114            {"nick": "jammus", "name": "James Scott"},
    114115            {"nick": "javiergodas", "name": "Javier Godas Vieitez"},
    115116            {"nick": "Jgwman"},
    116117            {"nick": "JonBaer", "name": "Jon Baer"},
    117118            {"nick": "Josh", "name": "Joshua J. Bakita"},
    118119            {"nick": "joskar", "name": "Johnny Oskarsson"},
    119120            {"nick": "jP_wanN", "name": "Jonas Platte"},
    120121            {"nick": "Jubalbarca", "name": "James Baillie"},
    121122            {"nick": "JubJub", "name": "Sebastian Vetter"},
    122123            {"nick": "jurgemaister"},
    123124            {"nick": "kabzerek", "name": "Grzegorz Kabza"},
    124125            {"nick": "Kai", "name": "Kai Chen"},
    125126            {"name": "Kareem Ergawy"},
    126127            {"nick": "kevmo", "name": "Kevin Caffrey"},
    127128            {"nick": "kezz", "name": "Graeme Kerry"},
    128129            {"nick": "kingadami", "name": "Adam Winsor"},
    129130            {"nick": "kingbasil", "name": "Giannis Fafalios"},
    130131            {"nick": "lafferjm", "name": "Justin Lafferty"},
    131132            {"nick": "LeanderH", "name": "Leander Hemelhof"},
    132133            {"nick": "leper", "name": "Georg Kilzer"},
    133134            {"nick": "LittleDev"},
    134135            {"nick": "livingaftermidnight", "name": "Will Dull"},
    135136            {"nick": "Louhike"},
    136137            {"nick": "lsdh"},
    137138            {"nick": "Ludovic", "name": "Ludovic Rousseau"},
    138139            {"nick": "madmax", "name": "Abhijit Nandy"},
    139140            {"nick": "madpilot", "name": "Guido Falsi"},
    140141            {"nick": "m0l0t0ph", "name": "Christoph Gielisch"},
    141142            {"nick": "markcho"},
    142143            {"nick": "MarkT", "name": "Mark Thompson"},
    143144            {"nick": "Markus"},
    144145            {"nick": "Matei", "name": "Matei Zaharia"},
    145146            {"nick": "Mate-86", "name": "Mate Kovacs"},
    146147            {"nick": "MattDoerksen", "name": "Matt Doerksen"},
    147148            {"nick": "mattlott", "name": "Matt Lott"},
    148149            {"nick": "maveric", "name": "Anton Protko"},
    149150            {"nick": "Micnasty", "name": "Travis Gorkin"},
    150151            {"nick": "mimo"},
    151152            {"nick": "mk12", "name": "Mitchell Kember"},
    152153            {"nick": "mmayfield45", "name": "Michael Mayfield"},
    153154            {"nick": "mmoanis", "name": "Mohamed Moanis"},
    154155            {"nick": "Molotov", "name": "Dario Alvarez"},
    155156            {"nick": "mpmoreti", "name": "Marcos Paulo Moreti"},
    156157            {"nick": "mreiland", "name": "Michael Reiland"},
    157158            {"nick": "myconid"},
    158159            {"nick": "nd3c3nt", "name": "Gavin Fowler"},
    159160            {"nick": "niektb", "name": "Niek ten Brinke"},
    160161            {"nick": "njm"},
    161162            {"nick": "NoMonkey", "name": "John Mena"},
    162163            {"nick": "notpete", "name": "Rich Cross"},
    163164            {"nick": "nwtour"},
    164165            {"nick": "odoaker", "name": "Ágoston Sipos"},
    165166            {"nick": "Offensive ePeen", "name": "Jared Ryan Bills"},
    166167            {"nick": "Ols", "name": "Oliver Whiteman"},
    167168            {"nick": "olsner", "name": "Simon Brenner"},
    168169            {"nick": "OptimusShepard", "name": "Pirmin Stanglmeier"},
    169170            {"nick": "otero"},
    170171            {"nick": "nani", "name": "S. N."},
    171172            {"nick": "Nescio"},
    172173            {"name": "Nick Owens"},
    173174            {"nick": "Palaxin", "name": "David A. Freitag"},
    174175            {"name": "Paul Withers"},
    175176            {"nick": "paulobezerr", "name": "Paulo George Gomes Bezerra"},
    176177            {"nick": "pcpa", "name": "Paulo Andrade"},
    177178            {"nick": "Pendingchaos"},
    178179            {"nick": "PeteVasi", "name": "Pete Vasiliauskas"},
    179180            {"nick": "pilino1234"},
    180181            {"nick": "PingvinBetyar", "name": "Schronk Tamás"},
    181182            {"nick": "plugwash", "name": "Peter Michael Green"},
    182183            {"nick": "Polakrity"},
    183184            {"nick": "Poya", "name": "Poya Manouchehri"},
    184185            {"name": "Quentin Pradet"},
    185186            {"nick": "prefect", "name": "Nicolai Hähnle"},
    186187            {"nick": "pstumpf", "name": "Pascal Stumpf"},
    187188            {"name": "André Puel"},
    188189            {"nick": "Prodigal Son"},
    189190            {"nick": "pyrolink", "name": "Andrew Decker"},
    190191            {"nick": "quantumstate", "name": "Jonathan Waller"},
    191192            {"nick": "QuickShot", "name": "Walter Krawec"},
    192193            {"nick": "quonter"},
    193194            {"nick": "qwertz"},
    194195            {"nick": "Radagast"},
    195196            {"nick": "Raj", "name": "Raj Sharma"},
    196197            {"nick": "rapidelectron", "name": "Christian Weihsbach"},
    197198            {"nick": "RedFox", "name": "Jorma Rebane"},
    198199            {"nick": "RefinedCode"},
    199200            {"nick": "Riemer"},
    200201            {"name": "Rolf Sievers"},
    201202            {"nick": "s0600204", "name": "Matthew Norwood"},
    202203            {"nick": "sacha_vrand", "name": "Sacha Vrand"},
    203204            {"nick": "SafaAlfulaij"},
    204205            {"nick": "Sandarac"},
    205206            {"nick": "sanderd17", "name": "Sander Deryckere"},
    206207            {"nick": "sathyam", "name": "Sathyam Vellal"},
    207208            {"nick": "sbirmi", "name": "Sharad Birmiwal"},
    208209            {"nick": "sbte", "name": "Sven Baars"},
    209210            {"nick": "scroogie", "name": "André Gemünd"},
    210211            {"nick": "scythetwirler", "name": "Casey X."},
    211212            {"nick": "serveurix"},
    212213            {"nick": "Shane", "name": "Shane Grant"},
    213214            {"nick": "shh"},
    214215            {"nick": "Silk", "name": "Josh Godsiff"},
    215216            {"nick": "silure"},
    216217            {"nick": "Simikolon", "name": "Yannick & Simon"},
    217218            {"nick": "smiley", "name": "M. L."},
    218219            {"nick": "Spahbod", "name": "Omid Davoodi"},
    219220            {"nick": "stanislas69", "name": "Stanislas Dolcini"},
    220221            {"nick": "Stefan"},
    221222            {"nick": "stilz", "name": "Sławomir Zborowski"},
    222223            {"nick": "stwf", "name": "Steven Fuchs"},
    223224            {"nick": "svott", "name": "Sven Ott"},
    224225            {"nick": "t4nk004"},
    225226            {"nick": "tbm", "name": "Martin Michlmayr"},
    226227            {"nick": "tau"},
    227228            {"nick": "Teiresias"},
    228229            {"nick": "temple"},
    229230            {"nick": "texane"},
    230231            {"nick": "thamlett", "name": "Timothy Hamlett"},
    231232            {"nick": "thedrunkyak", "name": "Dan Fuhr"},
    232233            {"nick": "TrinityDeath", "name": "Jethro Lu"},
    233234            {"nick": "triumvir", "name": "Corin Schedler"},
    234235            {"nick": "trompetin17", "name": "Juan Guillermo"},
    235236            {"nick": "user1", "name": "A. C."},
    236237            {"nick": "usey11"},
    237238            {"nick": "vincent_c", "name": "Vincent Cheng"},
    238239            {"nick": "vladislavbelov", "name": "Vladislav Belov"},
    239240            {"nick": "vts", "name": "Jeroen DR"},
    240241            {"nick": "WhiteTreePaladin", "name": "Brian Ashley"},
    241242            {"nick": "wraitii", "name": "Lancelot de Ferrière le Vayer"},
    242243            {"nick": "Xentelian", "name": "Mark Strawson"},
    243244            {"nick": "Xienen", "name": "Dayle Flowers"},
    244245            {"nick": "xtizer", "name": "Matt Green"},
    245246            {"nick": "yashi", "name": "Yasushi Shoji"},
    246247            {"nick": "Ykkrosh", "name": "Philip Taylor"},
    247248            {"nick": "Yves"},
    248249            {"nick": "Zeusthor", "name": "Jeffrey Tavares"},
    249250            {"nick": "zoot"},
    250251            {"nick": "zsol", "name": "Zsolt Dollenstein"},
    251252            {"nick": "ztamas", "name": "Tamas Zolnai"},
    252253            {"nick": "Zyi", "name": "Charles De Meulenaer"}
    253254        ]
    254255    }
    255256    ]
    256257}

  • binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml

     
    11<?xml version="1.0" encoding="utf-8"?>
    22<Entity parent="template_structure_resource">
    33  <Armour>
    44    <Hack>15</Hack>
    55    <Pierce>40</Pierce>
    66    <Crush>5</Crush>
    77  </Armour>
    88  <BuildRestrictions>
    99    <Category>Field</Category>
    1010  </BuildRestrictions>
    1111  <Cost>
    1212    <BuildTime>50</BuildTime>
    1313    <Resources>
    1414      <wood>100</wood>
    1515    </Resources>
    1616  </Cost>
    1717  <Footprint>
    1818    <Square width="28.0" depth="28.0"/>
    1919    <Height>2.0</Height>
    2020  </Footprint>
    2121  <Health>
    2222    <Max>250</Max>
    2323    <SpawnEntityOnDeath>decay|rubble/rubble_field</SpawnEntityOnDeath>
    2424  </Health>
    2525  <Identity>
    2626    <GenericName>Field</GenericName>
    2727    <VisibleClasses datatype="tokens">Field</VisibleClasses>
    28     <Tooltip>Harvest vegetables for food. Max gatherers: 5.</Tooltip>
     28    <Tooltip>Up to 5 units may harvest vegetables for food from each field (but at reduced efficiency).</Tooltip>
    2929    <Icon>structures/field.png</Icon>
    3030  </Identity>
    3131  <Loot>
    3232    <food>50</food>
    3333    <wood>0</wood>
    3434  </Loot>
    3535  <Minimap>
    3636    <Color r="119" g="82" b="46"/>
    3737  </Minimap>
    3838  <Obstruction>
    3939    <Static width="22.0" depth="22.0"/>
    4040    <BlockMovement>false</BlockMovement>
    4141    <BlockPathfinding>false</BlockPathfinding>
    4242  </Obstruction>
    4343  <ProductionQueue disable=""/>
    4444  <RallyPoint disable=""/>
    4545  <ResourceSupply>
    4646    <KillBeforeGather>false</KillBeforeGather>
    4747    <Amount>Infinity</Amount>
    4848    <Type>food.grain</Type>
    4949    <MaxGatherers>5</MaxGatherers>
    5050    <DiminishingReturns>0.90</DiminishingReturns>
    5151  </ResourceSupply>
    5252  <Sound>
    5353    <SoundGroups>
    5454      <select>interface/select/building/sel_field.xml</select>
    5555      <constructed>interface/complete/building/complete_field.xml</constructed>
    5656      <death>attack/destruction/building_collapse_large.xml</death>
    5757    </SoundGroups>
    5858  </Sound>
    5959  <StatusBars>
    6060    <HeightOffset>8.0</HeightOffset>
    6161  </StatusBars>
    6262  <TerritoryDecay>
    6363    <DecayRate>5.0</DecayRate>
    6464  </TerritoryDecay>
    6565  <Vision>
    6666    <Range>0</Range>
    6767  </Vision>
    6868  <VisualActor>
    6969    <Actor>structures/plot_field_3D_8x8.xml</Actor>
    7070    <FoundationActor>structures/plot_field_found.xml</FoundationActor>
    7171    <SelectionShape>
    7272      <Footprint/>
    7373    </SelectionShape>
    7474  </VisualActor>
    7575</Entity>