openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Fixed typos for Resurrection Balm and Leather Baldric #579

Merged
josefwk merged 2 commits from master into master 2025-02-08 00:43:29 +00:00
Conversation 2 Commits 2 Files Changed 7 +14 -14
josefwk commented 2025-02-07 15:54:30 +00:00 (Migrated from github.com)
Copy Link

See title. Changes the unidentified name for Leather Baldric (which was "Leather Baldri") and fixes a typo in the name of Resurrection Balm (was "Ressurection Balm").

See title. Changes the unidentified name for Leather Baldric (which was "Leather Baldri") and fixes a typo in the name of Resurrection Balm (was "Ressurection Balm").
josefwk commented 2025-02-07 15:58:28 +00:00 (Migrated from github.com)
Copy Link

So there are other instances of these typos in the following files, not sure if they should be modified or preserved:

  • rsrc/scenarios/busywork/items.xml
  • rsrc/scenarios/stealth/items.xml
  • rsrc/scenarios/valleydy/items.xml
  • rsrc/scenarios/zakhazi/items.xml
  • test/files/town/townRectUniversal/items.xml
  • test/replays/scenarios/use-special-terrain/items.xml

Pushed corrections to these files as well in the interest of expediting the PR, can always cherry pick or request changes.

So there are other instances of these typos in the following files, not sure if they should be modified or preserved: - `rsrc/scenarios/busywork/items.xml` - `rsrc/scenarios/stealth/items.xml` - `rsrc/scenarios/valleydy/items.xml` - `rsrc/scenarios/zakhazi/items.xml` - `test/files/town/townRectUniversal/items.xml` - `test/replays/scenarios/use-special-terrain/items.xml` Pushed corrections to these files as well in the interest of expediting the PR, can always cherry pick or request changes.
CelticMinstrel commented 2025-02-07 18:25:46 +00:00 (Migrated from github.com)
Copy Link

I'll merge this as soon as possible, but it'll need to be cherry-picked to the scen_update branch (#338) too (which would omit the test scenarios). It might take me a bit of time to get to that, though you're also welcome to do that yourself in a second PR.

I'll merge this as soon as possible, but it'll need to be cherry-picked to the `scen_update` branch (#338) too (which would omit the test scenarios). It might take me a bit of time to get to that, though you're also welcome to do that yourself in a second PR.
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
ASR
Specific to the A Small Rebellion scenario
BB
Specific to the Bandit Busywork scenario
bug
charedit
Affects the character editor
core
Affects core systems other than dialogs
dialogxml
Affects the dialog system
duplicate
enhancement
game
Affects the game, as opposed to the editors
important
A high priority task
invalid
linux
Specific to Linux builds
mac
Specific to Mac builds
meta
Related to the build system or other things other than the code
minor
A low priority task
Needs more info
question
replay
Affects the replay system
resources
Specific to the game's assets and resources
scenedit
Affects the scenario editor
Tutorial
Specific to the Tutorial scenario
unconfirmed
VoDT
Specific to the Valley of Dying Things scenario
windows
Specific to Windows builds
wontfix
work
Non coding related task
ZKR
Specific to the Za-Khazi Run scenario
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
CelticMinstrel NQN
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: openboe/oboe#579
No description provided.
Delete Branch "master"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?