From aeb4772c14013e4882aaba2e868fd8f303d96f37 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Sat, 13 Apr 2024 19:13:16 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B0=D1=87=D0=BA=D0=B0=20=D0=BD=D0=B5?= =?UTF-8?q?=D1=81=D0=B2=D1=8F=D0=B7=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BE?= =?UTF-8?q?=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B9=20(#88)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add coins, start ftl * localization patch * fixes * localization patch * tiefling * Update structures.ftl * add tag * Update LICENSE.TXT * Update README.md * move dagger and sickle to belt slot * fix license * Update equipped-CLOAK.png --- LICENSE.TXT | 23 ++++-------------- README.md | 7 +++--- .../Entities/Objects/Weapons/Melee/dagger.yml | 8 ++++++ .../Entities/Objects/Weapons/Melee/sickle.yml | 8 ++++++ .../Objects/Weapons/Melee/twoHandedSword.yml | 2 ++ .../_CP14/Entities/Objects/coins.yml | 19 +++++++++------ Resources/Prototypes/_CP14/tags.yml | 5 +++- .../redguardarmor.rsi/equipped-CLOAK.png | Bin 1568 -> 1826 bytes .../Dagger/dagger.rsi/equipped-BELT1.png | Bin 0 -> 315 bytes .../Dagger/dagger.rsi/equipped-BELT2.png | Bin 0 -> 312 bytes .../Weapons/Melee/Dagger/dagger.rsi/meta.json | 10 +++++++- .../HandheldAxe/handheldAxe.rsi/meta.json | 2 +- .../Sickle/sickle.rsi/equipped-BELT1.png | Bin 0 -> 332 bytes .../Sickle/sickle.rsi/equipped-BELT2.png | Bin 0 -> 346 bytes .../Weapons/Melee/Sickle/sickle.rsi/meta.json | 8 ++++++ .../throwableSpear.rsi/meta.json | 2 +- 16 files changed, 61 insertions(+), 33 deletions(-) create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/equipped-BELT1.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/equipped-BELT2.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Sickle/sickle.rsi/equipped-BELT1.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Sickle/sickle.rsi/equipped-BELT2.png 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 c7db68523281751f28ab7c920f285f518c15e178..87b7740520d3e91565c8bd6e15b35cb891549fd4 100644 GIT binary patch delta 1798 zcmV+h2l@D*45AK@Fn2#53ViHiz#6xY@t*OW5RZAInKpG zSYTbEDh{qyO{%$jkk9S4{@yEFo;&UbjHP?e`F(%q$GPWRoqyjC92^`R92^{)aclgt zerx=)e$Z`?g8uic7`*=GTUPA>aQ)4SlfU~d=QcN)UwJ~v-=oJfU%To#Fu(GI_@jUD>EA!) zo!`7GZs~WYK7X!h--<^1`SK1Se~%vU`i!>ee2#p1hj#QE20)NpT;SZ#&M_T}0yK5t z2f%bJ%CE1#L2_|{!5^QoJMOyrW1|=O(?@>+;P(SRB9|?2FP}Er-0TkE>-P{}OEDdb za%FVPvVOw=%&$Blxwx?B+Ux0c6wd%^L1QkTGp>ir5`T(EMoq8tFwoD7%}q|c^b*O% z1?E?t*dBDX{)^2`L!W^lzCI5T23y*&qTh4|2;u2il!uQOT>bs0bOi_v1iAD1zl~`X zd38|FWeccoiHDCDT!4OMbgZR=t*ECTYSO-*{_gjNGz@?+WW~rq_HAZEDHX|O3;6mx zHSKfR0)I-WSkt!^wwxR9Kcy?BB8o@mYHG#kdq4O?T`g#+Zi%V&jkX4Ch10TI_jY$x zo_SLca@hj+%4zcD9agoHE&ZmCz@_tN^^xHr-g*B+7eKu9C9BwCMq2zY(m%YUZ{Y?~J0a*lx42c~t&s(#Y|j0_JE zR0f&6eM1i_gWP-XZ312&bNL)zD$be2#Eg;^qhM+0t+NB9vHK1|X;m5{=CgE=#2Im1yV7I~CpXjuD7(St1&n zHGjlK|8}X?SKSgfy8~R~c+KCh<|lJ=$okyfVkFm^$LIc>~l*ykYxuWa<8s< zWYmIY1Rx^!>gLbQ0<>R*zIpYp4nQtj*yEoSTK*aosBQ_Mq47J~bC-A->IA}WE?cO3 zUtG7VZ#e+}uYBhMpcb^6Ss!+n(gOj&!=;2@dQhaSI z-F+CCQ|d3D^y(s^(u|f3CU4)+pMQOs2OyKpGB$dV$N&6{dOaN?j@)k-dNm5AAgXl&Lf zjQHr!e=vM+hOIL}QLK>3X33X#3}G?w!#E!h8bVVPXNcKZUDMEtmNVe))PKjWOXtt( z)rLdvlRzb99p`JpWeF(S5^o2kR762CG*!0*ZZIE{iW(s+i5bf?Af+ZrsY#--S;n3| zt2k0B8i@(<|I+!h9h(Khwpmm7G4}Ks(b%lvr&TQN0=tpa0mhy_Gin1Oa<49qs2e3L zIzhE&C0X;F`=CczHv8NX%YTQW!r%0=`7cQ9exBIcZrb)Rnb_LqkGr$;%={P3*yw9} z225;iGqJTzd@Tihn|~fVj2%Ewtr=fS8GhNtRsdAD)NsF_THkOT);8EE1Kdu5#=hzU zs)NzVBFRP?`+WhkogP;U8tNKt=i?6&bIpKwB<-fiZ3jT{$N>NI!3)em0E~2b$B4+i odPMF$az|rF)h`DJhojAZ0RjjO4I^w)*#H0l07*qoM6N<$f~O#jRR910 delta 1538 zcmV+d2L1V>4xkK>FnU|Jbz+a>uXHro~`vYmVWZc z(>-5ZWMiCRobJZ*(jwb^_7qVw2CwaHt*^1D8N=?gr&wNE9C(j1$N>OYn43k^jA7-c zpZi`9I1gVSd1McA0DztS7X$C4td zdtdtl1F$eRD}Nf5ae&`9YyjM&jt5lF6J(liF)?-xk%^GFwpgp8W}hLh-h>r1MTc?v zb=>t{CwTNZ*@GO;(%Y!v4Dso4*3E&l^fvI#ZQ(%FjA3DJmJRBKZtOmLDta+{ki-1T zR{($?XKtffvGBN76xTi+iy#!%k$F=9UcN%Mb=*CAq<;gzdopUq+8p>*p8>Hb_G(pe zZNk=I>IR5KG2e0^YR2Gx6^4O3pFBFj3au-f#tjAlp-CN^h;_YZgVvSw(Fxl{&XeuF zNichmLxJRxJUYP!tt&*;008lsC^Dr}h5yB8q5uG*YS^H4C3$q>`{8%?UnqK>I1gWV zt?>5y!GF)M6kaRIqZ8B;Et5q=p=XbGI#U2_%J0L^C*09%_acY#dpR84pur*|G zD%GY`0JsB@i4d}sA_AahpJBl;P#n?$8HlRk;dKMVrsvL?V+Nip@1@(63V?8cQe@%G z|9=25NB_fpJu;L7URe!Kv3u9QMrcw;2+pjNc~bzNfdJrM1wa@~Ch>X>0C#{`6dSbO zW?%zNY#LzqbVJ&K&&|M(p?>g%$(M|D06Ker(D93c&+*lY)%83-?p_Oc!E*r2W~1u@ z#7$^Ymv%q~Vx3QZGUvPD>lL_6i2CV!qknT0@P(ME8v~ciop?@yMAcyS7=CSzNIKw^ z)Nxrs*h#d+qIh1?096Aim0>m;Fm(gZhgf<`O@mhf-qWV*H(Ik3h6ujr0Hlt~ifJ_3 zvVLc86N@4>!eq#McQvdzeyAGAM`!IZO1nK-4NraX(_lbAKtMo1KtMo1K)^s`g?|#C z16dzEe?oGxL_gudEkk98v^mnx(q1+?#S~t32~ry(3v;ugZoj;=$V$0?M0E&2SK-7( zb4Z&?e0rP#5VoghzZF^lx1hrdp7sQ{*4J34>H=`8LZTv6I#n)Xe_%B{#WJN+C1Gnq znBk@+%J8fy@)UsVK~6k89|ZsqSATCJVQZo~Gs+!d4!04Xi8{8`n*bnsANVBd@Pg-8 zpg{5foM0r6PQ(_pyEFwjxx$YysvpZsiwrHLim=_1#hAK*UC0YEJO!Yo)?j9{fuwGT z+W)3;gY^ufxecOf*zveKEVU`>{Hlv%MAZP7U}98T;(uigUe&v6FM`npVmfXX*w0GK+d#Raw8`eG)X>-!n-XwRhft&ly z|Emsao2^Ygy8sOVf;x+18@I(advf1qz42^orG>xn-#XJxvFo4w%zRR{dwW&A*c7d; zK~HmzEx63#5}2`zFMG~^_L3|IfgGRfhO(hwXPo`BeObuL*SpHLGy2W9gBZ%dAfaP0 zae1fSrn^7B2|25|{fam(eUnf8rr-0-OV!GYG)(TbJl!vEF-KoXspwYvWS?${os7<` zYCvWFS_%(;?@Qlx(@n}CB_XNgA&QA@B*Bah%V28KC%7|nd#7KtTZ764h}>FVdQ&MBb@ E04iyHcmMzZ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..86c60421e50043560afbd8ab12cc48c0919e72e0 GIT binary patch literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z**skwLn`LH zy`{)^$Ux-SM|Q=9j^`FE7hny?{Q;AT1fO%$V+L>kM(2wOT}qK24JO%| zvj6AD?b@E7>l*J0G!zK#Nj$gREz_Ix#;PW3m(85gTSfcsIb9WM4QBZ4sP;NjZq+o6 zIZQiz#4g3=y1ZT#cKX1{vhCZW#IH$w-miE?lVQ1PfV({Njd$Np{>#+gYM)=B>06&a zyR`E0@2~yl$0F8p&;E3V6=D;EgU!6p(?jxl&;B~Re$M{(SMDKv3SWOSO=b4@yU*b% z1K;t<9WApLdHx7H{N>{J&z5PYpC>HTTq?D%xh#%p3K{-_zC4Wt~$(69BOmh#dd` literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..178ddbb2b848a30a91d9efa516d1a48e0ca38733 GIT binary patch literal 346 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zMLb;`Ln`LH zy=9oiU(W&ATvF|R4^iaF4JHe#*9 zjTd`vK7IJVykYz1{-4WcR4M^Y1_Dm8Qd#@e*DbzS<$cVFeDl9x%BR$vNF(dZY&x^O zp1oh1dh(51SgTXU;*Jw_yM=%L+pP7vdDSt2TRWoiW1imkx!$nwdLjR1;{%J=@Ot#N ztoDfQcFfYbbJQzz@z+M6nk0_gkkI(E5W5%{Y?$)Pe@4c&{n~YS{@z-Z`r}`3KiIT# zQud6q>|fr>Y+XNpiIrZtgZRe#Z}VO(jd}H&_k5Au!4h^KwP4MzM<+L>