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

Release 1.7.0 PR #612

Merged
merged 72 commits into from
Nov 23, 2024
Merged
Changes from 1 commit
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
ce016b5
converted 1st half of v1 sections to v2 rules
calumbell Oct 20, 2024
fe83c3d
converted 2nd half of v1 sections to v2 rules
calumbell Oct 20, 2024
1e0b9c8
Merge branch 'staging' into data/v2-rules-data
calumbell Oct 20, 2024
37126ae
included migration files
calumbell Oct 20, 2024
b7342f8
first pass at new oas file generation
Dashron Oct 21, 2024
beac15b
Merge pull request #588 from calumbell/data/v2-rules-data
augustjohnson Oct 21, 2024
8a9e38c
More descriptive smoke test.
augustjohnson Oct 21, 2024
dcb46da
Merge pull request #590 from open5e/better_smoke_test
augustjohnson Oct 21, 2024
b849d4f
Fixing up spell endpoint to fetch all needed data beforehand
tylereed Oct 21, 2024
d3d3cd8
remove most warnings, and all errors
Dashron Oct 21, 2024
3f9656e
fix some harder schemas
Dashron Oct 22, 2024
43b0fee
add a postprocessing hook to fix the search object
Dashron Oct 22, 2024
1f94362
Adding fields to SpellCastingOption.
augustjohnson Oct 22, 2024
6d0f135
Editing values for strange spells.
augustjohnson Oct 22, 2024
005de61
Merge branch '419-v2-casting-options-field-support' of github.com:ope…
augustjohnson Oct 22, 2024
8ffb815
Adjusting tests for new fields.
augustjohnson Oct 22, 2024
e009405
Merge pull request #592 from tylereed/577-optimize-spell-sql
augustjohnson Oct 22, 2024
cdb36ba
Merge pull request #593 from open5e/419-v2-casting-options-field-support
augustjohnson Oct 22, 2024
c5c7735
fix decimal issue
Dashron Oct 22, 2024
0d5ed00
update github action
Dashron Oct 22, 2024
3ebb03f
temp tweak github action to test oas upload
Dashron Oct 22, 2024
c7bbb51
more github action tests
Dashron Oct 22, 2024
37416c0
more github action tests
Dashron Oct 22, 2024
4a24ecf
remove pull request option for rdme github action
Dashron Oct 22, 2024
ed28901
Merge pull request #589 from Dashron/oas-v2
augustjohnson Oct 23, 2024
aa5e213
Adding new method to gamecontent.
augustjohnson Oct 23, 2024
97a7149
Ref to v2 related documents.
augustjohnson Oct 23, 2024
71adcd8
returns a url.
augustjohnson Oct 23, 2024
5a7321a
Resolving tests.
augustjohnson Oct 23, 2024
d997b3a
Merge pull request #594 from open5e/442-way-to-compare-if-a-v1-data-i…
augustjohnson Oct 24, 2024
007b847
Hit dice is specifically blank, all other creatures are ok.
augustjohnson Oct 24, 2024
ea81d37
Added base hit dice field to sizes.
augustjohnson Oct 24, 2024
fb9e677
Fixing tests.
augustjohnson Oct 24, 2024
eec2960
Merge pull request #596 from open5e/458-add-hit-dice-to-sizes-model
augustjohnson Oct 24, 2024
76b57f0
Removing items from the response.
augustjohnson Oct 24, 2024
3a926c4
Merge pull request #597 from open5e/591-itemcategories-is-so-slow-tha…
augustjohnson Oct 24, 2024
a657cc9
Adding interior flag.
augustjohnson Oct 27, 2024
ca90d6e
Adjusting data.
augustjohnson Oct 27, 2024
ecbec85
basic fields added.
augustjohnson Oct 27, 2024
cbafe7d
Adding creature environments.
augustjohnson Oct 27, 2024
17e4b96
Adding some creatures from various other sources.
augustjohnson Oct 27, 2024
8960df6
Exposing environments.
augustjohnson Oct 27, 2024
186d627
Updating tests.
augustjohnson Oct 29, 2024
303364d
Merge pull request #599 from open5e/464-add-monster-filter-for-habita…
augustjohnson Oct 29, 2024
f3108e9
refactored field filtering using remove_unwanted_fields method
calumbell Nov 3, 2024
2f0caeb
implemented basic filtering via 'fields' query param
calumbell Nov 3, 2024
753cd21
improved comments for methods in GameContentSerializer abstract seria…
calumbell Nov 3, 2024
a4d5a35
reimplemented depth logic to abstract serializer
calumbell Nov 4, 2024
00675cd
spells view prefetching now pulls depth data from query params instea…
calumbell Nov 4, 2024
af1ac1d
fixed bug with 'field' filters propagating to child serializers
calumbell Nov 4, 2024
b4e0952
improved comments on GameContentSerializer
calumbell Nov 4, 2024
10ab5ae
fixed filtering on 'type' and 'size' fields of /creatures endpoint
calumbell Nov 6, 2024
fbd25fb
fixed filtering on 'category' and 'rarity' fields for /items endpoint
calumbell Nov 6, 2024
7ff9de6
fixed filtering on 'school' and 'classes' for /spells endpoint
calumbell Nov 6, 2024
63ebf7c
updated tests
calumbell Nov 9, 2024
8733d54
Merge pull request #601 from calumbell/feature-api-v2/filtering-neste…
calumbell Nov 9, 2024
dee7c0b
added selecting and prefetching of related fields to CreatureViewSet
calumbell Nov 10, 2024
5a87fbe
add LanguageSerializer and EnvironmentSerializer to CreatureSerializer
calumbell Nov 11, 2024
183b6e5
updated tests for reflect new res. structure of /creatures endpoint
calumbell Nov 11, 2024
c267db2
Merge pull request #602 from calumbell/bugfix/v2-creatures-N+1
augustjohnson Nov 13, 2024
a218d78
Merge pull request #603 from calumbell/bugfix/v2-missing-serializers-…
augustjohnson Nov 13, 2024
e46fdfc
Error in the viewset.
augustjohnson Nov 14, 2024
a877c84
Merge pull request #607 from open5e/606-spell-schools-error-500
augustjohnson Nov 14, 2024
7f3a1a9
traits now returned by v2 creatures endpoint
calumbell Nov 17, 2024
d956978
fixed N+1 problem on 'traits' field of Creature view
calumbell Nov 18, 2024
7f31aac
updated tests - add 'traits' to expected res for /creatures
calumbell Nov 18, 2024
e77a494
eager loading on /items endpoint - mitigates N+1 problem
calumbell Nov 19, 2024
2df92ba
Merge pull request #608 from calumbell/541-v2-creature-traits
augustjohnson Nov 23, 2024
2b0582d
Merge pull request #609 from calumbell/bugfix/v2-item-n+1
augustjohnson Nov 23, 2024
cc6a5f5
Adding creature action attacks.
augustjohnson Nov 23, 2024
0431895
Tests
augustjohnson Nov 23, 2024
13a1a13
Merge pull request #611 from open5e/creature_model_adjustments
augustjohnson Nov 23, 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
Prev Previous commit
Next Next commit
Tests
augustjohnson committed Nov 23, 2024
commit 0431895ad93a9cb23cf8687eca26e694a599c98f
Original file line number Diff line number Diff line change
@@ -10,7 +10,28 @@
"actions": [
{
"action_type": "ACTION",
"attacks": [],
"attacks": [
{
"attack_type": "WEAPON",
"damage_bonus": null,
"damage_die_count": 2,
"damage_die_type": "D10",
"damage_type": "thunder",
"distance_unit": "feet",
"extra_damage_bonus": null,
"extra_damage_die_count": null,
"extra_damage_die_type": null,
"extra_damage_type": "thunder",
"key": "srd_ancient-red-dragon_bite_bite-attack",
"long_range": null,
"name": "Bite attack",
"parent": "srd_ancient-red-dragon_bite",
"range": null,
"reach": 15.0,
"target_creature_only": false,
"to_hit_mod": 17
}
],
"desc": "Melee Weapon Attack: +17 to hit, reach 15 ft., one target. Hit: 21 (2d10 + 10) piercing damage plus 14 (4d6) fire damage.",
"form_condition": null,
"key": "srd_ancient-red-dragon_bite",
@@ -22,7 +43,28 @@
},
{
"action_type": "ACTION",
"attacks": [],
"attacks": [
{
"attack_type": "WEAPON",
"damage_bonus": null,
"damage_die_count": 2,
"damage_die_type": "D6",
"damage_type": "thunder",
"distance_unit": "feet",
"extra_damage_bonus": null,
"extra_damage_die_count": null,
"extra_damage_die_type": null,
"extra_damage_type": null,
"key": "srd_ancient-red-dragon_claw_claw-attack",
"long_range": null,
"name": "Claw attack",
"parent": "srd_ancient-red-dragon_claw",
"range": null,
"reach": 10.0,
"target_creature_only": false,
"to_hit_mod": 17
}
],
"desc": "Melee Weapon Attack: +17 to hit, reach 10 ft., one target. Hit: 17 (2d6 + 10) slashing damage.",
"form_condition": null,
"key": "srd_ancient-red-dragon_claw",
@@ -82,7 +124,28 @@
},
{
"action_type": "ACTION",
"attacks": [],
"attacks": [
{
"attack_type": "WEAPON",
"damage_bonus": null,
"damage_die_count": 2,
"damage_die_type": "D8",
"damage_type": "thunder",
"distance_unit": "feet",
"extra_damage_bonus": null,
"extra_damage_die_count": null,
"extra_damage_die_type": null,
"extra_damage_type": null,
"key": "srd_ancient-red-dragon_tail_tail-attack",
"long_range": null,
"name": "Tail attack",
"parent": "srd_ancient-red-dragon_tail",
"range": null,
"reach": 20.0,
"target_creature_only": false,
"to_hit_mod": 17
}
],
"desc": "Melee Weapon Attack: +17 to hit, reach 20 ft., one target. Hit: 19 (2d8 + 10) bludgeoning damage.",
"form_condition": null,
"key": "srd_ancient-red-dragon_tail",
Original file line number Diff line number Diff line change
@@ -10,7 +10,28 @@
"actions": [
{
"action_type": "ACTION",
"attacks": [],
"attacks": [
{
"attack_type": "WEAPON",
"damage_bonus": null,
"damage_die_count": 1,
"damage_die_type": "D6",
"damage_type": "thunder",
"distance_unit": "feet",
"extra_damage_bonus": null,
"extra_damage_die_count": null,
"extra_damage_die_type": null,
"extra_damage_type": null,
"key": "srd_goblin_scimitar_scimitar-attack",
"long_range": null,
"name": "Scimitar attack",
"parent": "srd_goblin_scimitar",
"range": null,
"reach": 5.0,
"target_creature_only": false,
"to_hit_mod": 4
}
],
"desc": "Melee Weapon Attack: +4 to hit, reach 5 ft., one target. Hit: 5 (1d6 + 2) slashing damage.",
"form_condition": null,
"key": "srd_goblin_scimitar",
@@ -22,7 +43,28 @@
},
{
"action_type": "ACTION",
"attacks": [],
"attacks": [
{
"attack_type": "WEAPON",
"damage_bonus": null,
"damage_die_count": 1,
"damage_die_type": "D6",
"damage_type": "thunder",
"distance_unit": "feet",
"extra_damage_bonus": null,
"extra_damage_die_count": null,
"extra_damage_die_type": null,
"extra_damage_type": null,
"key": "srd_goblin_shortbow_shortbow-attack",
"long_range": 320.0,
"name": "Shortbow attack",
"parent": "srd_goblin_shortbow",
"range": 80.0,
"reach": null,
"target_creature_only": false,
"to_hit_mod": 4
}
],
"desc": "Ranged Weapon Attack: +4 to hit, range 80/320 ft., one target. Hit: 5 (1d6 + 2) piercing damage.",
"form_condition": null,
"key": "srd_goblin_shortbow",
Original file line number Diff line number Diff line change
@@ -10,7 +10,48 @@
"actions": [
{
"action_type": "ACTION",
"attacks": [],
"attacks": [
{
"attack_type": "WEAPON",
"damage_bonus": null,
"damage_die_count": 1,
"damage_die_type": "D8",
"damage_type": "thunder",
"distance_unit": "feet",
"extra_damage_bonus": null,
"extra_damage_die_count": null,
"extra_damage_die_type": null,
"extra_damage_type": null,
"key": "srd_guard_spear_spear-melee-attack",
"long_range": 60.0,
"name": "Spear Melee attack",
"parent": "srd_guard_spear",
"range": 20.0,
"reach": 5.0,
"target_creature_only": false,
"to_hit_mod": 3
},
{
"attack_type": "WEAPON",
"damage_bonus": null,
"damage_die_count": 1,
"damage_die_type": "D6",
"damage_type": "thunder",
"distance_unit": "feet",
"extra_damage_bonus": null,
"extra_damage_die_count": null,
"extra_damage_die_type": null,
"extra_damage_type": null,
"key": "srd_guard_spear_spear-ranged-attack",
"long_range": 60.0,
"name": "Spear Ranged attack",
"parent": "srd_guard_spear",
"range": 20.0,
"reach": null,
"target_creature_only": false,
"to_hit_mod": 3
}
],
"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.",
"form_condition": null,
"key": "srd_guard_spear",
Loading