diff --git a/LICENSE.TXT b/LICENSE.TXT index 8a644834fa..710fb816e6 100644 --- a/LICENSE.TXT +++ b/LICENSE.TXT @@ -1,21 +1,8 @@ -MIT License +CC-BY-NC-SA Copyright (c) 2024 TheShuEd (Github) -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +This work is licensed under the Creative Commons +Attribution-NonCommercial-ShareAlike 3.0 United States License. To view a copy +of this license, visit http://creativecommons.org/licenses/by-nc-sa/3.0/us/ or +send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA. diff --git a/README.md b/README.md index 18e03b7b47..e437f7f222 100644 --- a/README.md +++ b/README.md @@ -30,9 +30,10 @@ We are not currently accepting translations of the game on our main repository. [More detailed instructions on building the project.](https://docs.spacestation14.com/en/general-development/setup.html) ## License +[![license-badge](https://shields.io/badge/license-CC--BY--NC--SA-lightgrey?style=for-the-badge)](https://creativecommons.org/licenses/by-nc-sa/3.0/) -All code for the content repository is licensed under [MIT](https://github.com/crystallpunk-14/crystall-punk-14/blob/master/LICENSE.TXT). +All CrystallPunk14 codebase contributions are licensed under [Creative Commons BY-NC-SA](https://creativecommons.org/licenses/by-nc-sa/3.0/). See LICENSE for more details. -Most assets are licensed under [CC-BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/) unless stated otherwise. Assets have their license and the copyright in the metadata file. [Example](https://github.com/crystallpunk-14/crystall-punk-14/blob/master/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json). +Most visual assets are licensed under [CC-BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/) unless stated otherwise. Assets have their license and the copyright in the metadata file. [Example](https://github.com/crystallpunk-14/crystall-punk-14/blob/master/Resources/Textures/Objects/Tools/crowbar.rsi/meta.json). -Note that some assets are licensed under the non-commercial [CC-BY-NC-SA 3.0](https://creativecommons.org/licenses/by-nc-sa/3.0/) or similar non-commercial licenses and will need to be removed if you wish to use this project commercially. +**Important:** This means that code from CrystallPunk14 cannot be ported to others codebases. If you wish to port a specific feature, you must get the developer(s) to sublicense it to you under a license like AGPLv3. This also applies in the opposite direction for features ported from other codebases. \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml index 98ae290182..c49758c3d8 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml @@ -12,7 +12,15 @@ description: A small, multi-purpose, sharp blade. You can cut meat or throw it at a goblin. components: - type: Item + size: Normal storedRotation: -45 + - type: Clothing + equipDelay: 0.25 + unequipDelay: 0.25 + sprite: _CP14/Objects/Weapons/Melee/Dagger/dagger.rsi + quickEquip: false + slots: + - belt - type: Sprite sprite: _CP14/Objects/Weapons/Melee/Dagger/dagger.rsi layers: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sickle.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sickle.yml index fc71ff0617..24d3166607 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sickle.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sickle.yml @@ -11,7 +11,15 @@ description: Originally developed as a weapon against grass, the sickle suddenly proved itself good at the bloodier harvest as well. components: - type: Item + size: Normal storedRotation: -45 + - type: Clothing + equipDelay: 0.45 + unequipDelay: 0.45 + sprite: _CP14/Objects/Weapons/Melee/Sickle/sickle.rsi + quickEquip: false + slots: + - belt - type: Sprite sprite: _CP14/Objects/Weapons/Melee/Sickle/sickle.rsi layers: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml index fafcdf43c4..4544416513 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml @@ -12,6 +12,8 @@ sprite: _CP14/Objects/Weapons/Melee/TwoHandedSword/twoHandedSword.rsi state: icon - type: Clothing + equipDelay: 1 + unequipDelay: 1 sprite: _CP14/Objects/Weapons/Melee/TwoHandedSword/twoHandedSword.rsi quickEquip: false slots: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/coins.yml b/Resources/Prototypes/_CP14/Entities/Objects/coins.yml index 668a9276bb..e3adf9c874 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/coins.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/coins.yml @@ -3,6 +3,9 @@ parent: BaseItem abstract: true components: + - type: Tag + tags: + - CPCoin - type: Item size: Tiny - type: Stack @@ -29,10 +32,10 @@ name: copper crown description: The minimum unit of currency in the world of Eberron. One tenth of a silver sovereign. suffix: 10 coins - components: + components: - type: Sprite sprite: /Textures/_CP14/Objects/Economy/cp_coin.rsi - layers: + layers: - state: coin10 map: ["base"] - type: Stack @@ -66,10 +69,10 @@ name: silver sovereign description: Equivalent to 10 copper crowns, and is 1 tenth of a gold galifar. suffix: 10 coins - components: + components: - type: Sprite sprite: /Textures/_CP14/Objects/Economy/sp_coin.rsi - layers: + layers: - state: coin10 map: ["base"] - type: Stack @@ -103,10 +106,10 @@ name: gold galifar description: Equivalent to 10 silver sovereign, and is 1 tenth of a platinum coin. suffix: 10 coins - components: + components: - type: Sprite sprite: /Textures/_CP14/Objects/Economy/gp_coin.rsi - layers: + layers: - state: coin10 map: ["base"] - type: Stack @@ -140,10 +143,10 @@ name: platinum dragon description: Equivalent to 10 gold galifar, and is the most expensive coin in Eberron's world. suffix: 10 coins - components: + components: - type: Sprite sprite: /Textures/_CP14/Objects/Economy/pp_coin.rsi - layers: + layers: - state: coin10 map: ["base"] - type: Stack diff --git a/Resources/Prototypes/_CP14/tags.yml b/Resources/Prototypes/_CP14/tags.yml index 036e2e097e..673d1921c3 100644 --- a/Resources/Prototypes/_CP14/tags.yml +++ b/Resources/Prototypes/_CP14/tags.yml @@ -1,2 +1,5 @@ - type: Tag - id: CPKey \ No newline at end of file + id: CPKey + +- type: Tag + id: CPCoin \ No newline at end of file diff --git a/Resources/Textures/_CP14/Clothing/Cloak/redguardarmor.rsi/equipped-CLOAK.png b/Resources/Textures/_CP14/Clothing/Cloak/redguardarmor.rsi/equipped-CLOAK.png index c7db685232..87b7740520 100644 Binary files a/Resources/Textures/_CP14/Clothing/Cloak/redguardarmor.rsi/equipped-CLOAK.png and b/Resources/Textures/_CP14/Clothing/Cloak/redguardarmor.rsi/equipped-CLOAK.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/equipped-BELT1.png new file mode 100644 index 0000000000..7c1e32bd3d Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/equipped-BELT1.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..629a5a3f29 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/meta.json index b62fe4c329..d7396a0e8c 100644 --- a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Created by TheShuEd (Discord) for CrystallPunk", + "copyright": "Created by TheShuEd (Github) for CrystallPunk", "size": { "x": 32, "y": 32 @@ -17,6 +17,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-BELT1", + "directions": 4 + }, + { + "name": "equipped-BELT2", + "directions": 4 } ] } diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/HandheldAxe/handheldAxe.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/HandheldAxe/handheldAxe.rsi/meta.json index b62fe4c329..8f4fcd67c9 100644 --- a/Resources/Textures/_CP14/Objects/Weapons/Melee/HandheldAxe/handheldAxe.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Weapons/Melee/HandheldAxe/handheldAxe.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Created by TheShuEd (Discord) for CrystallPunk", + "copyright": "Created by TheShuEd (Github) for CrystallPunk", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Sickle/sickle.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Sickle/sickle.rsi/equipped-BELT1.png new file mode 100644 index 0000000000..86c60421e5 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Sickle/sickle.rsi/equipped-BELT1.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Sickle/sickle.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Sickle/sickle.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..178ddbb2b8 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Sickle/sickle.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Sickle/sickle.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/Sickle/sickle.rsi/meta.json index 8f4fcd67c9..d7396a0e8c 100644 --- a/Resources/Textures/_CP14/Objects/Weapons/Melee/Sickle/sickle.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Weapons/Melee/Sickle/sickle.rsi/meta.json @@ -17,6 +17,14 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-BELT1", + "directions": 4 + }, + { + "name": "equipped-BELT2", + "directions": 4 } ] } diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/ThrowableSpear/throwableSpear.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/ThrowableSpear/throwableSpear.rsi/meta.json index b62fe4c329..8f4fcd67c9 100644 --- a/Resources/Textures/_CP14/Objects/Weapons/Melee/ThrowableSpear/throwableSpear.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Weapons/Melee/ThrowableSpear/throwableSpear.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Created by TheShuEd (Discord) for CrystallPunk", + "copyright": "Created by TheShuEd (Github) for CrystallPunk", "size": { "x": 32, "y": 32