diff --git a/Resources/Locale/en-US/_CP14/materials/materials.ftl b/Resources/Locale/en-US/_CP14/materials/materials.ftl index f66e3992fe..88aca4d1ac 100644 --- a/Resources/Locale/en-US/_CP14/materials/materials.ftl +++ b/Resources/Locale/en-US/_CP14/materials/materials.ftl @@ -1,4 +1,5 @@ cp14-material-wooden-planks = wooden planks cp14-material-dirt-block = dirt cp14-material-stone-block = stone -cp14-material-cloth = cloth \ No newline at end of file +cp14-material-cloth = cloth +cp14-material-flora = flora material diff --git a/Resources/Locale/en-US/_CP14/stack/materials.ftl b/Resources/Locale/en-US/_CP14/stack/materials.ftl index 1983dc34f1..17b900de56 100644 --- a/Resources/Locale/en-US/_CP14/stack/materials.ftl +++ b/Resources/Locale/en-US/_CP14/stack/materials.ftl @@ -3,6 +3,7 @@ cp14-stack-stone-block = stone blocks cp14-stack-wood-planks = wooden planks cp14-stack-nails = nails cp14-stack-cloth = rolls of fabric +cp14-stack-flora = tufts of grass cp14-stack-copper-bars = copper bars cp14-stack-iron-bars = iron bars @@ -10,4 +11,4 @@ cp14-stack-gold-bars = gold bars cp14-stack-wallpaper = rolls of wallpaper -cp14-stack-glass-sheet = glass \ No newline at end of file +cp14-stack-glass-sheet = glass diff --git a/Resources/Locale/en-US/_CP14/stack/medical.ftl b/Resources/Locale/en-US/_CP14/stack/medical.ftl new file mode 100644 index 0000000000..873b128260 --- /dev/null +++ b/Resources/Locale/en-US/_CP14/stack/medical.ftl @@ -0,0 +1,2 @@ +cp14-stack-pack-herbal-bandage = herbal bandage kit +cp14-stack-pack-gauze = gauze kit diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index 3279eb7879..e06b9e6aee 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -760,7 +760,7 @@ ent-CP14Nail10 = { ent-CP14Nail1 } .desc = { ent-CP14Nail1.desc } .suffix = 10 -ent-CP14FloraMaterial = растительный материал +ent-CP14FloraMaterial1 = растительный материал .desc = Органический материал, используемый в лечебных или строительных целях. ent-CP14String = нитки diff --git a/Resources/Locale/ru-RU/_CP14/materials/materials.ftl b/Resources/Locale/ru-RU/_CP14/materials/materials.ftl index d529232e06..6ada59c193 100644 --- a/Resources/Locale/ru-RU/_CP14/materials/materials.ftl +++ b/Resources/Locale/ru-RU/_CP14/materials/materials.ftl @@ -1,4 +1,5 @@ cp14-material-wooden-planks = деревянные доски cp14-material-dirt-block = земля cp14-material-stone-block = камень -cp14-material-cloth = ткань \ No newline at end of file +cp14-material-cloth = ткань +cp14-material-flora = растительный материал diff --git a/Resources/Locale/ru-RU/_CP14/stack/materials.ftl b/Resources/Locale/ru-RU/_CP14/stack/materials.ftl index f8b15e7bf3..b276652b0a 100644 --- a/Resources/Locale/ru-RU/_CP14/stack/materials.ftl +++ b/Resources/Locale/ru-RU/_CP14/stack/materials.ftl @@ -3,11 +3,12 @@ cp14-stack-stone-block = каменные блоки cp14-stack-wood-planks = деревянные доски cp14-stack-nails = гвозди cp14-stack-cloth = рулоны ткани +cp14-stack-flora = пучки травы cp14-stack-copper-bars = медные слитки cp14-stack-iron-bars = железные слитки cp14-stack-gold-bars = золотые слитки -cp14-stack-wallpaper = рулон розоев +cp14-stack-wallpaper = рулон обоев cp14-stack-glass-sheet = стекло \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/stack/medical.ftl b/Resources/Locale/ru-RU/_CP14/stack/medical.ftl new file mode 100644 index 0000000000..5b37c9bdb5 --- /dev/null +++ b/Resources/Locale/ru-RU/_CP14/stack/medical.ftl @@ -0,0 +1,2 @@ +cp14-stack-pack-herbal-bandage = набор травяных бинтов +cp14-stack-pack-gauze = набор марли diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml index 6e770fb210..1c3378d8ae 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml @@ -283,14 +283,18 @@ count: 10 - type: entity - id: CP14FloraMaterial + id: CP14FloraMaterial1 parent: BaseItem name: flora material description: An organic material used for medicinal or construction purposes. + suffix: 1 categories: [ ForkFiltered ] components: - type: Item size: Tiny + - type: Stack + stackType: CP14FloraMaterial + count: 1 - type: Sprite sprite: _CP14/Objects/Materials/flora.rsi layers: @@ -314,6 +318,18 @@ damage: types: Heat: 1 + - type: Material + - type: PhysicalComposition # точно ли это нужно? + materialComposition: + CP14FloraMaterial: 100 + +- type: entity + id: CP14FloraMaterial2 + parent: CP14FloraMaterial1 + suffix: 2 + components: + - type: Stack + count: 2 - type: entity id: CP14String diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Medical/healing.yml new file mode 100644 index 0000000000..21b58c3709 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Medical/healing.yml @@ -0,0 +1,101 @@ +- type: entity + id: CP14HerbalBandage + parent: BaseItem + name: herbal bandage + description: A bandage net woven from grass, not the most reliable or useful thing, but better than nothing. + suffix: 10 + categories: [ ForkFiltered ] + components: + - type: Item + size: Small + - type: Sprite + sprite: _CP14/Objects/Specific/Medical/medical.rsi + state: herbbandage_3 + layers: + - state: herbbandage_3 + map: ["base"] + - type: Appearance + - type: Construction + graph: CP14HerbBandage + node: cp14herbbandage + - type: Healing + damageContainers: + - Biological + damage: + types: + Slash: -1 + Piercing: -1 + bloodlossModifier: -4 + healingBeginSound: + path: "/Audio/Items/Medical/brutepack_begin.ogg" + healingEndSound: + path: "/Audio/Items/Medical/brutepack_end.ogg" + - type: Stack + stackType: CP14HerbalBandage + count: 10 + baseLayer: base + layerStates: + - herbbandage + - herbbandage_2 + - herbbandage_3 + +- type: entity + id: CP14HerbalBandage1 + parent: CP14HerbalBandage + suffix: 1 + components: + - type: Sprite + state: herbbandage + - type: Stack + count: 1 + +- type: entity + id: CP14Gauze + parent: BaseItem + name: gauze + description: Dense cloth gauze, to prevent valuable blood from leaking out of the body. + suffix: 10 + categories: [ ForkFiltered ] + components: + - type: Item + size: Small + - type: Sprite + sprite: _CP14/Objects/Specific/Medical/medical.rsi + state: bandage_3 + layers: + - state: bandage_3 + map: ["base"] + - type: Appearance + - type: Construction + graph: CP14Gauze + node: cp14gauze + - type: Healing + damageContainers: + - Biological + damage: + types: + Slash: -4 + Piercing: -4 + bloodlossModifier: -10 + healingBeginSound: + path: "/Audio/Items/Medical/brutepack_begin.ogg" + healingEndSound: + path: "/Audio/Items/Medical/brutepack_end.ogg" + - type: Stack + stackType: CP14Gauze + count: 10 + baseLayer: base + layerStates: + - bandage + - bandage_2 + - bandage_3 + +- type: entity + id: CP14Gauze1 + parent: CP14Gauze + suffix: 1 + components: + - type: Sprite + state: bandage + - type: Stack + count: 1 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/grasshighbush.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/grasshighbush.yml index 8fdf54cadd..445dae26fe 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/grasshighbush.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/grasshighbush.yml @@ -79,7 +79,7 @@ acts: [ "Destruction" ] - !type:SpawnEntitiesBehavior spawn: - CP14FloraMaterial: + CP14FloraMaterial1: min: 0 max: 2 - type: SpeedModifierContacts diff --git a/Resources/Prototypes/_CP14/Materials/simple.yml b/Resources/Prototypes/_CP14/Materials/simple.yml index 2d147eca36..c101e29c27 100644 --- a/Resources/Prototypes/_CP14/Materials/simple.yml +++ b/Resources/Prototypes/_CP14/Materials/simple.yml @@ -68,4 +68,13 @@ unit: materials-unit-bar icon: { sprite: _CP14/Objects/Materials/gold_bar.rsi, state: bar_2 } color: "#FFD700" - price: 0 #? \ No newline at end of file + price: 0 #? + +- type: material + id: CP14FloraMaterial + stackEntity: CP14FloraMaterial1 + name: cp14-material-flora + unit: materials-unit-bunch + icon: { sprite: _CP14/Objects/Materials/flora.rsi, state: grass_material1 } + color: "#85903e" + price: 0 #? diff --git a/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/improvised/gauze.yml b/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/improvised/gauze.yml new file mode 100644 index 0000000000..6783405962 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/improvised/gauze.yml @@ -0,0 +1,14 @@ +- type: constructionGraph + id: CP14Gauze + start: start + graph: + - node: start + edges: + - to: cp14gauze + steps: + - material: CP14Cloth + amount: 2 + doAfter: 4 + + - node: cp14gauze + entity: CP14Gauze1 diff --git a/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/improvised/herbal_bandage.yml b/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/improvised/herbal_bandage.yml new file mode 100644 index 0000000000..34326ba336 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/improvised/herbal_bandage.yml @@ -0,0 +1,16 @@ +- type: constructionGraph + id: CP14HerbBandage + start: start + graph: + - node: start + edges: + - to: cp14herbbandage + steps: + - material: CP14FloraMaterial + amount: 2 + - material: CP14FloraMaterial + amount: 2 + doAfter: 4 + + - node: cp14herbbandage + entity: CP14HerbalBandage1 diff --git a/Resources/Prototypes/_CP14/Recipes/Crafting/improvised.yml b/Resources/Prototypes/_CP14/Recipes/Crafting/improvised.yml new file mode 100644 index 0000000000..e2f0f7552c --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Crafting/improvised.yml @@ -0,0 +1,27 @@ +- type: construction + crystallPunkAllowed: true + name: herbal bandage + id: cp14herbbandage + graph: CP14HerbBandage + startNode: start + targetNode: cp14herbbandage + category: construction-category-tools + objectType: Item + description: I'm surprised it can help at all. + icon: + sprite: _CP14/Objects/Specific/Medical/medical.rsi + state: herbbandage + +- type: construction + crystallPunkAllowed: true + name: gauze + id: cp14gauze + graph: CP14Gauze + startNode: start + targetNode: cp14gauze + category: construction-category-tools + objectType: Item + description: Last chance not to bleed out. + icon: + sprite: _CP14/Objects/Specific/Medical/medical.rsi + state: bandage diff --git a/Resources/Prototypes/_CP14/Stacks/materials.yml b/Resources/Prototypes/_CP14/Stacks/materials.yml index f56029fe40..2968487280 100644 --- a/Resources/Prototypes/_CP14/Stacks/materials.yml +++ b/Resources/Prototypes/_CP14/Stacks/materials.yml @@ -59,4 +59,11 @@ name: cp14-stack-glass-sheet spawn: CP14GlassSheet1 icon: { sprite: _CP14/Objects/Materials/glass.rsi, state: glass_2 } - maxCount: 10 \ No newline at end of file + maxCount: 10 + +- type: stack + id: CP14FloraMaterial + name: cp14-stack-flora + icon: { sprite: "_CP14/Objects/Materials/flora.rsi", state: grass_material1 } + spawn: CP14FloraMaterial1 + maxCount: 2 diff --git a/Resources/Prototypes/_CP14/Stacks/medical.yml b/Resources/Prototypes/_CP14/Stacks/medical.yml new file mode 100644 index 0000000000..5ca31dbb7c --- /dev/null +++ b/Resources/Prototypes/_CP14/Stacks/medical.yml @@ -0,0 +1,13 @@ +- type: stack + id: CP14HerbalBandage + name: cp14-stack-pack-herbal-bandage + icon: { sprite: "_CP14/Objects/Specific/Medical/medical.rsi", state: herbbandage_3 } + spawn: CP14HerbalBandage + maxCount: 10 + +- type: stack + id: CP14Gauze + name: cp14-stack-pack-gauze + icon: { sprite: "_CP14/Objects/Specific/Medical/medical.rsi", state: bandage_3 } + spawn: CP14Gauze + maxCount: 10 diff --git a/Resources/Textures/_CP14/Objects/Specific/Medical/medical.rsi/bandage.png b/Resources/Textures/_CP14/Objects/Specific/Medical/medical.rsi/bandage.png new file mode 100644 index 0000000000..d16fa54392 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Medical/medical.rsi/bandage.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Medical/medical.rsi/bandage_2.png b/Resources/Textures/_CP14/Objects/Specific/Medical/medical.rsi/bandage_2.png new file mode 100644 index 0000000000..d911e7e3ab Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Medical/medical.rsi/bandage_2.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Medical/medical.rsi/bandage_3.png b/Resources/Textures/_CP14/Objects/Specific/Medical/medical.rsi/bandage_3.png new file mode 100644 index 0000000000..26bc8e4fb3 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Medical/medical.rsi/bandage_3.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Medical/medical.rsi/herbbandage.png b/Resources/Textures/_CP14/Objects/Specific/Medical/medical.rsi/herbbandage.png new file mode 100644 index 0000000000..a882611346 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Medical/medical.rsi/herbbandage.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Medical/medical.rsi/herbbandage_2.png b/Resources/Textures/_CP14/Objects/Specific/Medical/medical.rsi/herbbandage_2.png new file mode 100644 index 0000000000..5fad2f9da8 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Medical/medical.rsi/herbbandage_2.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Medical/medical.rsi/herbbandage_3.png b/Resources/Textures/_CP14/Objects/Specific/Medical/medical.rsi/herbbandage_3.png new file mode 100644 index 0000000000..6fa4d84a01 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Medical/medical.rsi/herbbandage_3.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Medical/medical.rsi/meta.json b/Resources/Textures/_CP14/Objects/Specific/Medical/medical.rsi/meta.json new file mode 100644 index 0000000000..5b559ea702 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Specific/Medical/medical.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CLA", + "copyright": "Created by jaraten(Github/discord)", + "states": [ + { + "name": "bandage" + }, + { + "name": "bandage_2" + }, + { + "name": "bandage_3" + }, + { + "name": "herbbandage" + }, + { + "name": "herbbandage_2" + }, + { + "name": "herbbandage_3" + } + ] +} \ No newline at end of file