Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Neutral Apocalypse #637

Closed
wants to merge 19 commits into from
Closed

Neutral Apocalypse #637

wants to merge 19 commits into from

Conversation

MargaretTheFool
Copy link
Contributor

@MargaretTheFool MargaretTheFool commented Feb 11, 2024 •
edited
Loading

(code is pretty outdated because i started this like a week or two ago)
add the Neutral Apocalypse Subfaction from TOS2

  • Move Plaguebearer/Pestilence, Soul Collector, Berserker to Neutral Apocalypse
  • Add Death (Soul Collector)
  • Create Baker/Famine
  • Add War (Berserker)
  • Win Conditions (I don't know how to do this) (thanks ryuk)

@MargaretTheFool
The Beginning of the Apocalypse
7d9689d 
Added Death, moved Soul Collector and Plaguebearer to new Neutral Apocalypse category, let apocalypse members see eachother, wincons are broken right now
@MargaretTheFool
Pestilence cant kill Apoc members + attempt at wincons
646b930
@Ultradragon005
Copy link
Contributor

Ultradragon005 commented Feb 11, 2024 •
edited
Loading

https://www.youtube.com/watch?v=cx007XYR1DY&ab_channel=alyaedits

@Tommy-XL Tommy-XL added the Improve Role/Add-on Improvements or additions to documentation label Feb 12, 2024
MargaretTheFool and others added 5 commits February 12, 2024 15:10
@MargaretTheFool
win con attempt
f50f3e4 
still dont work but im getting somewhere maybe
@ryuk201198
Merge pull request 0xDrMoe#4 from MargaretTheFool/main
b4b78ca 
neutral appocalypse test
@ryuk201198
fix apocalypse win condition
76cd970
@MargaretTheFool
some pb fixes from ryuk
5b90b4e 
basically just merged ryuk's "fix progress for plaguebearer in modded clients", also attempted more wincon stuff (it didnt work) and moved pb to non killing neutrals
@MargaretTheFool
Merge pull request #1 from ryuk201198/Test-Neutral-Appocalypse
da99fc9 
fix apocalypse win condition (thank you so much omg)
@MargaretTheFool
Baker + few Soul Collector changes
0a9508e
@MargaretTheFool
Update PlayerControlPatch.cs
c6c3883
@MargaretTheFool
Baker stuff
5763445 
Baker and Famine should be fully added now
also target NA's added for some roles, i dont know every role that would need this setting
@MargaretTheFool
Merge branch 'main' of https://github.com/MargaretTheFool/TownofHost-…
7201ecd 
…Enhanced
@MargaretTheFool
Soul Collector gains passive souls
28a1c99
@MargaretTheFool
Berserker + NA's own assign category
2766588 
Neutral APocalypse are now their own category for role assigning
@MargaretTheFool
Copy link
Contributor Author

MargaretTheFool commented Feb 18, 2024 •
edited
Loading

im pretty close to being done, its late at night here
all I need to do is give berserker a role color and test to make sure it works properly, otherwise I'm done with everything I've listed
there's a lot of conflicts though because I built this on 1.5.1, but I'm not sure that's something I'll be able to handle myself

@MargaretTheFool
Bers/War + finalize other stuff
750192f 
Berserker has been moved to NA, War basically just replaced level 4 of Bers with the option to make War have an even lower kd
Baker now knows who they gave bread to
Lawyer and Executioner now have the option to target NA's
All NA's now have transform announce messages
@MargaretTheFool
Merge branch 'main' into main
4323fa8
@MargaretTheFool
Copy link
Contributor Author

MargaretTheFool commented Feb 19, 2024 •
edited
Loading

all should be done now, please review my code and make sure its fine

@MargaretTheFool MargaretTheFool marked this pull request as ready for review February 19, 2024 14:18
@Ultradragon005
Copy link
Contributor

image
28000 => 28100

@Ultradragon005
Copy link
Contributor

ur gonna wait a long time #693

@MargaretTheFool
Copy link
Contributor Author

ur gonna wait a long time #693

ah that's lovely

@MargaretTheFool
Copy link
Contributor Author

well let me know when i can update my stuff

@MargaretTheFool MargaretTheFool marked this pull request as draft February 23, 2024 21:41
@MargaretTheFool
add readme to .gitignore for myself
4c85e46 
if this shows up in the pr then I'll revert it
this is for my own tasks that I have to do
@MargaretTheFool
Revert last change
68beb15 
woops
@Ultradragon005
Copy link
Contributor

Ultradragon005 commented Mar 22, 2024 •
edited
Loading

image

@MargaretTheFool
Copy link
Contributor Author

image

broken link lol

@Ultradragon005
Copy link
Contributor

did you just inherit from a class you haven't added yet-

@Ultradragon005
Copy link
Contributor

you could change the branch to rolebase and fixing conflicts which should merge it, and just pull into vs/vsc

or trying this ig (I did smt like this I forgot the exact steps 💀)
image

@Tommy-XL
Copy link
Collaborator

I will merge Role Base into main probably somewhere after dev 3-5

@MargaretTheFool
Copy link
Contributor Author

yeah I did something and it completely messed everything, I made a branch and put what was supposed to happen in there, I'll fix it later

@MargaretTheFool MargaretTheFool mentioned this pull request Apr 11, 2024
Draft
@MargaretTheFool
Copy link
Contributor Author

#815 is where i'll be updating

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ultradragon005 Ultradragon005 Ultradragon005 left review comments

Assignees
No one assigned
Labels
Improve Role/Add-on Improvements or additions to documentation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@MargaretTheFool @Ultradragon005 @Tommy-XL @ryuk201198