Skip to content

Commit

Permalink
Merge pull request #7 from ConductionNL/development
Browse files Browse the repository at this point in the history
Dev to main
  • Loading branch information
rubenvdlinde authored Sep 10, 2024
2 parents b726b7f + a6415a5 commit f7e204b
Show file tree
Hide file tree
Showing 160 changed files with 7,558 additions and 3,300 deletions.
26 changes: 26 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"files.autoSave": "afterDelay",
"editor.defaultFormatter": "dbaeumer.vscode-eslint",
"editor.formatOnSave": true,
"eslint.format.enable": true,
"cSpell.words": [
"depubliceren",
"Depubliceren",
"gedepubliceerd",
"Matadata",
"nextcloud",
"opencatalogi",
"organisation",
"Organisation",
"organisations",
"Organisations",
"pinia",
"Toegangs"
],
"[javascript]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
},
"[css]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
}
8 changes: 2 additions & 6 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,8 @@ Create a [feature request](https://github.com/OpenCatalogi/.github/issues/new/ch
<version>0.1.4</version>
<licence>agpl</licence>
<author mail="[email protected]" homepage="https://www.conduction.nl/">Conduction</author>
<documentation>
<user>https://conduction.gitbook.io/opencatalogi-nextcloud/</user>
<admin>https://conduction.gitbook.io/opencatalogi-nextcloud/</admin>
<developer>https://conduction.gitbook.io/opencatalogi-nextcloud/</developer>
</documentation>
<category>tools</category>
<namespace>LarpingApp</namespace>
<category>organisation</category>
<website>https://github.com/ConductionNL/LarpingNextApp</website>
<bugs>https://github.com/ConductionNL/LarpingNextApp/issues</bugs>
<repository type="git">https://github.com/ConductionNL/LarpingNextApp.git</repository>
Expand Down
3 changes: 2 additions & 1 deletion appinfo/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
'items' => ['url' => 'api/items'],
'players' => ['url' => 'api/players'],
'skills' => ['url' => 'api/skills'],
'templates' => ['url' => 'api/templates'],
'templates' => ['url' => 'api/templates'],
'conditions' => ['url' => 'api/conditions'],
],
'routes' => [
// Page routes
Expand Down
23 changes: 16 additions & 7 deletions css/main.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
:root {
--OC-margin-10: 10px;
--OC-margin-20: 20px;
--OC-margin-50: 50px;
--Larp-margin-10: 10px;
--Larp-margin-20: 20px;
--Larp-margin-50: 50px;
}

/* Pages */
Expand All @@ -18,11 +18,15 @@
/* Lists */

.listHeader {
display: flex;

position: sticky;
top: 0;
z-index: 1000;
background-color: var(--color-main-background);
border-bottom: 1px solid var(--color-border);
flex-direction: row;
align-items: center;
}

.searchField {
Expand All @@ -39,9 +43,9 @@
/* Detail pages */

.detailContainer {
margin-block-start: var(--OC-margin-20);
margin-inline-start: var(--OC-margin-20);
margin-inline-end: var(--OC-margin-20);
margin-block-start: var(--Larp-margin-20);
margin-inline-start: var(--Larp-margin-20);
margin-inline-end: var(--Larp-margin-20);
}

.tabContainer > * ul > li {
Expand Down Expand Up @@ -79,7 +83,7 @@
}

.tabContainer > * div[role="tabpanel"] {
margin-block-start: var(--OC-margin-10);
margin-block-start: var(--Larp-margin-10);
}

.tabPanel {
Expand Down Expand Up @@ -107,6 +111,11 @@
}

/* Modals */
.modalContent {
margin: var(--Larp-margin-50);
text-align: center;
}

.form-group > * {
margin-block-end: 10px;
}
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ services:
volumes:
- nextcloud:/var/www/html:rw
- ./custom-apps:/var/www/html/custom_apps
- .:/var/www/html/custom_apps/larpingapp
- .:/var/www/html/custom_apps/opencatalogi
environment:
- MYSQL_PASSWORD='!ChangeMe!'
- MYSQL_DATABASE=nextcloud
Expand Down
133 changes: 133 additions & 0 deletions docs/Schema/Character.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
{
"$id": "https://larping.nl/character.schema.json",
"$schema": "https://docs.commongateway.nl/schemas/Entity.schema.json",
"version": "0.9",
"title":"Character",
"type":"object",
"description":" A player or non player character within an setting. Non Player characters are defined by not being attached to a user",
"properties":{
"name": {
"type":"string",
"example":"Jack Doe",
"description":"The chosen name for this character"
},
"ocName": {
"type":"string",
"example":"Jack Doe",
"description":"The name of the player playing this character"
},
"description": {
"type":"string",
"format":"text",
"example":"A proper sea faring pirate",
"description":"A public description of this character visible for al users with access to the character. DO NOT USE FOR PRIVET BACKGROUNDS",
"maxLength":2555
},
"background": {
"type":"string",
"format":"text",
"maxLength":2555,
"description":"The background of a character, usually this should only be available to players and game masters",
"example":"Jack isn’t much of a sea faring pirate, sea fearing would be more appropriate. Ever since getting the black mark jack has gone out of its way not to leave shore. "
},
"itemsAndMoney": {
"type":"string",
"format":"text",
"maxLength":2555,
"description":"A note containing info about items, money etc."
},
"notice":{
"type":"string",
"format":"text",
"maxLength":2555,
"description":"Anything out of the ordinary that the system noticed automatically",
"example":" ",
"readOnly": true
},
"faith":{
"type":"string",
"format":"text",
"maxLength":2555,
"description":"The faith of a character",
"example":"Godless"
},
"slNotesPublic":{
"type":"string",
"format":"text",
"maxLength":2555,
"description":"SL notes that are visible to players",
"example":" "
},
"slNotesPrivate":{
"type":"string",
"format":"text",
"maxLength":2555,
"description":"SL notes that are NOT-visible to players",
"example":" "
},
"card":{
"type":"string",
"format":"text",
"maxLength":5000,
"description":"The character card as a nice markdown table",
"example":""
},
"stats":{
"type":"array",
"description":"The stats of this character",
"readOnly": true
},
"gold":{
"type":"integer",
"description":"The amount of gold peaces that this character has"
},
"silver":{
"type":"integer",
"description":"The amount of silver peaces that this character has"
},
"copper":{
"type":"integer",
"description":"The amount of copper peaces that this character has"
},
"events":{
"type":"array",
"description":"All the events that this characters has subscribed to\n",
"items":{
"type":"object",
"$ref": "https://larping.nl/event.schema.json"
}
},
"skills":{
"type":"array",
"description":"All the skills that this characters posses\n",
"items":{
"type":"object",
"$ref": "https://larping.nl/skill.schema.json"
}
},
"conditions":{
"type":"array",
"description":"All the conditions that apply to this character",
"items":{
"type":"object",
"$ref": "https://larping.nl/condition.schema.json"
}
},
"type":{
"type":"string",
"default":"player",
"enum": ["player","npc","other"],
"description":"Whether this character is a player character, setting this to false wil turn the character to a non player character (NPC)"
},
"approved":{
"type":"string",
"default":"player",
"enum": ["no","approved"],
"description":"Whether this character is a approved by a game master,setting this to approved wil make the character playable on events"
}
},
"required":[
"name",
"ocName"
]
}
57 changes: 57 additions & 0 deletions docs/Schema/Condition.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"$id": "https://larping.nl/condition.schema.json",
"$schema": "https://docs.commongateway.nl/schemas/Entity.schema.json",
"version": "0.3",
"title":"Condition",
"type":"object",
"description":"Conditions can be either positive or negative effects that target a character. They are generaly consequences of characters actions and choices during gameplay and part of play. Conditions differ from abilities in that they are bought \"bought\" by a character trough skill points.\n\nConditions may contain pre configured effects (handy for character calculations) but are not required to. Some ingame effects are simply not automatable, in that case use the effect text property",
"properties":{
"id":{
"type":"string",
"format":"uuid",
"example":"56cf6db0-7c37-41a5-968b-d322c3f0da28",
"description":"The unique identiefier of this condition",
"readOnly":true
},
"name":{
"type":"string",
"example":"Vamperic demener",
"description":"The unique name of the condition"
},
"description":{
"type":"string",
"example":"You crave the blood of other humanoid beings and feel powerfull when drinking it",
"description":"A setting apropriate flavor text for the condition"
},
"effect":{
"type":"string",
"example":"Charater may drink the blood of other humanoid beings, dealing 1 HP damage per 10 seconds a drinking. Character gains 1 Spiritual Mana per damage dealth. Character sustains 1 HP damage comulative for each 24 hours in wich charater has not used this ablillity. Eg 1 HP for on day one, 2 hp on day 3 ",
"description":"The game description of what this condition does, visable to characters effected by the condition and game masters"
},
"effects":{
"type":"array",
"description":"The automated effects coused by this condition",
"items":{
"type":"object",
"$ref": "https://larping.nl/effect.schema.json"
}
},
"unique":{
"type":"boolean",
"default": false,
"description":"Whether this condition can apply to only ONE player"
},
"characters":{
"type":"array",
"description":"The characters effected by this condition",
"items":{
"type":"object",
"$ref": "https://larping.nl/character.schema.json"
},
"readOnly":true
}
},
"required":[
"name"
]
}
53 changes: 53 additions & 0 deletions docs/Schema/Effect.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"$id": "https://larping.nl/effect.schema.json",
"$schema": "https://docs.commongateway.nl/schemas/Entity.schema.json",
"version": "0.3",
"type":"object",
"title":"Effect",
"description":"A calculated effect to an ability e.g increase of experience point or availible mana to a character. This could be from an Item, Skill, Event or Condition.\n\nKeep in mind that not all effects need to be game related, some might simply be of an administrative nature. For example skills are normally bought and will have a negative effect on characters experience points",
"nameProperties": ["name"],
"properties":{
"id":{
"type":"string",
"format":"uuid",
"example":"56cf6db0-7c37-41a5-968b-d322c3f0da28",
"description":"The unique identiefier of the effect",
"readOnly":true
},
"name":{
"type":"string",
"example":"+ 5 Healing Mana",
"description":"The unique name of the effect"
},
"description":{
"type":"string",
"example":"The character has aditional healing mana",
"description":"An rule technicalo description of what the effect does. Visable to characters effected by the condition and game masters. "
},
"stat":{
"type":"object",
"description":"The stat affected by the effect",
"$ref": "https://larping.nl/stat.schema.json"
},
"modifier":{
"type":"integer",
"description":"The modification that is made to the abbillity",
"example":5
},
"modification":{
"type":"string",
"enum": ["positive","negative"],
"default":"positive",
"description":"Whether the modification is a positive one, normaly speaking this should be true. But it might be negative for sertain conditions e.g "
},
"cumulative":{
"type":"string",
"enum": ["cumulative","non-cumulative"],
"default":"non-cumulative",
"description":"Determines if a character can take this effect more then once"
}
},
"required":[
"name"
]
}
Loading

0 comments on commit f7e204b

Please sign in to comment.