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

feat(content): Watch Tower quest #1099

Open
wants to merge 51 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
49a4f6c
feat: first few watchtower interactions
Indio3 Jan 14, 2025
c3c79e8
feat: grub dialogue
Indio3 Jan 16, 2025
75773f2
feat: more pre-quest stuff
Indio3 Jan 17, 2025
551c1ac
feat: a few watchtower items
KeepBotting Jan 18, 2025
23b83f7
feat: quest start
Indio3 Jan 18, 2025
5cd56b5
fix: comp error
Indio3 Jan 18, 2025
12598f7
Merge pull request #1 from KeepBotting/indio-watchtower
Indio3 Jan 18, 2025
432f4c9
feat: varps, start of fingernails/loc2799, and ladder
KeepBotting Jan 18, 2025
9c903d9
feat: scrub comments
KeepBotting Jan 18, 2025
f3432b0
feat: gold gate guard, changes to bush interactions
Indio3 Jan 18, 2025
d4bffbd
Merge branch 'itwatchtower' of https://github.com/Indio3/Server into …
Indio3 Jan 18, 2025
03851c4
feat: non fingernail bush interactions
Indio3 Jan 18, 2025
504bfdd
fix: revert changes to loc_2799
Indio3 Jan 18, 2025
81bb2d2
Merge remote-tracking branch 'indio/itwatchtower' into indio-watchtower
KeepBotting Jan 18, 2025
cbc0b9f
feat: watchwiz dialog for stage 2
KeepBotting Jan 18, 2025
c30b371
feat: watchtower wizard first stage interactions
Indio3 Jan 19, 2025
7d6d15e
feat: 3rd stage watch wiz dialogue, toban and gorad
Indio3 Jan 19, 2025
7e8e3e7
Merge remote-tracking branch 'indio/itwatchtower' into indio-watchtower
KeepBotting Jan 19, 2025
2976f95
feat: compile, ogre_guard_west + west city gate
KeepBotting Jan 19, 2025
6f929b8
feat: og and gorad dialogue first part
Indio3 Jan 19, 2025
9cfd1e0
Merge pull request #2 from KeepBotting/indio-watchtower
Indio3 Jan 19, 2025
d214ab3
feat: complete interactions for both gates
KeepBotting Jan 19, 2025
bf0717f
fix: gate interactions
KeepBotting Jan 19, 2025
bbf1740
feat: more relics stuff
Indio3 Jan 19, 2025
5e0d310
feat: completing and handing in relic parts
Indio3 Jan 20, 2025
204f806
Merge remote-tracking branch 'indio/itwatchtower' into indio-watchtower
KeepBotting Jan 20, 2025
f2703d4
feat: retrieving relic, changes to gate guard logic
Indio3 Jan 20, 2025
5f08d92
feat: complete interactions for both gates (#3)
KeepBotting Jan 20, 2025
68bb5e3
Merge remote-tracking branch 'indio/itwatchtower' into indio-watchtower
KeepBotting Jan 20, 2025
418faee
feat: more gutanoth interactions
Indio3 Jan 20, 2025
e30dc4d
Merge remote-tracking branch 'indio/itwatchtower' into indio-watchtower
KeepBotting Jan 20, 2025
8219754
feat: stealing rock cake
Indio3 Jan 20, 2025
8cb605e
fix: change check, add enclave guard
Indio3 Jan 20, 2025
e8897c0
Merge remote-tracking branch 'indio/itwatchtower' into indio-watchtower
KeepBotting Jan 21, 2025
f01eed6
feat: gutanoth chests, rock cake guards
Indio3 Jan 22, 2025
e214897
feat: stage 5 and 6, some changes to ogre potion
Indio3 Jan 24, 2025
85864d2
Merge remote-tracking branch 'indio/itwatchtower' into indio-watchtower
KeepBotting Jan 25, 2025
c02acbd
feat(content): start of skavid caves
KeepBotting Jan 25, 2025
1a1a4a0
fix(content): fix faulty logic
KeepBotting Jan 25, 2025
c06c8e2
feat(content): add mad skavid's cave
KeepBotting Jan 25, 2025
09bba90
Merge pull request #5 from KeepBotting/indio-watchtower
Indio3 Jan 25, 2025
918b866
fix: pre-rework behaviour for no light source skavid caves
Indio3 Jan 26, 2025
a2ac2c0
feat: start of skavid speech:'
Indio3 Jan 26, 2025
be10f97
feat: more skavid stuff
Indio3 Jan 30, 2025
b5fc66d
feat: missing skavid constants
Indio3 Jan 31, 2025
7a08f94
fix: change skavid logic
Indio3 Feb 1, 2025
e08caed
feat: entering shaman cave and making ogre potion
Indio3 Feb 4, 2025
84ee9df
feat: ogre shaman killing
Indio3 Feb 4, 2025
c16bebc
feat: remainder of watch tower
Indio3 Feb 6, 2025
1c6544b
refactor: remove unused cat
Indio3 Feb 6, 2025
36ece21
refactor: move watchtower locs and objs to quest folder
Indio3 Feb 6, 2025
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
38 changes: 19 additions & 19 deletions data/src/pack/npc.pack
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
112=moss_giant
113=jogre
114=npc_114
115=npc_115
115=ogre
116=cyclops
117=giant
118=npc_118
Expand Down Expand Up @@ -850,27 +850,27 @@
849=gnome_barman
850=aluft_gianne
851=gnome_waiter
852=npc_852
853=npc_853
854=npc_854
855=npc_855
856=npc_856
852=ogre_chieftan
853=og
854=grew
855=toban
856=gorad
857=npc_857
858=npc_858
859=npc_859
860=npc_860
858=ogre_guard_east
859=ogre_guard_west
860=ogre_guard_battlements
861=npc_861
862=npc_862
863=npc_863
864=npc_864
865=npc_865
866=npc_866
867=npc_867
868=npc_868
862=city_guard
863=scared_skavid
864=mad_skavid
865=skavid_ig
866=skavid_ar
867=skavid_cur
868=skavid_nod
869=npc_869
870=npc_870
871=npc_871
872=npc_872
870=enclave_guard
871=ogre_shaman
872=watchtower_wizard
873=npc_873
874=npc_874
875=npc_875
Expand Down
18 changes: 9 additions & 9 deletions data/src/pack/obj.pack
Original file line number Diff line number Diff line change
Expand Up @@ -2376,16 +2376,16 @@
2375=relic_part_3
2376=skavid_map
2377=ogre_tooth
2378=obj_2378
2378=toban_key
2379=rock_cake
2380=obj_2380
2381=obj_2381
2382=obj_2382
2383=obj_2383
2384=obj_2384
2385=obj_2385
2386=obj_2386
2387=obj_2387
2380=watchtower_crystal1
2381=watchtower_crystal2
2382=watchtower_crystal3
2383=watchtower_crystal4
2384=fingernails
2385=old_robe
2386=unusual_armour
2387=damaged_dagger
2388=tattered_eye_patch
2389=vial_water_jangerberries
2390=mixture_guam_jangerberries
Expand Down
4 changes: 2 additions & 2 deletions data/src/pack/varp.pack
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@
210=smithing_bars
211=smithing_level
212=itwatchtower_progress
213=varp_213
214=varp_214
213=itwatchtower_bits
214=gutanoth_gold
215=varp_215
216=varp_216
217=pk_prey1
Expand Down
Loading