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

feat: full soul war quest #2535

Merged
merged 77 commits into from
Sep 11, 2024
Merged

feat: full soul war quest #2535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
bd3596a
feat: full soul war quest
dudantas Apr 10, 2024
1a07c70
fix: goshnar's malice damage white tiles and add zones
dudantas Apr 10, 2024
715f127
fix: ebb and flow fixed map
dudantas Apr 11, 2024
535503b
fix: simplify some functions, logs to trace and map fixes
dudantas Apr 11, 2024
446718b
fix: more logs to debug
dudantas Apr 11, 2024
be209b3
improve: "/pos" talkaction better handling
dudantas Apr 11, 2024
55edd29
fix: miniBosses table
dudantas Apr 11, 2024
f9e664e
fix: some bugs
dudantas Apr 11, 2024
89f1744
feat: add mirror item to summon mirror image
dudantas Apr 11, 2024
8319f29
fix: map paths
dudantas Apr 11, 2024
b1fb702
fix: add condition for taint icon
dudantas Apr 15, 2024
f01418a
fix: cloak of terror mechanic
dudantas Apr 15, 2024
316b668
fix: change soul war table to lib folder
dudantas Apr 16, 2024
c3bbf05
fix: no removable conditions on death
dudantas Apr 16, 2024
cd7a82c
fix: nil value with boss levers
dudantas Apr 16, 2024
8035147
Merge branch 'main' into dudantas/feat-soul-war-quest
elsongabriel Apr 29, 2024
ce7c611
Code format - (Clang-format)
github-actions[bot] Apr 29, 2024
164e093
fix: mechanics and npc flickering soul
phacUFPE May 12, 2024
3b30af0
Merge branch 'main' into dudantas/feat-soul-war-quest
elsongabriel May 12, 2024
b9ce9ff
Code format - (Clang-format)
github-actions[bot] May 12, 2024
beb3dba
feat: claustrophobic inferno boss access mechanics
phacUFPE May 12, 2024
377573c
Merge branch 'dudantas/feat-soul-war-quest' of https://github.com/ope…
phacUFPE May 12, 2024
19346e2
Lua code format - (Stylua)
github-actions[bot] May 12, 2024
5c7f121
fix: dont start raid when player exits the raid zones
phacUFPE May 13, 2024
145a3af
Merge branch 'main' into dudantas/feat-soul-war-quest
elsongabriel May 20, 2024
4c7402d
improvement: claustrophobic inferno raids and safe zones
phacUFPE May 26, 2024
f84006e
Lua code format - (Stylua)
github-actions[bot] May 26, 2024
b4152a5
fix: removed duplicated spawns and some improvements
phacUFPE May 27, 2024
0f640f2
Merge branch 'dudantas/feat-soul-war-quest' of https://github.com/ope…
phacUFPE May 27, 2024
9fc4634
Merge branch 'main' into dudantas/feat-soul-war-quest
elsongabriel May 27, 2024
ea09e56
Merge branch 'main' into dudantas/feat-soul-war-quest
elsongabriel May 30, 2024
e466baf
Merge branch 'main' into dudantas/feat-soul-war-quest
dudantas Jun 15, 2024
d37fdff
fix: eventcallback and flickering soul
dudantas Jun 15, 2024
9fc0f11
fix: megalomania drop for bag you desire
dudantas Jun 15, 2024
60a825d
Merge branch 'main' into dudantas/feat-soul-war-quest
elsongabriel Jun 26, 2024
43afc71
Code format - (Clang-format)
github-actions[bot] Jun 26, 2024
fd680fc
Merge branch 'main' into dudantas/feat-soul-war-quest
elsongabriel Jun 26, 2024
a984f32
Merge branch 'main' into dudantas/feat-soul-war-quest
elsongabriel Jul 2, 2024
4e2e537
fix build error.
elsongabriel Jul 2, 2024
1027ab2
Merge branch 'main' into dudantas/feat-soul-war-quest
elsongabriel Jul 18, 2024
d364e32
Code format - (Clang-format)
github-actions[bot] Jul 18, 2024
96f5698
Merge branch 'main' into dudantas/feat-soul-war-quest
dudantas Aug 1, 2024
95f1c17
fix: crash related to lua callback
dudantas Aug 1, 2024
be1179e
fix: addCallback check
dudantas Aug 2, 2024
2e89beb
fix: ZoneEvent callback
dudantas Aug 7, 2024
fb9a4a1
Lua code format - (Stylua)
github-actions[bot] Aug 7, 2024
7b2444d
fix: maps bugs
dudantas Aug 8, 2024
60e6102
fix: some things
dudantas Aug 8, 2024
16c2087
fix: remove house
dudantas Aug 8, 2024
5c5470a
fix: change bag you desire chance
dudantas Aug 8, 2024
784f671
feat: add new icon
dudantas Aug 8, 2024
4fae862
Merge branch 'main' into dudantas/feat-soul-war-quest
dudantas Aug 9, 2024
e337cae
fix: goshnar's greed bugs
dudantas Aug 9, 2024
bfbcf19
Lua code format - (Stylua)
github-actions[bot] Aug 9, 2024
46da501
fix: soul ghosts looktype
dudantas Aug 9, 2024
dc817ac
Merge branch 'main' into dudantas/feat-soul-war-quest
dudantas Aug 9, 2024
a55a2b5
fix: final conflicts
dudantas Aug 9, 2024
f4a8e54
fix: register missing stairs
dudantas Aug 9, 2024
a9b5c95
fix: goshnar's cruelty and greed mechanic
dudantas Sep 10, 2024
7622cfd
fix: reset taint correctly
dudantas Sep 10, 2024
8630296
Merge branch 'main' into dudantas/feat-soul-war-quest
dudantas Sep 10, 2024
3a836e9
fix: remove duplicated script
dudantas Sep 10, 2024
3aab8a3
fix: revert conflict
dudantas Sep 10, 2024
444b488
Merge branch 'main' into dudantas/feat-soul-war-quest
dudantas Sep 10, 2024
631c6c3
fix: indent
github-actions[bot] Sep 10, 2024
4b9816c
fix: mirror image change to table and remove xml files
dudantas Sep 10, 2024
5a0f4a7
fix: remove weeping soul corpses on boss spawn
dudantas Sep 10, 2024
4195798
fix: remove outfit massive fire elemental
dudantas Sep 10, 2024
a231525
fix spawns
dudantas Sep 10, 2024
5d9e835
fix: stop mechanics on bosses death
github-actions[bot] Sep 10, 2024
84e7648
fix: some goshnar's megalomania mechanics
dudantas Sep 10, 2024
5b403e2
fix: zone param
dudantas Sep 10, 2024
89f2ad8
fix: move event location
dudantas Sep 10, 2024
2df6ace
fix: add missing spawns
dudantas Sep 10, 2024
b5a9e79
fix: bag you desire drop
dudantas Sep 10, 2024
e763b83
fix: missing monster and remove "."
dudantas Sep 10, 2024
376e387
fix: calculate desire chance function
dudantas Sep 10, 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 data-otservbr-global/lib/quests/quest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ dofile(DATA_DIRECTORY .. "/lib/quests/killing_in_the_name_of.lua")
dofile(DATA_DIRECTORY .. "/lib/quests/svargrond_arena.lua")
dofile(DATA_DIRECTORY .. "/lib/quests/the_cursed_crystal.lua")
dofile(DATA_DIRECTORY .. "/lib/quests/the_queen_of_the_banshees.lua")
dofile(DATA_DIRECTORY .. "/lib/quests/soul_war.lua")
dofile(DATA_DIRECTORY .. "/lib/quests/their_masters_voice.lua")
dofile(DATA_DIRECTORY .. "/lib/quests/the_primal_ordeal.lua")
Loading
Loading