Skip to content

Adds Skills for Part 2 Enemies #25

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

Open
wants to merge 19 commits into
base: CodeCleanupRefactor
Choose a base branch
from
Open

Adds Skills for Part 2 Enemies #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
56ecf29
Adds tables for new skills, their SOs and rearrange files.
LeonardoTPereira Jan 6, 2023
ab44c1e
Merge branch 'CodeCleanupRefactor' of https://github.com/FellowshipOf…
LeonardoTPereira Feb 22, 2023
70af25d
Adds cries to part 2 enemies
LeonardoTPereira Feb 28, 2023
4ca8d93
Fixes tables with float, adds imp AI with table's chance to use skill
LeonardoTPereira Mar 2, 2023
ca13413
Adds .idea folder to gitignore
LeonardoTPereira Mar 4, 2023
84376b2
Fixes Cerberus status
LeonardoTPereira Mar 4, 2023
9f99981
Fixes malformed imp name on table
LeonardoTPereira Mar 4, 2023
1768ad3
Revert asset changes and the ex-new malformed imp AI
LeonardoTPereira Mar 4, 2023
491129c
Revert "Revert asset changes and the ex-new malformed imp AI"
LeonardoTPereira Mar 4, 2023
4f3c726
Adds malformed imp AI
LeonardoTPereira Mar 5, 2023
684b91a
Revert wrong reversion
LeonardoTPereira Mar 5, 2023
be7a3a7
Merge pull request #32 from FellowshipOfTheGame/Feature/Malformed-Imp-AI
kori4r2 Mar 5, 2023
a0fe65a
Fix leftover guid error
kori4r2 Mar 5, 2023
70eb6b1
Update enemy cries with mastered versions
kori4r2 May 2, 2023
dd3637a
Added new boss battle song for Mammon battle
kori4r2 May 2, 2023
37bb1a7
Merge branch 'CodeCleanupRefactor' into Feature/NewPart2Tables
kori4r2 May 2, 2023
105ec06
Merge branch 'CodeCleanupRefactor' into Feature/NewPart2Tables
kori4r2 May 3, 2023
85d21e3
Merge branch 'CodeCleanupRefactor' into Feature/NewPart2Tables
kori4r2 Jun 7, 2023
fe6ecb1
Merge pull request #27 from FellowshipOfTheGame/Feature/Part2-Enemies…
kori4r2 Jun 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Assets/AssetStoreTools*
.vs/
.vscode/
.vsconfig
.idea/

# Gradle cache directory
.gradle/
Expand Down
6 changes: 6 additions & 0 deletions .idea/.idea.FinalInferno/.idea/projectSettingsUpdater.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

142 changes: 142 additions & 0 deletions .idea/.idea.FinalInferno/.idea/workspace.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Music/Efeitos/Monster Cries/CryEunuchSatyr.wav
View file
Open in desktop
Binary file not shown.
22 changes: 22 additions & 0 deletions Assets/Music/Efeitos/Monster Cries/CryEunuchSatyr.wav.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Music/Efeitos/Monster Cries/CryGoldenTormentor.wav
View file
Open in desktop
Binary file not shown.
22 changes: 22 additions & 0 deletions Assets/Music/Efeitos/Monster Cries/CryGoldenTormentor.wav.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Music/Efeitos/Monster Cries/CryMalformedImp.wav
View file
Open in desktop
Binary file not shown.
22 changes: 22 additions & 0 deletions Assets/Music/Efeitos/Monster Cries/CryMalformedImp.wav.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Music/Efeitos/Monster Cries/CryMammon.wav
View file
Open in desktop
Binary file not shown.
22 changes: 22 additions & 0 deletions Assets/Music/Efeitos/Monster Cries/CryMammon.wav.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Music/Temas/FI_M2_FINAL INFERNO BOSS 2_03 2023.wav
View file
Open in desktop
Binary file not shown.
22 changes: 22 additions & 0 deletions Assets/Music/Temas/FI_M2_FINAL INFERNO BOSS 2_03 2023.wav.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions Assets/ScriptableObjects/Dialogues/Dialoguesot2/FacingMammon.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,11 @@ MonoBehaviour:
eventsTriggered:
- quest: {fileID: 11400000, guid: 86461e150e0505f4599af049f91e27d6, type: 2}
eventFlag: MiddleBoosRoom
battleBG: {fileID: 21300000, guid: 689feba995043064fa956c35af324b85, type: 3}
battleBGM: {fileID: 8300000, guid: f0eef6ae720c7c44b8813d4ede6e667a, type: 3}
battleEnemies:
- {fileID: 11400000, guid: fc9397eef5dd14f499aa19d79f54d002, type: 2}
battleInfo:
enemies:
- {fileID: 11400000, guid: fc9397eef5dd14f499aa19d79f54d002, type: 2}
BGImage: {fileID: 21300000, guid: 689feba995043064fa956c35af324b85, type: 3}
BGM: {fileID: 8300000, guid: f0eef6ae720c7c44b8813d4ede6e667a, type: 3}
BGM: {fileID: 8300000, guid: 3ebcc5fff56c43043b53fdb15950c791, type: 3}
isLoadingBattle: {fileID: 11400000, guid: 8a0e889bb05558bd9b65a2e6103fe7da, type: 2}
startSceneChangeAnimation: {fileID: 11400000, guid: cf69cddf33ac468b69a9cf9493b3cc10,
type: 2}
Expand Down
2 changes: 1 addition & 1 deletion Assets/ScriptableObjects/Enemies/Eunuch Satyr.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ MonoBehaviour:
damageFocus: 2
bestiaryPortrait: {fileID: 8662577868061255951, guid: aa9312c71792007b0a75607e5b941a7f,
type: 3}
enemyCry: {fileID: 8300000, guid: 24c1a2410b1154844a312d23598a28c1, type: 3}
enemyCry: {fileID: 8300000, guid: cc704e0da07b49942b0cf6a56780b4c9, type: 3}
bio: Where are my testicles, summer?
enemyTable: {fileID: 4900000, guid: fad97e4bea2fabc4192746002a560182, type: 3}
table:
Expand Down
2 changes: 1 addition & 1 deletion Assets/ScriptableObjects/Enemies/Golden Tormentor.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ MonoBehaviour:
damageFocus: 1
bestiaryPortrait: {fileID: -6323316956162443975, guid: ba237fe8c01ca22b1990300925d4e184,
type: 3}
enemyCry: {fileID: 8300000, guid: 24c1a2410b1154844a312d23598a28c1, type: 3}
enemyCry: {fileID: 8300000, guid: a3746f11d545b6749a9ce9b5853c8adc, type: 3}
bio: Eat you up and spit you out. Baller.
enemyTable: {fileID: 4900000, guid: fad97e4bea2fabc4192746002a560182, type: 3}
table:
Expand Down
Loading