-
Notifications
You must be signed in to change notification settings - Fork 435
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
SightglassCat
wants to merge
37
commits into
Innoxia:dev
Choose a base branch
from
SightglassCat:pr-lpf
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
(cherry picked from commit 01257262358bb252cd5be6a8b5e5a4fb9e52ff24)
# Conflicts: # pom.xml
# Conflicts: # pom.xml
…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 50d2c9d)
(cherry picked from commit 540b5c7)
getName functions were reworked, but the overrides were not removed (cherry picked from commit 694920a)
(cherry picked from commit b51038c)
# 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
I might rewrite this entire thing. |
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.
Adds special races made out of rubber, foliage and fungal matter.
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
All needed assets are included. Includes new species icon backgrounds, new icons for items, special attacks and status effects.
Tested on v0.4.7 and v0.4.8
sightglass