String fixes#918
Open
stm2 wants to merge 36 commits intoeressea:developfrom
Open
Conversation
This closes bug 2669.
The logic for "insects do not need castles in deserts or swamps" was broken.
bug 2678: fix trade_needs_castle
Add a message and don't pay for the failed spell.
Bug 2680: shapeshift spell cannot be cast twice.
Fixing the symptoms, not the cause, becasue I don't know how this happened.
Zauber sollen force benutzen, nicht level.
Contributor
Author
|
Aha, ich Trottel such ich ewig einen Bug, dabei ist der build schon in develop kaputt. |
Member
|
Ich habe gerade aus dem develop branch die WDW Strings (Sphinx & Co) entfernt, und die Umbenennung der Zauber vollzogen. Ein Rebase wäre also mindestens angebracht. |
Contributor
Author
|
Bin dabei ... Kann das wirklich weg oder hast du das nur übersehen? |
Member
Ja, fortress_generic gibt es nicht. |
Contributor
Author
|
Rebased. |
ennorehling
force-pushed
the
develop
branch
3 times, most recently
from
62cc513 to
11ce5a2
Compare
ennorehling
force-pushed
the
develop
branch
3 times, most recently
from
68db444 to
e61b8ad
Compare
ennorehling
force-pushed
the
develop
branch
2 times, most recently
from
3dfa0c4 to
5730779
Compare
ennorehling
force-pushed
the
develop
branch
4 times, most recently
from
b9cf842 to
f69501a
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Viele Fehler in strings.de/en.po verbessert.
Die letzten beiden Commits ändern Dinge, die nicht nur kosmetisch sind, sondern Befehle ungültig machen können. Habe viele fragwürdige Zusammenschreibweisen im Englischen auseinandergerissen (stonecircle, dragonblood). Die sind im Englischen zwar grundsätzlich möglich (JRR Martin schreibt zum Beispiel direwolves, D&D kennt den hellhound), ich empfinde sie aber vielfach als komisch. Auch im Sinne von unfreiwillig komisch.