wickedwaifus/wicked-waifus-rs
3
0
Fork 1
Code Issues Pull requests 1 Projects Releases 1 Packages Wiki Activity Actions

Introduce automatic concomitants, buffs + a little bit more #6

Open
RabbyDevs wants to merge 8 commits from RabbyDevs/wicked-waifus-rs:master into master
pull from: RabbyDevs/wicked-waifus-rs:master
merge into: wickedwaifus:master
Conversation 2 Commits 8 Files changed 15 +345 -134
RabbyDevs commented 2025-05-13 17:53:24 +00:00
First-time contributor
Copy link

This PR would introduce the automatic creation of concomitants and finding of buffs (specifically does character specific buffs and concoms), allowing faster setup of new characters.
also introduces the ability to edit the watermark text, however, by default it'll act as if it was removed.
also introduces new buff override system that replaces permanent buff table with something a little more robust

This PR does some clippy fixes. (that i thought looked annoying/out of place), you can leave those out if they are problematic when I was editing the files. (though i recommend using clippy!!))

this was made with major help (in no particular order) from frager, ranny, sleep, and naruse, many thanks to them.

This PR would introduce the automatic creation of concomitants and finding of buffs (specifically does character specific buffs and concoms), allowing faster setup of new characters. also introduces the ability to edit the watermark text, however, by default it'll act as if it was removed. also introduces new buff override system that replaces permanent buff table with something a little more robust **This PR does some clippy fixes.** (that i thought looked annoying/out of place), you can leave those out if they are problematic when I was editing the files. (though i recommend using clippy!!)) this was made with major help (in no particular order) from frager, ranny, sleep, and naruse, many thanks to them.
RabbyDevs added 7 commits 2025-05-13 17:53:25 +00:00
RabbyDevs requested review from xavo95 2025-05-13 17:59:41 +00:00
RabbyDevs commented 2025-05-14 06:15:30 +00:00
Author
First-time contributor
Copy link

do not merge yet, requests for change are allowed but concoms for ciaconna dont properly work

do not merge yet, requests for change are allowed but concoms for ciaconna dont properly work
RabbyDevs commented 2025-05-15 16:00:13 +00:00
Author
First-time contributor
Copy link

actually free to merge if you want me to make another PR that has the extra edits that will be needed to make cia and zhezhi work better 👍

actually free to merge if you want me to make another PR that has the extra edits that will be needed to make cia and zhezhi work better 👍
RabbyDevs added 1 commit 2025-05-16 11:12:15 +00:00
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u master:RabbyDevs-master
git checkout RabbyDevs-master

Merge

Merge the changes and update on Forgejo.
git checkout master
git merge --no-ff RabbyDevs-master
git checkout master
git merge --ff-only RabbyDevs-master
git checkout RabbyDevs-master
git rebase master
git checkout master
git merge --no-ff RabbyDevs-master
git checkout master
git merge --squash RabbyDevs-master
git checkout master
git merge --ff-only RabbyDevs-master
git checkout master
git merge RabbyDevs-master
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
xavo95
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: wickedwaifus/wicked-waifus-rs#6
No description provided.
Delete branch "RabbyDevs/wicked-waifus-rs: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?