Skip to content

Commit 13a1a13

Browse files
augustjohnsonaugustjohnson
authored
Merge pull request open5e#611 from open5e/creature_model_adjustments
Adding creature action attacks.
2 parents 2b0582d + 0431895 commit 13a1a13

File tree

6 files changed

+12930
-54
lines changed

6 files changed

+12930
-54
lines changed

‎api_v2/tests/responses/TestObjects.test_creature_ancient_example.approved.json‎

Lines changed: 66 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,28 @@
1010
"actions": [
1111
{
1212
"action_type": "ACTION",
13-
"attacks": [],
13+
"attacks": [
14+
{
15+
"attack_type": "WEAPON",
16+
"damage_bonus": null,
17+
"damage_die_count": 2,
18+
"damage_die_type": "D10",
19+
"damage_type": "thunder",
20+
"distance_unit": "feet",
21+
"extra_damage_bonus": null,
22+
"extra_damage_die_count": null,
23+
"extra_damage_die_type": null,
24+
"extra_damage_type": "thunder",
25+
"key": "srd_ancient-red-dragon_bite_bite-attack",
26+
"long_range": null,
27+
"name": "Bite attack",
28+
"parent": "srd_ancient-red-dragon_bite",
29+
"range": null,
30+
"reach": 15.0,
31+
"target_creature_only": false,
32+
"to_hit_mod": 17
33+
}
34+
],
1435
"desc": "Melee Weapon Attack: +17 to hit, reach 15 ft., one target. Hit: 21 (2d10 + 10) piercing damage plus 14 (4d6) fire damage.",
1536
"form_condition": null,
1637
"key": "srd_ancient-red-dragon_bite",
@@ -22,7 +43,28 @@
2243
},
2344
{
2445
"action_type": "ACTION",
25-
"attacks": [],
46+
"attacks": [
47+
{
48+
"attack_type": "WEAPON",
49+
"damage_bonus": null,
50+
"damage_die_count": 2,
51+
"damage_die_type": "D6",
52+
"damage_type": "thunder",
53+
"distance_unit": "feet",
54+
"extra_damage_bonus": null,
55+
"extra_damage_die_count": null,
56+
"extra_damage_die_type": null,
57+
"extra_damage_type": null,
58+
"key": "srd_ancient-red-dragon_claw_claw-attack",
59+
"long_range": null,
60+
"name": "Claw attack",
61+
"parent": "srd_ancient-red-dragon_claw",
62+
"range": null,
63+
"reach": 10.0,
64+
"target_creature_only": false,
65+
"to_hit_mod": 17
66+
}
67+
],
2668
"desc": "Melee Weapon Attack: +17 to hit, reach 10 ft., one target. Hit: 17 (2d6 + 10) slashing damage.",
2769
"form_condition": null,
2870
"key": "srd_ancient-red-dragon_claw",
@@ -82,7 +124,28 @@
82124
},
83125
{
84126
"action_type": "ACTION",
85-
"attacks": [],
127+
"attacks": [
128+
{
129+
"attack_type": "WEAPON",
130+
"damage_bonus": null,
131+
"damage_die_count": 2,
132+
"damage_die_type": "D8",
133+
"damage_type": "thunder",
134+
"distance_unit": "feet",
135+
"extra_damage_bonus": null,
136+
"extra_damage_die_count": null,
137+
"extra_damage_die_type": null,
138+
"extra_damage_type": null,
139+
"key": "srd_ancient-red-dragon_tail_tail-attack",
140+
"long_range": null,
141+
"name": "Tail attack",
142+
"parent": "srd_ancient-red-dragon_tail",
143+
"range": null,
144+
"reach": 20.0,
145+
"target_creature_only": false,
146+
"to_hit_mod": 17
147+
}
148+
],
86149
"desc": "Melee Weapon Attack: +17 to hit, reach 20 ft., one target. Hit: 19 (2d8 + 10) bludgeoning damage.",
87150
"form_condition": null,
88151
"key": "srd_ancient-red-dragon_tail",

‎api_v2/tests/responses/TestObjects.test_creature_goblin_example.approved.json‎

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,28 @@
1010
"actions": [
1111
{
1212
"action_type": "ACTION",
13-
"attacks": [],
13+
"attacks": [
14+
{
15+
"attack_type": "WEAPON",
16+
"damage_bonus": null,
17+
"damage_die_count": 1,
18+
"damage_die_type": "D6",
19+
"damage_type": "thunder",
20+
"distance_unit": "feet",
21+
"extra_damage_bonus": null,
22+
"extra_damage_die_count": null,
23+
"extra_damage_die_type": null,
24+
"extra_damage_type": null,
25+
"key": "srd_goblin_scimitar_scimitar-attack",
26+
"long_range": null,
27+
"name": "Scimitar attack",
28+
"parent": "srd_goblin_scimitar",
29+
"range": null,
30+
"reach": 5.0,
31+
"target_creature_only": false,
32+
"to_hit_mod": 4
33+
}
34+
],
1435
"desc": "Melee Weapon Attack: +4 to hit, reach 5 ft., one target. Hit: 5 (1d6 + 2) slashing damage.",
1536
"form_condition": null,
1637
"key": "srd_goblin_scimitar",
@@ -22,7 +43,28 @@
2243
},
2344
{
2445
"action_type": "ACTION",
25-
"attacks": [],
46+
"attacks": [
47+
{
48+
"attack_type": "WEAPON",
49+
"damage_bonus": null,
50+
"damage_die_count": 1,
51+
"damage_die_type": "D6",
52+
"damage_type": "thunder",
53+
"distance_unit": "feet",
54+
"extra_damage_bonus": null,
55+
"extra_damage_die_count": null,
56+
"extra_damage_die_type": null,
57+
"extra_damage_type": null,
58+
"key": "srd_goblin_shortbow_shortbow-attack",
59+
"long_range": 320.0,
60+
"name": "Shortbow attack",
61+
"parent": "srd_goblin_shortbow",
62+
"range": 80.0,
63+
"reach": null,
64+
"target_creature_only": false,
65+
"to_hit_mod": 4
66+
}
67+
],
2668
"desc": "Ranged Weapon Attack: +4 to hit, range 80/320 ft., one target. Hit: 5 (1d6 + 2) piercing damage.",
2769
"form_condition": null,
2870
"key": "srd_goblin_shortbow",

‎api_v2/tests/responses/TestObjects.test_creature_guard_example.approved.json‎

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,48 @@
1010
"actions": [
1111
{
1212
"action_type": "ACTION",
13-
"attacks": [],
13+
"attacks": [
14+
{
15+
"attack_type": "WEAPON",
16+
"damage_bonus": null,
17+
"damage_die_count": 1,
18+
"damage_die_type": "D8",
19+
"damage_type": "thunder",
20+
"distance_unit": "feet",
21+
"extra_damage_bonus": null,
22+
"extra_damage_die_count": null,
23+
"extra_damage_die_type": null,
24+
"extra_damage_type": null,
25+
"key": "srd_guard_spear_spear-melee-attack",
26+
"long_range": 60.0,
27+
"name": "Spear Melee attack",
28+
"parent": "srd_guard_spear",
29+
"range": 20.0,
30+
"reach": 5.0,
31+
"target_creature_only": false,
32+
"to_hit_mod": 3
33+
},
34+
{
35+
"attack_type": "WEAPON",
36+
"damage_bonus": null,
37+
"damage_die_count": 1,
38+
"damage_die_type": "D6",
39+
"damage_type": "thunder",
40+
"distance_unit": "feet",
41+
"extra_damage_bonus": null,
42+
"extra_damage_die_count": null,
43+
"extra_damage_die_type": null,
44+
"extra_damage_type": null,
45+
"key": "srd_guard_spear_spear-ranged-attack",
46+
"long_range": 60.0,
47+
"name": "Spear Ranged attack",
48+
"parent": "srd_guard_spear",
49+
"range": 20.0,
50+
"reach": null,
51+
"target_creature_only": false,
52+
"to_hit_mod": 3
53+
}
54+
],
1455
"desc": "Melee or Ranged Weapon Attack: +3 to hit, reach 5 ft. or range 20/60 ft., one target. Hit: 4 (1d6 + 1) piercing damage, or 5 (1d8 + 1) piercing damage if used with two hands to make a melee attack.",
1556
"form_condition": null,
1657
"key": "srd_guard_spear",

0 commit comments

Comments
 (0)