Skip to content

Commit 2bad62d

Browse files
augustjohnsonaugustjohnson
authored
Merge pull request #504 from open5e/staging
Release 1.6.0.
2 parents 20420c0 + 8efdb1c commit 2bad62d

11 files changed

Lines changed: 73391 additions & 29 deletions

File tree

‎api/tests/approved_files/TestAPIRoot.test_documents.approved.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -199,17 +199,17 @@
199199
"version": "1.0"
200200
},
201201
{
202-
"author": "EN Publishing",
203-
"copyright": "This work includes material taken from the A5E System Reference Document (A5ESRD) by EN Publishing and available at A5ESRD.com, based on Level Up: Advanced 5th Edition, available at www.levelup5e.com. The A5ESRD is licensed under the Creative Commons Attribution 4.0 International License available at https://creativecommons.org/licenses/by/4.0/legalcode.",
202+
"author": "Kobold Press",
203+
"copyright": "ORC NOTICE: This product is licensed under the ORC License, located at the Library of Congress at TX 9-307-067, and available online at various locations including koboldpress.com/orclicense and others. All warranties are disclaimed as set forth therein.",
204204
"created_at": "2014-07-16T00:00:0.000000",
205-
"desc": "Advanced 5th Edition System Reference Document by EN Publishing",
206-
"license": "Creative Commons Attribution 4.0 International License",
207-
"license_url": "http://open5e.com/legal",
208-
"organization": "EN Publishing\u2122",
205+
"desc": "Black Flag Roleplaying Reference Document v0.2, \u00a9 Open Design LLC d/b/a Kobold Press",
206+
"license": "ORC License",
207+
"license_url": "https://paizo.com/orclicense",
208+
"organization": "Kobold Press",
209209
"slug": "blackflag",
210-
"title": "TODO",
211-
"url": "https://a5esrd.com/a5esrd",
212-
"version": "1.0"
210+
"title": "Black Flag SRD",
211+
"url": "https://koboldpress.com/black-flag-reference-document/",
212+
"version": "0.2"
213213
},
214214
{
215215
"author": "Dan Dillon, Chris Harris, Rodrigo Garcia Carmona, Wolfgang Baur",

‎api_v2/migrations/0111_auto_20240804_1809.py‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# Generated by Django 3.2.20 on 2024-08-04 18:09
2+
3+
import django.core.validators
4+
from django.db import migrations, models
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('api_v2', '0110_auto_20240804_1331'),
11+
]
12+
13+
operations = [
14+
migrations.AlterField(
15+
model_name='creature',
16+
name='ability_score_charisma',
17+
field=models.SmallIntegerField(default=0, help_text='Integer representing the charisma ability.', validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(50)]),
18+
),
19+
migrations.AlterField(
20+
model_name='creature',
21+
name='ability_score_constitution',
22+
field=models.SmallIntegerField(default=0, help_text='Integer representing the constitution ability.', validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(50)]),
23+
),
24+
migrations.AlterField(
25+
model_name='creature',
26+
name='ability_score_dexterity',
27+
field=models.SmallIntegerField(default=0, help_text='Integer representing the dexterity ability.', validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(50)]),
28+
),
29+
migrations.AlterField(
30+
model_name='creature',
31+
name='ability_score_intelligence',
32+
field=models.SmallIntegerField(default=0, help_text='Integer representing the intelligence ability.', validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(50)]),
33+
),
34+
migrations.AlterField(
35+
model_name='creature',
36+
name='ability_score_strength',
37+
field=models.SmallIntegerField(default=0, help_text='Integer representing the strength ability.', validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(50)]),
38+
),
39+
migrations.AlterField(
40+
model_name='creature',
41+
name='ability_score_wisdom',
42+
field=models.SmallIntegerField(default=0, help_text='Integer representing the wisdom ability.', validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(50)]),
43+
),
44+
migrations.AlterField(
45+
model_name='creature',
46+
name='experience_points_integer',
47+
field=models.IntegerField(blank=True, help_text='Optional override for calculated XP based on CR.', null=True, validators=[django.core.validators.MinValueValidator(0)]),
48+
),
49+
]

‎api_v2/models/enums.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
("miles","miles")
1515
]
1616

17-
ABILITY_SCORE_MAXIMUM = 30
17+
ABILITY_SCORE_MAXIMUM = 50
1818
SAVING_THROW_MINIMUM = -5
1919
SAVING_THROW_MAXIMUM = +20
2020
SKILL_BONUS_MINIMUM = -5

‎data/v1/blackflag/Document.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
"pk": 46,
55
"fields": {
66
"slug": "blackflag",
7-
"title": "TODO",
8-
"desc": "Advanced 5th Edition System Reference Document by EN Publishing",
9-
"license": "Creative Commons Attribution 4.0 International License",
10-
"author": "EN Publishing",
11-
"organization": "EN Publishing™",
12-
"version": "1.0",
13-
"url": "https://a5esrd.com/a5esrd",
14-
"copyright": "This work includes material taken from the A5E System Reference Document (A5ESRD) by EN Publishing and available at A5ESRD.com, based on Level Up: Advanced 5th Edition, available at www.levelup5e.com. The A5ESRD is licensed under the Creative Commons Attribution 4.0 International License available at https://creativecommons.org/licenses/by/4.0/legalcode.",
15-
"created_at": "2023-11-08T15:35:07.465",
16-
"license_url": "http://open5e.com/legal"
7+
"title": "Black Flag SRD",
8+
"desc": "Black Flag Roleplaying Reference Document v0.2, © Open Design LLC d/b/a Kobold Press",
9+
"license": "ORC License",
10+
"author": "Kobold Press",
11+
"organization": "Kobold Press",
12+
"version": "0.2",
13+
"url": "https://koboldpress.com/black-flag-reference-document/",
14+
"copyright": "ORC NOTICE: This product is licensed under the ORC License, located at the Library of Congress at TX 9-307-067, and available online at various locations including koboldpress.com/orclicense and others. All warranties are disclaimed as set forth therein.",
15+
"created_at": "2024-05-27T21:12:00",
16+
"license_url": "https://paizo.com/orclicense"
1717
}
1818
}
1919
]

0 commit comments

Comments
 (0)