Skip to content
Draft

Arena #4077

Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 16 additions & 0 deletions config/fxdata/columnset.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10966,3 +10966,19 @@ SolidMask = 31
FloorTexture = 27
Orientation = 0
Cubes = [42, 486, 487, 487, 485, 0, 0, 0]

[column1371]
Lintel = 1
Height = 2
SolidMask = 3
FloorTexture = 27
Orientation = 0
Cubes = [148, 83, 0, 0, 0, 0, 0, 0]

[column1372]
Lintel = 1
Height = 0
SolidMask = 0
FloorTexture = 27
Orientation = 0
Cubes = [0, 0, 0, 0, 0, 0, 0, 0]
11 changes: 11 additions & 0 deletions config/fxdata/creature.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -1386,6 +1386,17 @@ CoordsFunctions = can_take_sleep sleep_in_lair
; Sleeping doesn't consume room capacity, because the lair itself does - no NEEDS_CAPACITY here.
Properties = WORK_WHOLE_AREA

[job24]
; Arena Fighting job.
Name = FIGHT_ARENA
RelatedRoomRole = ROOM_ROLE_ARENA
InitialState = AtArena
ContinueState = ArenaFighting
Assign = OWNED_CREATURES OWNED_DIGGERS HUMAN_DROP COMPUTER_DROP AREA_WITHIN_ROOM WHOLE_AREA
PlayerFunctions = can_do_training work_in_room
CoordsFunctions = can_do_training work_in_room
Properties = WORK_WHOLE_AREA NEEDS_CAPACITY

[angerjob0]
Name = NULL

Expand Down
33 changes: 33 additions & 0 deletions config/fxdata/crstates.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2618,3 +2618,36 @@ DisplayThoughtBubble = 0
Sneaky = 0
ReactToCta = 1

[state154]
Name = AtArena
ProcessFunction = AtArenaRoom
CleanupFunction = none
MoveFromSlabFunction = none
MoveCheckFunction = move_check_on_head_for_room
Overrides =
StateType = Work
Captive = 0
Transition = 0
FollowBehavior = FollowLeader
BlocksAllStateChanges = 0
SpriteIdx = 57
DisplayThoughtBubble = 1
Sneaky = 0
ReactToCta = 1

[state155]
Name = ArenaFighting
ProcessFunction = ArenaFighting
CleanupFunction = state_cleanup_in_room
MoveFromSlabFunction = none
MoveCheckFunction = none
Overrides =
StateType = Work
Captive = 0
Transition = 0
FollowBehavior = MatchWorkRoom
BlocksAllStateChanges = 0
SpriteIdx = 57
DisplayThoughtBubble = 1
Sneaky = 0
ReactToCta = 1
Loading