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

Death Spells #1471

Merged
merged 64 commits into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
59491cb
Basic UI and function for Raise Dead
robmart Sep 6, 2024
eac0055
Better resurrection tooltip
robmart Sep 6, 2024
abfcb86
Missing loc
robmart Sep 6, 2024
2febfa9
Trait icon and back button
robmart Sep 6, 2024
2e89160
Banshee
robmart Sep 6, 2024
e8b14fc
Ghoul
robmart Sep 7, 2024
3a80b7d
Vampire
robmart Sep 7, 2024
00e636d
Variable raise undead cost depending on undead type
robmart Sep 20, 2024
1f0260f
Disabled TT
robmart Sep 20, 2024
abed987
Minor fixes
robmart Sep 20, 2024
e719d15
WIP tooltip
robmart Sep 20, 2024
dfb9a0b
Finalize Raise Dead UI
robmart Sep 20, 2024
8e3574a
Death Coil
robmart Sep 20, 2024
29c57bf
Death coil fixes
robmart Sep 21, 2024
753bd61
Death Grip
robmart Sep 22, 2024
cb50e2c
Give Disease pt1
robmart Sep 22, 2024
764b04f
Give Disease pt2
robmart Sep 22, 2024
fc07db1
Death and Decay
robmart Sep 23, 2024
c29f7cc
Cripple
robmart Sep 23, 2024
eb8b1f1
Improve Body
robmart Sep 24, 2024
0638b5a
Improved Body target has to be a prisoner
robmart Sep 24, 2024
91d1d80
Coagulation
robmart Sep 24, 2024
f279a7f
Blood Boil
robmart Sep 25, 2024
669bd74
Strangulate
robmart Sep 25, 2024
af016f5
Loc pt1
robmart Sep 25, 2024
744af10
Loc pt2
robmart Sep 26, 2024
d0833e0
Supreme Raise Dead
robmart Sep 26, 2024
5b34a19
Army of the Dead
robmart Sep 26, 2024
a8b0d8c
Epidemic
robmart Sep 27, 2024
4e9affd
Crimson Binding
robmart Sep 27, 2024
5f5c00a
Loc
robmart Sep 28, 2024
ec15af0
Fix Supreme Raise Dead target
robmart Sep 28, 2024
8a55f29
Vampire loc
robmart Sep 28, 2024
e819932
Revenant trait loc
robmart Sep 28, 2024
1799d9f
Can't raise vanished ppl, improved body always kills
robmart Oct 2, 2024
a0a72f5
Crimson Binding loc fix
robmart Oct 2, 2024
4fc59dd
Shorten Vampire trait desc
robmart Oct 2, 2024
ef3947e
Blood Boil and opinion loc
robmart Oct 2, 2024
6220c72
Can steal beauty_good_lore
robmart Oct 2, 2024
6b747f3
Cripple tt
robmart Oct 2, 2024
9386db9
Hide interactions
robmart Oct 2, 2024
e972122
Death Coil banner loc and portrait fix
robmart Oct 2, 2024
424f491
Fix some Give Disease and Epidemic GUI errors
robmart Oct 2, 2024
9efe60b
Disable diseases the target can't get
robmart Oct 2, 2024
3a2a198
Fix minor loc and Death Grip movement
robmart Oct 2, 2024
7226fca
Banshee raising fixes
robmart Oct 2, 2024
dc3f44a
Army name
robmart Oct 2, 2024
e388d4a
Supreme Raise Dead tt
robmart Oct 2, 2024
1fe6d70
Fix (Supreme) Raise Dead
robmart Oct 2, 2024
7ff52ec
Fix Give Disease tt
robmart Oct 2, 2024
3d9bb6c
Fix interactions removing variables
robmart Oct 2, 2024
c23bce6
Note that the trait from Improved Body is non-magical
robmart Oct 2, 2024
d3378b1
Can't raise targets in the twisting nether
robmart Nov 2, 2024
955ddf6
Reduce revenant trait loc length
robmart Nov 2, 2024
73af716
Give disease fixes
robmart Nov 2, 2024
0d101f8
Fix being able to manually unpause during some spells
robmart Nov 2, 2024
7d7d3a7
Merge branch 'feat/magic/death-lifestyle' into feat/magic/death-spells
robmart Nov 2, 2024
7bd5304
Merge fixes
robmart Nov 2, 2024
ede5978
Fix GUI
robmart Nov 2, 2024
ebe132c
Fix more GUI
robmart Nov 2, 2024
3167e19
Use new dodge system
robmart Nov 2, 2024
11045c7
Better tooltip for disease immunity
robmart Nov 3, 2024
2b19d63
Fix weird spell trigger behavior
robmart Nov 3, 2024
09fe62b
Fix error
robmart Nov 5, 2024
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
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

.vscode/
.idea/
.config/

.vs/
*/.DS_Store
Expand Down
Loading