├── .gitignore
├── packs
├── cyborg-3p-actors
│ ├── LOCK
│ ├── 000026.log
│ ├── 000030.log
│ ├── CURRENT
│ ├── 000005.ldb
│ ├── MANIFEST-000024
│ ├── MANIFEST-000028
│ ├── LOG.old
│ └── LOG
├── cyborg-3p-items
│ ├── LOCK
│ ├── 000029.log
│ ├── 000034.log
│ ├── CURRENT
│ ├── 000031.ldb
│ ├── MANIFEST-000027
│ ├── MANIFEST-000032
│ ├── LOG.old
│ └── LOG
├── cyborg-3p-journal
│ ├── LOCK
│ ├── 000020.log
│ ├── 000024.log
│ ├── CURRENT
│ ├── 000011.ldb
│ ├── MANIFEST-000018
│ ├── MANIFEST-000022
│ ├── LOG.old
│ └── LOG
└── cyborg-3p-tables
│ ├── LOCK
│ ├── 000026.log
│ ├── 000030.log
│ ├── CURRENT
│ ├── 000005.ldb
│ ├── MANIFEST-000024
│ ├── MANIFEST-000028
│ ├── LOG.old
│ └── LOG
├── assets
└── images
│ ├── impudent-dolph
│ ├── dolph-icon.png
│ ├── dolph-encante-icon.png
│ ├── minigun.svg
│ ├── mecha-fist.svg
│ └── micro-missiles.svg
│ └── full-auto
│ ├── armored-car.svg
│ ├── gunship.svg
│ ├── boat.svg
│ ├── vehicle-armor.svg
│ ├── interceptor.svg
│ ├── car.svg
│ ├── van.svg
│ ├── old-school-motorcyle.svg
│ ├── cyberbike.svg
│ └── gliderboard.svg
├── LICENSE.CB3PL
├── README.md
├── CHANGELOG.md
├── scripts
└── module.js
├── .github
└── workflows
│ └── main.yml
└── module.json
/.gitignore:
--------------------------------------------------------------------------------
1 | .DS_Store
2 |
--------------------------------------------------------------------------------
/packs/cyborg-3p-actors/LOCK:
--------------------------------------------------------------------------------
1 |
--------------------------------------------------------------------------------
/packs/cyborg-3p-items/LOCK:
--------------------------------------------------------------------------------
1 |
--------------------------------------------------------------------------------
/packs/cyborg-3p-journal/LOCK:
--------------------------------------------------------------------------------
1 |
--------------------------------------------------------------------------------
/packs/cyborg-3p-tables/LOCK:
--------------------------------------------------------------------------------
1 |
--------------------------------------------------------------------------------
/packs/cyborg-3p-actors/000026.log:
--------------------------------------------------------------------------------
1 |
--------------------------------------------------------------------------------
/packs/cyborg-3p-actors/000030.log:
--------------------------------------------------------------------------------
1 |
--------------------------------------------------------------------------------
/packs/cyborg-3p-items/000029.log:
--------------------------------------------------------------------------------
1 |
--------------------------------------------------------------------------------
/packs/cyborg-3p-items/000034.log:
--------------------------------------------------------------------------------
1 |
--------------------------------------------------------------------------------
/packs/cyborg-3p-tables/000026.log:
--------------------------------------------------------------------------------
1 |
--------------------------------------------------------------------------------
/packs/cyborg-3p-tables/000030.log:
--------------------------------------------------------------------------------
1 |
--------------------------------------------------------------------------------
/packs/cyborg-3p-journal/000020.log:
--------------------------------------------------------------------------------
1 |
--------------------------------------------------------------------------------
/packs/cyborg-3p-journal/000024.log:
--------------------------------------------------------------------------------
1 |
--------------------------------------------------------------------------------
/packs/cyborg-3p-actors/CURRENT:
--------------------------------------------------------------------------------
1 | MANIFEST-000024
2 |
--------------------------------------------------------------------------------
/packs/cyborg-3p-items/CURRENT:
--------------------------------------------------------------------------------
1 | MANIFEST-000027
2 |
--------------------------------------------------------------------------------
/packs/cyborg-3p-journal/CURRENT:
--------------------------------------------------------------------------------
1 | MANIFEST-000018
2 |
--------------------------------------------------------------------------------
/packs/cyborg-3p-tables/CURRENT:
--------------------------------------------------------------------------------
1 | MANIFEST-000024
2 |
--------------------------------------------------------------------------------
/packs/cyborg-3p-items/000031.ldb:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/fvtt-fria-ligan/cyborg-foundry-3p/main/packs/cyborg-3p-items/000031.ldb
--------------------------------------------------------------------------------
/packs/cyborg-3p-actors/000005.ldb:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/fvtt-fria-ligan/cyborg-foundry-3p/main/packs/cyborg-3p-actors/000005.ldb
--------------------------------------------------------------------------------
/packs/cyborg-3p-journal/000011.ldb:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/fvtt-fria-ligan/cyborg-foundry-3p/main/packs/cyborg-3p-journal/000011.ldb
--------------------------------------------------------------------------------
/packs/cyborg-3p-tables/000005.ldb:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/fvtt-fria-ligan/cyborg-foundry-3p/main/packs/cyborg-3p-tables/000005.ldb
--------------------------------------------------------------------------------
/packs/cyborg-3p-items/MANIFEST-000027:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/fvtt-fria-ligan/cyborg-foundry-3p/main/packs/cyborg-3p-items/MANIFEST-000027
--------------------------------------------------------------------------------
/packs/cyborg-3p-items/MANIFEST-000032:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/fvtt-fria-ligan/cyborg-foundry-3p/main/packs/cyborg-3p-items/MANIFEST-000032
--------------------------------------------------------------------------------
/packs/cyborg-3p-actors/MANIFEST-000024:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/fvtt-fria-ligan/cyborg-foundry-3p/main/packs/cyborg-3p-actors/MANIFEST-000024
--------------------------------------------------------------------------------
/packs/cyborg-3p-actors/MANIFEST-000028:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/fvtt-fria-ligan/cyborg-foundry-3p/main/packs/cyborg-3p-actors/MANIFEST-000028
--------------------------------------------------------------------------------
/packs/cyborg-3p-journal/MANIFEST-000018:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/fvtt-fria-ligan/cyborg-foundry-3p/main/packs/cyborg-3p-journal/MANIFEST-000018
--------------------------------------------------------------------------------
/packs/cyborg-3p-journal/MANIFEST-000022:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/fvtt-fria-ligan/cyborg-foundry-3p/main/packs/cyborg-3p-journal/MANIFEST-000022
--------------------------------------------------------------------------------
/packs/cyborg-3p-tables/MANIFEST-000024:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/fvtt-fria-ligan/cyborg-foundry-3p/main/packs/cyborg-3p-tables/MANIFEST-000024
--------------------------------------------------------------------------------
/packs/cyborg-3p-tables/MANIFEST-000028:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/fvtt-fria-ligan/cyborg-foundry-3p/main/packs/cyborg-3p-tables/MANIFEST-000028
--------------------------------------------------------------------------------
/assets/images/impudent-dolph/dolph-icon.png:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/fvtt-fria-ligan/cyborg-foundry-3p/main/assets/images/impudent-dolph/dolph-icon.png
--------------------------------------------------------------------------------
/assets/images/impudent-dolph/dolph-encante-icon.png:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/fvtt-fria-ligan/cyborg-foundry-3p/main/assets/images/impudent-dolph/dolph-encante-icon.png
--------------------------------------------------------------------------------
/packs/cyborg-3p-actors/LOG.old:
--------------------------------------------------------------------------------
1 | 2023/06/03-22:06:18.108449 16f99b000 Recovering log #20
2 | 2023/06/03-22:06:18.108757 16f99b000 Delete type=3 #18
3 | 2023/06/03-22:06:18.108801 16f99b000 Delete type=0 #20
4 |
--------------------------------------------------------------------------------
/packs/cyborg-3p-items/LOG.old:
--------------------------------------------------------------------------------
1 | 2023/06/03-22:06:18.110393 16f99b000 Recovering log #23
2 | 2023/06/03-22:06:18.111110 16f99b000 Delete type=3 #21
3 | 2023/06/03-22:06:18.111179 16f99b000 Delete type=0 #23
4 |
--------------------------------------------------------------------------------
/packs/cyborg-3p-tables/LOG.old:
--------------------------------------------------------------------------------
1 | 2023/06/03-22:06:18.113157 16f99b000 Recovering log #20
2 | 2023/06/03-22:06:18.113683 16f99b000 Delete type=3 #18
3 | 2023/06/03-22:06:18.113746 16f99b000 Delete type=0 #20
4 |
--------------------------------------------------------------------------------
/packs/cyborg-3p-journal/LOG.old:
--------------------------------------------------------------------------------
1 | 2023/06/03-22:06:18.110883 16f193000 Recovering log #14
2 | 2023/06/03-22:06:18.111331 16f193000 Delete type=3 #12
3 | 2023/06/03-22:06:18.111533 16f193000 Delete type=0 #14
4 |
--------------------------------------------------------------------------------
/LICENSE.CB3PL:
--------------------------------------------------------------------------------
1 | cy-borg-foundry-vtt is an independent production by community contributors,
2 | and is not affiliated with Stockholm Kartell. It is published under the cy-borg Third Party License.
3 | https://morkborg.com/cb-license/
4 |
5 | cy-borg IS ©2022 STOCKHOLM KARTELL.
--------------------------------------------------------------------------------
/packs/cyborg-3p-journal/LOG:
--------------------------------------------------------------------------------
1 | 2023/06/04-07:39:46.261959 171887000 Recovering log #17
2 | 2023/06/04-07:39:46.262357 171887000 Delete type=0 #17
3 | 2023/06/04-07:39:46.262406 171887000 Delete type=3 #16
4 | 2023/06/04-08:09:24.380182 17211b000 Level-0 table #21: started
5 | 2023/06/04-08:09:24.380268 17211b000 Level-0 table #21: 0 bytes OK
6 | 2023/06/04-08:09:24.380463 17211b000 Delete type=0 #19
7 | 2023/06/04-08:09:24.381420 17211b000 Manual compaction at level-0 from '!folders!acA3DtR8cH0Mp7iR' @ 72057594037927935 : 1 .. '!journal.pages!WclBNPlWsyFpBFgN.fbs8XMPe6NJv8JoI' @ 0 : 0; will stop at (end)
8 |
--------------------------------------------------------------------------------
/README.md:
--------------------------------------------------------------------------------
1 | # cyborg-foundry-3p
2 |
3 | Third-party content for the CY_BORG system for Foundry VTT.
4 |
5 | cyborg-foundry-3p is an independent production by community contributors,
6 | and is not affiliated with Stockholm Kartell. It is published under the CY_BORG Third Party License.
7 | https://morkborg.com/cb-license/
8 |
9 | CY_BORG IS ©2022 STOCKHOLM KARTELL.
10 |
11 |
12 | # Content Credits
13 |
14 | * [Elite Apps](https://hasturudjat.itch.io/apps-4-ellite) by [HasturUdjat](https://hasturudjat.itch.io/).
15 | * [Full Auto](https://rollthebones.itch.io/full-auto) by [RollTheBones](https://rollthebones.itch.io/).
16 | * [Impudent Dolph](https://flintwyrm.itch.io/impudent-dolph) by Wayward Polyhedral and Flintwyrm.
17 |
--------------------------------------------------------------------------------
/packs/cyborg-3p-actors/LOG:
--------------------------------------------------------------------------------
1 | 2023/06/04-07:39:46.259466 17107f000 Recovering log #23
2 | 2023/06/04-07:39:46.259783 17107f000 Delete type=3 #22
3 | 2023/06/04-07:39:46.259827 17107f000 Delete type=0 #23
4 | 2023/06/04-08:09:24.379818 17211b000 Level-0 table #27: started
5 | 2023/06/04-08:09:24.379964 17211b000 Level-0 table #27: 0 bytes OK
6 | 2023/06/04-08:09:24.380131 17211b000 Delete type=0 #25
7 | 2023/06/04-08:09:24.381409 17211b000 Manual compaction at level-0 from '!actors!1LbEhDUOW0HKgyid' @ 72057594037927935 : 1 .. '!folders!vlWbpzacEOD368ER' @ 0 : 0; will stop at (end)
8 | 2023/06/04-08:09:24.381443 17211b000 Manual compaction at level-1 from '!actors!1LbEhDUOW0HKgyid' @ 72057594037927935 : 1 .. '!folders!vlWbpzacEOD368ER' @ 0 : 0; will stop at (end)
9 |
--------------------------------------------------------------------------------
/CHANGELOG.md:
--------------------------------------------------------------------------------
1 | # 2.0.2
2 |
3 | - Add scripts dir to build zip.
4 |
5 | # 2.0.1
6 |
7 | - Fix esmodules path. (by rklos)
8 |
9 | # 2.0.0
10 |
11 | - v11 compatibility.
12 | - Reorganize compendiums using folders.
13 |
14 | # 1.2.1
15 |
16 | - Rename journal compendium.
17 | - Set carry slots and quantity for all apps.
18 |
19 | # 1.2.0
20 |
21 | - Rename module id from cy_borg-3p to cy-borg-3p.
22 |
23 | # 1.1.0
24 |
25 | - Add cy-borg 3P JournalEntry compendium with license and credits.
26 | - Add Elite Apps by HasturUdjat.
27 | - Add Full Auto by RollTheBones.
28 |
29 | # 1.0.0
30 |
31 | - Foundry v10 compatibility.
32 |
33 | # 0.2.0
34 |
35 | - Add lo-fi pixel portraits.
36 |
37 | # 0.1.1
38 |
39 | - Various DOLPH class fixes.
40 |
41 | # 0.1.0
42 |
43 | - First release.
44 |
--------------------------------------------------------------------------------
/packs/cyborg-3p-tables/LOG:
--------------------------------------------------------------------------------
1 | 2023/06/04-07:39:46.263513 17107f000 Recovering log #23
2 | 2023/06/04-07:39:46.263942 17107f000 Delete type=3 #22
3 | 2023/06/04-07:39:46.264008 17107f000 Delete type=0 #23
4 | 2023/06/04-08:09:24.382544 17211b000 Level-0 table #27: started
5 | 2023/06/04-08:09:24.382649 17211b000 Level-0 table #27: 0 bytes OK
6 | 2023/06/04-08:09:24.382893 17211b000 Delete type=0 #25
7 | 2023/06/04-08:09:24.383545 17211b000 Manual compaction at level-0 from '!folders!EYdxbNCMgO8GGtC4' @ 72057594037927935 : 1 .. '!tables.results!zcOerV6wjGX10yIE.t6aPp0mKN8JaC5SX' @ 0 : 0; will stop at (end)
8 | 2023/06/04-08:09:24.383576 17211b000 Manual compaction at level-1 from '!folders!EYdxbNCMgO8GGtC4' @ 72057594037927935 : 1 .. '!tables.results!zcOerV6wjGX10yIE.t6aPp0mKN8JaC5SX' @ 0 : 0; will stop at (end)
9 |
--------------------------------------------------------------------------------
/assets/images/full-auto/armored-car.svg:
--------------------------------------------------------------------------------
1 |
--------------------------------------------------------------------------------
/scripts/module.js:
--------------------------------------------------------------------------------
1 | Hooks.once('init', async function() {
2 | console.log("°º¤ø,¸¸,ø¤º°`°º¤ø,Initializing CY_BORG 3P module,ø¤°º¤ø,¸¸,ø¤º°`°º¤ø,");
3 |
4 | // add our additional classes to the scvmfactory generator
5 | CONFIG.CY.scvmFactory.classUuids.push(
6 | // Dolph Apex
7 | "Compendium.cy-borg-3p.cyborg-3p-items.Item.KU71GxJzvn683Rt6",
8 | // Dolph Data-Driver
9 | "Compendium.cy-borg-3p.cyborg-3p-items.Item.xVaZeiivOUgGRhqM",
10 | // Dolph Echo Jammer
11 | "Compendium.cy-borg-3p.cyborg-3p-items.Item.B04GNL0hLeo2HzJo",
12 | // Dolph Encante
13 | "Compendium.cy-borg-3p.cyborg-3p-items.Item.NeVAqxf63k03xBc3",
14 | // Dolph Spearfish
15 | "Compendium.cy-borg-3p.cyborg-3p-items.Item.UgVR9BsmIpW5zg7V",
16 | // Dolph Zspacer
17 | "Compendium.cy-borg-3p.cyborg-3p-items.Item.RmIBvP364fW67nkI",
18 | );
19 | });
--------------------------------------------------------------------------------
/assets/images/full-auto/gunship.svg:
--------------------------------------------------------------------------------
1 |
--------------------------------------------------------------------------------
/assets/images/full-auto/boat.svg:
--------------------------------------------------------------------------------
1 |
--------------------------------------------------------------------------------
/assets/images/full-auto/vehicle-armor.svg:
--------------------------------------------------------------------------------
1 |
--------------------------------------------------------------------------------
/assets/images/full-auto/interceptor.svg:
--------------------------------------------------------------------------------
1 |
--------------------------------------------------------------------------------
/assets/images/impudent-dolph/minigun.svg:
--------------------------------------------------------------------------------
1 |
--------------------------------------------------------------------------------
/assets/images/full-auto/car.svg:
--------------------------------------------------------------------------------
1 |
--------------------------------------------------------------------------------
/packs/cyborg-3p-items/LOG:
--------------------------------------------------------------------------------
1 | 2023/06/04-07:39:46.261773 17208f000 Recovering log #26
2 | 2023/06/04-07:39:46.262165 17208f000 Delete type=3 #25
3 | 2023/06/04-07:39:46.262226 17208f000 Delete type=0 #26
4 | 2023/06/04-08:09:24.380510 17211b000 Level-0 table #30: started
5 | 2023/06/04-08:09:24.380829 17211b000 Level-0 table #30: 4030 bytes OK
6 | 2023/06/04-08:09:24.380998 17211b000 Delete type=0 #28
7 | 2023/06/04-08:09:24.381432 17211b000 Manual compaction at level-0 from '!folders!7ekZsputCg4Xx20m' @ 72057594037927935 : 1 .. '!items!ygaK4iuCe0rhjEzD' @ 0 : 0; will stop at (end)
8 | 2023/06/04-08:09:24.381459 17211b000 Manual compaction at level-1 from '!folders!7ekZsputCg4Xx20m' @ 72057594037927935 : 1 .. '!items!ygaK4iuCe0rhjEzD' @ 0 : 0; will stop at '!items!xVaZeiivOUgGRhqM' @ 70 : 1
9 | 2023/06/04-08:09:24.381467 17211b000 Compacting 1@1 + 1@2 files
10 | 2023/06/04-08:09:24.382143 17211b000 Generated table #31@1: 55 keys, 19786 bytes
11 | 2023/06/04-08:09:24.382160 17211b000 Compacted 1@1 + 1@2 files => 19786 bytes
12 | 2023/06/04-08:09:24.382268 17211b000 compacted to: files[ 0 0 1 0 0 0 0 ]
13 | 2023/06/04-08:09:24.382341 17211b000 Delete type=2 #20
14 | 2023/06/04-08:09:24.382471 17211b000 Delete type=2 #30
15 | 2023/06/04-08:09:24.383527 17211b000 Manual compaction at level-1 from '!items!xVaZeiivOUgGRhqM' @ 70 : 1 .. '!items!ygaK4iuCe0rhjEzD' @ 0 : 0; will stop at (end)
16 |
--------------------------------------------------------------------------------
/assets/images/full-auto/van.svg:
--------------------------------------------------------------------------------
1 |
--------------------------------------------------------------------------------
/assets/images/impudent-dolph/mecha-fist.svg:
--------------------------------------------------------------------------------
1 |
--------------------------------------------------------------------------------
/.github/workflows/main.yml:
--------------------------------------------------------------------------------
1 | name: Release Creation
2 |
3 | on:
4 | release:
5 | types: [published]
6 |
7 | jobs:
8 | build:
9 | runs-on: ubuntu-latest
10 | steps:
11 | - uses: actions/checkout@v2
12 |
13 | # Substitute the Manifest and Download URLs in the module.json
14 | - name: Substitute Manifest and Download Links For Versioned Ones
15 | id: sub_manifest_link_version
16 | uses: microsoft/variable-substitution@v1
17 | with:
18 | files: 'module.json'
19 | env:
20 | version: ${{github.event.release.tag_name}}
21 | url: https://github.com/${{github.repository}}
22 | manifest: https://github.com/${{github.repository}}/releases/latest/download/module.json
23 | download: https://github.com/${{github.repository}}/releases/download/${{github.event.release.tag_name}}/module.zip
24 |
25 | # Create a zip file with all files required by the module to add to the release
26 | - run: zip -r ./module.zip LICENSE.CB3PL module.json assets/ packs/ scripts/
27 |
28 | # Create a release for this specific version
29 | - name: Update Release with Files
30 | id: create_version_release
31 | uses: ncipollo/release-action@v1
32 | with:
33 | allowUpdates: true # Set this to false if you want to prevent updating existing releases
34 | name: ${{ github.event.release.name }}
35 | draft: false
36 | prerelease: false
37 | token: ${{ secrets.GITHUB_TOKEN }}
38 | artifacts: './module.json, ./module.zip'
39 | tag: ${{ github.event.release.tag_name }}
40 | body: ${{ github.event.release.body }}
41 |
--------------------------------------------------------------------------------
/module.json:
--------------------------------------------------------------------------------
1 | {
2 | "id": "cy-borg-3p",
3 | "title": "CY_BORG Third-Party Content",
4 | "description": "Third-party content for the CY_BORG system.",
5 | "version": "This is auto replaced",
6 | "library": "false",
7 | "compatibility": {
8 | "minimum": "11.300",
9 | "verified": "11.300"
10 | },
11 | "authors": [
12 | {
13 | "name": "mcglintlock"
14 | }
15 | ],
16 | "relationships": {
17 | "systems": [{
18 | "id": "cy-borg",
19 | "type": "system",
20 | "manifest": "https://github.com/fvtt-fria-ligan/cyborg-foundry-vtt/releases/download/1.0.8/system.json",
21 | "compatibility": {
22 | "verified": "1"
23 | }
24 | }]
25 | },
26 | "esmodules": ["./scripts/module.js"],
27 | "packs": [
28 | {
29 | "name": "cyborg-3p-actors",
30 | "label": "CY_BORG 3P (Actors)",
31 | "system": "cy-borg",
32 | "path": "./packs/cyborg-3p-actors",
33 | "type": "Actor"
34 | },
35 | {
36 | "name": "cyborg-3p-items",
37 | "label": "CY_BORG 3P (Items)",
38 | "system": "cy-borg",
39 | "path": "./packs/cyborg-3p-items",
40 | "type": "Item"
41 | },
42 | {
43 | "name": "cyborg-3p-journal",
44 | "label": "CY_BORG 3P (Journal)",
45 | "system": "cy-borg",
46 | "path": "./packs/cyborg-3p-journal",
47 | "type": "JournalEntry"
48 | },
49 | {
50 | "name": "cyborg-3p-tables",
51 | "label": "CY_BORG 3P (Tables)",
52 | "system": "cy-borg",
53 | "path": "./packs/cyborg-3p-tables",
54 | "type": "RollTable"
55 | }
56 | ],
57 | "url": "This is auto replaced",
58 | "manifest": "This is auto replaced",
59 | "download": "This is auto replaced"
60 | }
61 |
--------------------------------------------------------------------------------
/assets/images/full-auto/old-school-motorcyle.svg:
--------------------------------------------------------------------------------
1 |
--------------------------------------------------------------------------------
/assets/images/full-auto/cyberbike.svg:
--------------------------------------------------------------------------------
1 |
--------------------------------------------------------------------------------
/assets/images/impudent-dolph/micro-missiles.svg:
--------------------------------------------------------------------------------
1 |
--------------------------------------------------------------------------------
/assets/images/full-auto/gliderboard.svg:
--------------------------------------------------------------------------------
1 |
--------------------------------------------------------------------------------