UtBS 5: changes to scenario locations #3104
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
From #3077: * Moved AI leader spawns to keeps * Changed spawn of trolls that were spawning in walls * Sanity-checked village ownership in cavern From #3078: * Changed spawn of Eastern Troll Flamecaster * Fixed entry routes of Troll Flamecasters From author notes: * Made 'Wounded Dwarf' a wounded unit
|
Ditto, spaces not tabs. |
sevu
added
High Priority
sevu
reviewed
Jun 4, 2018
| [/move_unit_fake] | ||
|
|
||
| #TODO maybe the wounded dwarf should really be wounded? | ||
| {NAMED_NOTRAIT_UNIT 4 (Dwarvish Fighter) 21 29 (Wounded Dwarf) ( _ "Wounded Dwarf")} |
There was a problem hiding this comment.
What is the name of the dwarf now - does he get a random one?
(I'm not opposed to that)
There was a problem hiding this comment.
Name is currently simply "Wounded Dwarf".
There was a problem hiding this comment.
I think that part is not in the code anymore - you removed it here, but it's nowhere else, only as ID.
Again, I consider this not a bad idea by default because UtBS has often long names which become too long for the sidebar if translated in other languages. But I didn't played this scenario yet.
(That's why I would prefer if someone else merges this, though looks like good to go)
There was a problem hiding this comment.
Apologies, yes you're right this now gives a random dwarf name. That was an unintentional oversight, (just when you think you've done enough testing!) though actually I think I prefer it this way as he's now evidently wounded.
sevu
pushed a commit
that referenced
this pull request
Jun 8, 2018
* UtBS 5: changes to scenario locations From #3077: * Moved AI leader spawns to keeps * Changed spawn of trolls that were spawning in walls * Sanity-checked village ownership in cavern From #3078: * Changed spawn of Eastern Troll Flamecaster * Fixed entry routes of Troll Flamecasters From author notes: * Made 'Wounded Dwarf' a wounded unit
jostephd
pushed a commit
to jostephd/wesnoth
that referenced
this pull request
Oct 6, 2018
* UtBS 5: changes to scenario locations Fixes wesnoth#3077: * Moved AI leader spawns to keeps * Changed spawn of trolls that were spawning in walls * Sanity-checked village ownership in cavern Fixes wesnoth#3078: * Changed spawn of Eastern Troll Flamecaster * Fixed entry routes of Troll Flamecasters From author notes: * Made 'Wounded Dwarf' a wounded unit
jostephd
pushed a commit
to jostephd/wesnoth
that referenced
this pull request
Oct 7, 2018
* UtBS 5: changes to scenario locations Fixes wesnoth#3077: * Moved AI leader spawns to keeps * Changed spawn of trolls that were spawning in walls * Sanity-checked village ownership in cavern Fixes wesnoth#3078: * Changed spawn of Eastern Troll Flamecaster * Fixed entry routes of Troll Flamecasters From author notes: * Made 'Wounded Dwarf' a wounded unit (cherry-picked from commit 7feb9ae)
jostephd
pushed a commit
to jostephd/wesnoth
that referenced
this pull request
Oct 18, 2018
* UtBS 5: changes to scenario locations From wesnoth#3077: * Moved AI leader spawns to keeps * Changed spawn of trolls that were spawning in walls * Sanity-checked village ownership in cavern From wesnoth#3078: * Changed spawn of Eastern Troll Flamecaster * Fixed entry routes of Troll Flamecasters From author notes: * Made 'Wounded Dwarf' a wounded unit (cherry picked from commit bf28cc7)
jostephd
pushed a commit
to jostephd/wesnoth
that referenced
this pull request
Oct 18, 2018
* UtBS 5: changes to scenario locations From wesnoth#3077: * Moved AI leader spawns to keeps * Changed spawn of trolls that were spawning in walls * Sanity-checked village ownership in cavern From wesnoth#3078: * Changed spawn of Eastern Troll Flamecaster * Fixed entry routes of Troll Flamecasters From author notes: * Made 'Wounded Dwarf' a wounded unit (cherry picked from commit bf28cc7)
jostephd
pushed a commit
to jostephd/wesnoth
that referenced
this pull request
Oct 27, 2018
* UtBS 5: changes to scenario locations From wesnoth#3077: * Moved AI leader spawns to keeps * Changed spawn of trolls that were spawning in walls * Sanity-checked village ownership in cavern From wesnoth#3078: * Changed spawn of Eastern Troll Flamecaster * Fixed entry routes of Troll Flamecasters From author notes: * Made 'Wounded Dwarf' a wounded unit (cherry picked from commit bf28cc7)
jostephd
pushed a commit
to jostephd/wesnoth
that referenced
this pull request
Oct 27, 2018
* UtBS 5: changes to scenario locations From wesnoth#3077: * Moved AI leader spawns to keeps * Changed spawn of trolls that were spawning in walls * Sanity-checked village ownership in cavern From wesnoth#3078: * Changed spawn of Eastern Troll Flamecaster * Fixed entry routes of Troll Flamecasters From author notes: * Made 'Wounded Dwarf' a wounded unit (cherry picked from commit bf28cc7)
jostephd
pushed a commit
to jostephd/wesnoth
that referenced
this pull request
Oct 28, 2018
* UtBS 5: changes to scenario locations From wesnoth#3077: * Moved AI leader spawns to keeps * Changed spawn of trolls that were spawning in walls * Sanity-checked village ownership in cavern From wesnoth#3078: * Changed spawn of Eastern Troll Flamecaster * Fixed entry routes of Troll Flamecasters From author notes: * Made 'Wounded Dwarf' a wounded unit (cherry picked from commit bf28cc7)
jostephd
added a commit
that referenced
this pull request
Oct 30, 2018
* josteph/forward-port-some-of-the-174: don't call invalidate_layout() unless needed Convert a bunch more C-style casts I missed in 0dc5656 to static_cast fixup don't show travis notifications from forks (cherry picked from commit 55bc62f) don't show travis notifications from forks (cherry picked from commit d6ab780) fix out of bonunds check Lua: Invalidate layout in set_dialog_value() Fix includes Implement iOS version detection Game Load: Use child_or_empty(). Themes: Fix the observers icon being hidden under the minimap Game Load: Restore the ability to select 1.12.6 savegames in the list Fix CMake build on macOS NR S8: compatibility commit to make the new companions from scratch if we don't have them stored Partially revert "Additional village variations (#3342)" DM: Add last breath dialog for Zorlan DM: Generalize death message so it works when Delfador is young and old gui2/unit_recall: Change Recall button back to its correct label Updated changelog in Xcode Add WML unit test for unupgradable (#3336) gui2/unit_recall: Fix i18n issues DM: add some TODOs iOS: finger scrolling in controls. iOS document directories. Might use these on other platforms as well. .gitignore for CLion German multiplayer translation: fixes German translation: reword era descriptions German translation: fix a string Statistics Dialog: merge unit name and count labels add / remove some comments Tutorial Part2: Give the player a canche to undo his move UtBS 5: changes to scenario locations (#3104) Update changelog in macOS package SotA: transform bats already after the 5th scenario TRoW: revert workaround for #2912 Changelog entry for the #2912 work around TRoW: Increase Rithrandil's workaround portrait height to 700 TRoW: IPF-downscale Rithrandil's portrait, as a workaround to #2912 Add missing deprecation messages for deprecated macros Northern Rebirth S02_01: keep side 8 leader from wandering off too far changelog: remove AToTB AI entry wesnothd: prevent another instance of crash from owner not in player_connections Increased in-game chat size. This makes it render more smoothly Minor tweaks to classic theme (thanks enclave for doing this) Update RELEASE_NOTES (cherry picked from commit e2a2a85) Update changelog for custom AI for AToTB S2 TRoW: revert changes, to avoid a potential OOS Re-apply patches to fix issues #2844 and #2846 in SotA Clear RELEASE_NOTES Repair 66ab35f in the upwards direction Add changelog for 1.14.0 add placeholer links to appdata file Hide Editor help section UtBS: readd do_not_list UtBS: wmlindent pass Fix MP label for #2855 Fixup 601c67d UtBS: Re-added compatibility code to load old saves using the new elves Swap count and name columns in statistics (fixes #2893) Revert string changes in SotA for 1.14 RC 3 - gold AI recruitment: use unit-specific recall cost AI recruitment: fix units on recall list interfering with recruiting Fixup f7ab008 before GCC complains about an unused parameter >_< Help: disabled parsing error popup LoW: Fix translation error in conjunct list (fixes #2833) (#2834) Fix pofix Changelog entry for recent SotA fixes Pofix entry for fc6c3ac Pofix entry for b86a296 Pofix entry for ab9f29a Fix HP label in longer languages Help: removed sort_sections key with invalid value less redraw_everything calls when receiving [change_controller] fix gui2 dialog disappearing after [change_controller] Use a fallback for when the player name is not known in debug notifications
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.
From #3077:
From #3078:
From author notes: