From 9fe32bf65ea8adaf7a45ba2f806c178b3c5fda02 Mon Sep 17 00:00:00 2001 From: ne4t02 <65731121+ne4t02@users.noreply.github.com> Date: Sun, 25 Aug 2024 21:44:24 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=87=D0=B5=D1=80=D0=B5=D0=B4=D0=B8=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BC=D0=BA=20=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=D1=81=20=D1=81=D0=B3=D1=83=D1=89=D0=B5=D0=BD=D0=BA?= =?UTF-8?q?=D0=B8=20(#337)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Описание PR Добавлены очереди для МК-58 и перенесена сгущенка Петра - [x] PR полностью завершён и мне не нужна помощь чтобы его закончить. - [x] Я внимательно просмотрел все свои изменения и багов в них не нашёл. - [x] Я запускал локальный сервер со своими изменениями и всё протестировал. - [x] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR этого не требует. **Изменения** :cl: Ne4to_ - add: Добавлен режим стрельбы очередями для МК-58 - add: По просьбам сладкоежек вновь добавлена сгущенка --------- Co-authored-by: bananchiki <87230164+Darkiich@users.noreply.github.com> Co-authored-by: 1Stepka1 <131589665+1Stepka1@users.noreply.github.com> Co-authored-by: Darki255 --- .../ru-RU/ADT/Flavors/flavor-profiles.ftl | 1 + .../Objects/Consumable/Food/containers.ftl | 5 ++ .../Objects/Consumable/Food/snacks.ftl | 6 +-- .../Food/Containers/condensed_milk.ftl | 2 + .../Food/Containers/condensed_milk.yml | 43 ++++++++++++++++++ .../Objects/Consumable/Food/snacks.yml | 2 + Resources/Prototypes/ADT/Flavors/fill.txt | 1 - Resources/Prototypes/ADT/Flavors/flavors.yml | 4 ++ .../ADT/Reagents/Consumable/Food/food.yml | 18 ++++++++ .../Objects/Weapons/Guns/Pistols/pistols.yml | 4 ++ .../condensed_milk.rsi/icon-open.png | Bin 0 -> 938 bytes .../Containers/condensed_milk.rsi/icon.png | Bin 0 -> 667 bytes .../Containers/condensed_milk.rsi/meta.json | 20 ++++++++ .../Containers/condensed_milk.rsi/trash.png | Bin 0 -> 920 bytes 14 files changed, 102 insertions(+), 4 deletions(-) create mode 100644 Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/containers.ftl create mode 100644 Resources/Locale/ru-RU/ADT/reagents/Consumable/Food/Containers/condensed_milk.ftl create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/condensed_milk.yml delete mode 100644 Resources/Prototypes/ADT/Flavors/fill.txt create mode 100644 Resources/Prototypes/ADT/Flavors/flavors.yml create mode 100644 Resources/Prototypes/ADT/Reagents/Consumable/Food/food.yml create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/icon-open.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/trash.png diff --git a/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl new file mode 100644 index 00000000000..e921f71467d --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl @@ -0,0 +1 @@ +flavor-complex-adtconsideredmilk = как сгущенка \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/containers.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/containers.ftl new file mode 100644 index 00000000000..e060ddfb874 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/containers.ftl @@ -0,0 +1,5 @@ +ent-ADTFoodTinCondensedMilkTrash = сгущеное молоко (пусто) + .desc = Пустая консервная банка. Из неё можно получить немного металла. + +ent-ADTFoodTinCondensedMilk = сгущеное молоко + .desc = Стандартная банка сгущенки с удобным язычком. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/snacks.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/snacks.ftl index 5d2bbb53894..3f5e24bce35 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/snacks.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/snacks.ftl @@ -7,7 +7,7 @@ ent-ADTFoodSnackChipsOnionAndSourcream = чипсы со вкусом зелён ent-ADTFoodSnackChipsShrimp = чипсы со вкусом креветки .desc = Для тех, кто любит вкус креветок, но не может позволить себе их купить. -ent-ADTFoodSnackChipsSpace = космомические Чипсы +ent-ADTFoodSnackChipsSpace = космомические Чипсы .desc = Кукурузные чипсы в форме треугольника со вкусом сыра чеддер - идеальная закуска для игр. ent-ADTFoodSnackChipsSpicy = чипсы ФлеймиХат @@ -19,9 +19,9 @@ ent-ADTFoodSnackDriedBeef = вяленая говядина .desc = Толстые куски вяленой говядины. Очень долго хранится, а в мясе много белка, хороший вещь для похода ent-ADTFoodSnackDriedChicken = сушеное куриное мясо - .desc = Хорошая закуска для охоты. + .desc = Хорошая закуска для охоты. -ent-ADTFoodSnackDriedHorse = сушеная конина +ent-ADTFoodSnackDriedHorse = сушеная конина .desc = Конина - самое вкусное мясо, в ней низкое содержание жира и богатое содержание белка. ent-ADTFoodSnackDriedPig = вяленая свинина diff --git a/Resources/Locale/ru-RU/ADT/reagents/Consumable/Food/Containers/condensed_milk.ftl b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Food/Containers/condensed_milk.ftl new file mode 100644 index 00000000000..4a7e34bf8c8 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/reagents/Consumable/Food/Containers/condensed_milk.ftl @@ -0,0 +1,2 @@ +reagent-name-condensedmilk = сгущенное молоко +reagent-desc-condensedmilk = белая густая и очень сладкая жидкость \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/condensed_milk.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/condensed_milk.yml new file mode 100644 index 00000000000..bcb152ca5f8 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/condensed_milk.yml @@ -0,0 +1,43 @@ +#Сгущенка + +- type: entity + parent: FoodTinBase + id: ADTFoodTinCondensedMilk + name: condensed milk + description: A standard issue tin of condensed milk with a convenient pull tab. + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi + # the convenient pull tab + - type: Item + sprite: ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi + size: Small + shape: + - 0,0,0,1 + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: ADTCondensedMilk + Quantity: 30 + - type: Openable + openableByHand: true + sound: + path: /Audio/Items/can_open3.ogg + - type: Food + trash: + - ADTFoodTinCondensedMilkTrash + +- type: entity + parent: FoodTinBaseTrash + id: ADTFoodTinCondensedMilkTrash + name: condensed milk + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi + - type: Item + sprite: ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi + size: Small + shape: + - 0,0,0,1 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml index 52ebd026aad..03d295bfbe7 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml @@ -500,3 +500,5 @@ components: - type: Sprite state: two-trash + + diff --git a/Resources/Prototypes/ADT/Flavors/fill.txt b/Resources/Prototypes/ADT/Flavors/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/Flavors/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Flavors/flavors.yml b/Resources/Prototypes/ADT/Flavors/flavors.yml new file mode 100644 index 00000000000..a4da2ce0991 --- /dev/null +++ b/Resources/Prototypes/ADT/Flavors/flavors.yml @@ -0,0 +1,4 @@ +- type: flavor + id: adtconsideredmilk + flavorType: Complex + description: flavor-complex-adtconsideredmilk \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Food/food.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Food/food.yml new file mode 100644 index 00000000000..0cc31f8e402 --- /dev/null +++ b/Resources/Prototypes/ADT/Reagents/Consumable/Food/food.yml @@ -0,0 +1,18 @@ +- type: reagent + id: ADTCondensedMilk + name: reagent-name-condensedmilk + group: Foods + desc: reagent-desc-condensedmilk + physicalDesc: reagent-physical-desc-gloopy + flavor: adtconsideredmilk + color: "#fcfcf2" + recognizable: true + metabolisms: + Food: + effects: + - !type:AdjustReagent + reagent: Sugar + amount: 0.5 + - !type:AdjustReagent + reagent: Nutriment + amount: 0.2 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 167e21e15f2..fbc1f9e8426 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -202,8 +202,12 @@ sprite: Objects/Weapons/Guns/Pistols/mk58.rsi - type: Gun fireRate: 5 + # ADT: amount of shots while burst + shotsPerBurst: 3 availableModes: - SemiAuto + # ADT: added burst mode + - Burst soundGunshot: path: /Audio/Weapons/Guns/Gunshots/mk58.ogg diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/icon-open.png b/Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/icon-open.png new file mode 100644 index 0000000000000000000000000000000000000000..4bc173fc9a1bb0018f2ace1de4576b8040f88295 GIT binary patch literal 938 zcmV;b16BNqP)Px&WJyFpR9HvFlwC+uVHkj4lOtuTGhv9WhE_*KFZ3ejjr4(;zT?qNcbo_NV0`E2 z+xI;0&v&xmKaVUme4EV{&&kOFyWOs8y_!AQnpHRK=;(-Z90z6PWwd^JYMN#(MN$eN z7(wPLGXecS{WSA>p61b!QJS4j=ejeJv;o2^Dk}&eg(RBi=H?(0i9lgtp`6`7AOK#k zcij>z3LrchjY23C0-;!d;IANfJRUF_jUswfiZ>+1cCV?q}t&TCKF^+oAKozjkORFi_bAr;6fGv)cfh z+)oMO^ZDdYK{yM8qChao9RLucdf*G)~2*V@5e@}d( zH5G8rAC@;(N+_E_3CA^6Ti$Ayfn!~F;Ij4Q5{ZjFb<}LwoHx3czPr{}2QRKzv=g}d zV1RHKE?I}yU05@b3c#R@T2^KlR5sX7E9M`H6U=ld9 zY%mEHIg1+CsEM4FPqhI117<^6d*$_7z!?jy1kd#Onlq3oXr=%C15Bd-FsYB)^Z)<= M07*qoM6N<$g2pPIF#rGn literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/icon.png b/Resources/Textures/ADT/Objects/Consumable/Food/Containers/condensed_milk.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3908b70bb125bccf22cfc0295ea599e9a52707d2 GIT binary patch literal 667 zcmV;M0%ZM(P)Px%RY^oaR9Hu2WEfz;IKcKZj5=U61V%$(=!HN+Qv82hWygYf3rY46(HdYDOG--O zEW4gRe-4%-#UVsF0AxAHVo_0127P^fhKm<3;w?ZgUAjcHBM3SGX1R-t3)oVa<*#4A zhC2e}FmynyBgk?9$Z}*$(fJ_9(A)vYAwp9Jq@*SPmy?la;Njy2$3H9@@I?Vg4ut2- znoBT*2`WfSOZ)%PznVe&>_V{R$PPh{cTn1ZIqIHOCIkP*R)$%#W)U=>paPHs=IGZj zgev@Ja8eXuc)6w*ZtwS>-%!$?LUb*|zWZ+&RzF~5NV(WT9S0;PCjS2x(g3#HUV@cD zYxxVDS@2q<1jE4>zrl{6S_ps~z%S^{kWu3YxBOeWG{eGMKj03DSL0ydn)wvW2RUL! z%O-|5uQo6&S+ay+2oqEQa=?{qnhe&~N(_^f&ES?O@G-+3@Zi&5xa0Efo?Luzr0A$-o87YQ4PIhodz+3=}7L|R682Fz&0}E5t0Y^VM!wp7u1ae|Pwj89!jB^L| zLcq6X3PVNNdK5<#HwS_f8z^!1)}qRFbOkc3t52t%1E$ZO1NN+5_;L(Kpj&=vWh7W_ zN+J=%!VKXVU7T?K@LH71kC3k%Rv@{0I`;X)DqPx&Qb|NXR9HvFm0w6xVHCj67TdI?cflTPYiM;{=z~7Qd=V?JWsV^L^HtIa=CcePDnY&Xu4?{aOMyPG#VAm81+ z=YGH6cfRvoHSnK9qlE8vyG6ZT4<3(4QNEHnS1G-OdO4a1A{brz20?KBy9qO*VNV!K!^%7&dkg}JRXPg@^Y!Vkw^qW zq0qV|vI-zPkw`!^8U?#u2A0!rdtpmD6n&%=3m^#h zzPPAZVqz6Aj7B4kvvafmrUDL!14c(j0r#F&07+V{mhQ2@(qqJ8F*?3VPKBZh2uCl& z!O&ZpeE7p~#v_O~OSY8Ivmg7<0r%>fdICMQ9dNutgoYhv(E6VcBpeP)B8!WQbj>?G z(EmLG&n7g``mtLb0jJX`#*cXjzOPIN)qRs$D-dWZgLjh&l2EMzD8Ow!1ZO&qNbq=@ z6?(reOCrtoBG`QY7yU+wd)==gGW`;KK3~o)&Y6G$p8{1-U%wM>@2Zm^6{VXbfr*8r zBzJ!NJ^20KV0Yz+x&lZOwp(DVVXq{?4A{2t{R6=LT=~zbs(^ptfHbjOLf#B=IOfz9 zzfrFOhdb`TrHe0CNnGe^q-MkByxF<>+4UQZ@cc@fdIEPJ^w45!PV}Wo{0$#@+C;gn zEzRl)xNmvEX4Ixh$hQE?&fvjV3a*}Ysw2>Hx>C&Cd-4d@HQ zso_p|^sqPQDa)CF6EX?BMiIFLTRFlJjG+{cxrzjs1dgm4OoFYPtr~NbtekD1VgdF7 uRztq`^6PxS1q)<@7kWSM3KR;;_TC?Ip~f&gIrxqM0000