New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
SoF Proofread Pass and Campaign Prose edits #6177
Conversation
This is a proofread pass. But this also has edits that are more than just minor edits which try to improve the campaign text. commit
data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
Outdated
Show resolved
Hide resolved
data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg
Outdated
Show resolved
Hide resolved
data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
Outdated
Show resolved
Hide resolved
data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
Outdated
Show resolved
Hide resolved
data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
Outdated
Show resolved
Hide resolved
data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
Outdated
Show resolved
Hide resolved
data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
Outdated
Show resolved
Hide resolved
data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
Outdated
Show resolved
Hide resolved
This is a changelog relative to the first draft: - Fixed up "nor" in S1. - reverted the ellipsis I added to indicate pause in story part of S2. - Reworded my edit in S3 to be closer to the original. - Followed Wedge's suggestion for S4. - S5: Exchanged Shorbear dwarves and elves, removed introductory clause in ln 560, rewording in ln 592. - Reverted my edit in S6. - in S8, converted comma into ellipsis to indicate pause. - S9: Reworded exposition of Thursagan, changed wording in ln1221, changed a period to a semi-colon.
Second draft is up. Please see if changes are agreeable. |
data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
Outdated
Show resolved
Hide resolved
data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
Outdated
Show resolved
Hide resolved
data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
Outdated
Show resolved
Hide resolved
data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
Outdated
Show resolved
Hide resolved
data/campaigns/Sceptre_of_Fire/scenarios/2t_In_the_Dwarven_City.cfg
Outdated
Show resolved
Hide resolved
[/message] | ||
[message] | ||
speaker=Thursagan | ||
message= _ "And how do you plan on doing that? There are elves swarming these hills, trying to kill us." | ||
[/message] | ||
[message] | ||
speaker=Durstorn | ||
message= _ "You are right... well, we will be able to break out eventually, and while we’re here, we’ll be able to finally make the sceptre." | ||
message= _ "You are right... well, we can close up these caves and make the sceptre in here. I’m sure we’ll eventually come up with a plan for breaking out of here when we’re done." |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems to be saying a completely different thing… is it a consistency error or something?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
he mentions "we will be able to break out eventually" at a point where nothing about having something to break out of has yet been mentioned in dialog, which seems awkward. So I had to change the dialog to talk about planning to stay in the caves first, then talk about breaking out.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
and my new line sounds like Durstorn is describing a plan, which is what he is in fact being asked. It feels like a better-sounding response to
And how do you plan on doing that? There are elves swarming these hills, trying to kill us.
than the former line.
Main argument is that it sounds like a better response than the original line to the question.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Original:
"And how do you plan on doing that? There are elves swarming these hills, trying to kill us."
"You are right... well, we will be able to break out eventually, and while we’re here, we’ll be able to finally make the sceptre."
Modified:
"And how do you plan on doing that? There are elves swarming these hills, trying to kill us."
"You are right... well, we can close up these caves and make the sceptre in here. I’m sure we’ll eventually come up with a plan for breaking out of here when we’re done."
When you look at it like this it's not a completely different thing. The main addition in the response is the added proposal of closing the gates.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The original has the implication of being already closed in, while the modified version implies they're intentionally closing themselves in.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How does this sound:
Er, yes I know... well, what if we buy ourselves some time? We can close the gates to keep the elves out until we have a good plan. We can even make the sceptre while we're here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Durstorn should sound more demanding/directive to me. So something more like "Aye. So close the gates and stay them elves outside. Meanwhiles ye runecrafter ken craft tha sceptre and I'll think me a plan ta get out o' here."
You can make it more in plain english of course, the idea is just to make him sound like he's in charge. Durstorn ain't diplomatic, I think.
(Also you have two comments left below to address too haha).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Regarding the scottish english, ill review durstorn's lines again to see if it would be more consistent to make this more scottish sounding or more plain sounding.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I reviewed Durstorn's lines and can confirm that he talks in plain English, not in Scottish English.
Is this line good @nemaara :
"Yes, I'm aware! Just close the gates and keep those elves out! We'll think of something. As long as a dwarf is in a cave, he can come up with a plan. And since the Shorbear's rune workshops are in here, you and your runecrafters might as well make the Sceptre now."
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm aware! Close the gates and keep them out! It should be easy to come up with a plan to outwit them later. Meanwhile, since the Shorbear's rune workshops are in here, you and your runecrafters might as well make that Sceptre now.
data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
Outdated
Show resolved
Hide resolved
data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
Outdated
Show resolved
Hide resolved
data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
Outdated
Show resolved
Hide resolved
data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
Outdated
Show resolved
Hide resolved
data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
Outdated
Show resolved
Hide resolved
data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
Outdated
Show resolved
Hide resolved
I just marked a few conversations as resolved. Only one more open conversation that I am asking to be looked at. |
data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
Outdated
Show resolved
Hide resolved
data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
Outdated
Show resolved
Hide resolved
data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
Outdated
Show resolved
Hide resolved
data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
Outdated
Show resolved
Hide resolved
data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
Outdated
Show resolved
Hide resolved
data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
Outdated
Show resolved
Hide resolved
data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
Show resolved
Hide resolved
I've finished my replay of the campaign and I have a couple of additional suggestions that aren't already covered in the PR (again, I can make my changes separately if that's preferred, but am trying to avoid additional work to resolve potential conflicts here):
|
I can make my changes separately if that's preferred, but am trying to avoid additional work to resolve potential conflicts here: I highly appreciate the merge conflict avoidance etiquette. Im okay with owning the tasks that you mention. @Wedge009 You went ahead with the capitalization of sceptre of fire in some of your commits, I suppose I'll just give one extra review of the capitalization before making another draft just for quality assurance. I have a feeling we could do better than 'piece of junk' illl try to cross reference other speech in mainline for ideas and what would be orcish. |
Thanks, I'm pretty sure we can do better than 'piece of crap'. I only capitalised Sceptre of Fire in UtBS, as I mentioned above. Clearly separate from this SoF-focused PR. So the SoF Epilogue still needs to be updated. |
I wrote the "magical piece of garbage", but later thought that sounded too posh for an angry orc. "Crap" was a mild vulgarity that seemed appropriate for character and intensity, and I think it's better than "junk", but this also seems really minor, so whatever others want is fine with me. |
I changed it to "piece of troll dung". I suppose even a troll's dung becomes hard like a rock.
I did a search for all instances of the word "sceptre/Sceptre" in the dialog. I shall refer to "sceptre" as lowercase and "Sceptre" as title case. Most of the usage of the word is in the lowercase. And a lot of those contexts seem to make sense to use the lowercase - it's because the word is being used in the general sense, e.g. 'Make a sceptre'. Less cases where it seems the title case is the appropriate context to use. It's another matter that I'd rather not involve in this PR, so I won't touch it here. If there is a merge conflict I'll just make the necessary adjustments. I did make a few capitalization changes, but this PR will not be a complete capitalization pass. It is like with object oriented programming: |
Troll's dung sounds fitting to me. Regarding the Sceptre of Fire, I recall I was only referring specifically to the epilogue. Of course general uses of the word 'sceptre' in the wider campaign should be left as lower-case, but I consider these to be referring to the actual Sceptre of Fire and therefore should be capitalised:
In my opinion these aren't talking about general sceptres or the Sceptre of Fire before it's been made. The king and Alanin are specifically referring to the Sceptre of Fire, and most certainly the narrator is too (last quote). |
Not really… in fact I think the reverse convention is more common (class is capitalized, instance is lowercase). |
I was thinking the same thing, at least in C++ contexts, but then I looked at Wesnoth's code and saw at least some class names are lower-case. It's not really directly related to this discussion anyway. |
What I meant was that in the usage in the campaign, the lowercase 'sceptre' refers to the general class of sceptre, while the titlecase 'Sceptre' refers to the instance of a sceptre known as 'The Sceptre of Fire'. Yes, the convention is reversed in typical coding OOP. |
Can I ask if this PR has blockers? I feel like it's okay now. |
Depends on the dev who was requested for review. |
You can ask. :p Assuming the question was asked, it looks like Durstorn's line about escaping the cave is resolved now. There's just the capitalisation of Sceptre of Fire to go, but if you don't want to do it, I'll take care of it separately. |
I'm officially requesting capitalisation pass of Sceptre of Fire to be handled by another person. |
* SoF Proofread Pass and Campaign Prose edits This is a proofread pass. But this also has edits that are more than just minor edits which try to improve the campaign text. commit * SoF Proofread Second Draft This is a changelog relative to the first draft: - Fixed up "nor" in S1. - reverted the ellipsis I added to indicate pause in story part of S2. - Reworded my edit in S3 to be closer to the original. - Followed Wedge's suggestion for S4. - S5: Exchanged Shorbear dwarves and elves, removed introductory clause in ln 560, rewording in ln 592. - Reverted my edit in S6. - in S8, converted comma into ellipsis to indicate pause. - S9: Reworded exposition of Thursagan, changed wording in ln1221, changed a period to a semi-colon. * SoF Proofread Third Draft * Update 4t_The_Jeweler.cfg * Update 1_A_Bargain_is_Struck.cfg removed a comma * Update 1_A_Bargain_is_Struck.cfg * More prose edits (SoF) * Update 4t_The_Jeweler.cfg * SoF Proofread Pass edits * Capitalize Sceptre * S5 and S9 small dialog change * S6 change semicolon to period * S9 change semicolon to exclamation (cherry picked from commit ec66a0a)
@@ -620,7 +620,7 @@ | |||
[/message] | |||
[message] | |||
speaker=Rugnur | |||
message= _ "Tell him to send forces north to aid us and fight the elves, but that we are probably going to die. We will run northeast towards the old eastern mines, and if he wants his sceptre intact he’d best send troops to meet us there." | |||
message= _ "Tell him to send forces north to aid us and fight the elves, but that we are probably going to die. We will run northeast towards the old eastern mines. And if he wants his sceptre intact, he’d best send troops to meet us there." |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Change "And if" to "If"?
I know the PR is already merged, but it's a handy place to add more comments for whatever will happen next. This isn't the only sentence in this campaign to start with "And", other existing ones might need a review too.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If the original author put the word "and" here, I say keep it. It's not too hard to believe that in oral speech someone would put "and" in that place while he is talking.
If this text represented only written text, sure it makes sense to really strike out the "and".
* SoF Proofread Pass and Campaign Prose edits This is a proofread pass. But this also has edits that are more than just minor edits which try to improve the campaign text. commit * SoF Proofread Second Draft This is a changelog relative to the first draft: - Fixed up "nor" in S1. - reverted the ellipsis I added to indicate pause in story part of S2. - Reworded my edit in S3 to be closer to the original. - Followed Wedge's suggestion for S4. - S5: Exchanged Shorbear dwarves and elves, removed introductory clause in ln 560, rewording in ln 592. - Reverted my edit in S6. - in S8, converted comma into ellipsis to indicate pause. - S9: Reworded exposition of Thursagan, changed wording in ln1221, changed a period to a semi-colon. * SoF Proofread Third Draft * Update 4t_The_Jeweler.cfg * Update 1_A_Bargain_is_Struck.cfg removed a comma * Update 1_A_Bargain_is_Struck.cfg * More prose edits (SoF) * Update 4t_The_Jeweler.cfg * SoF Proofread Pass edits * Capitalize Sceptre * S5 and S9 small dialog change * S6 change semicolon to period * S9 change semicolon to exclamation
@@ -300,7 +300,7 @@ | |||
[/message] | |||
[message] | |||
speaker=Theganli | |||
message= _ "Well... Maybe you can ask the Shorbear clan? They have good tools... Chisels and grit of some rare mineral, I don’t know what it is or how they got it, but their work is well known among us gem crafters." | |||
message= _ "Well... Maybe you can ask the Shorbear clan? They have good tools... chisels made of some rare mineral. I don’t know what mineral it is or how they got it, but their work is well known among us gem crafters." |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"Well... Maybe you can ask the Shorbear clan? They have good tools... chisels made of a metal that could only be worked with the heat of a volcanic forge. I don’t know how much of that legend is true, but their work is well known among us gem crafters."
Too late for the current PR, but it seems a good place to discuss possible future PRs. I'm thinking we could replace the unobtainable mineral with foreshadowing.
This is a proofread pass. But this also has edits that are more than just minor edits which try to improve the campaign text.
wmlxgettext
was used to review all the text.