Trees Pull Request #5
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
s0600204
reviewed
Jun 7, 2023
There was a problem hiding this comment.
A lot of these read as descriptions (for which the <Description> tag would be better) rather than histories. Anyway...
- Be consistent with abbreviations. In some places you've used
ft, in others, the full unitfeet. - Be consistent with capitalisations. e.g.
Autumn/autumn,Acorn/acorn,Summer/summer,Oak/oak,Fall/fall(where it refers to the season, not something... falling). - Use apostrophes where applicable, rather than single quotation marks. (
'not’). - The possessive form of
itisits, notit's. - Various entries have a missing space prior to an opening parenthesis. (
text(text->text (text). - Various entries have a double space between words mid-sentence.
0-ad-history-mod-package/simulation/templates/gaia/tree/bush_temperate_winter.xml
Outdated
Show resolved
Hide resolved
0-ad-history-mod-package/simulation/templates/gaia/tree/juniper_prickly.xml
Outdated
Show resolved
Hide resolved
0-ad-history-mod-package/simulation/templates/gaia/tree/oak_holly.xml
Outdated
Show resolved
Hide resolved
0-ad-history-mod-package/simulation/templates/gaia/tree/oak_holly_autumn.xml
Outdated
Show resolved
Hide resolved
0-ad-history-mod-package/simulation/templates/gaia/tree/oak_holly_autumn.xml
Outdated
Show resolved
Hide resolved
| @@ -2,6 +2,19 @@ | |||
| <Entity parent="template_gaia_tree"> | |||
| <Identity> | |||
| <SpecificName>Deciduous Tree</SpecificName> | |||
| <History> | |||
| The once green leaves of these temperate, template trees have faded into a variety of orange and red hues. Soon the trees will shed their leaves and be ready to weather the coming winter. | |||
There was a problem hiding this comment.
It's a joke. I researched 70 some trees I get to make a few jokes.
0-ad-history-mod-package/simulation/templates/gaia/tree/tropic_rainforest.xml
Outdated
Show resolved
Hide resolved
0-ad-history-mod-package/simulation/templates/gaia/tree/oak.xml
Outdated
Show resolved
Hide resolved
0-ad-history-mod-package/simulation/templates/gaia/tree/acacia.xml
Outdated
Show resolved
Hide resolved
0-ad-history-mod-package/simulation/templates/gaia/tree/poplar_lombardy_autumn.xml
Outdated
Show resolved
Hide resolved
There is a description tag?!? No one told me. I haven't looked hard, but the description tag looks like it's been used mostly for in game descriptions, so this is more history than it is gameplay relevant description. |
indoptogopt
suggested changes
Jun 10, 2023
| @@ -5,6 +5,9 @@ | |||
| </Footprint> | |||
| <Identity> | |||
| <SpecificName>Apple</SpecificName> | |||
| <History> | |||
| A tree from the genus Malus, which is the apple. Apples in ancient times were far different than they were today. Their fruit were smaller and sourer than the fruit from the modern Malus domestica. | |||
There was a problem hiding this comment.
Suggested change
| A tree from the genus Malus, which is the apple. Apples in ancient times were far different than they were today. Their fruit were smaller and sourer than the fruit from the modern Malus domestica. | |
| A tree from the genus Malus, which is the apple. Apples in ancient times were far different than they are today. Their fruit was smaller and sourer than the fruit of modern Malus domestica. |
0-ad-history-mod-package/simulation/templates/gaia/tree/acacia_large.xml
Outdated
Show resolved
Hide resolved
0-ad-history-mod-package/simulation/templates/gaia/tree/bamboo.xml
Outdated
Show resolved
Hide resolved
0-ad-history-mod-package/simulation/templates/gaia/tree/bamboo_dragon.xml
Outdated
Show resolved
Hide resolved
0-ad-history-mod-package/simulation/templates/gaia/tree/bamboo_single.xml
Outdated
Show resolved
Hide resolved
0-ad-history-mod-package/simulation/templates/gaia/tree/palm_palmyra.xml
Outdated
Show resolved
Hide resolved
| @@ -2,6 +2,10 @@ | |||
| <Entity parent="template_gaia_tree"> | |||
| <Identity> | |||
| <SpecificName>Poplar</SpecificName> | |||
| <History> | |||
| Poplars(Genus Populus) are fast growing, deciduous trees of the family Salicacae. There are around 35 different kinds of the tree. | |||
| It is Autumn and this Poplar's leaves are fading yellow and soon will fall to the ground. | |||
There was a problem hiding this comment.
Suggested change
| It is Autumn and this Poplar's leaves are fading yellow and soon will fall to the ground. | |
| It is autumn and this poplar's leaves are fading yellow and soon will fall to the ground. |
0-ad-history-mod-package/simulation/templates/gaia/tree/maple_autumn.xml
Show resolved
Hide resolved
0-ad-history-mod-package/simulation/templates/gaia/tree/oak_holly.xml
Outdated
Show resolved
Hide resolved
0-ad-history-mod-package/simulation/templates/gaia/tree/oak_holly_autumn.xml
Outdated
Show resolved
Hide resolved
…_large.xml Co-authored-by: indoptogopt <135018641+indoptogopt@users.noreply.github.com>
….xml Co-authored-by: indoptogopt <135018641+indoptogopt@users.noreply.github.com>
…_dragon.xml Co-authored-by: indoptogopt <135018641+indoptogopt@users.noreply.github.com>
…_single.xml Co-authored-by: indoptogopt <135018641+indoptogopt@users.noreply.github.com>
…almyra.xml Co-authored-by: indoptogopt <135018641+indoptogopt@users.noreply.github.com>
…lly.xml Co-authored-by: indoptogopt <135018641+indoptogopt@users.noreply.github.com>
…autumn.xml Co-authored-by: indoptogopt <135018641+indoptogopt@users.noreply.github.com>
…lly_autumn.xml Co-authored-by: indoptogopt <135018641+indoptogopt@users.noreply.github.com>
|
We are capitalizing seasons like Fall, Autumn and Winter, so those changes can't happen. I think I got everything else. Is this clear to be merged? |
|
Yes, you can merge it. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ok, this is a huge pull request for all of 0 A.D.'s trees(gaia/tree) and also apples from the fruit category.