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.

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

Latex, Plant and Fungal creatures #1784

Open
wants to merge 37 commits into
base: dev
Choose a base branch
from

Conversation

SightglassCat
Copy link
Contributor

  • What is the purpose of the pull request?
    Adds special races made out of rubber, foliage and fungal matter.
  • Give a brief description of what you changed or added.
    Added:
    Two new body materials (rubber was extant).
    Three new races and subspecies for the three materials.
    Items, special attacks and status effects for each.
    Changed systems:
    Race calculation based on body material
    Subspecies icon recoloring
    Added descriptions and unique effects for the subspecies where appropriate
  • Are any new graphical assets required?
    All needed assets are included. Includes new species icon backgrounds, new icons for items, special attacks and status effects.
  • Has this change been tested? If so, mention the version number that the test was based on.
    Tested on v0.4.7 and v0.4.8
  • So we have a better idea of who you are, what is your Discord Handle?
    sightglass

(cherry picked from commit 01257262358bb252cd5be6a8b5e5a4fb9e52ff24)
…4.8.5 pt.1)

# Conflicts:
#	src/com/lilithsthrone/game/character/race/AbstractSubspecies.java
(cherry picked from commit 4fda650)
Updates to plant, latex lore

(cherry picked from commit 6751f24)
(cherry picked from commit 540b5c7)
getName functions were reworked, but the overrides were not removed

(cherry picked from commit 694920a)
(cherry picked from commit 976f0f9)
(cherry picked from commit 7045097)
@SightglassCat SightglassCat marked this pull request as ready for review July 12, 2023 23:06
# Conflicts:
#	src/com/lilithsthrone/game/character/CharacterUtils.java
#	src/com/lilithsthrone/game/character/GameCharacter.java
#	src/com/lilithsthrone/game/character/body/Body.java
#	src/com/lilithsthrone/game/character/body/abstractTypes/AbstractHairType.java
#	src/com/lilithsthrone/game/character/race/AbstractSubspecies.java
#	src/com/lilithsthrone/game/character/race/Race.java
#	src/com/lilithsthrone/game/character/race/Subspecies.java
#	src/com/lilithsthrone/game/inventory/enchanting/ItemEffectType.java
# Conflicts:
#	src/com/lilithsthrone/game/character/CharacterUtils.java
#	src/com/lilithsthrone/game/character/GameCharacter.java
#	src/com/lilithsthrone/game/character/body/abstractTypes/AbstractHairType.java
#	src/com/lilithsthrone/game/character/race/Race.java
#	src/com/lilithsthrone/game/character/race/Subspecies.java
@SightglassCat
Copy link
Contributor Author

I might rewrite this entire thing.
It's kinda messy.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant