Skip to content

/Cataclysm-DDA

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

Last set of Heatblades (Ready to go!) #3030

Merged
merged 5 commits into from Sep 17, 2013

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
6 participants
@NaturesWitness @OzoneH3 @Wuzzy2 @KA101 @Golgo82 @kevingranade
@NaturesWitness
Copy link
Contributor

commented Sep 14, 2013

Trying to get back to coding, so I'm putting together what will probably be the last of the Heatblades. So far we have the flammenschwert (flame bladed sword). Item descriptions are placeholders until I think of better ones, and the menu text is in german, as translated by babelfish. If there's anyone out there who actually reads german, I would really appreciate it if someone double-checked the spelling, as I'd prefer to avoid any chinglish-esque "Beware sharp turn where lurks the skid demon" type screwups.

I'm also going to do a version for the forged sword (Forgetooth maybe), and I will probably also do one for the nodachi (probably called Radiant Death, after a sword from Neverwinter Nights). Also, from a suggestion in #2704 I'm considering doing a "Heat-club" with the aluminum bat as a base ( who DOESN'T want to beat up monsters with a burning-hot baseball bat!) as well as a "combat torch" made from a regular baseball bat (who says wimpy little sticks are the only thing we can tie gasoline-soaked rags to?).

I would really appreciate a review of the German lines, as I don't hold a lot of confidence in babelfish, as well as whether the Heatclubs are a good idea, if I should make versions of the forged sword and nodachi, or if I have completely run this idea into the ground and nobody wants to ever see anymore of these things again :)

Update - This also fixes a bug with all heatblades not being usable for lighting cigars, pipebombs, etc. Also includes a fix for torches not being able to start fires like a heatblade or lighter. I figured it was similar enough to the heatblades that I could throw it in with this instead of making a whole new pull.

Update - Added the Louieville Slaughterer and fixed the spelling with flammenschwert menus. I was originally going to do a few more of these, but looking at it I think this is enough (I'm also running out of ideas for flavour text). I think I'll call this pull done, and maybe in the future if it feels like more of these would be useful I'll do a new PR then. This is ready for review, I've tested it and everything works.

NaturesWitness added some commits Sep 14, 2013

@NaturesWitness
Flammenschwert (Zweihander heatblade) 
Adds the flammenschwert (flame bladed sword)  Item descriptions are
placeholders until I think of better ones, and the menu text is in
german, as translated by babelfish.  If there's anyone out there who
actually reads german, I would really appreciate it if someone
double-checked the spelling, as I'd prefer to avoid any chinglish-esque
"Beware sharp turn where lurks the skid demon" type screwups.
Loading status checks…
45711a6
@NaturesWitness
Added feature (heatblades are fire source when turned on) 
Finally got around to fixing a lingering bug.  When switched on,
heatblades can be used for any task that requires a source of flame
(lighting a cigar, pipebomb fuse, etc.), and consumes no additional fuel
in doing so (the thing is already glowing hot, and using fuel
constantly).
d6826a1
@NaturesWitness
Add heatblade menu to lit torch (fixes #2857) 
I know the torch isn't a heatblade, but the menu is the same and it's a
tiny fix anyway so I thought I'd stick it here.  Also set charges per
use on torch to 0 so it didn't screw up the iuse menu, the torch losing
a charge from being extinguished was already covered in the iuse entry
and was essentially double-billing people.
Loading status checks…
1e1f926
@KA101

This comment has been minimized.

Sign in to view
Copy link

commented on 45711a6 Sep 15, 2013

OK, if you're taking the jacqueshammer route, the menu needs translated too. English speaker with several years of German, taken a long time ago.

This comment has been minimized.

Sign in to view
Copy link

replied Sep 15, 2013

I sent a PM to KA101 on the forums but whatever, so..what exactly do you need translated here?

This comment has been minimized.

Sign in to view
Copy link

replied Sep 15, 2013

Hey, Golgo82. Replied to the PM; I'm probably gonna be leaving the forums before too long so here's better

I made some line notes; not sure if they showed up. (My javascript-blocker blocked them when I came back to check in.) Those might help in terms of "what needs translated".

@2birdie 2birdie referenced this pull request Sep 15, 2013

Closed

Torches can't light things on fire #2857

@KA101

This comment has been minimized.

Sign in to view
Copy link

commented on data/raw/items/tools.json in 45711a6 Sep 15, 2013

Ein(e(r)) grosses Zweihander von Deutschland, mit ?. Sehr machtig.

(A large two-handed sword from Germany, with...something about the fire mod. Very powerful.)
@KA101

This comment has been minimized.

Sign in to view
Copy link

commented on data/raw/items/tools.json in 45711a6 Sep 15, 2013

Flammenschwert (brennen)

(burning; "on" would be "activiert", IIRC)

As the (off), but with something about it being on and burning. Not sure--my reference books are in storage. Sorry.
@KA101

This comment has been minimized.

Sign in to view
Copy link

commented on iuse.cpp in 45711a6 Sep 15, 2013

I want to change up the article and the noun:
"Deine/Seine" has no "Brennstoff". "Ihr" is second-person, as "they". "Du" is informal "You", and "Sie" is formal "You". Probably the formal since the menu uses that (and IIRC it's considered good manners in German). "Brennstoff" was fuel oil in Das Boot, so I may well be totally off base there. "Benzin", below on 2630, seems better?
@KA101

This comment has been minimized.

Sign in to view
Copy link

commented on iuse.cpp in 45711a6 Sep 15, 2013

Not familiar with "schalten" but German nouns are always capitalized. (Exception: personal pronoun "ich" (=I) only capitalized at sentence-start.)
iuse.cpp Outdated
void iuse::zweifire_off(game *g, player *p, item *it, bool t)
{
int choice = menu(true,
_("Was werden Sie tun?"), _("Schalten Sie"), _("Verwenden Sie als Messer"), _("nichts tun"), NULL);

This comment has been minimized.

Sign in to view
Copy link
@OzoneH3

OzoneH3 Sep 15, 2013

Member

Was willst du tun?
Die Flamme entfachen.
Als Messer verwenden.
Nichts tun.
iuse.cpp Outdated
if (it->charges > 0)
{
g->sound(p->posx, p->posy, 10,
_("Ihre Flammenschwert heizt!"));

This comment has been minimized.

Sign in to view
Copy link
@OzoneH3

OzoneH3 Sep 15, 2013

Member

Die Klinge deines Schwertes brennt!
iuse.cpp Outdated
it->active = true;
}
else
g->add_msg_if_player(p,_("Ihre Flammenschwert hat kein Kraftstoff."));

This comment has been minimized.

Sign in to view
Copy link
@OzoneH3

OzoneH3 Sep 15, 2013

Member

Dein Flammenschwert hat keinen Brennstoff mehr.
iuse.cpp Outdated
}
else if (it->charges == 0)
{
g->add_msg_if_player(p,_("Ihre Flammenschwert läuft Benzin aus!"));

This comment has been minimized.

Sign in to view
Copy link
@OzoneH3

OzoneH3 Sep 15, 2013

Member

Deinem Flammenschwert ist der Brennstoff ausgegangen!
iuse.cpp Outdated
if (t) // Effects while simply on
{
if (one_in(35))
g->add_msg_if_player(p,_("Ihre Klinge leuchtet!"));

This comment has been minimized.

Sign in to view
Copy link
@OzoneH3

OzoneH3 Sep 15, 2013

Member

Das Feuer um deine Schwertklinge leuchtet hell!
iuse.cpp Outdated
else
{
int choice = menu(true,
_("Was werden Sie tun?"), _("Ausschalten"), _("ein Feuer"), _("nichts tun"), NULL);

This comment has been minimized.

Sign in to view
Copy link
@OzoneH3

OzoneH3 Sep 15, 2013

Member

Was willst du tun?
Die Flamme erlöschen.
Ein Feuer entfachen.
Nichts tun.
iuse.cpp Outdated
break;
case 1:
{
g->add_msg_if_player(p,_("Sie schalten Sie Ihre flammenschwert."));

This comment has been minimized.

Sign in to view
Copy link
@OzoneH3

OzoneH3 Sep 15, 2013

Member

Die Flamme deines Schwertes erlischt.
data/raw/items/tools.json Outdated
"type": "TOOL",
"symbol": "/",
"color": "red",
"name": "flammenschwert (on)",

This comment has been minimized.

Sign in to view
Copy link
@OzoneH3

OzoneH3 Sep 15, 2013

Member

Flammenschwert (an)

I would keep it simple here. Just say that its on.
data/raw/items/tools.json Outdated
"type": "TOOL",
"symbol": "/",
"color": "cyan",
"name": "flammenschwert (off)",

This comment has been minimized.

Sign in to view
Copy link
@OzoneH3

OzoneH3 Sep 15, 2013

Member

Flammenschwert (aus)
@OzoneH3

This comment has been minimized.

Sign in to view
Copy link
Member

commented Sep 15, 2013

[quote]
Ein(e(r)) grosses Zweihander von Deutschland, mit ?. Sehr machtig.
(A large two-handed sword from Germany, with...something about the fire mod. Very powerful.)
[/quote]

Ein großes zweihändiges Schwert aus Deutschland, an dessen Klinge sich, unter zuführung von Benzin, eine anhaltende Flamme erzeugen lässt. Es ist eine sehr mächtige Waffe.
@NaturesWitness

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Sep 15, 2013

Thanks for the help with the wording everybody, I don't speak any German so I really needed the help. BTW Ozone, what does the message in your last post translate to?

NaturesWitness added some commits Sep 15, 2013

@NaturesWitness
Spelling fixes for flammenschwert 
Fixes spelling for flammenschwert, also adds item descriptions (thanks
KA101 and OzoneH3)
Loading status checks…
4daa689
@NaturesWitness
Louieville Slaughterer and more bugfixes 
Per the suggestion in #2704, I give you the Louieville Slaughterer.
Essentially a bigger, beefier, and in general more
suitable-for-clubbing-things version of the torch.  Also added
heatblades to the use_fire entry in player.cpp as it looks like they
belong there
Loading status checks…
bd4ad14

@kevingranade kevingranade merged commit bd4ad14 into CleverRaven:master Sep 17, 2013
1 check passed

1 check passed

default Merged build finished.
Details
@Wuzzy2

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Feb 28, 2014

Okay, with the last description there was a little spelling mistake. Here’s my correction:
“Ein großes zweihändiges Schwert aus Deutschland, an dessen Klinge sich, unter Zuführung von Benzin, eine anhaltende Flamme erzeugen lässt. Es ist eine sehr mächtige Waffe.”
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.