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 #551

Merged
merged 169 commits into from
Oct 10, 2024
Merged
Changes from 3 commits
Commits
Show all changes
169 commits
Select commit Hold shift + click to select a range
25e2d3f
cinderslag elemental
nstefanski Oct 18, 2023
6a4abad
syndicate cutthroat and enforcer
nstefanski Oct 18, 2023
a5d778c
cyclops stormcaller
nstefanski Oct 18, 2023
d93f5fb
goliaths and formatting
nstefanski Oct 18, 2023
61277f8
goat-knight and steed
nstefanski Oct 19, 2023
1a6ff00
slaughter lord and stabby-stabber
nstefanski Oct 19, 2023
1934356
one-eyed cultist and chosen
nstefanski Oct 20, 2023
9d5dafe
Optional Campaign Rules and Guidelines in sections.json
nstefanski Oct 20, 2023
f7285d5
additional feats
nstefanski Oct 20, 2023
ea98a24
Advancement of a Vestige and formatting
nstefanski Oct 25, 2023
ede09ec
Cloak of Ruin
nstefanski Oct 25, 2023
8045906
Armor of Warding Death and Everbark Longbow
nstefanski Oct 26, 2023
35fb12a
Plainscow
nstefanski Oct 26, 2023
7a2d6ef
adding standard OGL lines
nstefanski Oct 26, 2023
87c9aaf
The Decadent End
nstefanski Oct 26, 2023
330fd26
additional vestiges
nstefanski Oct 26, 2023
661541c
additional magic items
nstefanski Oct 26, 2023
03b5b6d
dragonborn subrace
nstefanski Oct 26, 2023
7eaf0af
tweak subclass formatting
nstefanski Oct 30, 2023
78d1e23
empty commit to re-run checks
eepMoody Jul 2, 2024
b203006
Merge pull request #513 from open5e/main
augustjohnson Aug 8, 2024
edede90
Merge pull request #362 from nstefanski/nstefanski-taldorei
augustjohnson Aug 8, 2024
7a3aa0a
refactoring abstracts.
augustjohnson Aug 8, 2024
7f2f769
Addin models.
augustjohnson Aug 8, 2024
3fe10b1
Creature fields changing because of model rename.
augustjohnson Aug 8, 2024
62ca607
Exposing abilities.
augustjohnson Aug 8, 2024
d42a5a0
Exposing Skills.
augustjohnson Aug 8, 2024
5f9aa42
Merge pull request #515 from open5e/139-queryable-mechanics-such-as-a…
augustjohnson Aug 8, 2024
c6a472c
Adding a functional csv export.
augustjohnson Aug 9, 2024
53b7d7c
added ™ to organization field for bf & tob2023
calumbell Aug 13, 2024
d2a5620
updated tests - added \u2122 suffix to organizations
calumbell Aug 14, 2024
ba2b542
Smoke test script.
augustjohnson Aug 22, 2024
28fd838
Adjusting build file to include smoke test.
augustjohnson Aug 22, 2024
f907109
Merge pull request #519 from open5e/228-consider-designing-a-post-dep…
augustjohnson Aug 22, 2024
415faeb
updated v2 Document serializer/view to fix filtering by ?field query …
calumbell Aug 22, 2024
448ac8f
AI Code review action (#497)
eepMoody Aug 25, 2024
f9158de
Merge pull request #520 from calumbell/bugfix/v2-documents-query-para…
calumbell Aug 25, 2024
0609296
Merge pull request #517 from calumbell/#485/update-tob2-organization
calumbell Aug 25, 2024
b9f753a
Adding filter to all relevant document endpoints.
augustjohnson Aug 26, 2024
4410e69
Merge pull request #524 from open5e/523-add-document-filter-to-all-v2…
augustjohnson Aug 26, 2024
0d10bc6
Adding classes to spell.
augustjohnson Aug 27, 2024
d0e194f
Adding spell classes.
augustjohnson Aug 27, 2024
098a770
Exposing key.
augustjohnson Aug 27, 2024
6cb296f
Merge pull request #525 from open5e/v2_spell_class_mapping
augustjohnson Aug 27, 2024
de41534
Adding support for document__ruleset_key filter
augustjohnson Aug 30, 2024
d44e649
Merge pull request #526 from open5e/document__ruleset__key-filter
augustjohnson Aug 30, 2024
3ea8a1c
Merge pull request #516 from open5e/397-exportconversion-to-other-for…
augustjohnson Aug 31, 2024
f27a866
changing quicksetup.
augustjohnson Aug 31, 2024
20e71c0
Changing the v1 index build to false.
augustjohnson Aug 31, 2024
f7c50db
Merge pull request #528 from open5e/468-deprecate-v1-search
augustjohnson Aug 31, 2024
fb4b213
added name icontains and type exact to creature filterset
calumbell Sep 4, 2024
7181f9d
added is_subclass bool filter to characterclass view
calumbell Sep 6, 2024
a6e7d10
Merge pull request #531 from calumbell/feature/charclass-is_subclass-…
augustjohnson Sep 6, 2024
5881e05
Merge pull request #530 from calumbell/bugfix/v2-creature-filter-opti…
augustjohnson Sep 6, 2024
bc6b12e
Getting close to having a working CA/CAA script.
augustjohnson Sep 6, 2024
9426acd
updated characterclass v2 view to allow filter on subclass_of field
calumbell Sep 8, 2024
1d68b0d
Merge pull request #533 from calumbell/bugfix/v2-charclass-subclass_of
augustjohnson Sep 8, 2024
ceaf8bf
lots of parsing changes. clean run.
augustjohnson Sep 14, 2024
f7305bf
Merge branch 'staging' of github.com:open5e/open5e-api into staging
augustjohnson Sep 14, 2024
fb68b7b
ready to save.
augustjohnson Sep 14, 2024
2e337f4
Almost got tob parsed.
augustjohnson Sep 14, 2024
1f1c622
clean run on TOB
augustjohnson Sep 14, 2024
d754ad2
/search rtns whether a CharacterClass is a subclass or not
calumbell Sep 14, 2024
03bf1ab
/search rtns whether a Race is a subrace or not
calumbell Sep 14, 2024
63ebb31
/search rtns Creature cr, size and type
calumbell Sep 14, 2024
aa3fefa
/search rtns spell level
calumbell Sep 14, 2024
e1651f0
/search rtns Items type and rarity if it is a magic item
calumbell Sep 15, 2024
ed22a65
Merge pull request #535 from calumbell/feature/v2-search-fields-for-C…
augustjohnson Sep 16, 2024
991ab7c
Bringing v2 spell filtering into line with v1
tylereed Sep 16, 2024
f3d62c0
Adding subcategory to v2 creature files
tylereed Sep 19, 2024
45f59fa
added additional sorting options to Items V2 endpoint
calumbell Sep 20, 2024
a467fdd
Full run on tob2023
augustjohnson Sep 21, 2024
de0e597
tob2023 caa
augustjohnson Sep 21, 2024
d03c0e7
tob2 seems to be ok
augustjohnson Sep 21, 2024
f46232c
Converting bfrd.
augustjohnson Sep 21, 2024
ad5ff00
Create Codex.
augustjohnson Sep 21, 2024
fc0099a
Menagerie.
augustjohnson Sep 21, 2024
2ff6f1b
taldorei parsed.
augustjohnson Sep 21, 2024
599954d
Adjusting creature actions from wotc.
augustjohnson Sep 21, 2024
54cfd95
Many creature traits added.
augustjohnson Sep 22, 2024
f439a2b
Converting traits.
augustjohnson Sep 22, 2024
90535b2
Fixing some errors.
augustjohnson Sep 22, 2024
5ddf71d
Fixing lots of bad names
augustjohnson Sep 22, 2024
518d71e
Adding form condition field on creatureaction.
augustjohnson Sep 22, 2024
c31ea74
Fixing some forms.
augustjohnson Sep 22, 2024
28d0b12
Adding many changes to CAA
augustjohnson Sep 22, 2024
6f3cabe
added more v2 spell filtering options
calumbell Sep 23, 2024
ec1c77e
Merge pull request #536 from tylereed/522-v2-spell-filters
calumbell Sep 23, 2024
333dc4e
Fixing some of the per day issues.
augustjohnson Sep 23, 2024
bf31f86
parsing out some /days
augustjohnson Sep 23, 2024
8efd7c7
Fixing lots of rechargers.
augustjohnson Sep 23, 2024
ab37b3a
Fixing actions in mmenag
augustjohnson Sep 23, 2024
92d6351
Fixing cantrips.
augustjohnson Sep 23, 2024
665fd29
straggler.
augustjohnson Sep 23, 2024
6798549
renaming.
augustjohnson Sep 23, 2024
dc44fc3
Merge pull request #543 from open5e/creature_action_data
augustjohnson Sep 23, 2024
acdf2ae
Merge pull request #538 from calumbell/bugfix/v2-item-sorting-fields
augustjohnson Sep 23, 2024
8d8e6d8
Updating spells to have the correct casting_time
tylereed Sep 25, 2024
9e81c91
added Rule model & endpoint
calumbell Sep 25, 2024
1d8bc64
Merge branch 'staging' into 486-add-subcategory
tylereed Sep 27, 2024
250e56e
Fixing up creature subcategory migration
tylereed Sep 27, 2024
de7a7ad
Adding in action.
augustjohnson Sep 28, 2024
5868a14
Adding action types to all creatureactions.
augustjohnson Sep 28, 2024
c06cb56
Adding in legendary cost.
augustjohnson Sep 28, 2024
3a7a0b9
Resetting legendary cost to Null by default.
augustjohnson Sep 29, 2024
75f7301
Adding creature actions.
augustjohnson Sep 29, 2024
e5afe9b
data error in ascetic grandmaster.
augustjohnson Sep 29, 2024
67f2274
Fixing some typoes in v1.
augustjohnson Sep 29, 2024
3377cc3
bonus, reactions fixed.
augustjohnson Sep 29, 2024
5c6a45a
Merge pull request #545 from open5e/legendary_reaction_bonus
augustjohnson Sep 29, 2024
018988f
Basic exposure.
augustjohnson Sep 29, 2024
39ded3c
Merge branch 'staging' into 542-fix-casting-time
tylereed Sep 29, 2024
26c669d
Adding some actions that had been missed.
augustjohnson Sep 29, 2024
029ff46
Adding in "reaction_condition" to spell v2 table
tylereed Sep 30, 2024
f8b4bd8
Adding in missing reaction condition data for spells that didn't have it
tylereed Sep 30, 2024
eb754ff
Added some missing LAs
augustjohnson Oct 2, 2024
32baee2
Merge pull request #547 from open5e/creatureaction_exposed
augustjohnson Oct 2, 2024
91a33bf
Merge pull request #537 from tylereed/486-add-subcategory
augustjohnson Oct 3, 2024
2268f83
Merge pull request #546 from tylereed/542-fix-casting-time
augustjohnson Oct 3, 2024
60588d8
Merging conflicting migrations
augustjohnson Oct 3, 2024
e60ff19
Merge pull request #549 from open5e/548-bugfix-for-migration-error-af…
augustjohnson Oct 3, 2024
80ec5d0
removal of haystack primarily.
augustjohnson Oct 5, 2024
f6dc571
Getting a pass out of approvaltests.
augustjohnson Oct 5, 2024
739c2ce
fixing an easy warning.
augustjohnson Oct 5, 2024
6037174
Adjusting a warning error.
augustjohnson Oct 5, 2024
19bc576
Squashing api migrations.
augustjohnson Oct 5, 2024
f798815
Collapsing v2 migrations.
augustjohnson Oct 5, 2024
b4f087f
Merge pull request #552 from open5e/469-clean-up-and-upgrade-dependen…
augustjohnson Oct 5, 2024
b70342e
Using gunicorn as a direct dependency.
augustjohnson Oct 5, 2024
0fc172e
Merge pull request #554 from open5e/staging
augustjohnson Oct 5, 2024
fd3095d
Adjusting the dockerfile to no longer use virtual env
augustjohnson Oct 5, 2024
fed6dc2
Slight adjustments to dockerfile.
augustjohnson Oct 5, 2024
944d813
Merge pull request #555 from open5e/469-clean-up-and-upgrade-dependen…
augustjohnson Oct 5, 2024
58e5eef
Maybe this will fix static files?
augustjohnson Oct 5, 2024
4fbb50f
Merge pull request #556 from open5e/469-clean-up-and-upgrade-dependen…
augustjohnson Oct 5, 2024
2ace928
Adding whitenoise into middleware.
augustjohnson Oct 6, 2024
3d9f826
Fixing favico 404.
augustjohnson Oct 6, 2024
677d6fa
Merge pull request #557 from open5e/469-clean-up-and-upgrade-dependen…
augustjohnson Oct 6, 2024
0454d5c
Script exists.
augustjohnson Oct 7, 2024
7832740
adding in new step to script.
augustjohnson Oct 7, 2024
dde4938
Removing en-dashes, backquotes, and some other stuff from monsters.
augustjohnson Oct 7, 2024
b64f78e
Merge pull request #559 from open5e/246-recurring-random-unicode-char…
augustjohnson Oct 7, 2024
4189b84
Added RuleGroup model (temp. name for RuleSet)
calumbell Oct 8, 2024
77ea2b4
Adding v2 approval tests.
augustjohnson Oct 8, 2024
ff06e25
Ruleset to GameSystem
augustjohnson Oct 8, 2024
f29dca9
ruleset to gamesystem
augustjohnson Oct 8, 2024
d8ffa55
Merge pull request #561 from open5e/ruleset_to_gamesystem_refactor
augustjohnson Oct 8, 2024
cb3eca3
Adding canonical approve tests for v2.
augustjohnson Oct 8, 2024
f74994d
Merge remote-tracking branch 'origin/staging' into 364-v2-testing
augustjohnson Oct 8, 2024
a4f9d1b
supporting refactor of gamesystem
augustjohnson Oct 8, 2024
0b151c9
Merge pull request #562 from open5e/364-v2-testing
augustjohnson Oct 8, 2024
6a9b1ae
merging staging into feature branch to fix GameSystem endpoint name
calumbell Oct 8, 2024
1c67f12
renamed RuleGroup model to RuleSet
calumbell Oct 8, 2024
0540833
added help_text to rules models
calumbell Oct 8, 2024
e742ec8
Data type change first.
augustjohnson Oct 9, 2024
958eee9
Rename to standard approach.
augustjohnson Oct 9, 2024
6478cfb
Progress, refactoring in creature.
augustjohnson Oct 9, 2024
40de875
distance on creature action attack working
augustjohnson Oct 9, 2024
09ed0da
Whitespace.
augustjohnson Oct 9, 2024
b27fec4
Migrated space over to distance field.
augustjohnson Oct 9, 2024
7b87df2
Size distance conversion.
augustjohnson Oct 9, 2024
02c2c43
Distance on size now.
augustjohnson Oct 9, 2024
e11b6f1
weapon ranges.
augustjohnson Oct 9, 2024
9ab96c9
Weapons.
augustjohnson Oct 9, 2024
ada1563
Testing success.
augustjohnson Oct 9, 2024
8bffdc9
Merge pull request #567 from open5e/563-standardize-approach-to-dista…
augustjohnson Oct 9, 2024
3963750
renamed v2/models.rules to rule.py, updated comments
calumbell Oct 9, 2024
7d73978
updated v2/models imports
calumbell Oct 9, 2024
5c98d41
Merge pull request #560 from calumbell/feature/v2-rules
augustjohnson Oct 10, 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
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -79,7 +79,7 @@ it with the content you add.
create a new one.
- `Publisher`: The publisher of the source. Select one of the available publishers. If the publisher is not available,
create a new one.
- `Ruleset`: The ruleset the source is associated with. Select one of the available rulesets. If the ruleset is not available,
- `GameSystem`: The gamesystem the source is associated with. Select one of the available gamesystems. If the gamesystem is not available,
create a new one.
- `Author`: The author of the source. This can be a single author or a list of authors. List them in the format `Author 1, Author 2, Author 3`.
- `Published at`: The Date and Time the source was published. Select the date it was published on. The time can be set to 00:00:00.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<p align="center">
<a href="https://open5e.com">https://open5e.com</a>
<br/>
A JSON API for the D&D 5e ruleset
A JSON API for the D&D 5e gamesystem
</p>
</p>
<br />
2 changes: 1 addition & 1 deletion api_v2/admin.py
Original file line number Diff line number Diff line change
@@ -79,7 +79,7 @@ class LanguageAdmin(admin.ModelAdmin):
admin.site.register(Document)
admin.site.register(License)
admin.site.register(Publisher)
admin.site.register(Ruleset)
admin.site.register(GameSystem)

admin.site.register(DamageType)

12 changes: 6 additions & 6 deletions api_v2/management/commands/export.py
Original file line number Diff line number Diff line change
@@ -83,13 +83,13 @@ def handle(self, *args, **options) -> None:
self.stdout.write(self.style.SUCCESS('Data for v1 data complete.'))

# Start V2 output.
rulesets = Ruleset.objects.all()
ruleset_path = get_filepath_by_model(
'Ruleset',
gamesystems = GameSystem.objects.all()
gamesystem_path = get_filepath_by_model(
'GameSystem',
'api_v2',
base_path=options['dir'],
format=options['format'])
write_queryset_data(ruleset_path, rulesets, format=options['format'])
write_queryset_data(gamesystem_path, gamesystems, format=options['format'])

license_path = get_filepath_by_model(
'License',
@@ -123,7 +123,7 @@ def handle(self, *args, **options) -> None:
write_queryset_data(doc_path, docq, format=options['format'])

for model in app_models:
SKIPPED_MODEL_NAMES = ['Document', 'Ruleset', 'License', 'Publisher','SearchResult']
SKIPPED_MODEL_NAMES = ['Document', 'GameSystem', 'License', 'Publisher','SearchResult']
CHILD_MODEL_NAMES = ['RaceTrait', 'FeatBenefit', 'BackgroundBenefit', 'ClassFeatureItem', 'SpellCastingOption','CreatureAction', 'CreatureTrait']
CHILD_CHILD_MODEL_NAMES = ['CreatureActionAttack']

@@ -158,7 +158,7 @@ def get_filepath_by_model(model_name, app_label, pub_key=None, doc_key=None, bas

if app_label == "api_v2":
root_folder_name = 'v2'
root_models = ['License', 'Ruleset']
root_models = ['License', 'GameSystem']
pub_models = ['Publisher']

if model_name in root_models:
8 changes: 4 additions & 4 deletions api_v2/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -95,11 +95,11 @@ class Migration(migrations.Migration):
},
),
migrations.CreateModel(
name='Ruleset',
name='GameSystem',
fields=[
('name', models.CharField(help_text='Name of the item.', max_length=100)),
('desc', models.TextField(help_text='Description of the game content item. Markdown.')),
('key', models.CharField(help_text='Unique key for the ruleset the document was published for.', max_length=100, primary_key=True, serialize=False)),
('key', models.CharField(help_text='Unique key for the gamesystem the document was published for.', max_length=100, primary_key=True, serialize=False)),
('content_prefix', models.CharField(blank=True, help_text='Short code prepended to content keys.', max_length=10)),
],
options={
@@ -533,8 +533,8 @@ class Migration(migrations.Migration):
),
migrations.AddField(
model_name='document',
name='ruleset',
field=models.ForeignKey(help_text="The document's game system that it was published for.", on_delete=django.db.models.deletion.CASCADE, to='api_v2.ruleset'),
name='gamesystem',
field=models.ForeignKey(help_text="The document's game system that it was published for.", on_delete=django.db.models.deletion.CASCADE, to='api_v2.gamesystem'),
),
migrations.CreateModel(
name='Size',
2 changes: 1 addition & 1 deletion api_v2/models/__init__.py
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@
from .document import Document
from .document import License
from .document import Publisher
from .document import Ruleset
from .document import GameSystem
from .document import FromDocument

from .damagetype import DamageType
2 changes: 1 addition & 1 deletion api_v2/models/creature.py
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ class CreatureType(HasName, HasDescription, FromDocument):

class Creature(Object, HasAbilities, HasSenses, HasLanguage, HasSpeed, FromDocument):
"""
This is the model for a Creature, per the 5e ruleset.
This is the model for a Creature, per the 5e gamesystem.

This extends the object and abilities models.
"""
10 changes: 5 additions & 5 deletions api_v2/models/document.py
Original file line number Diff line number Diff line change
@@ -21,8 +21,8 @@ class Document(HasName, HasDescription):
on_delete=models.CASCADE,
help_text="Publisher which has written the game content document.")

ruleset = models.ForeignKey(
"Ruleset",
gamesystem = models.ForeignKey(
"GameSystem",
on_delete=models.CASCADE,
help_text="The document's game system that it was published for."
)
@@ -55,7 +55,7 @@ def stats(self):

SKIPPED_MODEL_NAMES = [
'Document',
'Ruleset',
'GameSystem',
'License',
'Publisher',
'SearchResult']
@@ -103,11 +103,11 @@ class Publisher(HasName):
)


class Ruleset(HasName, HasDescription):
class GameSystem(HasName, HasDescription):
key = models.CharField(
primary_key=True,
max_length=100,
help_text="Unique key for the ruleset the document was published for."
help_text="Unique key for the gamesystem the document was published for."
)

content_prefix = models.CharField(
2 changes: 1 addition & 1 deletion api_v2/serializers/__init__.py
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
from .background import BackgroundBenefitSerializer
from .background import BackgroundSerializer

from .document import RulesetSerializer
from .document import GameSystemSerializer
from .document import LicenseSerializer
from .document import PublisherSerializer
from .document import DocumentSerializer
6 changes: 3 additions & 3 deletions api_v2/serializers/document.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
"""Serializers for Ruleset, License, Publisher, and Document models."""
"""Serializers for GameSystem, License, Publisher, and Document models."""
from rest_framework import serializers
from .abstracts import GameContentSerializer

from api_v2 import models

class RulesetSerializer(serializers.HyperlinkedModelSerializer):
class GameSystemSerializer(serializers.HyperlinkedModelSerializer):
key = serializers.ReadOnlyField()

class Meta:
model = models.Ruleset
model = models.GameSystem
fields = '__all__'


2 changes: 1 addition & 1 deletion api_v2/tests/test_router.py
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ def test_get_root_list(self):
self.assertContains(response, 'documents', count=2)
self.assertContains(response, 'publishers', count=2)
self.assertContains(response, 'licenses', count=2)
self.assertContains(response, 'rulesets', count=2)
self.assertContains(response, 'gamesystems', count=2)
self.assertContains(response, 'items', count=4) #include itemsets
self.assertContains(response, 'itemsets', count=2)
self.assertContains(response, 'weapons', count=2)
2 changes: 1 addition & 1 deletion api_v2/views/__init__.py
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
from .creature import CreatureSetViewSet

from .document import DocumentViewSet
from .document import RulesetViewSet
from .document import GameSystemViewSet
from .document import PublisherViewSet
from .document import LicenseViewSet

4 changes: 2 additions & 2 deletions api_v2/views/ability.py
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ class Meta:
'key': ['in', 'iexact', 'exact' ],
'name': ['iexact', 'exact','contains'],
'document__key': ['in','iexact','exact'],
'document__ruleset__key': ['in','iexact','exact'],
'document__gamesystem__key': ['in','iexact','exact'],
}

class AbilityViewSet(viewsets.ReadOnlyModelViewSet):
@@ -33,7 +33,7 @@ class Meta:
'key': ['in', 'iexact', 'exact' ],
'name': ['iexact', 'exact','contains'],
'document__key': ['in','iexact','exact'],
'document__ruleset__key': ['in','iexact','exact'],
'document__gamesystem__key': ['in','iexact','exact'],
}


2 changes: 1 addition & 1 deletion api_v2/views/alignment.py
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ class Meta:
'key': ['in', 'iexact', 'exact' ],
'name': ['iexact', 'exact','contains'],
'document__key': ['in','iexact','exact'],
'document__ruleset__key': ['in','iexact','exact'],
'document__gamesystem__key': ['in','iexact','exact'],
}

class AlignmentViewSet(viewsets.ReadOnlyModelViewSet):
2 changes: 1 addition & 1 deletion api_v2/views/background.py
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ class Meta:
'key': ['in', 'iexact', 'exact'],
'name': ['iexact', 'exact'],
'document__key': ['in', 'iexact', 'exact'],
'document__ruleset__key': ['in','iexact','exact'],
'document__gamesystem__key': ['in','iexact','exact'],
}


2 changes: 1 addition & 1 deletion api_v2/views/characterclass.py
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ class Meta:
'key': ['in', 'iexact', 'exact' ],
'name': ['iexact', 'exact','contains'],
'document__key': ['in','iexact','exact'],
'document__ruleset__key': ['in','iexact','exact'],
'document__gamesystem__key': ['in','iexact','exact'],
'subclass_of': ['exact']
}

2 changes: 1 addition & 1 deletion api_v2/views/condition.py
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ class Meta:
'key': ['in', 'iexact', 'exact' ],
'name': ['iexact', 'exact','contains'],
'document__key': ['in','iexact','exact'],
'document__ruleset__key': ['in','iexact','exact'],
'document__gamesystem__key': ['in','iexact','exact'],
}


6 changes: 3 additions & 3 deletions api_v2/views/creature.py
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ class Meta:
'key': ['in', 'iexact', 'exact' ],
'name': ['iexact', 'exact', 'icontains'],
'document__key': ['in','iexact','exact'],
'document__ruleset__key': ['in','iexact','exact'],
'document__gamesystem__key': ['in','iexact','exact'],
'size': ['exact'],
'category': ['exact', 'iexact'],
'subcategory': ['exact', 'iexact'],
@@ -73,7 +73,7 @@ class Meta:
'key': ['in', 'iexact', 'exact' ],
'name': ['iexact', 'exact','contains'],
'document__key': ['in','iexact','exact'],
'document__ruleset__key': ['in','iexact','exact'],
'document__gamesystem__key': ['in','iexact','exact'],
}


@@ -94,7 +94,7 @@ class Meta:
'key': ['in', 'iexact', 'exact' ],
'name': ['iexact', 'exact','contains'],
'document__key': ['in','iexact','exact'],
'document__ruleset__key': ['in','iexact','exact'],
'document__gamesystem__key': ['in','iexact','exact'],
}


2 changes: 1 addition & 1 deletion api_v2/views/damagetype.py
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ class Meta:
'key': ['in', 'iexact', 'exact' ],
'name': ['iexact', 'exact','contains'],
'document__key': ['in','iexact','exact'],
'document__ruleset__key': ['in','iexact','exact'],
'document__gamesystem__key': ['in','iexact','exact'],
}


12 changes: 6 additions & 6 deletions api_v2/views/document.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""Viewsets for the Document, Ruleset, Publisher, and License Serializers."""
"""Viewsets for the Document, GameSystem, Publisher, and License Serializers."""
from rest_framework import viewsets
from django_filters import FilterSet, CharFilter
from django.db.models import JSONField
@@ -8,14 +8,14 @@



class RulesetViewSet(viewsets.ReadOnlyModelViewSet):
class GameSystemViewSet(viewsets.ReadOnlyModelViewSet):
""""
list: API Endpoint for returning a set of rulesets.
list: API Endpoint for returning a set of gamesystems.

retrieve: API endpoint for return a particular ruleset.
retrieve: API endpoint for return a particular gamesystem.
"""
queryset = models.Ruleset.objects.all().order_by('pk')
serializer_class = serializers.RulesetSerializer
queryset = models.GameSystem.objects.all().order_by('pk')
serializer_class = serializers.GameSystemSerializer


class DocumentFilterSet(FilterSet):
2 changes: 1 addition & 1 deletion api_v2/views/environment.py
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ class Meta:
'key': ['in', 'iexact', 'exact' ],
'name': ['iexact', 'exact','contains'],
'document__key': ['in','iexact','exact'],
'document__ruleset__key': ['in','iexact','exact'],
'document__gamesystem__key': ['in','iexact','exact'],
}


2 changes: 1 addition & 1 deletion api_v2/views/feat.py
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ class Meta:
'key': ['in', 'iexact', 'exact' ],
'name': ['iexact', 'exact'],
'document__key': ['in','iexact','exact'],
'document__ruleset__key': ['in','iexact','exact'],
'document__gamesystem__key': ['in','iexact','exact'],
}


8 changes: 4 additions & 4 deletions api_v2/views/item.py
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ class Meta:
'requires_attunement': ['exact'],
'category': ['in', 'exact'],
'document__key': ['in','iexact','exact'],
'document__ruleset__key': ['in','iexact','exact'],
'document__gamesystem__key': ['in','iexact','exact'],
}


@@ -56,7 +56,7 @@ class Meta:
'key': ['in', 'iexact', 'exact' ],
'name': ['iexact', 'exact'],
'document__key': ['in','iexact','exact'],
'document__ruleset__key': ['in','iexact','exact'],
'document__gamesystem__key': ['in','iexact','exact'],
}


@@ -89,7 +89,7 @@ class Meta:
'key': ['in', 'iexact', 'exact' ],
'name': ['iexact', 'exact'],
'document__key': ['in','iexact','exact'],
'document__ruleset__key': ['in','iexact','exact'],
'document__gamesystem__key': ['in','iexact','exact'],
'damage_dice': ['in','iexact','exact'],
'versatile_dice': ['in','iexact','exact'],
'range_reach': ['exact','lt','lte','gt','gte'],
@@ -127,7 +127,7 @@ class Meta:
'key': ['in', 'iexact', 'exact' ],
'name': ['iexact', 'exact'],
'document__key': ['in','iexact','exact'],
'document__ruleset__key': ['in','iexact','exact'],
'document__gamesystem__key': ['in','iexact','exact'],
'grants_stealth_disadvantage': ['exact'],
'strength_score_required': ['exact','lt','lte','gt','gte'],
'ac_base': ['exact','lt','lte','gt','gte'],
2 changes: 1 addition & 1 deletion api_v2/views/language.py
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ class Meta:
'key': ['in', 'iexact', 'exact' ],
'name': ['iexact', 'exact'],
'document__key': ['in','iexact','exact'],
'document__ruleset__key': ['in','iexact','exact'],
'document__gamesystem__key': ['in','iexact','exact'],
'is_exotic': ['exact'],
'is_secret': ['exact']
}
2 changes: 1 addition & 1 deletion api_v2/views/race.py
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ class Meta:
'key': ['in', 'iexact', 'exact'],
'name': ['iexact', 'exact'],
'document__key': ['in', 'iexact', 'exact'],
'document__ruleset__key': ['in','iexact','exact'],
'document__gamesystem__key': ['in','iexact','exact'],
'subrace_of': ['isnull'],
'subrace_of__key':['in', 'iexact', 'exact'],
}
2 changes: 1 addition & 1 deletion api_v2/views/size.py
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ class Meta:
'key': ['in', 'iexact', 'exact' ],
'name': ['iexact', 'exact','contains'],
'document__key': ['in','iexact','exact'],
'document__ruleset__key': ['in','iexact','exact'],
'document__gamesystem__key': ['in','iexact','exact'],
}


2 changes: 1 addition & 1 deletion api_v2/views/spell.py
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ class Meta:
'key': ['in', 'iexact', 'exact'],
'name': ['iexact', 'exact', 'contains', 'icontains'],
'document__key': ['in', 'iexact', 'exact'],
'document__ruleset__key': ['in', 'iexact', 'exact'],
'document__gamesystem__key': ['in', 'iexact', 'exact'],
'classes__key': ['in', 'iexact', 'exact'],
'classes__name': ['in'],
'level': ['exact', 'range', 'gt', 'gte', 'lt', 'lte'],
Loading
Loading