Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f28e766
Add Isafdar navigation obstacles and Lletya content
HarleyGilpin Aug 30, 2026
bf7c86f
Fix Isafdar trap animations and movement to match original behaviour
HarleyGilpin Sep 5, 2026
e4b6395
Make walking at the tripwire cross it like a border guard gate
HarleyGilpin Sep 5, 2026
56461eb
Tripwire arrow volley always hits two 50s and poisons starting at 20
HarleyGilpin Sep 5, 2026
caf9cb7
Keep facing the direction of travel after squeezing through dense forest
HarleyGilpin Sep 5, 2026
99eaa85
Use the climb-over animation for dense forest 3938
HarleyGilpin Sep 5, 2026
8f4a477
Correct dense forest double squeeze animation id to 3303
HarleyGilpin Sep 5, 2026
c3f223f
Use the standard squeeze animation for dense forest 3998
HarleyGilpin Sep 5, 2026
a3db65b
Add the two missing tripwires and three missing sticks traps
HarleyGilpin Sep 5, 2026
a0ce14f
Cross the sticks trap with a single forced move
HarleyGilpin Sep 5, 2026
d8a452f
Spring the sticks trap when walking through like a border guard gate
HarleyGilpin Sep 5, 2026
8da7678
Use the startled-back animation for springing the sticks trap
HarleyGilpin Sep 5, 2026
62f5a0d
Walk across the sticks trap on a successful pass
HarleyGilpin Sep 5, 2026
c11d63e
Keep the player's facing when the sticks trap flings them back
HarleyGilpin Sep 5, 2026
7f1be9f
Jump the leaf trap from the player's own lane
HarleyGilpin Sep 5, 2026
a2a5df7
Address review: sticks trap destinations table and log balance cleanup
HarleyGilpin Sep 7, 2026
9ec0d84
Keep the log balance approach cancellable
HarleyGilpin Sep 7, 2026
5846c34
Remove the log balance approach handler and fix forced walking
HarleyGilpin Sep 7, 2026
f5820e0
Move the forced walk check into TileTargetStrategy
HarleyGilpin Sep 7, 2026
29a03c7
Address review: authentic rates, teles data, gate and overpass rework
HarleyGilpin Sep 9, 2026
738c94c
Fix dense forest facing, tree gate animation and heavy gate swing
HarleyGilpin Sep 9, 2026
60fb2f2
Correct the heavy gate open-variant placement
HarleyGilpin Sep 9, 2026
e5f5ec2
Set both open heavy gate variants to rotation 2
HarleyGilpin Sep 9, 2026
c94818a
Swap which open variant each heavy gate half becomes
HarleyGilpin Sep 9, 2026
8c60c1b
Cross the heavy gate through its middle opening tiles
HarleyGilpin Sep 9, 2026
b6e58be
Cross the Lletya tree entrance through its middle opening
HarleyGilpin Sep 9, 2026
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
17 changes: 17 additions & 0 deletions data/area/kandarin/arandar/arandar.objs.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[arandar_heavy_gate]
id = 3944
examine = "A heavy wooden gate."

[arandar_heavy_gate_2]
id = 3945
examine = "A heavy wooden gate."

[arandar_heavy_gate_open]
id = 3947

[arandar_heavy_gate_2_open]
id = 3946

[arandar_log_balance]
id = 3933
examine = "A slippery looking log."
2 changes: 2 additions & 0 deletions data/area/kandarin/arandar/arandar.sounds.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[bigdoor_open]
id = 46
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[underground_pass_cave_entrance]
id = 36000
examine = "A dark cave entrance."
26 changes: 26 additions & 0 deletions data/area/tirannwn/isafdar/isafdar.anims.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
[tripwire_step_over]
id = 1236

[trap_stumble_back]
id = 1441

[leaf_trap_stumble]
id = 764

[leaf_trap_jump]
id = 1115

[pit_getup]
id = 534

[dense_forest_climb]
id = 839

[dense_forest_squeeze]
id = 1237

[woodspring]
id = 1219

[arrowtrip]
id = 1213
71 changes: 71 additions & 0 deletions data/area/tirannwn/isafdar/isafdar.areas.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,74 @@ y = [3243, 3249]
[isafdar_hunter_fishing_area]
x = [2264, 2274]
y = [3248, 3258]

[isafdar_leaf_trap_1]
x = [2208, 2210]
y = [3202, 3204]

[isafdar_leaf_trap_2]
x = [2266, 2268]
y = [3202, 3204]

[isafdar_leaf_trap_3]
x = [2273, 2275]
y = [3173, 3175]

[isafdar_leaf_trap_4]
x = [2276, 2278]
y = [3261, 3263]

[isafdar_tripwire_1]
x = [2215]
y = [3154, 3155]
tags = ["border"]

[isafdar_tripwire_2]
x = [2220]
y = [3153, 3154]
tags = ["border"]

[isafdar_tripwire_3]
x = [2285, 2286]
y = [3188]
tags = ["border"]

[isafdar_tripwire_4]
x = [2251, 2252]
y = [3168]
tags = ["border"]

[isafdar_tripwire_5]
x = [2294]
y = [3243, 3244]
tags = ["border"]

[isafdar_sticks_trap_1]
x = [2200, 2202]
y = [3169]
tags = ["border"]

[isafdar_sticks_trap_2]
x = [2235, 2237]
y = [3181]
tags = ["border"]

[isafdar_sticks_trap_3]
x = [2275, 2277]
y = [3163]
tags = ["border"]

[isafdar_sticks_trap_4]
x = [2181]
y = [3209, 3211]
tags = ["border"]

[isafdar_sticks_trap_5]
x = [2257, 2259]
y = [3227]
tags = ["border"]

[isafdar_sticks_trap_6]
x = [2295]
y = [3214, 3216]
tags = ["border"]
72 changes: 72 additions & 0 deletions data/area/tirannwn/isafdar/isafdar.objs.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
[tripwire]
id = 3921
examine = "I wonder who set this here."

[isafdar_sticks_trap]
id = 3922
examine = "A suspicious looking bundle of sticks."

[isafdar_leaves]
id = 3923
examine = "Are those leaves hiding something?"

[isafdar_leaves_2]
id = 3924
examine = "Are those leaves hiding something?"

[isafdar_leaves_3]
id = 3925
examine = "Are those leaves hiding something?"

[isafdar_protruding_rocks]
id = 3927
examine = "Perhaps I could climb up these."

[isafdar_log_balance]
id = 3931
examine = "A slippery looking log."

[isafdar_log_balance_2]
id = 3932
examine = "A slippery looking log."

[dense_forest]
id = 3937
examine = "Very dense forest."

[dense_forest_2]
id = 3938
examine = "Very dense forest."

[dense_forest_3]
id = 3939
examine = "Very dense forest."

[dense_forest_hard]
id = 3998
level = 56
examine = "Very dense forest."

[dense_forest_hard_2]
id = 3999
level = 56
examine = "Very dense forest."

[lletya_tree_entrance]
id = 8742
examine = "An especially dense patch of trees."

[elven_overpass_rocks_top]
id = 9296
examine = "A rocky cliff face."

[elven_overpass_rocks_bottom]
id = 9297
examine = "A rocky cliff face."

[isafdar_cave_entrance]
id = 4006
examine = "A dark cave entrance."

[isafdar_arrow_trap]
id = 3920
14 changes: 14 additions & 0 deletions data/area/tirannwn/isafdar/isafdar.sounds.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[forest_doublesqueeze]
id = 1348

[forest_lowwall]
id = 1358

[tripwire_with_arrows]
id = 1360

[forest_sidesqueeze]
id = 1361

[springtrap]
id = 1368
37 changes: 37 additions & 0 deletions data/area/tirannwn/isafdar/isafdar.tables.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Where crossing or being flung off each sticks trap lands, per direction
[sticks_traps]
trap = "tile"
north = "tile"
east = "tile"
south = "tile"
west = "tile"

[.isafdar_sticks_trap_1]
trap = { x = 2200, y = 3169 }
east = { x = 2202, y = 3168 }
west = { x = 2199, y = 3169 }

[.isafdar_sticks_trap_2]
trap = { x = 2235, y = 3181 }
east = { x = 2238, y = 3181 }
west = { x = 2234, y = 3181 }

[.isafdar_sticks_trap_3]
trap = { x = 2275, y = 3163 }
east = { x = 2278, y = 3163 }
west = { x = 2274, y = 3163 }

[.isafdar_sticks_trap_4]
trap = { x = 2181, y = 3209 }
north = { x = 2181, y = 3212 }
south = { x = 2181, y = 3208 }

[.isafdar_sticks_trap_5]
trap = { x = 2257, y = 3227 }
east = { x = 2260, y = 3227 }
west = { x = 2256, y = 3227 }

[.isafdar_sticks_trap_6]
trap = { x = 2295, y = 3214 }
north = { x = 2295, y = 3217 }
south = { x = 2295, y = 3213 }
2 changes: 2 additions & 0 deletions data/area/tirannwn/lletya/lletya.anims.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[treegate_open]
id = 12109
3 changes: 3 additions & 0 deletions data/area/tirannwn/lletya/lletya.areas.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[lletya_teleport]
x = [2328, 2330]
y = [3171, 3173]
2 changes: 2 additions & 0 deletions data/area/tirannwn/lletya/lletya.sounds.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[treedoor_open]
id = 93
11 changes: 11 additions & 0 deletions data/area/tirannwn/lletya/lletya.vars.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[teleport_crystal_recharges]
format = "int"
default = 0
persist = true
transmit = false

[crystal_seed_attunements]
format = "int"
default = 0
persist = true
transmit = false
35 changes: 35 additions & 0 deletions data/area/tirannwn/poison_waste/poison_waste.objs.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[poison_waste_cave_entrance]
id = 26684
examine = "A murky cave entrance."

[poison_waste_cave_entrance_2]
id = 26685
examine = "A murky cave entrance."

[poison_waste_cave_entrance_3]
id = 26686
examine = "A murky cave entrance."

[poison_waste_cave_exit]
id = 26571
examine = "A way out of the cave."

[poison_waste_cave_exit_2]
id = 26572
examine = "A way out of the cave."

[poison_waste_cave_exit_3]
id = 26573
examine = "A way out of the cave."

[poison_waste_cave_exit_4]
id = 26574
examine = "A way out of the cave."

[poison_waste_sewer_ladder_up]
id = 26518
examine = "A ladder leading up."

[poison_waste_sewer_ladder_down]
id = 26519
examine = "A ladder leading down."
74 changes: 74 additions & 0 deletions data/area/tirannwn/poison_waste/poison_waste.teles.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
[poison_waste_cave_entrance]
option = "Enter"
tile = { x = 2322, y = 3098 }
to = { x = 1989, y = 4174 }

[poison_waste_cave_entrance_2]
option = "Enter"
tile = { x = 2322, y = 3099 }
to = { x = 1989, y = 4174 }

[poison_waste_cave_entrance_2]
option = "Enter"
tile = { x = 2322, y = 3100 }
to = { x = 1989, y = 4174 }

[poison_waste_cave_entrance_2]
option = "Enter"
tile = { x = 2322, y = 3101 }
to = { x = 1989, y = 4174 }

[poison_waste_cave_entrance_3]
option = "Enter"
tile = { x = 2322, y = 3102 }
to = { x = 1989, y = 4174 }

[poison_waste_cave_exit_2]
option = "Exit"
tile = { x = 1984, y = 4171 }
to = { x = 2321, y = 3100 }

[poison_waste_cave_exit]
option = "Exit"
tile = { x = 1984, y = 4172 }
to = { x = 2321, y = 3100 }

[poison_waste_cave_exit_3]
option = "Exit"
tile = { x = 1984, y = 4174 }
to = { x = 2321, y = 3100 }

[poison_waste_cave_exit_4]
option = "Exit"
tile = { x = 1984, y = 4175 }
to = { x = 2321, y = 3100 }

[poison_waste_sewer_ladder_up]
option = "Climb-up"
tile = { x = 1991, y = 4175 }
delta = { y = 1, level = 1 }

[poison_waste_sewer_ladder_up]
option = "Climb-up"
tile = { x = 2041, y = 4172 }
delta = { x = 1, level = 1 }

[poison_waste_sewer_ladder_up]
option = "Climb-up"
tile = { x = 2041, y = 4189 }
delta = { x = 1, level = 1 }

[poison_waste_sewer_ladder_down]
option = "Climb-down"
tile = { x = 1991, y = 4175, level = 1 }
delta = { y = -1, level = -1 }

[poison_waste_sewer_ladder_down]
option = "Climb-down"
tile = { x = 2041, y = 4172, level = 1 }
delta = { x = -1, level = -1 }

[poison_waste_sewer_ladder_down]
option = "Climb-down"
tile = { x = 2041, y = 4189, level = 1 }
delta = { x = -1, level = -1 }
1 change: 1 addition & 0 deletions data/entity/npc/humanoid/musicians.npcs.toml
Original file line number Diff line number Diff line change
Expand Up @@ -169,5 +169,6 @@ examine = "He looks lovelorn."
[musician_isafdar]
id = 8723
song = 704
interacts = false
categories = ["elf"]
examine = "She's beautiful."
Loading