diff --git a/Resources/Audio/_CP14/Items/Pestle/pestle1.ogg b/Resources/Audio/_CP14/Items/Pestle/pestle1.ogg index 534c0d7089..6fb8eda366 100644 Binary files a/Resources/Audio/_CP14/Items/Pestle/pestle1.ogg and b/Resources/Audio/_CP14/Items/Pestle/pestle1.ogg differ diff --git a/Resources/ConfigPresets/_CP14/Dev.toml b/Resources/ConfigPresets/_CP14/Dev.toml index 8290ab7940..21726971be 100644 --- a/Resources/ConfigPresets/_CP14/Dev.toml +++ b/Resources/ConfigPresets/_CP14/Dev.toml @@ -1,5 +1,5 @@ [whitelist] -enabled = false +enabled = true [log] path = "logs" @@ -14,7 +14,7 @@ bindto = "::,0.0.0.0" max_connections = 100 [game] -hostname = "⚔️ CrystallEdge [RU] ⚔️ Status: Долгожданный релиз!" +hostname = "⚔️ CrystallEdge [RU] ⚔️ Status: Whitelist only" desc = "History of the City of Sword and Magic. A social economic sandbox reinventing the Space Station 14 concept in fantasy style" lobbyenabled = true soft_max_players = 40 @@ -61,4 +61,4 @@ enable_during_round = true [cp14] discord_auth_enabled = true -closet_beta_test = false \ No newline at end of file +closet_beta_test = true \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/ghostRoles/roles.ftl b/Resources/Locale/en-US/_CP14/ghostRoles/roles.ftl index 543c8e0c95..5be865037e 100644 --- a/Resources/Locale/en-US/_CP14/ghostRoles/roles.ftl +++ b/Resources/Locale/en-US/_CP14/ghostRoles/roles.ftl @@ -1,2 +1,2 @@ -cp14-ghost-role-information-name-skeleton = Undead friendly skeleton -cp14-ghost-role-information-description-skeleton = A spawn of purest kindness, instilling a living soul into dead bones. Often such souls are controlled by adventurers, forever saving them. \ No newline at end of file +cp14-ghost-role-information-name-skeleton = Undead skeleton +cp14-ghost-role-information-description-skeleton = The spawn of necromancy, putting a living soul into dead bones. Often such souls are controlled by the necromancer, doing his bidding. \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/ghostRoles/rules.ftl b/Resources/Locale/en-US/_CP14/ghostRoles/rules.ftl index dfcda4a500..4671a3d23c 100644 --- a/Resources/Locale/en-US/_CP14/ghostRoles/rules.ftl +++ b/Resources/Locale/en-US/_CP14/ghostRoles/rules.ftl @@ -1,3 +1,3 @@ -cp14-ghost-role-information-rules-demiplane = You are the [color=red]The savior of the demiplane[/color]. Your task is to save the demiplane invaders at any cost. You can fulfil your goal in any number of ways. You do not remember your past life, and you are absolutely [color=red]NOT[/color] allowed to remember, say, the name, appearance, etc. of your previous character. +cp14-ghost-role-information-rules-demiplane = You are the [color=red]demiplane antagonist[/color]. Your task is to kill the demiplane invaders at any cost. You can fulfil your goal in any number of ways. You do not remember your past life, and you are absolutely [color=red]NOT[/color] allowed to remember, say, the name, appearance, etc. of your previous character. cp14-ghost-role-information-rules-free = You are a [color=yellow]free antagonist[/color]. You can do whatever you want, as long as it doesn't result in widespread destruction and mass deaths. You do not remember your past life, and you are absolutely [color=red]NOT[/color] allowed to remember, say, the name, appearance, etc. of your previous character. \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/mind/role-types.ftl b/Resources/Locale/en-US/_CP14/mind/role-types.ftl index 0e3e513718..588b9f85f5 100644 --- a/Resources/Locale/en-US/_CP14/mind/role-types.ftl +++ b/Resources/Locale/en-US/_CP14/mind/role-types.ftl @@ -1 +1 @@ -cp14-role-type-demiplane-antag-name = The savior of the demiplane \ No newline at end of file +cp14-role-type-demiplane-antag-name = Demiplane antagonist \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/objectives/condition/empire-order.ftl b/Resources/Locale/en-US/_CP14/objectives/condition/empire-order.ftl index b5d871509c..b7b9a14086 100644 --- a/Resources/Locale/en-US/_CP14/objectives/condition/empire-order.ftl +++ b/Resources/Locale/en-US/_CP14/objectives/condition/empire-order.ftl @@ -6,5 +6,5 @@ cp14-objective-town-send-desc = Your task is to mine and ship { $count } { $item cp14-objective-bank-earning-title = Accumulate in the vault{ $coins } cp14-objective-bank-earning-desc = There must be at least{ $coins } in the bank vault. You can use any methods of earning money that do not violate the law. -cp14-objective-no-demiplane-death-title = Allow as many deaths as possible in the demiplanes -cp14-objective-no-demiplane-death-desc = [color=red]I need to control the work of adventurers so they die in demiplanes. No less than {$min} deaths! The main thing is to keep them from finding out about it![/color] \ No newline at end of file +cp14-objective-no-demiplane-death-title = Prevent deaths in the demiplanes +cp14-objective-no-demiplane-death-desc = I need to control the work of the adventurers so they don't die in the demiplanes. No more {$max} deaths! \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/_CP14/reagents/meta/physical-desc.ftl index b8cd6b6aa4..b54db697ca 100644 --- a/Resources/Locale/en-US/_CP14/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/en-US/_CP14/reagents/meta/physical-desc.ftl @@ -9,5 +9,4 @@ cp14-reagent-physical-desc-iridescent = iridescent cp14-reagent-physical-desc-powdery = powdery cp14-reagent-physical-desc-shimmering = shimmering cp14-reagent-physical-desc-grainy = grainy -cp14-reagent-physical-desc-slick = slick -cp14-reagent-physical-desc-molten = molten \ No newline at end of file +cp14-reagent-physical-desc-slick = slick \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/reagents/meta/thaumaturgy/ingots.ftl b/Resources/Locale/en-US/_CP14/reagents/meta/thaumaturgy/ingots.ftl deleted file mode 100644 index 01daab5055..0000000000 --- a/Resources/Locale/en-US/_CP14/reagents/meta/thaumaturgy/ingots.ftl +++ /dev/null @@ -1,48 +0,0 @@ -# Base 4 :trollface: - -cp14-reagent-name-molten-ingot-copper = Molten copper -cp14-reagent-desc-molten-ingot-copper = Molten copper? I hope you will not drink this - -cp14-reagent-name-molten-ingot-iron = Molten iron -cp14-reagent-desc-molten-ingot-iron = Just why... - -cp14-reagent-name-molten-ingot-gold = Molten gold -cp14-reagent-desc-molten-ingot-gold = A tasty looking piece of... butter? - -cp14-reagent-name-molten-ingot-mithril = Molten mithril -cp14-reagent-desc-molten-ingot-mithril = Conifers transformed into molten form - -# New alloys - -cp14-reagent-name-alloy-coconut = Coconut alloy??? -cp14-reagent-desc-alloy-coconut = We dont know what the fuck is that but it heals - -cp14-reagent-name-alloy-not-coconut = Not coconut alloy? -cp14-reagent-desc-alloy-not-coconut = It hurts - -cp14-reagent-name-alloy-inversium = The i-forgot-his-name alloy -cp14-reagent-desc-alloy-inversium = We forgot what it does, but it -> INVERTED <- our lives - -cp14-reagent-name-alloy-normaldaynium = Normal day or night alloy -cp14-reagent-desc-alloy-normaldaynium = Cools or heats the consumer to room temperature - -cp14-reagent-name-alloy-baddaynium = Just a bad day -cp14-reagent-desc-alloy-baddaynium = This thing just kills you instantly. No jokes - -cp14-reagent-name-alloy-healium = Philosophical alloy -cp14-reagent-desc-alloy-healium = dayoes not turn lead into gold, but cures loss of blood, air and poisons - -cp14-reagent-name-alloy-killium = Kill yourself, now -cp14-reagent-desc-alloy-killium = Just kills consumer, nothing special - -cp14-reagent-name-alloy-dinner = Lunch, cozy, glasses with a mustache -cp14-reagent-desc-alloy-dinner = So nutritious that even vampires can't resist - -cp14-reagent-name-alloy-speedrunnium = THE SPEEDRUN SOLUTION -cp14-reagent-desc-alloy-speedrunnium = Gotta go fast - -cp14-reagent-name-alloy-turtle = Turtle -cp14-reagent-desc-alloy-turtle = Turtle Jr - -cp14-reagent-name-alloy-breakingbad = Blue Meth -cp14-reagent-desc-alloy-breakingbad = Please dont call Soul, and why it dupes itself... \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/skill/skill_tree.ftl b/Resources/Locale/en-US/_CP14/skill/skill_tree.ftl index c8c068d74d..c4a72617b6 100644 --- a/Resources/Locale/en-US/_CP14/skill/skill_tree.ftl +++ b/Resources/Locale/en-US/_CP14/skill/skill_tree.ftl @@ -16,9 +16,6 @@ cp14-skill-tree-illusion-desc = Explore the nature of light to create illusions, cp14-skill-tree-healing-name = Lifecation cp14-skill-tree-healing-desc = Explore the ways in which magic affects living creatures. -cp14-skill-tree-vampire-name = Vampirism -cp14-skill-tree-vampire-desc = How the hell do you know this?! - # Body cp14-skill-tree-atlethic-name = Atlethic diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index 2b467f1dd0..69d6493369 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -1704,13 +1704,13 @@ ent-CP14AgaricMushroom = мухомор .desc = Этот ядовитый гриб часто можно встретить вблизи водоемов или других влажных мест. Не рекомендуется для употребления в пищу. ent-CP14ChromiumSlime = хромиевая слизь - .desc = Это редкое густое вещество можно обнаружить в потоке воды, как будто оно обладает собственным разумом. + .desc = Это редкое густое вещество можно обнаружить в потоке воды, как будто оно обладает собственным разумом. При попытке изменить саму слизь - она меняет реагент, с которым взаимодействует. ent-CP14WildSage = корень дикого шалфея - .desc = Сегодня бесполезен, простите :( + .desc = Корень повсеместно распространенного лекарственного растения, неплохо заживляющего физические повреждения и вызывающего откашливание. ent-CP14LumiMushroom = люмигриб - .desc = Слабо светящийся гриб. Часто используется алхимиками как средство для концентрации оружий? + .desc = Слабо светящийся гриб. Часто используется алхимиками как средство для концентрации растворов. ent-CP14BlueAmanita = лазурная Аманита .desc = Небесно-голубой цветок, известный своими лечебными и магическими свойствами. @@ -2552,10 +2552,10 @@ ent-CP14Cauldron = котел .desc = Тяжелый котелок. Он не такой громоздкий, как чан, но его можно нести в руках. ent-CP14Pestle = пестик - .desc = Мяу <3 + .desc = Устройство для удобного измельчения различных материалов в жидкость. ent-CP14Mortar = ступка - .desc = Кузнечная ступка, ой, а почему она мяукает? + .desc = Алхимическая прочная тарелка для измельчения реагентов. ent-CP14Dropper = пипетка .desc = Маленькая пипетка для работы с очень малыми объемами жидкостей. @@ -4182,7 +4182,7 @@ ent-CP14FenceWoodSmallGate = маленькие деревянные ворот .desc = Представляете ли вы, что ждет вас за этими воротами? Это может быть как туалет, так и роскошный особняк. ent-CP14GatherableWaterAirLily = воздушная лилия - .desc = Легкий, нежный и воздушный цветок. Я бы не стал из него делать стрелы. + .desc = Легкий, нежный и воздушный цветок. Говорят, что его особые свойства позволяют людям даже дышать под водой... .suffix = Собираемый ent-CP14BaseBarrel = деревянная бочка @@ -4270,11 +4270,11 @@ ent-CP14AlchemySolutionCleaner = очиститель растворов ent-CP14BaseVat = большой чан .desc = Очень большой чан для хранения огромного количества жидкости. Тяжелый, неудобный для переноски. -ent-CP14WorkbenchAnvil = наковальня-гриль - .desc = Большой кусок металла, который позволяет греть шашлык. +ent-CP14WorkbenchAnvil = наковальня + .desc = Большой кусок металла, который позволяет превращать квадратные куски металла в куски металла других, более полезных форм. ent-CP14WorkbenchFurnace = плавильная печь - .desc = Сломана. + .desc = Раскаленный камень, позволяющий переплавлять руды в чистый металл. ent-CP14WallmountButtonBase = настенная кнопка .desc = Эта кнопка может активировать что-то! @@ -4313,130 +4313,3 @@ ent-CP14WallCardboard = картонная стена ent-CP14WindowWooden = деревянное окно .desc = Деревянная стена со стеклянным окном в ней. - -ent-CP14ArmorBloodflowerChainmail = Бладфлавер чейнмейл - .desc = За что ты так с цветочками? - -ent-CP14ArmorChromiumslimeChainmail = Хромиумслизиевый чейнмейл - .desc = Тот же эффект что и у бладфлавер чейнмейл, но инвертированный! - -ent-CP14ArmorDayflinChainmail = Дэйфлин чейнмейл - .desc = Даже не смотри сюда, больной ублюдок - -ent-CP14ArmorBloodflowerCuirass = Кираса из прикольных цветочков - .desc = Прикольнааааа - -ent-CP14ArmorChromiumslimeCuirass = Кираса из всеми забытой херни - .desc = Кому оно вообще надо-то? - -ent-CP14ArmorDayflinCuirass = Кираса больного ублюдка - .desc = Ускоряет, но какой ценой? - -ent-CP14ArmorBloodflowerInfantryCuirass = АФИГЕТЬ КАКАЯ КИРАСА ИЗ ПРИКОЛЬНЫХ ЦВЕТОЧКОВ!!!! - .desc = АФИГЕТЬ КАК ПРИКОЛЬНО!!!!!!!!!!!!!! - -ent-CP14ArmorChromiumslimeInfantryCuirass = Пехотная кираса из богом забытого материалами - .desc = Ты антаг что-ли, откуда у тебя слизь? - -ent-CP14ArmorDayflinInfantryCuirass = Пехотная кираса второй космической - .desc = Скорее комической. - -ent-CP14ModularCuissesBloodflowerChainmail = Штанишки чейнмельные из цветочков недорого - .desc = 10 медных и они твои! - -ent-CP14ModularCuissesChromiumslimeChainmail = Вдвойне прозрачные штаны - .desc = Наденьте под них ещё одну пару штанов - -ent-CP14ModularCuissesLumimushroomChainmail = ШТАНЫ СВЕТЯТСЯ АФИГЕТЬ - .desc = НА 2 ТАЙЛА!!!!!!!! - -ent-CP14ModularCuissesDayflinChainmail = Скоростные трусы - .desc = Быстрые трусы для быстрых гоблинов - -ent-CP14ModularCuissesBloodflowerPlate = Бладфлавер плита штаны - .desc = Умру в демиплане, не умру в демиплане, умру в демиплане... - -ent-CP14ModularCuissesChromiumslimePlate = Прозрачные штаны - .desc = Не забудьте про подштанники. - -ent-CP14ModularCuissesLumimushroomPlate = Штаны светятся... - .desc = На три тайла... - -ent-CP14ModularCuissesDayflinPlate = Это же штаны больного ублюдка! - .desc = Ты чего творишь... - -ent-CP14ModularGreaveBloodFlowerChainmail = Каблуки - .desc = Напиши в чатике под чьим ты каблуком! - -ent-CP14ModularGreaveChromiumslimeChainmail = Не слизь не ботинки не кольчуга - .desc = Слизь ботинки кольчуга - -ent-CP14ModularGreaveDayflinChainmail = Акселерятор - .desc = Некий научный акселерятор классное аниме, вы знали? - -ent-CP14ModularBladeBloodflowerAxe = БЛАДФЛАВЕР ТОПООООООООООР - -ent-CP14ModularBladeChromiumslimeAxe = Топор который сломается сразу - -ent-CP14ModularBladeDayflinAxe = Быстрейший топор на диком западе - -ent-CP14ModularBladeBloodflowerDagger = БЛАДФЛАВЕР ДАГГЕЕЕЕЕЕЕР - -ent-CP14ModularBladeChromiumslimeDagger = Меня никто не скрафтит - -ent-CP14ModularBladeDayflinDagger = Антон - -ent-CP14ModularBladeBloodflowerHammer = БЛАДФЛАВЕР МОЛООООООТ - -ent-CP14ModularBladeChromiumslimeHammer = Меня никто не получить - -ent-CP14ModularBladeDayflinHammer = Олег - -ent-CP14ModularBladeBloodflowerMace = БЛАДФЛАВЕР МОРГЕНШТЕРН? стоп чё - -ent-CP14ModularBladeChromiumslimeMace = Никто - -ent-CP14ModularBladeDayflinMace = Санёк - -ent-CP14ModularBladeBloodflowerPickaxe = БЛАДФЛАВЕР КИРКААААААА - -ent-CP14ModularBladeChromiumslimePickaxe = Кирка из ничего - -ent-CP14ModularBladeDayflinPickaxe = Илья - -ent-CP14ModularBladeBloodflowerRapier = БЛАДФЛАВЕР РАПИРАААААААААА - -ent-CP14ModularBladeChromiumslimeRapier = Рапира из воды - -ent-CP14ModularBladeDayflinRapier = Денис - -ent-CP14ModularBladeBloodflowerShovel = БЛАДФЛАВЕР ЛОПАТААААААА - -ent-CP14ModularBladeChromiumslimeShovel = Лопата из - -ent-CP14ModularBladeDayflinShovel = Филипп - -ent-CP14ModularBladeBloodflowerSickle = БЛАДФЛАВЕР СЕЕЕЕЕЕЕРП - -ent-CP14ModularBladeChromiumslimeSickle = Серп без молота - -ent-CP14ModularBladeDayflinSickle = Пушок - -ent-CP14ModularBladeBloodflowerSpear = БЛАДФЛАВЕР КОПЬЁЁЁЁЁЁЁЁЁЁЁЁЁЁЁЁЁЁЁ - -ent-CP14ModularBladeChromiumslimeSpear = Копье без ё - -ent-CP14ModularBladeDayflinSpear = Дымок - -ent-CP14ModularBladeBloodflowerSword = БЛАДФЛАВЕР МЕЕЕЕЕЕЕЕЕЕЕЧ - -ent-CP14ModularBladeChromiumslimeSword = Мч - -ent-CP14ModularBladeDayflinSword = Бася - -ent-CP14ModularGardeSharpLumimushroom = Гарда светяшка классная - -ent-CP14ModularGardeSturdyLumimushroom = Гарда светяшка не классная - -ent-CP14ModularTipAirlilyArrow = Наконечник стрелы из воздушной лилии - diff --git a/Resources/Locale/ru-RU/_CP14/ghostRoles/roles.ftl b/Resources/Locale/ru-RU/_CP14/ghostRoles/roles.ftl index eb8a0c6ef3..d08a54d9fd 100644 --- a/Resources/Locale/ru-RU/_CP14/ghostRoles/roles.ftl +++ b/Resources/Locale/ru-RU/_CP14/ghostRoles/roles.ftl @@ -1,2 +1,2 @@ -cp14-ghost-role-information-name-skeleton = Оживленный скелет позитива -cp14-ghost-role-information-description-skeleton = Порождение чистейшей доброты, вселившее живую душу в мертвые кости. Часто такие души контролируются авантюристами, вечно спасая их. \ No newline at end of file +cp14-ghost-role-information-name-skeleton = Оживленный скелет +cp14-ghost-role-information-description-skeleton = Порождение некромантии, вселившее живую душу в мертвые кости. Часто такие души контролируются некромантом, исполняя его волю. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/ghostRoles/rules.ftl b/Resources/Locale/ru-RU/_CP14/ghostRoles/rules.ftl index bc9242f31b..e5c0edb56b 100644 --- a/Resources/Locale/ru-RU/_CP14/ghostRoles/rules.ftl +++ b/Resources/Locale/ru-RU/_CP14/ghostRoles/rules.ftl @@ -1,3 +1,3 @@ -cp14-ghost-role-information-rules-demiplane = Вы - [color=green]спасатель демиплана[/color]. Ваша задача - спасти вторженцев в демиплан любой ценой. Вы можете выполнять свою цель любыми способами. Вы не помните вашу прошлую жизнь, и вам абсолютно [color=red]НЕ[/color] разрешается помнить, скажем, имя, внешность и т.д. вашего предыдущего персонажа. +cp14-ghost-role-information-rules-demiplane = Вы - [color=red]антагонист демиплана[/color]. Ваша задача - убить вторженцев в демиплан любой ценой. Вы можете выполнять свою цель любыми способами. Вы не помните вашу прошлую жизнь, и вам абсолютно [color=red]НЕ[/color] разрешается помнить, скажем, имя, внешность и т.д. вашего предыдущего персонажа. cp14-ghost-role-information-rules-free = Вы - [color=yellow]свободный антагонист[/color]. Вы можете делать все что хотите, если это не приводит к масштабным разрушениям и массовым смертям. Вы не помните вашу прошлую жизнь, и вам абсолютно [color=red]НЕ[/color] разрешается помнить, скажем, имя, внешность и т.д. вашего предыдущего персонажа. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/mind/role-types.ftl b/Resources/Locale/ru-RU/_CP14/mind/role-types.ftl index 0eb1200a97..03d039eb61 100644 --- a/Resources/Locale/ru-RU/_CP14/mind/role-types.ftl +++ b/Resources/Locale/ru-RU/_CP14/mind/role-types.ftl @@ -1 +1 @@ -cp14-role-type-demiplane-antag-name = Спасатель демиплана \ No newline at end of file +cp14-role-type-demiplane-antag-name = Антагонист демиплана \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/objectives/condition/empire-order.ftl b/Resources/Locale/ru-RU/_CP14/objectives/condition/empire-order.ftl index c05b52f707..cd8595b870 100644 --- a/Resources/Locale/ru-RU/_CP14/objectives/condition/empire-order.ftl +++ b/Resources/Locale/ru-RU/_CP14/objectives/condition/empire-order.ftl @@ -6,5 +6,5 @@ cp14-objective-town-send-desc = Ваша задача - добыть и отпр cp14-objective-bank-earning-title = Накопить в хранилище{ $coins } cp14-objective-bank-earning-desc = В банковском хранилище должно находиться не меньше{ $coins }. Вы можете использовать любые методы заработка, не нарушающие закон. -cp14-objective-no-demiplane-death-title = Допустить как можно больше смертей в демипланах -cp14-objective-no-demiplane-death-desc = [color=red]Мне нужно контролировать работу авантюристов, чтобы они погибали в демипланах. Не менее {$min} смертей! Главное не дать им узнать об этом![/color] \ No newline at end of file +cp14-objective-no-demiplane-death-title = Не допустить смертей в демипланах +cp14-objective-no-demiplane-death-desc = Мне нужно контролировать работу авантюристов, чтобы они не погибали в демипланах. Не больше {$max} смертей! \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/reagents/meta/physical-desc.ftl b/Resources/Locale/ru-RU/_CP14/reagents/meta/physical-desc.ftl index 8d02e55481..6f927fc6d6 100644 --- a/Resources/Locale/ru-RU/_CP14/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/ru-RU/_CP14/reagents/meta/physical-desc.ftl @@ -10,4 +10,3 @@ cp14-reagent-physical-desc-powdery = пудровый cp14-reagent-physical-desc-shimmering = мерцающий cp14-reagent-physical-desc-grainy = зернистый cp14-reagent-physical-desc-slick = скользкий -cp14-reagent-physical-desc-molten = расплавленное diff --git a/Resources/Locale/ru-RU/_CP14/reagents/meta/thaumaturgy/ingots.ftl b/Resources/Locale/ru-RU/_CP14/reagents/meta/thaumaturgy/ingots.ftl deleted file mode 100644 index adad896230..0000000000 --- a/Resources/Locale/ru-RU/_CP14/reagents/meta/thaumaturgy/ingots.ftl +++ /dev/null @@ -1,45 +0,0 @@ -cp14-reagent-name-molten-ingot-copper = Расплавленная медь -cp14-reagent-desc-molten-ingot-copper = Расплавленная медь? Среьёзно? Только не говори мне что ты будешь это пить - -cp14-reagent-name-molten-ingot-iron = Расплавленное железо -cp14-reagent-desc-molten-ingot-iron = Просто почему... - -cp14-reagent-name-molten-ingot-gold = Расплавленное золото -cp14-reagent-desc-molten-ingot-gold = Аппетитный кусок... масла? - -cp14-reagent-name-molten-ingot-mithril = Расплавленный мифрил -cp14-reagent-desc-molten-ingot-mithril = Хвойные растения, готовые к небольшим понюхиваниям - - -cp14-reagent-name-alloy-coconut = КОКОНАТ ЭЛЛОЙ???? -cp14-reagent-desc-alloy-coconut = Мы не знаем что это за херня но она лечит - -cp14-reagent-name-alloy-not-coconut = Не коконат эллой? -cp14-reagent-desc-alloy-not-coconut = Боль - -cp14-reagent-name-alloy-inversium = Я-забыл-как-эта-штука-называется сплав! -cp14-reagent-desc-alloy-inversium = Мы не знаем что оно делает, но оно -> инвертировало <- мою жизнь к худшему - -cp14-reagent-name-alloy-normaldaynium = Нормальный день или ночь сплав -cp14-reagent-desc-alloy-normaldaynium = Приводит потребителя к комнатной температуре! - -cp14-reagent-name-alloy-baddaynium = Просто плохой день -cp14-reagent-desc-alloy-baddaynium = Что вы знаете о пародоксе Мпембы? - -cp14-reagent-name-alloy-healium = Философский сплав -cp14-reagent-desc-alloy-healium = Даоес, не превращает свинец в золото но лечит всё подряд - -cp14-reagent-name-alloy-killium = Убейся -cp14-reagent-desc-alloy-killium = Убивает - -cp14-reagent-name-alloy-dinner = Обед, уютненько, очки с усами -cp14-reagent-desc-alloy-dinner = Настолько афигенно что даже вампир не устоит - -cp14-reagent-name-alloy-speedrunnium = РЕШЕНИЕ СПИДРАННЕРА -cp14-reagent-desc-alloy-speedrunnium = Готта го фаст - -cp14-reagent-name-alloy-turtle = Торториель -cp14-reagent-desc-alloy-turtle = Торториель джуниор - -cp14-reagent-name-alloy-breakingbad = Синий мет -cp14-reagent-desc-alloy-breakingbad = Джесси, звони стражникам, жидкость сама себя увеличивает \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/skill/skill_tree.ftl b/Resources/Locale/ru-RU/_CP14/skill/skill_tree.ftl index 423df5d742..2c20e1c3d0 100644 --- a/Resources/Locale/ru-RU/_CP14/skill/skill_tree.ftl +++ b/Resources/Locale/ru-RU/_CP14/skill/skill_tree.ftl @@ -18,9 +18,6 @@ cp14-skill-tree-illusion-desc = Исследуйте природу света, cp14-skill-tree-healing-name = Жизнетворение cp14-skill-tree-healing-desc = Изучайте способы влияния магии на живые создания. -cp14-skill-tree-vampire-name = Вампиризм -cp14-skill-tree-vampire-desc = Откуда вы чёрт возьми знаете это?! - # Body cp14-skill-tree-atlethic-name = Атлетика diff --git a/Resources/Maps/_CP14/comoss.yml b/Resources/Maps/_CP14/comoss.yml index 476ec3086a..c63efe584b 100644 --- a/Resources/Maps/_CP14/comoss.yml +++ b/Resources/Maps/_CP14/comoss.yml @@ -4,8 +4,8 @@ meta: engineVersion: 248.0.2 forkId: "" forkVersion: "" - time: 03/31/2025 19:07:07 - entityCount: 14451 + time: 03/18/2025 21:57:21 + entityCount: 14429 maps: - 2 grids: @@ -818,12 +818,34 @@ entities: - type: ItemPlacer placedEntities: - 10904 + - uid: 4 + components: + - type: Transform + pos: -15.5,-19.5 + parent: 2 + - uid: 5 + components: + - type: Transform + pos: -13.5,-19.5 + parent: 2 - uid: 6 components: - type: Transform rot: -1.5707963267948966 rad pos: 22.5,15.5 parent: 2 +- proto: CP14AlchemySolutionCleaner + entities: + - uid: 7 + components: + - type: Transform + pos: 22.5,14.5 + parent: 2 + - uid: 8 + components: + - type: Transform + pos: 15.5,0.5 + parent: 2 - proto: CP14AstralCorrosion entities: - uid: 9 @@ -19503,6 +19525,11 @@ entities: - type: Transform pos: 51.5,-35.5 parent: 2 + - uid: 3442 + components: + - type: Transform + pos: 51.5,-34.5 + parent: 2 - uid: 3443 components: - type: Transform @@ -41441,13 +41468,6 @@ entities: - type: Transform pos: 17.630857,-2.5448456 parent: 2 -- proto: CP14DemiplaneArtifactRoomSpawner - entities: - - uid: 14451 - components: - - type: Transform - pos: 30.5,66.5 - parent: 2 - proto: CP14DemiplaneKeyT1 entities: - uid: 7681 @@ -41500,13 +41520,6 @@ entities: - type: Transform pos: -5.9540577,-14.337633 parent: 2 -- proto: CP14DemiplanEnterRoomMarker - entities: - - uid: 1 - components: - - type: Transform - pos: 51.5,-34.5 - parent: 2 - proto: CP14DirtBlock1 entities: - uid: 7691 @@ -41547,6 +41560,18 @@ entities: rot: -1.5707963267948966 rad pos: 16.07972,-4.6309657 parent: 2 +- proto: CP14EssenceCollector + entities: + - uid: 7697 + components: + - type: Transform + pos: 17.5,0.5 + parent: 2 + - uid: 7698 + components: + - type: Transform + pos: 22.5,16.5 + parent: 2 - proto: CP14FenceIronGrilleGate entities: - uid: 7699 @@ -42638,108 +42663,6 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-23.5 parent: 2 -- proto: CP14FlameCreationArtificialFlame - entities: - - uid: 14352 - components: - - type: Transform - pos: -14.268382,-23.283566 - parent: 2 - - uid: 14359 - components: - - type: Transform - pos: -13.705882,-23.283566 - parent: 2 - - uid: 14431 - components: - - type: Transform - pos: -11.159007,-21.61169 - parent: 2 - - uid: 14432 - components: - - type: Transform - pos: -11.346507,-21.89294 - parent: 2 - - uid: 14433 - components: - - type: Transform - pos: -1.7158322,-22.01794 - parent: 2 - - uid: 14434 - components: - - type: Transform - pos: -2.9345822,-20.33044 - parent: 2 - - uid: 14435 - components: - - type: Transform - pos: -4.153332,-20.002316 - parent: 2 - - uid: 14436 - components: - - type: Transform - pos: -6.356457,-20.51794 - parent: 2 - - uid: 14437 - components: - - type: Transform - pos: -8.965832,-19.908566 - parent: 2 - - uid: 14438 - components: - - type: Transform - pos: -8.997082,-21.42419 - parent: 2 - - uid: 14439 - components: - - type: Transform - pos: -4.153332,-22.814816 - parent: 2 - - uid: 14440 - components: - - type: Transform - pos: -8.465832,-22.877316 - parent: 2 - - uid: 14441 - components: - - type: Transform - pos: -16.444216,-22.749506 - parent: 2 - - uid: 14442 - components: - - type: Transform - pos: -15.459841,-20.233881 - parent: 2 - - uid: 14443 - components: - - type: Transform - pos: -17.11609,-19.390131 - parent: 2 - - uid: 14444 - components: - - type: Transform - pos: -17.100466,-14.53067 - parent: 2 - - uid: 14445 - components: - - type: Transform - pos: -17.006716,-16.952545 - parent: 2 - - uid: 14446 - components: - - type: Transform - pos: -15.319216,-15.265045 - parent: 2 - - uid: 14447 - components: - - type: Transform - pos: 0.05167377,-21.530228 - parent: 2 - - uid: 14448 - components: - - type: Transform - pos: -5.908425,-22.545853 - parent: 2 - proto: CP14FloorWater entities: - uid: 7883 @@ -43097,6 +43020,11 @@ entities: - type: Transform pos: 3.5,22.5 parent: 2 + - uid: 7945 + components: + - type: Transform + pos: 4.5,-13.5 + parent: 2 - proto: CP14FloraTreeGreenLarge entities: - uid: 7946 @@ -43871,12 +43799,15 @@ entities: rot: -1.5707963267948966 rad pos: 10.5,-27.5 parent: 2 -- proto: CP14JewelryEmerald +- proto: CP14JewelryTopaz entities: - - uid: 7131 + - uid: 8074 components: + - type: MetaData + desc: fragmentum materiae ignotae, quae huc e longinquo mundo prodiit. + name: supermatter - type: Transform - pos: -0.5,48.5 + pos: -0.4932046,48.519947 parent: 2 - proto: CP14KeyPersonalHouse5 entities: @@ -43892,175 +43823,176 @@ entities: - type: Transform pos: -3.7526371,-11.30407 parent: 2 +- proto: CP14LaddersDownStoneAutoLink + entities: + - uid: 8077 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-0.5 + parent: 2 + - uid: 8078 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 19.5,-17.5 + parent: 2 + - uid: 8079 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 19.5,-18.5 + parent: 2 + - uid: 8080 + components: + - type: Transform + pos: 16.5,40.5 + parent: 2 + - uid: 8081 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 81.5,41.5 + parent: 2 + - uid: 8082 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-17.5 + parent: 2 + - uid: 8083 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-16.5 + parent: 2 + - uid: 8084 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 39.5,13.5 + parent: 2 + - uid: 8085 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-50.5 + parent: 2 - proto: CP14LaddersDownWoodAutoLink entities: + - uid: 8086 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-2.5 + parent: 2 - uid: 8087 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,5.5 parent: 2 + - uid: 8088 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 43.5,-15.5 + parent: 2 + - uid: 8089 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 43.5,-16.5 + parent: 2 + - uid: 8090 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 12.5,3.5 + parent: 2 - uid: 8091 components: - type: Transform pos: -13.5,-29.5 parent: 2 + - uid: 8092 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-38.5 + parent: 2 + - uid: 8093 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 22.5,17.5 + parent: 2 + - uid: 8094 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 27.5,-9.5 + parent: 2 - uid: 8095 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,-7.5 parent: 2 + - uid: 8096 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,-34.5 + parent: 2 + - uid: 8097 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,-39.5 + parent: 2 - uid: 8098 components: - type: Transform rot: 1.5707963267948966 rad pos: -12.5,1.5 parent: 2 + - uid: 8099 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,27.5 + parent: 2 - uid: 8100 components: - type: Transform rot: 1.5707963267948966 rad pos: -12.5,-6.5 parent: 2 + - uid: 8101 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,16.5 + parent: 2 + - uid: 8102 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -17.5,-13.5 + parent: 2 - uid: 8103 components: - type: Transform rot: 1.5707963267948966 rad pos: -24.5,-4.5 parent: 2 -- proto: CP14LaddersUpStoneAutoLink - entities: - - uid: 7945 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 24.5,-0.5 - parent: 2 - - uid: 8074 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 19.5,-17.5 - parent: 2 - - uid: 8077 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 19.5,-18.5 - parent: 2 - - uid: 8078 + - uid: 8104 components: - type: Transform rot: 3.141592653589793 rad - pos: 16.5,40.5 - parent: 2 - - uid: 8079 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 81.5,41.5 - parent: 2 - - uid: 8080 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -9.5,-16.5 - parent: 2 - - uid: 8081 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -9.5,-17.5 - parent: 2 - - uid: 8082 - components: - - type: Transform - pos: 39.5,13.5 - parent: 2 - - uid: 8083 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-50.5 - parent: 2 -- proto: CP14LaddersUpWoodAutoLink - entities: - - uid: 8084 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 6.5,-2.5 - parent: 2 - - uid: 8085 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 43.5,-16.5 - parent: 2 - - uid: 8086 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 43.5,-15.5 - parent: 2 - - uid: 8088 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 12.5,3.5 - parent: 2 - - uid: 8089 - components: - - type: Transform - pos: -6.5,-38.5 - parent: 2 - - uid: 8090 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 22.5,17.5 - parent: 2 - - uid: 8092 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 27.5,-9.5 - parent: 2 - - uid: 8093 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,-34.5 - parent: 2 - - uid: 8094 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,-39.5 - parent: 2 - - uid: 8096 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 14.5,27.5 - parent: 2 - - uid: 8097 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 9.5,16.5 - parent: 2 - - uid: 8099 - components: - - type: Transform pos: -16.5,-13.5 parent: 2 - - uid: 8101 - components: - - type: Transform - pos: -17.5,-13.5 - parent: 2 - proto: CP14Lamppost entities: - uid: 8105 @@ -45026,18 +44958,6 @@ entities: rot: 1.5707963267948966 rad pos: 11.675974,-34.404755 parent: 2 -- proto: CP14Mortar - entities: - - uid: 8 - components: - - type: Transform - pos: 30.55681,16.72985 - parent: 2 - - uid: 10613 - components: - - type: Transform - pos: 28.499714,5.503121 - parent: 2 - proto: CP14Nail20 entities: - uid: 8222 @@ -45310,18 +45230,6 @@ entities: - type: Transform pos: 17.469593,-42.292152 parent: 2 -- proto: CP14Pestle - entities: - - uid: 7 - components: - - type: Transform - pos: 30.40056,16.526726 - parent: 2 - - uid: 10612 - components: - - type: Transform - pos: 28.499714,5.581246 - parent: 2 - proto: CP14PlantCabbage entities: - uid: 8269 @@ -61780,6 +61688,26 @@ entities: parent: 2 - proto: CP14SpawnEssenceNodeRandom entities: + - uid: 10612 + components: + - type: Transform + pos: 109.5,60.5 + parent: 2 + - uid: 10613 + components: + - type: Transform + pos: 30.5,48.5 + parent: 2 + - uid: 10614 + components: + - type: Transform + pos: -7.5,21.5 + parent: 2 + - uid: 10615 + components: + - type: Transform + pos: -11.5,-11.5 + parent: 2 - uid: 10616 components: - type: Transform @@ -61809,13 +61737,6 @@ entities: - type: Transform pos: 24.5,51.5 parent: 2 -- proto: CP14SpawnMobMonsterMosquito - entities: - - uid: 14452 - components: - - type: Transform - pos: -8.5,-16.5 - parent: 2 - proto: CP14SpawnMobRabbit entities: - uid: 10621 @@ -62084,23 +62005,6 @@ entities: pos: 24.655243,14.690253 parent: 2 - type: DamagedByContact -- proto: CP14StatueWizard - entities: - - uid: 3442 - components: - - type: Transform - pos: 16.5,-29.5 - parent: 2 - - uid: 14449 - components: - - type: Transform - pos: 3.5,-13.5 - parent: 2 - - uid: 14450 - components: - - type: Transform - pos: 18.5,-29.5 - parent: 2 - proto: CP14SteelBeerMug entities: - uid: 10665 @@ -81375,66 +81279,6 @@ entities: parent: 2 - proto: CP14WoodenChest entities: - - uid: 7697 - components: - - type: Transform - pos: 30.5,16.5 - parent: 2 - - type: EntityStorage - open: True - removedMasks: 20 - - type: Fixtures - fixtures: - fix1: - shape: !type:PolygonShape - radius: 0.01 - vertices: - - -0.4,-0.4 - - 0.4,-0.4 - - 0.4,0.29 - - -0.4,0.29 - mask: - - Impassable - - LowImpassable - layer: - - BulletImpassable - - Opaque - density: 50 - hard: True - restitution: 0 - friction: 0.4 - - type: PlaceableSurface - isPlaceable: True - - uid: 7698 - components: - - type: Transform - pos: 28.5,5.5 - parent: 2 - - type: EntityStorage - open: True - removedMasks: 20 - - type: Fixtures - fixtures: - fix1: - shape: !type:PolygonShape - radius: 0.01 - vertices: - - -0.4,-0.4 - - 0.4,-0.4 - - 0.4,0.29 - - -0.4,0.29 - mask: - - Impassable - - LowImpassable - layer: - - BulletImpassable - - Opaque - density: 50 - hard: True - restitution: 0 - friction: 0.4 - - type: PlaceableSurface - isPlaceable: True - uid: 14286 components: - type: Transform @@ -81843,11 +81687,10 @@ entities: parent: 2 - proto: CP14WoodenDoorPersonalHouse3 entities: - - uid: 8104 + - uid: 14352 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -6.5,16.5 + pos: -6.5,11.5 parent: 2 - proto: CP14WoodenDoorPersonalHouse4 entities: @@ -81893,11 +81736,11 @@ entities: parent: 2 - proto: CP14WoodenDoorPersonalHouse8 entities: - - uid: 8102 + - uid: 14359 components: - type: Transform - rot: 3.141592653589793 rad - pos: -6.5,11.5 + rot: -1.5707963267948966 rad + pos: -6.5,16.5 parent: 2 - uid: 14360 components: @@ -82128,18 +81971,6 @@ entities: parent: 2 - proto: CP14WorkbenchAnvil entities: - - uid: 4 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -15.5,-19.5 - parent: 2 - - uid: 5 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -13.5,-19.5 - parent: 2 - uid: 14399 components: - type: Transform @@ -82259,35 +82090,6 @@ entities: - type: Transform pos: 19.349468,-26.151648 parent: 2 -- proto: PlushieLizardInversed - entities: - - uid: 17541 - components: - - type: MetaData - desc: oooo you like mapping. ur a mapper - name: Viator - - type: Transform - pos: -0.05448258,-0.9127189 - parent: 2 - - type: Fixtures - fixtures: - fix1: - shape: !type:PolygonShape - radius: 0.01 - vertices: - - -1.25,-1.25 - - 1.25,-1.25 - - 1.25,1.25 - - -1.25,1.25 - mask: - - Impassable - layer: [] - density: 20 - hard: True - restitution: 0.3 - friction: 0.2 - - type: ScaleVisuals - - type: Appearance - proto: SpawnPointLatejoin entities: - uid: 14420 diff --git a/Resources/Maps/_CP14/comoss_d.yml b/Resources/Maps/_CP14/comoss_d.yml index f75221fae4..76edb46d88 100644 --- a/Resources/Maps/_CP14/comoss_d.yml +++ b/Resources/Maps/_CP14/comoss_d.yml @@ -4,8 +4,8 @@ meta: engineVersion: 248.0.2 forkId: "" forkVersion: "" - time: 03/30/2025 12:13:47 - entityCount: 23481 + time: 03/22/2025 21:07:42 + entityCount: 23486 maps: - 2 grids: @@ -774,18 +774,6 @@ entities: - type: Transform pos: 49.269325,-15.964533 parent: 2 -- proto: CP14BaseLockpick - entities: - - uid: 8337 - components: - - type: Transform - pos: 74.42914,23.514683 - parent: 2 - - uid: 8340 - components: - - type: Transform - pos: 74.30414,23.795933 - parent: 2 - proto: CP14BaseMop entities: - uid: 4359 @@ -35015,6 +35003,30 @@ entities: - type: Transform pos: -62.5,-31.5 parent: 2 + - uid: 9323 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 80.5,42.5 + parent: 2 + - uid: 9324 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 80.5,41.5 + parent: 2 + - uid: 9325 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 80.5,40.5 + parent: 2 + - uid: 9326 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 80.5,39.5 + parent: 2 - uid: 9332 components: - type: Transform @@ -101243,13 +101255,6 @@ entities: - type: Transform pos: -0.5,-10.5 parent: 2 -- proto: CP14DemiplanEnterRoomMarker - entities: - - uid: 8891 - components: - - type: Transform - pos: -2.5,-17.5 - parent: 2 - proto: CP14DirtBlock1 entities: - uid: 20424 @@ -105831,24 +105836,87 @@ entities: - type: Transform pos: 10.158333,-34.388634 parent: 2 -- proto: CP14OreGold10 +- proto: CP14OreCopper1 entities: - - uid: 8330 + - uid: 9023 components: - type: Transform - parent: 3142 + parent: 9022 - type: Physics canCollide: False - type: InsideEntityStorage - - uid: 8331 + - uid: 9029 components: - type: Transform - parent: 3142 + parent: 9022 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 9031 + components: + - type: Transform + parent: 9022 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 9032 + components: + - type: Transform + parent: 9022 - type: Physics canCollide: False - type: InsideEntityStorage - proto: CP14OreIron1 entities: + - uid: 9024 + components: + - type: Transform + parent: 9022 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 9025 + components: + - type: Transform + parent: 9022 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 9026 + components: + - type: Transform + parent: 9022 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 9027 + components: + - type: Transform + parent: 9022 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 9028 + components: + - type: Transform + parent: 9022 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 9030 + components: + - type: Transform + parent: 9022 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 9033 + components: + - type: Transform + parent: 9022 + - type: Physics + canCollide: False + - type: InsideEntityStorage - uid: 15020 components: - type: Transform @@ -105867,38 +105935,6 @@ entities: rot: 3.141592653589793 rad pos: -71.78356,28.329292 parent: 2 -- proto: CP14OreIron10 - entities: - - uid: 8328 - components: - - type: Transform - parent: 3142 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 8329 - components: - - type: Transform - parent: 3142 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: CP14OreMithril10 - entities: - - uid: 8332 - components: - - type: Transform - parent: 3142 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 8333 - components: - - type: Transform - parent: 3142 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: CP14Paper entities: - uid: 1401 @@ -117810,11 +117846,6 @@ entities: - type: Transform pos: -6.5,-11.5 parent: 2 - - uid: 1394 - components: - - type: Transform - pos: 79.5,42.5 - parent: 2 - uid: 1448 components: - type: Transform @@ -118438,7 +118469,7 @@ entities: - uid: 3010 components: - type: Transform - pos: 79.5,39.5 + pos: 79.5,42.5 parent: 2 - uid: 3016 components: @@ -118623,7 +118654,7 @@ entities: - uid: 3117 components: - type: Transform - pos: 79.5,41.5 + pos: 79.5,39.5 parent: 2 - uid: 3122 components: @@ -118650,6 +118681,11 @@ entities: - type: Transform pos: 84.5,44.5 parent: 2 + - uid: 3133 + components: + - type: Transform + pos: 80.5,43.5 + parent: 2 - uid: 3135 components: - type: Transform @@ -119140,16 +119176,6 @@ entities: - type: Transform pos: 18.5,-15.5 parent: 2 - - uid: 8336 - components: - - type: Transform - pos: 80.5,43.5 - parent: 2 - - uid: 8339 - components: - - type: Transform - pos: 79.5,40.5 - parent: 2 - uid: 11567 components: - type: Transform @@ -119160,6 +119186,16 @@ entities: - type: Transform pos: 84.5,24.5 parent: 2 + - uid: 14251 + components: + - type: Transform + pos: 79.5,40.5 + parent: 2 + - uid: 14276 + components: + - type: Transform + pos: 79.5,41.5 + parent: 2 - uid: 14301 components: - type: Transform @@ -119852,10 +119888,10 @@ entities: - type: Transform pos: -8.5,-13.5 parent: 2 - - uid: 3133 + - uid: 3142 components: - type: Transform - pos: 80.5,41.5 + pos: 80.5,39.5 parent: 2 - uid: 3216 components: @@ -120057,21 +120093,6 @@ entities: - type: Transform pos: -9.5,-20.5 parent: 2 - - uid: 8334 - components: - - type: Transform - pos: 80.5,39.5 - parent: 2 - - uid: 8335 - components: - - type: Transform - pos: 80.5,42.5 - parent: 2 - - uid: 8338 - components: - - type: Transform - pos: 80.5,40.5 - parent: 2 - uid: 8349 components: - type: Transform @@ -120237,6 +120258,16 @@ entities: - type: Transform pos: 81.5,21.5 parent: 2 + - uid: 8890 + components: + - type: Transform + pos: 80.5,41.5 + parent: 2 + - uid: 8891 + components: + - type: Transform + pos: 80.5,42.5 + parent: 2 - uid: 8892 components: - type: Transform @@ -120247,6 +120278,11 @@ entities: - type: Transform pos: 82.5,42.5 parent: 2 + - uid: 8894 + components: + - type: Transform + pos: 80.5,40.5 + parent: 2 - uid: 8896 components: - type: Transform @@ -123147,27 +123183,6 @@ entities: - type: Transform pos: -5.5,-6.5 parent: 2 - - uid: 3142 - components: - - type: Transform - pos: 77.5,30.5 - parent: 2 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 8328 - - 8329 - - 8330 - - 8331 - - 8332 - - 8333 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 4268 components: - type: Transform @@ -123242,6 +123257,32 @@ entities: showEnts: False occludes: True ent: null + - uid: 9022 + components: + - type: Transform + pos: 77.5,30.5 + parent: 2 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 9033 + - 9032 + - 9031 + - 9030 + - 9029 + - 9028 + - 9027 + - 9026 + - 9025 + - 9024 + - 9023 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null - uid: 17508 components: - type: Transform @@ -123422,14 +123463,6 @@ entities: rot: 3.141592653589793 rad pos: 79.5,30.5 parent: 2 -- proto: CP14WorkbenchAnvil - entities: - - uid: 8894 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 76.5,28.5 - parent: 2 - proto: CP14WorkbenchCooking entities: - uid: 4431 @@ -123452,11 +123485,14 @@ entities: rot: 1.5707963267948966 rad pos: -7.5,-35.5 parent: 2 -- proto: SpawnPointGhostDemiplaneSkeleton +- proto: PlushieLizardInversed entities: - - uid: 8890 + - uid: 17541 components: + - type: MetaData + desc: oooo you like mapping. ur a mapper + name: Viator - type: Transform - pos: 74.5,22.5 + pos: -52.729527,-71.3009 parent: 2 ... diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml index f5be87847e..adcb9d88c1 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml @@ -7,17 +7,34 @@ contents: - id: CP14Lighter - id: CP14ManaOperationGlove + - id: CP14Syringe + amount: 2 + - id: CP14Cauldron + - id: CP14Pestle + amount: 1 + - id: CP14Mortar + amount: 1 + - id: CP14Dropper + amount: 1 + - id: CP14VialTinyReinforced + amount: 1 + - id: CP14VialTiny + amount: 3 + - id: CP14VialSmallReinforced + amount: 1 + - id: CP14VialSmall + amount: 3 - id: CP14PaperFolderBlue - id: CP14PenFeather amount: 1 - - id: CP14BloodFlower - amount: 5 - - id: CP14Dayflin - amount: 5 - - id: CP14ChromiumSlime - amount: 5 - - id: CP14LumiMushroom - amount: 5 + - id: CP14WoodenPlanks20 + #Random start resource + - id: CP14VialMediumEarthEssence + - id: CP14VialMediumFireEssence + - id: CP14VialMediumWaterEssence + - id: CP14VialMediumAirEssence + - id: CP14VialMediumOrderEssence + - id: CP14VialMediumChaosEssence - type: entity parent: CP14WoodenCloset @@ -56,10 +73,11 @@ - type: StorageFill contents: - id: HandLabeler #TODO custom cp14 labeler - - id: CP14Pestle - amount: 1 - - id: CP14Mortar - amount: 1 + - id: CP14WoodenPlanks10 + - id: CP14CopperBar10 + - id: CP14CopperBar10 + - id: CP14IronBar10 + - id: CP14GoldBar5 - id: CP14PaperFolderRed - id: CP14PenFeather amount: 1 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Alchemist/Breastplate/chainmail.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Alchemist/Breastplate/chainmail.yml deleted file mode 100644 index a7296800f8..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Alchemist/Breastplate/chainmail.yml +++ /dev/null @@ -1,113 +0,0 @@ -- type: entity - parent: CP14ModularArmorBase - id: CP14ArmorBloodflowerChainmail - name: the funny flower chainmail - description: they just wanted to live - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi - layers: - - state: icon - color: "#5c1f0a" - - type: Clothing - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi - clothingVisuals: - outerClothing: - - state: equipped-OUTERCLOTHING - color: "#5c1f0a" - - type: Item - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi - inhandVisuals: - left: - - state: inhand-left - color: "#5c1f0a" - right: - - state: inhand-right - color: "#5c1f0a" - - type: Armor - modifiers: - coefficients: - Blunt: 0.94 - Slash: 0.76 - Piercing: 0.97 - - type: ClothingSpeedModifier - walkModifier: 0.94 - sprintModifier: 0.94 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ArmorBloodflowerChainmail - -- type: entity - parent: CP14ModularArmorBase - id: CP14ArmorChromiumslimeChainmail - name: who chainmail? - description: not armour at all - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi - layers: - - state: icon - color: "#3b487280" - - type: Clothing - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi - clothingVisuals: - outerClothing: - - state: equipped-OUTERCLOTHING - color: "#3b487280" - - type: Item - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi - inhandVisuals: - left: - - state: inhand-left - color: "#3b487280" - right: - - state: inhand-right - color: "#3b487280" - - type: Armor - modifiers: - coefficients: - Blunt: 1.06 - Slash: 1.24 - Piercing: 1.03 - - type: ClothingSpeedModifier - walkModifier: 1.06 - sprintModifier: 1.06 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ArmorChromiumslimeChainmail - -- type: entity - parent: CP14ModularArmorBase - id: CP14ArmorDayflinChainmail - name: speed - description: only ugly bastards wear this shit - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi - layers: - - state: icon - color: "#ffe269" - - type: Clothing - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi - clothingVisuals: - outerClothing: - - state: equipped-OUTERCLOTHING - color: "#ffe269" - - type: Item - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi - inhandVisuals: - left: - - state: inhand-left - color: "#ffe269" - right: - - state: inhand-right - color: "#ffe269" - - type: Armor - modifiers: - coefficients: - Blunt: 1.12 - Slash: 1.48 - Piercing: 1.06 - - type: ClothingSpeedModifier - walkModifier: 1.12 - sprintModifier: 1.12 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ArmorDayflinChainmail \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Alchemist/Breastplate/cuirass.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Alchemist/Breastplate/cuirass.yml deleted file mode 100644 index f71d22a362..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Alchemist/Breastplate/cuirass.yml +++ /dev/null @@ -1,116 +0,0 @@ -- type: entity - parent: CP14ModularArmorBase - id: CP14ArmorBloodflowerCuirass - name: blood - description: we're gonna ultrakill it guys - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi - layers: - - state: icon - color: "#5c1f0a" - - type: Clothing - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi - clothingVisuals: - outerClothing: - - state: equipped-OUTERCLOTHING - color: "#5c1f0a" - - type: Item - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi - inhandVisuals: - left: - - state: inhand-left - color: "#5c1f0a" - right: - - state: inhand-right - color: "#5c1f0a" - - type: Armor - modifiers: - coefficients: - Blunt: 0.82 - Slash: 0.94 - Piercing: 0.70 - Caustic: 0.70 - - type: ClothingSpeedModifier - walkModifier: 0.70 - sprintModifier: 0.70 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ArmorBloodflowerCuirass - -- type: entity - parent: CP14ModularArmorBase - id: CP14ArmorChromiumslimeCuirass - name: chromium - description: what is that shit - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi - layers: - - state: icon - color: "#3b487280" - - type: Clothing - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi - clothingVisuals: - outerClothing: - - state: equipped-OUTERCLOTHING - color: "#3b487280" - - type: Item - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi - inhandVisuals: - left: - - state: inhand-left - color: "#3b487280" - right: - - state: inhand-right - color: "#3b487280" - - type: Armor - modifiers: - coefficients: - Blunt: 1.18 - Slash: 1.06 - Piercing: 1.30 - Caustic: 1.30 - - type: ClothingSpeedModifier - walkModifier: 1.30 - sprintModifier: 1.30 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ArmorChromiumslimeCuirass - -- type: entity - parent: CP14ModularArmorBase - id: CP14ArmorDayflinCuirass - name: nightflin cuirass - description: speedo - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi - layers: - - state: icon - color: "#ffe269" - - type: Clothing - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi - clothingVisuals: - outerClothing: - - state: equipped-OUTERCLOTHING - color: "#ffe269" - - type: Item - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi - inhandVisuals: - left: - - state: inhand-left - color: "#ffe269" - right: - - state: inhand-right - color: "#ffe269" - - type: Armor - modifiers: - coefficients: - Blunt: 1.36 - Slash: 1.12 - Piercing: 1.60 - Caustic: 1.60 - - type: ClothingSpeedModifier - walkModifier: 1.60 - sprintModifier: 1.60 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ArmorDayflinCuirass \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Alchemist/Breastplate/infantry_cuirass.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Alchemist/Breastplate/infantry_cuirass.yml deleted file mode 100644 index 60c75d3de8..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Alchemist/Breastplate/infantry_cuirass.yml +++ /dev/null @@ -1,116 +0,0 @@ -- type: entity - parent: CP14ModularArmorBase - id: CP14ArmorBloodflowerInfantryCuirass - name: bloody infantry cuirass - description: Cool armour! - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi - layers: - - state: icon - color: "#5c1f0a" - - type: Clothing - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi - clothingVisuals: - outerClothing: - - state: equipped-OUTERCLOTHING - color: "#5c1f0a" - - type: Item - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi - inhandVisuals: - left: - - state: inhand-left - color: "#5c1f0a" - right: - - state: inhand-right - color: "#5c1f0a" - - type: Armor - modifiers: - coefficients: - Blunt: 0.73 - Slash: 0.94 - Piercing: 0.64 - Caustic: 0.58 - - type: ClothingSpeedModifier - walkModifier: 0.64 - sprintModifier: 0.64 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ArmorBloodflowerInfantryCuirass - -- type: entity - parent: CP14ModularArmorBase - id: CP14ArmorChromiumslimeInfantryCuirass - name: slime infantry cuirass - description: you can see it through - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi - layers: - - state: icon - color: "#3b487280" - - type: Clothing - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi - clothingVisuals: - outerClothing: - - state: equipped-OUTERCLOTHING - color: "#3b487280" - - type: Item - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi - inhandVisuals: - left: - - state: inhand-left - color: "#3b487280" - right: - - state: inhand-right - color: "#3b487280" - - type: Armor - modifiers: - coefficients: - Blunt: 1.27 - Slash: 1.27 - Piercing: 1.36 - Caustic: 1.42 - - type: ClothingSpeedModifier - walkModifier: 1.36 - sprintModifier: 1.36 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ArmorChromiumslimeInfantryCuirass - -- type: entity - parent: CP14ModularArmorBase - id: CP14ArmorDayflinInfantryCuirass - name: Funny cuirass - description: At the speed of light - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi - layers: - - state: icon - color: "#ffe269" - - type: Clothing - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi - clothingVisuals: - outerClothing: - - state: equipped-OUTERCLOTHING - color: "#ffe269" - - type: Item - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi - inhandVisuals: - left: - - state: inhand-left - color: "#ffe269" - right: - - state: inhand-right - color: "#ffe269" - - type: Armor - modifiers: - coefficients: - Blunt: 1.54 - Slash: 1.12 - Piercing: 1.72 - Caustic: 1.84 - - type: ClothingSpeedModifier - walkModifier: 1.72 - sprintModifier: 1.72 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ArmorDayflinInfantryCuirass \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Alchemist/Cuisses/chainmail.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Alchemist/Cuisses/chainmail.yml deleted file mode 100644 index 146d81b338..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Alchemist/Cuisses/chainmail.yml +++ /dev/null @@ -1,62 +0,0 @@ -- type: entity - parent: CP14ModularCuissesBase - id: CP14ModularCuissesBloodflowerChainmail - name: bloodymemes - description: memes from our blood - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi - layers: - - state: icon - color: "#5c1f0a" - - type: CP14ModularCraftPart - possibleParts: - - CuissesBloodflowerChainmail - -- type: entity - parent: CP14ModularCuissesBase - id: CP14ModularCuissesChromiumslimeChainmail - name: slimeeeeee - description: Who is that - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi - layers: - - state: icon - color: "#3b487280" - - type: CP14ModularCraftPart - possibleParts: - - CuissesChromiumslimeChainmail - -- type: entity - parent: CP14ModularCuissesBase - id: CP14ModularCuissesLumimushroomChainmail - name: LUMIMUSHROOM???? - description: ITS LIKE FUCKIN EMERGENCY LIGHT BUT GREEN!!! - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi - layers: - - state: icon - color: "#36c98f" - - type: CP14ModularCraftPart - possibleParts: - - CuissesLumimushroomChainmail - - type: PointLight - color: "#36c98f" - radius: 2 - -- type: entity - parent: CP14ModularCuissesBase - id: CP14ModularCuissesDayflinChainmail - name: Catty - description: Just random cat name - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - CuissesDayflinChainmail \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Alchemist/Cuisses/plate.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Alchemist/Cuisses/plate.yml deleted file mode 100644 index 6ad9f20317..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Alchemist/Cuisses/plate.yml +++ /dev/null @@ -1,62 +0,0 @@ -- type: entity - parent: CP14ModularCuissesBase - id: CP14ModularCuissesBloodflowerPlate - name: flower of blood cuisses - description: What is cuisses - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi - layers: - - state: icon - color: "#5c1f0a" - - type: CP14ModularCraftPart - possibleParts: - - CuissesBloodflowerPlate - -- type: entity - parent: CP14ModularCuissesBase - id: CP14ModularCuissesChromiumslimePlate - name: Nothing cuisses - description: My fantasy is dead please forgive me - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi - layers: - - state: icon - color: "#3b487280" - - type: CP14ModularCraftPart - possibleParts: - - CuissesChromiumslimePlate - -- type: entity - parent: CP14ModularCuissesBase - id: CP14ModularCuissesLumimushroomPlate - name: LUMI CUISS - description: FUCKIN LIGHT! - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi - layers: - - state: icon - color: "#36c98f" - - type: CP14ModularCraftPart - possibleParts: - - CuissesLumimushroomPlate - - type: PointLight - color: "#36c98f" - radius: 3 - -- type: entity - parent: CP14ModularCuissesBase - id: CP14ModularCuissesDayflinPlate - name: day - description: night. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - CuissesDayflinPlate \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Alchemist/Greave/chainmail.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Alchemist/Greave/chainmail.yml deleted file mode 100644 index 458b558fcf..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Alchemist/Greave/chainmail.yml +++ /dev/null @@ -1,44 +0,0 @@ -- type: entity - parent: CP14ModularGreaveBase - id: CP14ModularGreaveBloodFlowerChainmail - name: bloodflower - description: It is really a flower? - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi - layers: - - state: icon - color: "#5c1f0a" - - type: CP14ModularCraftPart - possibleParts: - - GreaveBloodflowerChainmail - -- type: entity - parent: CP14ModularGreaveBase - id: CP14ModularGreaveChromiumslimeChainmail - name: nulla - description: Nulla - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi - layers: - - state: icon - color: "#3b487280" - - type: CP14ModularCraftPart - possibleParts: - - GreaveChromiumslimeChainmail - -- type: entity - parent: CP14ModularGreaveBase - id: CP14ModularGreaveDayflinChainmail - name: Dmitry - description: Dima but cooler - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - GreaveDayflinChainmail diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/pumpkin_monster.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/pumpkin_monster.yml deleted file mode 100644 index e73c2c655f..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/pumpkin_monster.yml +++ /dev/null @@ -1,194 +0,0 @@ -- type: entity - id: CP14MobPumpkinKing - parent: CP14SimpleMobNoLifeBase - name: pumpkin king - description: It's a pumpkin, and he's the King. - components: - - type: HTN - rootTask: - task: CP14MonsterCompound - blackboard: - NavSmash: !type:Bool - true - VisionRadius: !type:Single - 12 - AggroVisionRadius: !type:Single - 10 - - type: NPCUseActionOnTarget - actionId: CP14ActionSpellPumpkinShot - - type: FlavorProfile - flavors: - - pumpkin - - type: Food - - type: Sprite - drawdepth: Mobs - sprite: _CP14/Mobs/Monster/pumpkin_king.rsi - layers: - - state: pumpkin_king - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.40 - density: 200 - mask: - - MobMask - layer: - - MobLayer - - type: NpcFactionMember - factions: - - CP14Monster - - type: MovementSpeedModifier - baseWalkSpeed: 3 - baseSprintSpeed: 3 - - type: FootstepModifier - footstepSoundCollection: - path: /Audio/Effects/Footsteps/slime1.ogg - params: - volume: 3 - - type: Damageable - damageContainer: Biological - damageModifierSet: Inflatable - - type: MeleeWeapon - altDisarm: false - soundHit: - path: /Audio/Weapons/punch3.ogg - angle: 0 - animation: WeaponArcPunch - damage: - types: - Blunt: 4 - - type: SolutionContainerManager - solutions: - food: - maxVol: 650 - reagents: - - ReagentId: PumpkinFlesh - Quantity: 500 - - ReagentId: Vitamin - Quantity: 125 - - type: Destructible - thresholds: - - trigger: - !type:DamageTypeTrigger - damageType: Heat - damage: 200 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 100 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 80 - behaviors: - - !type:SpillBehavior - solution: food - - !type:PlaySoundBehavior - sound: - path: /Audio/Effects/tree_fell.ogg # Поменять звук - params: - volume: 5 - variation: 0.05 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - !type:SpawnEntitiesBehavior - spawn: - CP14FoodPumpkinSlice: - min: 20 - max: 25 - - type: CP14MagicCasterSlowdown - -- type: entity - id: CP14ActionSpellPumpkinShot - name: Pumpkin shot - description: The Pumpkin King's servants will fly at their enemy. - components: - - type: Sprite - sprite: _CP14/Objects/Flora/Farm/pumpkin.rsi - state: base2 #TODO - - type: CP14MagicEffectCastSlowdown - speedMultiplier: 0.7 - - type: CP14MagicEffect - effects: - - !type:CP14SpellSpawnEntityOnUser - - !type:CP14SpellProjectile - prototype: CP14PumpkinShell - - type: CP14MagicEffectVerbalAspect - startSpeech: "Serve cucurbita..." - endSpeech: "fuge ad mortem magnam!" - - type: CP14MagicEffectPacifiedBlock - - type: EntityWorldTargetAction - useDelay: 5 - range: 15 - raiseOnUser: true - checkCanAccess: false - itemIconStyle: BigAction - icon: - sprite: _CP14/Objects/Flora/Farm/pumpkin.rsi - state: base2 #TODO - event: !type:CP14DelayedEntityWorldTargetActionEvent - hidden: true - breakOnMove: false - breakOnDamage: false - castDelay: 1 - -- type: entity - id: CP14PumpkinShell - parent: CP14FoodPumpkin - name: pumpkin shell - categories: [ HideSpawnMenu ] - components: - - type: Projectile - deleteOnCollide: false - onlyCollideWhenShot: true - damage: - types: - Blunt: 5 - - type: ThrowingAngle - angle: 0 - - type: Ammo - muzzleFlash: null - - type: Fixtures - fixtures: - fix1: - shape: !type:PhysShapeCircle - radius: 0.2 - density: 5 - mask: - - ItemMask - restitution: 0.3 - friction: 0.2 - projectile: - shape: - !type:PhysShapeAabb - bounds: "-0.1,-0.1,0.1,0.1" - hard: false - mask: - - Impassable - - BulletImpassable - - type: Damageable - damageContainer: Biological - - type: DamageOnHighSpeedImpact - minimumSpeed: 0.1 - damage: - types: - Blunt: 2 - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 1 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: desecration - - !type:SpillBehavior - solution: food - - !type:DoActsBehavior - acts: [ "Destruction" ] diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml index a386af0381..1a6abf8601 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml @@ -38,11 +38,11 @@ - type: CP14SkillStorage progress: Metamagic: 1 - - type: CP14MagicEnergyContainer #SMALL mana container - maxEnergy: 25 - energy: 25 - - type: CP14MagicEnergyDraw #Cool x3 mana regen! - energy: 1.5 + - type: CP14MagicEnergyContainer #Increased mana container + maxEnergy: 200 + energy: 200 + - type: CP14MagicEnergyDraw #Half of standard mana regeneration + energy: 0.5 delay: 3 - type: Inventory templateId: CP14Human diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml index 54eab19cb1..b32dc7a13b 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml @@ -111,11 +111,11 @@ decay: 5 # 3 default critThreshold: 120 # 100 default stunTime: 4 #6 default - - type: CP14MagicEnergyContainer #Increased mana container - maxEnergy: 200 - energy: 200 - - type: CP14MagicEnergyDraw #Half of standard mana regeneration - energy: 0.5 + - type: CP14MagicEnergyContainer #SMALL mana container + maxEnergy: 25 + energy: 25 + - type: CP14MagicEnergyDraw #Cool x3 mana regen! + energy: 1.5 delay: 3 - type: Hands handDisplacement: diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml index 1ab94fb33b..477aacf740 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml @@ -74,8 +74,8 @@ 50: Dead - type: SlowOnDamage speedModifierThresholds: - 40: 1.2 - 25: 1.5 + 40: 0.8 + 25: 0.6 - type: Fixtures fixtures: fix1: diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml index 9a6b580743..ab2fe0a957 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml @@ -9,7 +9,7 @@ - type: Hunger starvationDamage: types: - Cold: 0.25 # лол им теперь почти не надо есть + Cold: 0.25 Bloodloss: 0.25 - type: Icon sprite: _CP14/Mobs/Species/Tiefling/parts.rsi @@ -35,22 +35,21 @@ - Critical damage: types: - Cold: -0.14 # Around 8 damage a minute healed + Heat: -0.14 # Around 8 damage a minute healed - type: CP14MagicEnergyDraw energy: 0.75 delay: 3 # 5m to full restore - type: CP14MagicEnergyFromDamage damage: - Heat: -1 #Magic regen from fire - Cold: 1 + Heat: 1 #Magic regen from fire + Cold: -1 - type: CP14MagicManacostModify globalModifier: 1.2 modifiers: - Water: 0.5 - Frost: 0.5 + Fire: 0.5 - type: CP14SkillStorage progress: - Hydrosophistry: 1 + Pyrokinetic: 1 - type: CP14SpellStorage #grantAccessToSelf: true #spells: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Economy/coins.yml b/Resources/Prototypes/_CP14/Entities/Objects/Economy/coins.yml index c6ae00ebf5..d22c571e57 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Economy/coins.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Economy/coins.yml @@ -47,7 +47,7 @@ suffix: 10 coins components: - type: Sprite - sprite: /Textures/_CP14/Objects/Economy/gp_coin.rsi + sprite: /Textures/_CP14/Objects/Economy/cp_coin.rsi layers: - state: coin10 map: ["base"] @@ -87,7 +87,7 @@ suffix: 10 coins components: - type: Sprite - sprite: /Textures/_CP14/Objects/Economy/pp_coin.rsi + sprite: /Textures/_CP14/Objects/Economy/sp_coin.rsi layers: - state: coin10 map: ["base"] @@ -127,7 +127,7 @@ suffix: 10 coins components: - type: Sprite - sprite: /Textures/_CP14/Objects/Economy/cp_coin.rsi + sprite: /Textures/_CP14/Objects/Economy/gp_coin.rsi layers: - state: coin10 map: ["base"] @@ -167,7 +167,7 @@ suffix: 10 coins components: - type: Sprite - sprite: /Textures/_CP14/Objects/Economy/sp_coin.rsi + sprite: /Textures/_CP14/Objects/Economy/pp_coin.rsi layers: - state: coin10 map: ["base"] @@ -196,40 +196,3 @@ state: coin1 - type: Stack count: 1 - -# you are trolled, Сrystal Edge -# 11111111111111111111111111111 -# 11111111111111¶¶¶¶¶¶¶¶¶¶¶¶¶¶¶¶¶¶¶¶¶¶ -# 1111111111¶¶¶¶¶111_________________¶¶ -# 11111111¶¶1_______1111______111_____¶¶ -# 111111¶¶______11_________11111111____¶1 -# 111111¶____11___1_____11______1111___1¶ -# 11111¶1___1_____1_____1_________1_____¶1 -# 11111¶__________________1¶¶¶¶1________1¶ -# 1111¶¶_____¶¶¶¶1______1¶¶_¶¶¶¶¶1_______¶¶ -# 111¶¶_1_1_¶¶¶¶¶¶¶_1___¶__1¶¶¶¶¶¶111____1¶¶ -# 111¶_1________11¶¶1___¶¶¶1__1_____1¶¶¶1__1¶ -# 11¶1__1¶¶1______11_____1____¶¶__1¶¶1__¶¶__1¶ -# 11¶1__111¶¶¶¶___¶1___________1¶¶1___¶__¶1__¶ -# 11¶1____1_11___¶¶_____1¶1_________¶¶¶1__¶__¶1 -# 111¶_1__¶____1¶¶______11¶1_____1¶¶1_¶¶¶1¶__¶1 -# 111¶1__¶¶___11¶¶____¶¶¶_¶___1¶¶¶1___¶__¶___¶1 -# 111¶¶__¶¶¶1_____¶¶1_____11¶¶¶1_¶__1¶¶_____¶11 -# 1111¶__¶¶1¶¶¶1___¶___1¶¶¶¶1____¶¶¶¶¶_____¶¶11 -# 1111¶__¶_1__¶¶¶¶¶¶¶¶¶11__¶__1¶¶¶1_¶_____¶¶111 -# 1111¶1_¶¶¶__1___¶___1____¶¶¶¶¶1¶_¶¶____¶¶1111 -# 1111¶1_¶¶¶¶¶¶¶1¶¶11¶¶1¶¶¶¶¶1___1¶¶_____¶11111 -# 1111¶1_¶¶¶¶¶¶¶¶¶¶¶¶¶¶¶¶¶1_¶____¶¶_____¶¶11111 -# 1111¶1_¶¶¶¶¶¶¶¶¶¶¶¶1¶1____¶__1¶¶______¶111111 -# 1111¶__1¶¶_¶_¶__¶___11____1¶¶¶______1¶1111111 -# 1111¶___¶¶1¶_11_11__1¶__1¶¶¶1___11_1¶11111111 -# 1111¶_____¶¶¶¶¶¶¶¶¶¶¶¶¶¶¶1___11111¶¶111111111 -# 1111¶__________11111_______111_1¶¶11111111111 -# 1111¶_1__11____________1111__1¶¶1111111111111 -# 1111¶__11__1________1111___1¶¶111111111111111 -# 1111¶___1111_____________1¶¶11111111111111111 -# 1111¶¶_______________11¶¶¶1111111111111111111 -# 11111¶¶__________1¶¶¶¶¶1111111111111111111111 -# 1111111¶¶¶¶¶¶¶¶¶¶¶111111111111111111111111111 -# 111111111111111111111111111111111111111111111 -# 111111111111111111111111111111111111111111111 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml b/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml index 25f5a9bf5a..abdbfc4f07 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml @@ -4,6 +4,9 @@ abstract: true categories: [ ForkFiltered ] components: + - type: Tag + tags: + - CP14FitInMortar - type: BadFood - type: Item size: Tiny @@ -27,6 +30,11 @@ - type: FlavorProfile flavors: - CP14Metallic + - type: Extractable + juiceSolution: + reagents: + - ReagentId: CP14BloodFlowerSap + Quantity: 12 - type: SolutionContainerManager solutions: food: @@ -36,6 +44,8 @@ Quantity: 12 - type: Tag tags: + - CP14FitInMortar + - CP14AlchemicalHerbals - CP14BloodFlower - type: entity @@ -57,6 +67,11 @@ base3: "" base4: "" base5: "" + - type: Extractable + juiceSolution: + reagents: + - ReagentId: CP14AgaricMushroom + Quantity: 3 - type: SolutionContainerManager solutions: food: @@ -64,12 +79,16 @@ reagents: - ReagentId: CP14AgaricMushroom Quantity: 3 + - type: Tag + tags: + - CP14FitInMortar + - CP14AlchemicalHerbals - type: entity id: CP14ChromiumSlime parent: CP14WildProduceBase name: chromium slime - description: This rare thick substance can be found in a stream of water as if it has a mind of its own. + description: This rare thick substance can be found in a stream of water as if it has a mind of its own. When trying to change the slime itself - the slime changes the reagent it interacts with. components: - type: Sprite sprite: _CP14/Objects/Flora/Wild/chromium_slime.rsi @@ -82,6 +101,11 @@ base1: "" base2: "" base3: "" + - type: Extractable + juiceSolution: + reagents: + - ReagentId: CP14ChromiumSlime + Quantity: 4 - type: SolutionContainerManager solutions: food: @@ -94,7 +118,7 @@ id: CP14WildSage parent: CP14WildProduceBase name: wild sage root - description: Root of a ubiquitous medicinal plant, not bad at healing weapons. + description: Root of a ubiquitous medicinal plant, not bad at healing physical injuries, and inducing coughing. components: - type: Item size: Tiny @@ -111,6 +135,11 @@ base1: "" base2: "" base3: "" + - type: Extractable + juiceSolution: + reagents: + - ReagentId: CP14WildSageSap + Quantity: 15 - type: SolutionContainerManager solutions: food: @@ -118,12 +147,16 @@ reagents: - ReagentId: CP14WildSageSap Quantity: 15 + - type: Tag + tags: + - CP14FitInMortar + - CP14AlchemicalHerbals - type: entity id: CP14LumiMushroom parent: CP14WildProduceBase name: lumishroom - description: A faintly luminous mushroom. Often used by alchemists as a means of concentrating tools. + description: A faintly luminous mushroom. Often used by alchemists as a means of concentrating solutions. components: - type: Sprite sprite: _CP14/Objects/Flora/Wild/lumishroom.rsi @@ -138,6 +171,11 @@ base3: "" base4: "" base5: "" + - type: Extractable + juiceSolution: + reagents: + - ReagentId: CP14LumiMushroom + Quantity: 4 - type: PointLight color: "#36c98f" radius: 1.2 @@ -148,6 +186,10 @@ reagents: - ReagentId: CP14LumiMushroom Quantity: 4 + - type: Tag + tags: + - CP14FitInMortar + - CP14AlchemicalHerbals - type: entity id: CP14BlueAmanita @@ -165,6 +207,11 @@ - random: base1: "" base2: "" + - type: Extractable + juiceSolution: + reagents: + - ReagentId: CP14BlueAmanita + Quantity: 5 - type: SolutionContainerManager solutions: food: @@ -172,6 +219,10 @@ reagents: - ReagentId: CP14BlueAmanita Quantity: 5 + - type: Tag + tags: + - CP14FitInMortar + - CP14AlchemicalHerbals - type: entity id: CP14Dayflin @@ -189,6 +240,11 @@ - random: base1: "" base2: "" + - type: Extractable + juiceSolution: + reagents: + - ReagentId: CP14YellowDayflinPulp + Quantity: 4 - type: SolutionContainerManager solutions: food: @@ -198,13 +254,15 @@ Quantity: 4 - type: Tag tags: + - CP14FitInMortar + - CP14AlchemicalHerbals - CP14Dayflin - type: entity id: CP14AirLily parent: CP14WildProduceBase name: air lily - description: A light, delicate and airy flower. + description: A light, delicate and airy flower. It is said that its special properties even allow it to breathe underwater... components: - type: Sprite sprite: _CP14/Structures/Flora/water_lilies.rsi @@ -215,10 +273,19 @@ available: - random: lily_icon: "" #TODO: more sprites + - type: Extractable + juiceSolution: + reagents: + - ReagentId: CP14AirLily + Quantity: 4 - type: SolutionContainerManager solutions: food: maxVol: 5 reagents: - ReagentId: CP14AirLily - Quantity: 4 \ No newline at end of file + Quantity: 4 + - type: Tag + tags: + - CP14FitInMortar + - CP14AlchemicalHerbals \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/bars.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/bars.yml index d55f920d40..a88bee5596 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/bars.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/bars.yml @@ -221,19 +221,3 @@ components: - type: Stack count: 10 - -- type: entity - id: CP14MithrilBarFake - parent: BaseItem - name: mithril bar - description: A warm to the touch, soft piece of refined mithril. - categories: [ ForkFiltered ] - components: - - type: Item - size: Normal - - type: Sprite - sprite: _CP14/Objects/Materials/mithril_bar.rsi - layers: - - state: bar - map: ["base"] - - type: Appearance \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/ores.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/ores.yml index fd71c9910b..5f2f1dd631 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/ores.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/ores.yml @@ -5,9 +5,6 @@ description: A piece of pale, heavy copper. categories: [ ForkFiltered ] components: - - type: Tag - tags: - - CP14FitInMortar - type: Item size: Normal - type: Sprite @@ -27,11 +24,6 @@ - type: CP14Material materials: CP14Copper: 2 - - type: Extractable - juiceSolution: - reagents: - - ReagentId: CP14MoltenIngotCopper - Quantity: 2 - type: entity id: CP14OreCopper5 @@ -58,9 +50,6 @@ description: A piece of cold, heavy iron. categories: [ ForkFiltered ] components: - - type: Tag - tags: - - CP14FitInMortar - type: Item size: Normal - type: Sprite @@ -80,11 +69,6 @@ - type: CP14Material materials: CP14Iron: 2 - - type: Extractable - juiceSolution: - reagents: - - ReagentId: CP14MoltenIngotIron - Quantity: 2 - type: entity id: CP14OreIron5 @@ -111,9 +95,6 @@ description: A piece of soft, pure gold. categories: [ ForkFiltered ] components: - - type: Tag - tags: - - CP14FitInMortar - type: Item size: Normal - type: Sprite @@ -133,11 +114,6 @@ - type: CP14Material materials: CP14Gold: 2 - - type: Extractable - juiceSolution: - reagents: - - ReagentId: CP14MoltenIngotGold - Quantity: 2 - type: entity id: CP14OreGold5 @@ -164,9 +140,6 @@ description: A piece of enchanted, pure mithril. categories: [ ForkFiltered ] components: - - type: Tag - tags: - - CP14FitInMortar - type: Item size: Normal - type: Sprite @@ -186,11 +159,6 @@ - type: CP14Material materials: CP14Mithril: 2 - - type: Extractable - juiceSolution: - reagents: - - ReagentId: CP14MoltenIngotMithril - Quantity: 2 - type: entity id: CP14OreMithril5 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/scrap.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/scrap.yml index 7ad9763f19..52807bc44c 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/scrap.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/scrap.yml @@ -4,9 +4,6 @@ abstract: true categories: [ ForkFiltered ] components: - - type: Tag - tags: - - CP14FitInMortar - type: Item size: Tiny - type: RandomSprite @@ -30,11 +27,6 @@ - type: CP14Material materials: CP14Copper: 5 - - type: Extractable - juiceSolution: - reagents: - - ReagentId: CP14MoltenIngotCopper - Quantity: 5 - type: entity id: CP14ScrapIron @@ -50,11 +42,6 @@ - type: CP14Material materials: CP14Iron: 5 - - type: Extractable - juiceSolution: - reagents: - - ReagentId: CP14MoltenIngotIron - Quantity: 5 - type: entity id: CP14ScrapGold @@ -70,11 +57,6 @@ - type: CP14Material materials: CP14Gold: 5 - - type: Extractable - juiceSolution: - reagents: - - ReagentId: CP14MoltenIngotGold - Quantity: 5 - type: entity id: CP14ScrapMithril @@ -89,9 +71,4 @@ map: ["random"] - type: CP14Material materials: - CP14Mithril: 5 - - type: Extractable - juiceSolution: - reagents: - - ReagentId: CP14MoltenIngotMithril - Quantity: 5 \ No newline at end of file + CP14Mithril: 5 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/axe.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/axe.yml deleted file mode 100644 index 072a87165f..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/axe.yml +++ /dev/null @@ -1,41 +0,0 @@ -- type: entity - parent: CP14ModularBladeAxeBase - id: CP14ModularBladeBloodflowerAxe - name: BLOODFLOWER AXE BLADE!!!! - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi - layers: - - state: icon - color: "#5c1f0a" - - type: CP14ModularCraftPart - possibleParts: - - BladeBloodflowerAxe - -- type: entity - parent: CP14ModularBladeAxeBase - id: CP14ModularBladeChromiumslimeAxe - name: wwho axe blade? - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi - layers: - - state: icon - color: "#3b487280" - - type: CP14ModularCraftPart - possibleParts: - - BladeChromiumslimeAxe - -- type: entity - parent: CP14ModularBladeAxeBase - id: CP14ModularBladeDayflinAxe - name: Oleg - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - BladeDayflinAxe \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/dagger.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/dagger.yml deleted file mode 100644 index b83760e6c7..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/dagger.yml +++ /dev/null @@ -1,41 +0,0 @@ -- type: entity - parent: CP14ModularBladeDaggerBase - id: CP14ModularBladeBloodflowerDagger - name: BLOOOOODFLOOOOWEEEER DAGGGEEEEEER BLAAAADE - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi - layers: - - state: icon - color: "#5c1f0a" - - type: CP14ModularCraftPart - possibleParts: - - BladeBloodflowerDagger - -- type: entity - parent: CP14ModularBladeDaggerBase - id: CP14ModularBladeChromiumslimeDagger - name: i dont know dagger blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi - layers: - - state: icon - color: "#3b487280" - - type: CP14ModularCraftPart - possibleParts: - - BladeChromiumslimeDagger - -- type: entity - parent: CP14ModularBladeDaggerBase - id: CP14ModularBladeDayflinDagger - name: Anton - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - BladeDayflinDagger diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/hammer.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/hammer.yml deleted file mode 100644 index c719038f98..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/hammer.yml +++ /dev/null @@ -1,41 +0,0 @@ -- type: entity - parent: CP14ModularBladeHammerBase - id: CP14ModularBladeBloodflowerHammer - name: Lets drop the hammer down *cool music* - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi - layers: - - state: icon - color: "#5c1f0a" - - type: CP14ModularCraftPart - possibleParts: - - BladeBloodflowerHammer - -- type: entity - parent: CP14ModularBladeHammerBase - id: CP14ModularBladeChromiumslimeHammer - name: nothing we can do head - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi - layers: - - state: icon - color: "#3b487280" - - type: CP14ModularCraftPart - possibleParts: - - BladeChromiumslimeHammer - -- type: entity - parent: CP14ModularBladeHammerBase - id: CP14ModularBladeDayflinHammer - name: Pushok - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - BladeDayflinHammer \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/mace.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/mace.yml deleted file mode 100644 index aa860b2557..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/mace.yml +++ /dev/null @@ -1,41 +0,0 @@ -- type: entity - parent: CP14ModularBladeMaceBase - id: CP14ModularBladeBloodflowerMace - name: minecraft mace ball - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi - layers: - - state: icon - color: "#5c1f0a" - - type: CP14ModularCraftPart - possibleParts: - - BladeBloodflowerMace - -- type: entity - parent: CP14ModularBladeMaceBase - id: CP14ModularBladeChromiumslimeMace - name: desusssy mace ball - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi - layers: - - state: icon - color: "#3b487280" - - type: CP14ModularCraftPart - possibleParts: - - BladeChromiumslimeMace - -- type: entity - parent: CP14ModularBladeMaceBase - id: CP14ModularBladeDayflinMace - name: nightflin mace ball - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - BladeDayflinMace \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/pickaxe.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/pickaxe.yml deleted file mode 100644 index 101b3e944f..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/pickaxe.yml +++ /dev/null @@ -1,41 +0,0 @@ -- type: entity - parent: CP14ModularBladePickaxeBase - id: CP14ModularBladeBloodflowerPickaxe - name: BLOODFLOWEEER PICKAXEEEE HEEEEAAAAD - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi - layers: - - state: icon - color: "#5c1f0a" - - type: CP14ModularCraftPart - possibleParts: - - BladeBloodflowerPickaxe - -- type: entity - parent: CP14ModularBladePickaxeBase - id: CP14ModularBladeChromiumslimePickaxe - name: null pickaxe head - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi - layers: - - state: icon - color: "#3b487280" - - type: CP14ModularCraftPart - possibleParts: - - BladeChromiumslimePickaxe - -- type: entity - parent: CP14ModularBladePickaxeBase - id: CP14ModularBladeDayflinPickaxe - name: Dimok - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - BladeDayflinPickaxe \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/rapier.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/rapier.yml deleted file mode 100644 index 0b5def93dd..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/rapier.yml +++ /dev/null @@ -1,41 +0,0 @@ -- type: entity - parent: CP14ModularBladeRapierBase - id: CP14ModularBladeBloodflowerRapier - name: BLOOD IS FUEL RAPIER BLADE - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi - layers: - - state: icon - color: "#5c1f0a" - - type: CP14ModularCraftPart - possibleParts: - - BladeBloodflowerRapier - -- type: entity - parent: CP14ModularBladeRapierBase - id: CP14ModularBladeChromiumslimeRapier - name: MANKIND IS DEAD RAPIER BLADE - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi - layers: - - state: icon - color: "#3b487280" - - type: CP14ModularCraftPart - possibleParts: - - BladeChromiumslimeRapier - -- type: entity - parent: CP14ModularBladeRapierBase - id: CP14ModularBladeDayflinRapier - name: Cat - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - BladeDayflinRapier diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/shovel.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/shovel.yml deleted file mode 100644 index 17044cf25d..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/shovel.yml +++ /dev/null @@ -1,41 +0,0 @@ -- type: entity - parent: CP14ModularBladeShovelBase - id: CP14ModularBladeBloodflowerShovel - name: BLOODFLOWER SHOVEL BLADE-HEAD - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi - layers: - - state: icon - color: "#5c1f0a" - - type: CP14ModularCraftPart - possibleParts: - - BladeBloodflowerShovel - -- type: entity - parent: CP14ModularBladeShovelBase - id: CP14ModularBladeChromiumslimeShovel - name: leonid shovel blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi - layers: - - state: icon - color: "#3b487280" - - type: CP14ModularCraftPart - possibleParts: - - BladeChromiumslimeShovel - -- type: entity - parent: CP14ModularBladeShovelBase - id: CP14ModularBladeDayflinShovel - name: dayflin funny name - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - BladeDayflinShovel diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/sickle.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/sickle.yml deleted file mode 100644 index c10b551a67..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/sickle.yml +++ /dev/null @@ -1,42 +0,0 @@ -- type: entity - parent: CP14ModularBladeSickleBase - id: CP14ModularBladeBloodflowerSickle - name: BLOODFLOWER SICKLE FUCKING BLADEEEEEE - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi - layers: - - state: icon - color: "#5c1f0a" - - type: CP14ModularCraftPart - possibleParts: - - BladeBloodflowerSickle - -- type: entity - parent: CP14ModularBladeSickleBase - id: CP14ModularBladeChromiumslimeSickle - name: nya sickle blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi - layers: - - state: icon - color: "#3b487280" - - type: CP14ModularCraftPart - possibleParts: - - BladeChromiumslimeSickle - -- type: entity - parent: CP14ModularBladeSickleBase - id: CP14ModularBladeDayflinSickle - name: Tortoriel - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - BladeDayflinSickle - diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/spear.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/spear.yml deleted file mode 100644 index d27522119f..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/spear.yml +++ /dev/null @@ -1,45 +0,0 @@ -- type: entity - parent: CP14ModularBladeSpearBase - id: CP14ModularBladeBloodflowerSpear - categories: [ ForkFiltered ] - name: BLOODFLOWER SPEARHEAD - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi - layers: - - state: icon - color: "#5c1f0a" - - type: CP14ModularCraftPart - possibleParts: - - BladeBloodflowerSpear - -- type: entity - parent: CP14ModularBladeSpearBase - id: CP14ModularBladeChromiumslimeSpear - categories: [ ForkFiltered ] - name: the i-want-to-sleep spearhead - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi - layers: - - state: icon - color: "#3b487280" - - type: CP14ModularCraftPart - possibleParts: - - BladeChromiumslimeSpear - -- type: entity - parent: CP14ModularBladeSpearBase - id: CP14ModularBladeDayflinSpear - categories: [ ForkFiltered ] - name: Dima - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - BladeDayflinSpear - diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/sword.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/sword.yml deleted file mode 100644 index 61915da46c..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Blade/sword.yml +++ /dev/null @@ -1,42 +0,0 @@ -- type: entity - parent: CP14ModularBladeSwordBase - id: CP14ModularBladeBloodflowerSword - name: BLOODFLOWEEEEEER SWOOOORD BLAAADE - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi - layers: - - state: icon - color: "#5c1f0a" - - type: CP14ModularCraftPart - possibleParts: - - BladeBloodflowerSword - -- type: entity - parent: CP14ModularBladeSwordBase - id: CP14ModularBladeChromiumslimeSword - name: who it can be now - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi - layers: - - state: icon - color: "#3b487280" - - type: CP14ModularCraftPart - possibleParts: - - BladeChromiumslimeSword - -- type: entity - parent: CP14ModularBladeSwordBase - id: CP14ModularBladeDayflinSword - name: Markite - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - BladeDayflinSword - diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Garde/sharp.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Garde/sharp.yml deleted file mode 100644 index 4011873960..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Garde/sharp.yml +++ /dev/null @@ -1,14 +0,0 @@ -- type: entity - parent: CP14ModularGardeBase - id: CP14ModularGardeSharpLumimushroom - categories: [ ForkFiltered ] - name: sharp lumimushroom garde - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi - layers: - - state: icon - color: "#36c98f" - - type: CP14ModularCraftPart - possibleParts: - - GardeSharpLumimushroom diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Garde/sturdy.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Garde/sturdy.yml deleted file mode 100644 index 86c5657106..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Garde/sturdy.yml +++ /dev/null @@ -1,14 +0,0 @@ -- type: entity - parent: CP14ModularGardeBase - id: CP14ModularGardeSturdyLumimushroom - categories: [ ForkFiltered ] - name: sturdy lumimushroom garde - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Garde/metall_sturdy.rsi - layers: - - state: icon - color: "#36c98f" - - type: CP14ModularCraftPart - possibleParts: - - GardeSturdyLumimushroom diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Tip/arrows.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Tip/arrows.yml deleted file mode 100644 index 31edf9664e..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Alchemist/Tip/arrows.yml +++ /dev/null @@ -1,13 +0,0 @@ -- type: entity - parent: CP14ModularBladeTipBase - id: CP14ModularTipAirlilyArrow - name: air lily arrow tip - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Tip/arrow.rsi - layers: - - state: tip - color: "#92cae0" - - type: CP14ModularCraftPart - possibleParts: - - TipAirlilyArrow diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/tools.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/tools.yml index 60b408ea1f..3c587b8674 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/tools.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/tools.yml @@ -73,8 +73,8 @@ - type: entity id: CP14Pestle - name: castle - description: A cat for conveniently grinding metals into liquid + name: pestle + description: A device for conveniently grinding various materials into liquid parent: BaseItem categories: [ ForkFiltered ] components: @@ -94,8 +94,8 @@ - type: entity id: CP14Mortar - name: cattar - description: Alchemical sturdy cat for grinding metals + name: mortar + description: Alchemical sturdy plate for grinding reagents parent: BaseStorageItem categories: [ ForkFiltered ] components: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/heater.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/heater.yml index 295e18f006..15ba236926 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/heater.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/heater.yml @@ -67,17 +67,16 @@ - type: entity id: CP14AlchemyFurnace name: alchemy furnace - parent: - - CP14BaseWorkbench + parent: CP14BaseFireplace description: A furnace fueled by wood, coal, or any other burning material. Handy for heating your alchemical potions. components: - type: Sprite - snapCardinals: false sprite: _CP14/Structures/Specific/Alchemy/alchemy_furnace.rsi layers: - state: base - - state: burning - shader: unshaded + - state: fuel1 + visible: false + map: ["fuel"] - type: Damageable damageContainer: Inorganic damageModifierSet: Metallic @@ -89,6 +88,16 @@ behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] + - type: GenericVisualizer + visuals: + enum.FireplaceFuelVisuals.Status: + fuel: + Empty: { visible: false } + Medium: { visible: true, state: fuel1 } + Full: { visible: true, state: fuel2 } + - type: FireVisuals + sprite: _CP14/Structures/Specific/Alchemy/alchemy_furnace.rsi + normalState: burning - type: Climbable - type: Fixtures fixtures: @@ -113,12 +122,19 @@ - TableMask layer: - TableLayer - - type: PointLight - color: "#99411f" - radius: 2 - energy: 2 - - type: CP14Workbench - craftSound: - collection: CP14Sawing #TODO - recipeTags: - - CP14RecipeAlchemistFurnace \ No newline at end of file + - type: Storage + grid: + - 0,0,2,2 + whitelist: + tags: + - CP14FireplaceFuel + +- type: entity + parent: CP14AlchemyFurnace + id: CP14AlchemyFurnaceDebug + suffix: Ignited, Infinity + categories: [ DoNotMap ] + components: + - type: CP14AutoIgnite + - type: CP14Fireplace + fuelDrainingPerUpdate: 0 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/vat.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/vat.yml index 45fcb3d6a7..cfc174dc73 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/vat.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/vat.yml @@ -2,7 +2,6 @@ id: CP14BaseVat parent: - BaseStructureDynamic - - CP14BaseWorkbench name: big vat description: A very large vat for storing huge amounts of liquid. Heavy, uncomfortable to carry. categories: [ ForkFiltered ] @@ -33,6 +32,8 @@ !type:DamageTrigger damage: 50 behaviors: + - !type:SpillBehavior + solution: vat - !type:PlaySoundBehavior sound: collection: MetalBreak @@ -43,10 +44,31 @@ drawdepth: Mobs sprite: _CP14/Structures/Specific/Alchemy/alchemy_vat.rsi noRot: true - state: full - - type: CP14Workbench - craftSound: - collection: CP14Sawing #TODO - recipeTags: - - CP14RecipeVat + layers: + - state: full + - state: liq1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - type: SolutionContainerManager + solutions: + vat: + maxVol: 500 + - type: CP14SolutionTemperature + - type: SolutionContainerVisuals + maxFillLevels: 6 + fillBaseName: liq + - type: DrainableSolution + solution: vat + - type: ExaminableSolution + solution: vat + - type: MixableSolution + solution: vat + - type: RefillableSolution + solution: vat + - type: DrawableSolution + solution: vat + - type: DumpableSolution + solution: vat + - type: Drink + solution: vat - type: Anchorable \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Blacksmith/anvil.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Blacksmith/anvil.yml index e28d862590..6efa1d4d0a 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Blacksmith/anvil.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Blacksmith/anvil.yml @@ -1,9 +1,9 @@ - type: entity id: CP14WorkbenchAnvil parent: - - CP14BaseFireplace - name: anvil heater - description: Kitchen stove with a slight modification + - CP14BaseWorkbench + name: anvil + description: A big piece of metal that allows you to turn square pieces of metal into pieces of metal in other, more useful shapes. components: - type: Sprite snapCardinals: false @@ -26,9 +26,8 @@ collection: MetalBreak - !type:DoActsBehavior acts: [ "Destruction" ] - - type: Storage - grid: - - 0,0,2,2 - whitelist: - tags: - - CP14FireplaceFuel \ No newline at end of file + - type: CP14Workbench + craftSound: + collection: CP14Sawing #TODO + recipeTags: + - CP14RecipeAnvil \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Blacksmith/furnace.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Blacksmith/furnace.yml index 31800f72d8..4780518eb4 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Blacksmith/furnace.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Blacksmith/furnace.yml @@ -1,9 +1,9 @@ - type: entity id: CP14WorkbenchFurnace parent: - - BaseStructure - name: broken furnace - description: Just broken furnace + - CP14BaseWorkbench + name: melting furnace + description: A red-hot stone construction that allows ores to be smelted into pure metal components: - type: Sprite snapCardinals: false @@ -11,6 +11,8 @@ sprite: _CP14/Structures/Specific/Blacksmith/furnace.rsi layers: - state: base + - state: fire + shader: unshaded - type: Icon sprite: _CP14/Structures/Specific/Blacksmith/furnace.rsi state: base @@ -27,4 +29,13 @@ sound: collection: MetalBreak - !type:DoActsBehavior - acts: [ "Destruction" ] \ No newline at end of file + acts: [ "Destruction" ] + - type: PointLight + color: "#99411f" + radius: 2 + energy: 2 + - type: CP14Workbench + craftSound: + collection: CP14Sawing #TODO + recipeTags: + - CP14RecipeMeltingFurnace \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Guidebook/entry.yml b/Resources/Prototypes/_CP14/Guidebook/entry.yml index 5a58a5a20d..a3e332bb5f 100644 --- a/Resources/Prototypes/_CP14/Guidebook/entry.yml +++ b/Resources/Prototypes/_CP14/Guidebook/entry.yml @@ -19,16 +19,3 @@ - CP14_RU_Species - CP14_RU_Jobs - CP14_RU_Imperial_Laws - -- type: guideEntry - crystallPunkAllowed: true - locFilter: "ru-RU" - id: CP14_TOPSECRET - name: АБСОЛЮТНО СЕКРЕТНО!!!!!!!!!!! - text: "/ServerInfo/_CP14/Guidebook_RU/TOPSECRET.xml" - -- type: guideEntry - crystallPunkAllowed: true - id: CP14_TOPSECRETEN - name: TOP SECRET!!!!! - text: "/ServerInfo/_CP14/Guidebook_EN/TOPSECRET.xml" \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index fd928cef1d..aec528696e 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -519,7 +519,6 @@ - CP14LuteInstrument - CP14LyraInstrument - CP14ClothingBeltQuiver - - CP14FakeMithril - type: loadout id: CP14ManaOperationGlove @@ -616,12 +615,6 @@ equipment: belt2: CP14ClothingBeltQuiver -- type: loadout - id: CP14FakeMithril - storage: - back: - - CP14MithrilBarFake - # Keys - type: loadoutGroup diff --git a/Resources/Prototypes/_CP14/Loadouts/Misc/undead_startinggear.yml b/Resources/Prototypes/_CP14/Loadouts/Misc/undead_startinggear.yml index b797f9e09d..043f60e713 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Misc/undead_startinggear.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Misc/undead_startinggear.yml @@ -24,8 +24,6 @@ pants: CP14ClothingPantsLoincloth neck: CP14ModularSkeletonHalberd shoes: CP14ClothingShoesSandals - inhand: - - CP14MagicHealingStaff - type: startingGear id: CP14MobSkeletonSword @@ -37,7 +35,6 @@ head: CP14ClothingHeadMetalHeadband inhand: - CP14BaseShield - - CP14MagicHealingStaff - type: startingGear id: CP14MobSkeletonDodger @@ -46,8 +43,6 @@ pants: CP14ClothingPantsLoincloth belt1: CP14ModularIronDagger belt2: CP14ModularIronDagger - inhand: - - CP14MagicHealingStaff - type: startingGear id: CP14MobSkeletonArcher @@ -56,8 +51,6 @@ pants: CP14ClothingPantsLoincloth neck: CP14BowCombat belt1: CP14ClothingBeltQuiverCopperArrow - inhand: - - CP14MagicHealingStaff - type: startingGear id: CP14MobSkeletonWizard @@ -69,7 +62,6 @@ cloak: CP14ClothingCloakWhite inhand: - CP14ManaOperationGlove - - CP14MagicHealingStaff - type: startingGear id: CP14MobSkeletonBard @@ -78,8 +70,6 @@ pants: CP14ClothingPantsMercenaryTrousers shoes: CP14ClothingShoesAristocraticBlack neck: SkeletonGuitarInstrument - inhand: - - CP14MagicHealingStaff - type: startingGear id: CP14MobSkeletonCloset diff --git a/Resources/Prototypes/_CP14/Loadouts/skill_tree.yml b/Resources/Prototypes/_CP14/Loadouts/skill_tree.yml index df8e0fe044..28623ac829 100644 --- a/Resources/Prototypes/_CP14/Loadouts/skill_tree.yml +++ b/Resources/Prototypes/_CP14/Loadouts/skill_tree.yml @@ -10,7 +10,6 @@ - CP14SkillTreeIllusion - CP14SkillTreeHealing - CP14SkillTreeAtlethic - - CP14SkillTreeVampire @@ -108,19 +107,4 @@ id: CP14SkillTreeAtlethic dummyEntity: CP14SkillTreeAtlethicLoadoutDummy skillTree: - Atlethic: 1 - -- type: entity - id: CP14SkillTreeVampireLoadoutDummy - name: Vampire - categories: [ HideSpawnMenu ] - components: - - type: Sprite - sprite: _CP14/Actions/Spells/vampire.rsi - state: bite - -- type: loadout - id: CP14SkillTreeVampire - dummyEntity: CP14SkillTreeVampireLoadoutDummy - skillTree: - VampireTree: 1 \ No newline at end of file + Atlethic: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Maps/comoss.yml b/Resources/Prototypes/_CP14/Maps/comoss.yml index b0d1795eb2..49ab10454b 100644 --- a/Resources/Prototypes/_CP14/Maps/comoss.yml +++ b/Resources/Prototypes/_CP14/Maps/comoss.yml @@ -28,7 +28,7 @@ - type: CP14StationZLevels defaultMapLevel: 0 levels: - 1: + -1: path: /Maps/_CP14/comoss_d.yml - type: CP14StationKeyDistribution keys: diff --git a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Armor/Cuisses/chainmail.yml b/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Armor/Cuisses/chainmail.yml deleted file mode 100644 index 444465eac2..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Armor/Cuisses/chainmail.yml +++ /dev/null @@ -1,76 +0,0 @@ -- type: modularPart - id: CuissesBloodflowerChainmail - slots: - - Cuisses - sourcePart: CP14BloodFlower - rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi - color: "#5c1f0a" - modifiers: - - !type:Inherit - copyFrom: - - BaseCuissesChainmail - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.05 - Slash: -0.15 - - !type:EditClothingSpeed - walkModifier: 0.90 - sprintModifier: 0.90 - -- type: modularPart - id: CuissesChromiumslimeChainmail - slots: - - Cuisses - sourcePart: CP14ChromiumSlime - rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi - color: "#3b487280" - modifiers: - - !type:Inherit - copyFrom: - - BaseCuissesChainmail - - !type:EditArmor - modifiers: - coefficients: - Blunt: 0.05 - Slash: 0.15 - - !type:EditClothingSpeed - walkModifier: 1.10 - sprintModifier: 1.10 - -- type: modularPart - id: CuissesLumimushroomChainmail - slots: - - Cuisses - sourcePart: CP14LumiMushroom - rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi - color: "#36c98f" - modifiers: - - !type:Inherit - copyFrom: - - BaseCuissesChainmail - - !type:AddComponents - components: - - type: PointLight - color: "#36c98f" - radius: 2 - -- type: modularPart - id: CuissesDayflinChainmail - slots: - - Cuisses - sourcePart: CP14Dayflin - rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseCuissesChainmail - - !type:EditArmor - modifiers: - coefficients: - Blunt: 0.10 - Slash: 0.30 - - !type:EditClothingSpeed - walkModifier: 1.20 - sprintModifier: 1.20 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Armor/Cuisses/plate.yml b/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Armor/Cuisses/plate.yml deleted file mode 100644 index 052798a7a9..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Armor/Cuisses/plate.yml +++ /dev/null @@ -1,79 +0,0 @@ -- type: modularPart - id: CuissesBloodflowerPlate - slots: - - Cuisses - sourcePart: CP14BloodFlower - rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi - color: "#5c1f0a" - modifiers: - - !type:Inherit - copyFrom: - - BaseCuissesPlate - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.03 - Slash: -0.03 - Piercing: -0.15 - - !type:EditClothingSpeed - walkModifier: 0.82 - sprintModifier: 0.82 - -- type: modularPart - id: CuissesChromiumslimePlate - slots: - - Cuisses - sourcePart: CP14ChromiumSlime - rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi - color: "#3b487280" - modifiers: - - !type:Inherit - copyFrom: - - BaseCuissesPlate - - !type:EditArmor - modifiers: - coefficients: - Blunt: 0.03 - Slash: 0.03 - Piercing: 0.15 - - !type:EditClothingSpeed - walkModifier: 1.18 - sprintModifier: 1.18 - -- type: modularPart - id: CuissesLumimushroomPlate - slots: - - Cuisses - sourcePart: CP14LumiMushroom - rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi - color: "#36c98f" - modifiers: - - !type:Inherit - copyFrom: - - BaseCuissesPlate - - !type:AddComponents - components: - - type: PointLight - color: "#36c98f" - radius: 3 - -- type: modularPart - id: CuissesDayflinPlate - slots: - - Cuisses - sourcePart: CP14Dayflin - rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseCuissesPlate - - !type:EditArmor - modifiers: - coefficients: - Blunt: 0.06 - Slash: 0.06 - Piercing: 0.30 - - !type:EditClothingSpeed - walkModifier: 1.36 - sprintModifier: 1.36 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Armor/Greave/chainmail.yml b/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Armor/Greave/chainmail.yml deleted file mode 100644 index 6b88190da7..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Armor/Greave/chainmail.yml +++ /dev/null @@ -1,59 +0,0 @@ -- type: modularPart - id: GreaveBloodflowerChainmail - slots: - - Greave - sourcePart: CP14BloodFlower - rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi - color: "#5c1f0a" - modifiers: - - !type:Inherit - copyFrom: - - BaseGreaveChainmail - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.03 - Slash: -0.12 - - !type:EditClothingSpeed - walkModifier: 0.97 - sprintModifier: 0.97 - -- type: modularPart - id: GreaveChromiumslimeChainmail - slots: - - Greave - sourcePart: CP14ChromiumSlime - rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi - color: "#3b487280" - modifiers: - - !type:Inherit - copyFrom: - - BaseGreaveChainmail - - !type:EditArmor - modifiers: - coefficients: - Blunt: 0.03 - Slash: 0.12 - - !type:EditClothingSpeed - walkModifier: 1.03 - sprintModifier: 1.03 - -- type: modularPart - id: GreaveDayflinChainmail - slots: - - Greave - sourcePart: CP14Dayflin - rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseGreaveChainmail - - !type:EditArmor - modifiers: - coefficients: - Blunt: 0.06 - Slash: 0.24 - - !type:EditClothingSpeed - walkModifier: 1.06 - sprintModifier: 1.06 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/axe.yml b/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/axe.yml deleted file mode 100644 index eda3bcc0eb..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/axe.yml +++ /dev/null @@ -1,42 +0,0 @@ -#Concept: -# + Very high damage -# - Very low attack speed - -- type: modularPart - id: BladeBloodflowerAxe - slots: - - Blade - sourcePart: CP14BloodFlower - rsiPath: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi - color: "#5c1f0a" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeAxe - - BaseBladeBloodflower - -- type: modularPart - id: BladeChromiumslimeAxe - slots: - - Blade - sourcePart: CP14ChromiumSlime - rsiPath: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi - color: "#3b487280" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeAxe - - BaseBladeChromiumslime - -- type: modularPart - id: BladeDayflinAxe - slots: - - Blade - sourcePart: CP14Dayflin - rsiPath: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeAxe - - BaseBladeDayflin \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/base.yml b/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/base.yml deleted file mode 100644 index 50a22e5b87..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/base.yml +++ /dev/null @@ -1,38 +0,0 @@ -- type: modularPart - id: BaseBladeBloodflower - modifiers: - - !type:EditDamageableModifier - multiplier: 0.95 - - !type:EditSharpened - sharpnessDamageMultiplier: 0.95 - - !type:EditMeleeWeapon - damageMultiplier: 1.1 - attackRateMultiplier: 0.9 - - !type:EditIncreaseDamageOnWield - damageMultiplier: 1.1 - -- type: modularPart - id: BaseBladeChromiumslime - modifiers: - - !type:EditDamageableModifier - multiplier: 1.05 - - !type:EditSharpened - sharpnessDamageMultiplier: 1.05 - - !type:EditMeleeWeapon - damageMultiplier: 0.9 - attackRateMultiplier: 1.1 - - !type:EditIncreaseDamageOnWield - damageMultiplier: 0.9 - -- type: modularPart - id: BaseBladeDayflin - modifiers: - - !type:EditDamageableModifier - multiplier: 1.15 - - !type:EditSharpened - sharpnessDamageMultiplier: 1.15 - - !type:EditMeleeWeapon - damageMultiplier: 0.7 - attackRateMultiplier: 2 - - !type:EditIncreaseDamageOnWield - damageMultiplier: 0.7 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/dagger.yml b/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/dagger.yml deleted file mode 100644 index 9358339637..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/dagger.yml +++ /dev/null @@ -1,43 +0,0 @@ -#Concept: -# + Fast attackRate -# fast swing -# - Low damage - -- type: modularPart - id: BladeBloodflowerDagger - slots: - - Blade - sourcePart: CP14BloodFlower - rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi - color: "#5c1f0a" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeDagger - - BaseBladeBloodflower - -- type: modularPart - id: BladeChromiumslimeDagger - slots: - - Blade - sourcePart: CP14ChromiumSlime - rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi - color: "#3b487280" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeDagger - - BaseBladeChromiumslime - -- type: modularPart - id: BladeDayflinDagger - slots: - - Blade - sourcePart: CP14Dayflin - rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeDagger - - BaseBladeDayflin \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/hammer.yml b/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/hammer.yml deleted file mode 100644 index b39a251bf4..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/hammer.yml +++ /dev/null @@ -1,43 +0,0 @@ -#Concept: -# hammer tool! -# High blunt damage -# Loow speed - -- type: modularPart - id: BladeBloodflowerHammer - slots: - - Blade - sourcePart: CP14BloodFlower - rsiPath: _CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi - color: "#5c1f0a" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeHammer - - BaseBladeBloodflower - -- type: modularPart - id: BladeChromiumslimeHammer - slots: - - Blade - sourcePart: CP14ChromiumSlime - rsiPath: _CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi - color: "#3b487280" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeHammer - - BaseBladeChromiumslime - -- type: modularPart - id: BladeDayflinHammer - slots: - - Blade - sourcePart: CP14Dayflin - rsiPath: _CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeHammer - - BaseBladeDayflin \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/mace.yml b/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/mace.yml deleted file mode 100644 index a4870a6793..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/mace.yml +++ /dev/null @@ -1,43 +0,0 @@ -#Concept: -# + High Wielded damage -# - Low AttackRate - -- type: modularPart - id: BladeBloodflowerMace - slots: - - Blade - sourcePart: CP14BloodFlower - rsiPath: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi - color: "#5c1f0a" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeMace - - BaseBladeBloodflower - -- type: modularPart - id: BladeChromiumslimeMace - slots: - - Blade - sourcePart: CP14ChromiumSlime - rsiPath: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi - color: "#3b487280" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeMace - - BaseBladeChromiumslime - -- type: modularPart - id: BladeDayflinMace - slots: - - Blade - sourcePart: CP14Dayflin - rsiPath: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeMace - - BaseBladeDayflin - diff --git a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/pickaxe.yml b/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/pickaxe.yml deleted file mode 100644 index e3ce125c09..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/pickaxe.yml +++ /dev/null @@ -1,38 +0,0 @@ -- type: modularPart - id: BladeBloodflowerPickaxe - slots: - - Blade - sourcePart: CP14BloodFlower - rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi - color: "#5c1f0a" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladePickaxe - - BaseBladeBloodflower - -- type: modularPart - id: BladeChromiumslimePickaxe - slots: - - Blade - sourcePart: CP14ChromiumSlime - rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi - color: "#3b487280" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladePickaxe - - BaseBladeChromiumslime - -- type: modularPart - id: BladeDayflinPickaxe - slots: - - Blade - sourcePart: CP14Dayflin - rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladePickaxe - - BaseBladeDayflin \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/rapier.yml b/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/rapier.yml deleted file mode 100644 index 82f106fd90..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/rapier.yml +++ /dev/null @@ -1,43 +0,0 @@ -#Concept: -# + Additional range -# + High Damage! And speed -# - Required Warcraft skill - -- type: modularPart - id: BladeBloodflowerRapier - slots: - - Blade - sourcePart: CP14BloodFlower - rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi - color: "#5c1f0a" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeRapier - - BaseBladeBloodflower - -- type: modularPart - id: BladeChromiumslimeRapier - slots: - - Blade - sourcePart: CP14ChromiumSlime - rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi - color: "#3b487280" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeRapier - - BaseBladeChromiumslime - -- type: modularPart - id: BladeDayflinRapier - slots: - - Blade - sourcePart: CP14Dayflin - rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeRapier - - BaseBladeDayflin diff --git a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/shovel.yml b/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/shovel.yml deleted file mode 100644 index feda60984d..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/shovel.yml +++ /dev/null @@ -1,39 +0,0 @@ -- type: modularPart - id: BladeBloodflowerShovel - slots: - - Blade - sourcePart: CP14BloodFlower - rsiPath: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi - color: "#5c1f0a" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeShovel - - BaseBladeBloodflower - -- type: modularPart - id: BladeChromiumslimeShovel - slots: - - Blade - sourcePart: CP14ChromiumSlime - rsiPath: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi - color: "#3b487280" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeShovel - - BaseBladeChromiumslime - -- type: modularPart - id: BladeDayflinShovel - slots: - - Blade - sourcePart: CP14Dayflin - rsiPath: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeShovel - - BaseBladeDayflin - diff --git a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/sickle.yml b/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/sickle.yml deleted file mode 100644 index 4af0260b73..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/sickle.yml +++ /dev/null @@ -1,39 +0,0 @@ -- type: modularPart - id: BladeBloodflowerSickle - slots: - - Blade - sourcePart: CP14BloodFlower - rsiPath: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi - color: "#5c1f0a" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeSickle - - BaseBladeBloodflower - -- type: modularPart - id: BladeChromiumslimeSickle - slots: - - Blade - sourcePart: CP14ChromiumSlime - rsiPath: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi - color: "#3b487280" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeSickle - - BaseBladeChromiumslime - -- type: modularPart - id: BladeDayflinSickle - slots: - - Blade - sourcePart: CP14Dayflin - rsiPath: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeSickle - - BaseBladeDayflin - diff --git a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/spear.yml b/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/spear.yml deleted file mode 100644 index 99d0935168..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/spear.yml +++ /dev/null @@ -1,39 +0,0 @@ -- type: modularPart - id: BladeBloodflowerSpear - slots: - - Blade - sourcePart: CP14BloodFlower - rsiPath: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi - color: "#5c1f0a" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeSpear - - BaseBladeBloodflower - -- type: modularPart - id: BladeChromiumslimeSpear - slots: - - Blade - sourcePart: CP14ChromiumSlime - rsiPath: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi - color: "#3b487280" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeSpear - - BaseBladeChromiumslime - -- type: modularPart - id: BladeDayflinSpear - slots: - - Blade - sourcePart: CP14Dayflin - rsiPath: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeSpear - - BaseBladeDayflin - diff --git a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/sword.yml b/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/sword.yml deleted file mode 100644 index 3a1210d1ae..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Blade/sword.yml +++ /dev/null @@ -1,39 +0,0 @@ -- type: modularPart - id: BladeBloodflowerSword - slots: - - Blade - sourcePart: CP14BloodFlower - rsiPath: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi - color: "#5c1f0a" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeSword - - BaseBladeBloodflower - -- type: modularPart - id: BladeChromiumslimeSword - slots: - - Blade - sourcePart: CP14ChromiumSlime - rsiPath: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi - color: "#3b487280" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeSword - - BaseBladeChromiumslime - -- type: modularPart - id: BladeDayflinSword - slots: - - Blade - sourcePart: CP14Dayflin - rsiPath: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeSword - - BaseBladeDayflin - diff --git a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Garde/sharp.yml b/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Garde/sharp.yml deleted file mode 100644 index f5b1f4d8d7..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Garde/sharp.yml +++ /dev/null @@ -1,16 +0,0 @@ -- type: modularPart - id: GardeSharpLumimushroom - slots: - - Garde - sourcePart: CP14LumiMushroom - rsiPath: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi - color: "#36c98f" - modifiers: - - !type:Inherit - copyFrom: - - BaseGardeSharp - - !type:AddComponents - components: - - type: PointLight - color: "#36c98f" - radius: 8 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Garde/sturdy.yml b/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Garde/sturdy.yml deleted file mode 100644 index f754b339f3..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Garde/sturdy.yml +++ /dev/null @@ -1,16 +0,0 @@ -- type: modularPart - id: GardeSturdyLumimushroom - slots: - - Garde - sourcePart: CP14LumiMushroom - rsiPath: _CP14/Objects/ModularTools/Garde/metall_sturdy.rsi - color: "#36c98f" - modifiers: - - !type:Inherit - copyFrom: - - BaseGardeSturdy - - !type:AddComponents - components: - - type: PointLight - color: "#36c98f" - radius: 4 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Tip/arrow.yml b/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Tip/arrow.yml deleted file mode 100644 index 47ff268eb3..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Alchemist/Tip/arrow.yml +++ /dev/null @@ -1,18 +0,0 @@ -- type: modularPart - id: TipAirlilyArrow - slots: - - ArrowTip - rsiPath: _CP14/Objects/ModularTools/Tip/arrow.rsi - color: "#92cae0" - modifiers: - - !type:Inherit - copyFrom: - - BaseTipArrow - - !type:AddComponents - components: - - type: Projectile - deleteOnCollide: false - onlyCollideWhenShot: true - damage: - groups: - Brute: -100 #trollface diff --git a/Resources/Prototypes/_CP14/Objectives/empire_orders.yml b/Resources/Prototypes/_CP14/Objectives/empire_orders.yml index 2cc9531715..bd34ec5ec9 100644 --- a/Resources/Prototypes/_CP14/Objectives/empire_orders.yml +++ b/Resources/Prototypes/_CP14/Objectives/empire_orders.yml @@ -63,8 +63,8 @@ - type: CP14StatisticRangeCondition statistic: DemiplaneDeaths range: - min: 4 - max: 40 #TODO Adaptive to player count + min: 0 + max: 3 #TODO Adaptive to player count objectiveText: cp14-objective-no-demiplane-death-title objectiveDescription: cp14-objective-no-demiplane-death-desc objectiveSprite: diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Fun/lol.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Fun/lol.yml index b5f43f42b3..70d1ca53f2 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Fun/lol.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Fun/lol.yml @@ -21,29 +21,6 @@ minGroupSize: 1 maxGroupSize: 1 -- type: cp14DemiplaneModifier - id: MobRoyalPumpkin - levels: - min: 1 - max: 10 - generationWeight: 0.2 - generationProb: 0.4 - categories: - Fun: 1 - requiredTags: - - CP14DemiplaneHerbals - - CP14DemiplaneOpenSky - layers: - - !type:OreDunGen - tileMask: - - CP14FloorGrass - - CP14FloorGrassLight - - CP14FloorGrassTall - entity: CP14MobPumpkinKing - count: 10 - minGroupSize: 1 - maxGroupSize: 1 - - type: cp14DemiplaneModifier id: LucenTree levels: diff --git a/Resources/Prototypes/_CP14/Reagents/ingots.yml b/Resources/Prototypes/_CP14/Reagents/ingots.yml deleted file mode 100644 index ba4b35cd67..0000000000 --- a/Resources/Prototypes/_CP14/Reagents/ingots.yml +++ /dev/null @@ -1,300 +0,0 @@ -- type: reagent - id: CP14MoltenIngotBase - abstract: true - physicalDesc: cp14-reagent-physical-desc-molten - flavor: CP14Metallic - reactiveEffects: - Acidic: - methods: [ Touch ] - effects: - - !type:HealthChange - scaleByQuantity: true - ignoreResistances: false - damage: - groups: - Brute: 0.5 - - !type:Emote - emote: Scream - probability: 0.3 - metabolisms: - Poison: - metabolismRate : 3.00 - effects: - - !type:HealthChange - damage: - groups: - Brute: 11.0 - - !type:PopupMessage - type: Local - visualType: Large - messages: [ "generic-reagent-effect-burning-insides" ] - probability: 0.33 - - !type:Emote - emote: Scream - probability: 0.3 - -# Base 4 -- type: reagent - parent: CP14MoltenIngotBase - id: CP14MoltenIngotCopper - name: cp14-reagent-name-molten-ingot-copper - desc: cp14-reagent-desc-molten-ingot-copper - group: CP14MoltenIngot - color: "#c57d07" - -- type: reagent - parent: CP14MoltenIngotBase - id: CP14MoltenIngotIron - name: cp14-reagent-name-molten-ingot-iron - desc: cp14-reagent-desc-molten-ingot-iron - group: CP14MoltenIngot - color: "#b6b9cb" - -- type: reagent - parent: CP14MoltenIngotBase - id: CP14MoltenIngotGold - name: cp14-reagent-name-molten-ingot-gold - desc: cp14-reagent-desc-molten-ingot-gold - group: CP14MoltenIngot - color: "#f1a94b" - -- type: reagent - parent: CP14MoltenIngotBase - id: CP14MoltenIngotMithril - name: cp14-reagent-name-molten-ingot-mithril - desc: cp14-reagent-desc-molten-ingot-mithril - group: CP14MoltenIngot - color: "#45d2a4" - -# Funny editions - -# Brute -- type: reagent - id: CP14AlloyCoconut - name: cp14-reagent-name-alloy-coconut - desc: cp14-reagent-desc-alloy-coconut - group: CP14AlloyApril - flavor: CP14Metallic - color: "#baaa9a" - physicalDesc: cp14-reagent-physical-desc-molten - worksOnTheDead: true - metabolisms: - Medicine: - metabolismRate: 3.00 - effects: - - !type:ModifyBleedAmount - amount: -120 - - !type:HealthChange - damage: - groups: - Brute: -360 #trollface - -- type: reagent - id: CP14AlloyNotCoconut - name: cp14-reagent-name-alloy-not-coconut - desc: cp14-reagent-desc-alloy-not-coconut - group: CP14AlloyApril - flavor: CP14Metallic - color: "#c18c38" - physicalDesc: cp14-reagent-physical-desc-molten - worksOnTheDead: true - metabolisms: - Poison: - metabolismRate: 3.00 - effects: - - !type:HealthChange - damage: - groups: - Brute: 180 - -# Inversium -- type: reagent - parent: CP14MoltenIngotBase - id: CP14AlloyInversium - name: cp14-reagent-name-alloy-inversium - desc: cp14-reagent-desc-alloy-inversium - group: CP14AlloyApril - color: "#70b670" - -# Temperature - -- type: reagent - id: CP14AlloyNormaldaynium - name: cp14-reagent-name-alloy-normaldaynium - desc: cp14-reagent-desc-alloy-normaldaynium - group: CP14AlloyApril - flavor: CP14Metallic - color: "#d9af7e" - physicalDesc: cp14-reagent-physical-desc-molten - worksOnTheDead: true - metabolisms: - Medicine: - metabolismRate: 3.00 - effects: - - !type:HealthChange - damage: - types: - Heat: -600 - Cold: -600 - -- type: reagent - id: CP14AlloyBaddaynium - name: cp14-reagent-name-alloy-baddaynium - desc: cp14-reagent-desc-alloy-baddaynium - group: CP14AlloyApril - flavor: CP14Metallic - color: "#ceb398" - physicalDesc: cp14-reagent-physical-desc-molten - worksOnTheDead: true - metabolisms: - Medicine: - metabolismRate: 3.00 - effects: - - !type:FlammableReaction - multiplier: 1.5 - - !type:AdjustTemperature - amount: 2000 - - !type:Ignite - - !type:HealthChange - damage: - types: - Cold: 180 - -- type: reagent - id: CP14AlloyHealium - name: cp14-reagent-name-alloy-healium - desc: cp14-reagent-desc-alloy-healium - group: CP14AlloyApril - flavor: CP14Metallic - color: "#d48c1e" - physicalDesc: cp14-reagent-physical-desc-molten - worksOnTheDead: true - metabolisms: - Medicine: - metabolismRate: 3.00 - effects: - - !type:HealthChange - damage: - types: - Poison: -600 - Asphyxiation: -600 - - !type:ModifyBloodLevel - amount: 1200 - -- type: reagent - id: CP14AlloyKillium - name: cp14-reagent-name-alloy-killium - desc: cp14-reagent-desc-alloy-killium - group: CP14AlloyApril - flavor: CP14Metallic - color: "#e29a34" - physicalDesc: cp14-reagent-physical-desc-molten - worksOnTheDead: true - metabolisms: - Medicine: - metabolismRate: 3.00 - effects: - - !type:HealthChange - damage: - types: - Poison: 300 - Asphyxiation: 300 - - !type:ModifyBloodLevel - amount: -600 - -- type: reagent - id: CP14AlloyDinner - name: cp14-reagent-name-alloy-dinner - desc: cp14-reagent-desc-alloy-dinner - group: CP14AlloyApril - flavor: CP14Metallic - color: "#70c88e" - physicalDesc: cp14-reagent-physical-desc-molten - metabolisms: - Food: - metabolismRate: 3.00 - effects: - - !type:SatiateHunger - factor: 900 - - !type:SatiateThirst - factor: 900 - -- type: reagent - id: CP14AlloySpeedrunnium - name: cp14-reagent-name-alloy-speedrunnium - desc: cp14-reagent-desc-alloy-speedrunnium - group: CP14AlloyApril - flavor: CP14Metallic - color: "#90c1be" - physicalDesc: cp14-reagent-physical-desc-molten - metabolisms: - Narcotic: - metabolismRate: 3.00 - effects: - - !type:CP14ManaChange - manaDelta: 1800 - safe: true - - !type:MovespeedModifier - walkSpeedModifier: 3 - sprintSpeedModifier: 3 - statusLifetime: 4.5 - - !type:GenericStatusEffect - key: Stutter - component: StutteringAccent - -- type: reagent - id: CP14AlloyTurtle - name: cp14-reagent-name-alloy-turtle - desc: cp14-reagent-desc-alloy-turtle - group: CP14AlloyApril - flavor: CP14Metallic - color: "#6bcab1" - physicalDesc: cp14-reagent-physical-desc-molten - metabolisms: - Narcotic: - metabolismRate: 3.00 - effects: - - !type:CP14ManaChange - manaDelta: -1800 - safe: true - - !type:MovespeedModifier - walkSpeedModifier: 0.1 - sprintSpeedModifier: 0.1 - statusLifetime: 4.5 - - !type:GenericStatusEffect - key: Stutter - component: StutteringAccent - -- type: reagent - id: CP14AlloyBreakingbad - name: cp14-reagent-name-alloy-breakingbad - desc: cp14-reagent-desc-alloy-breakingbad - group: CP14AlloyApril - flavor: CP14Metallic - color: "#4946d2" - physicalDesc: cp14-reagent-physical-desc-molten - metabolisms: - Narcotic: - metabolismRate: 3.00 - effects: - - !type:Emote - emote: Yawn - showInChat: true - probability: 0.7 - - !type:GenericStatusEffect - key: ForcedSleep - component: ForcedSleeping - type: Add - - !type:GenericStatusEffect - key: SeeingRainbows - component: SeeingRainbows - type: Add - time: 75 - refresh: false - - !type:Emote - showInChat: false - emote: Cough - probability: 0.7 - - !type:Drunk - boozePower: 45 - - !type:Jitter \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/agaric.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/agaric.yml new file mode 100644 index 0000000000..1b8baae732 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/agaric.yml @@ -0,0 +1,47 @@ + +# Splitting: Applying magical dispel to split precursor into essences. + +- type: reaction + id: CP14AgaricShroomSplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14AgaricMushroom: + amount: 1 + products: + CP14EssencePoison: 0.5 + cp14RandomProducts: + - CP14EssenceWater: 0.5 + - CP14EssenceEarth: 0.5 + +# Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions. + +# invert Brute treatment into poison and back + +- type: reaction + id: CP14AgaricShroomAdmixture1 + minTemp: 500 + reactants: + CP14AgaricMushroom: + amount: 1 + CP14BasicEffectEmpty: + amount: 1 + CP14BasicEffectHealBrute: + amount: 1 + products: + CP14BasicEffectDamageBrute: 2 + CP14BasicEffectRainbow: 1 + +- type: reaction + id: CP14AgaricShroomAdmixture2 + minTemp: 500 + reactants: + CP14AgaricMushroom: + amount: 1 + CP14BasicEffectEmpty: + amount: 1 + CP14BasicEffectDamageBrute: + amount: 1 + products: + CP14BasicEffectHealBrute: 2 + CP14BasicEffectRainbow: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/air_lily.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/air_lily.yml new file mode 100644 index 0000000000..38ef054ab0 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/air_lily.yml @@ -0,0 +1,33 @@ + +# Splitting: Applying magical dispel to split precursor into essences. + +- type: reaction + id: CP14AirLilySplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14AirLily: + amount: 1 + products: + CP14EssenceAir: 0.5 + cp14RandomProducts: + - CP14EssenceWater: 0.5 + - CP14EssenceLife: 0.5 + +# Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions. + +# Emote cough -> Heal airloss + +- type: reaction + id: CP14AirLilyAdmixture + minTemp: 500 + reactants: + CP14AirLily: + amount: 1 + CP14BasicEffectEmpty: + amount: 1 + CP14BasicEffectEmoteCough: + amount: 1 + products: + CP14BasicEffectHealAirloss: 2 + CP14BasicEffectDrunk: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/blood_flower.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/blood_flower.yml new file mode 100644 index 0000000000..a858cdf01b --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/blood_flower.yml @@ -0,0 +1,77 @@ + +# Splitting: Applying magical dispel to split precursor into essences. + +- type: reaction + id: CP14BloodFlowerSplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14BloodFlowerSap: + amount: 1 + products: + CP14EssenceLife: 0.5 + CP14EssenceWater: 0.5 + +- type: reaction + id: CP14BloodFlowerBloodSplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14BloodFlowerSap: + amount: 1 + CP14BloodTiefling: + amount: 1 + products: + CP14EssenceFire: 1 + CP14EssenceLife: 1 + +- type: reaction + id: CP14BloodFlowerTieflingSplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14BloodFlowerSap: + amount: 1 + CP14Blood: + amount: 1 + products: + CP14EssenceLife: 2 + +- type: reaction + id: CP14BloodFlowerElfSplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14BloodFlowerSap: + amount: 1 + CP14BloodElf: + amount: 1 + products: + CP14EssenceOrder: 1 + CP14EssenceLife: 1 + +- type: reaction + id: CP14BloodFlowerGoblinSplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14BloodFlowerSap: + amount: 1 + CP14BloodGoblin: + amount: 1 + products: + CP14EssenceChaos: 1 + CP14EssenceLife: 1 + +#- type: reaction +# id: CP14BloodFlowerVampireSplitting +# requiredMixerCategories: +# - CP14MagicSplitting +# reactants: +# CP14BloodFlowerSap: +# amount: 1 +# CP14BloodVampire: +# amount: 1 +# products: +# CP14EssenceChaos: 1 #TODO: need some advanced essences first +# CP14EssenceLife: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/blue_amanita.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/blue_amanita.yml new file mode 100644 index 0000000000..81ac81f7ac --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/blue_amanita.yml @@ -0,0 +1,31 @@ + +# Splitting: Applying magical dispel to split precursor into essences. + +- type: reaction + id: CP14BlueAmanitaSplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14BlueAmanita: + amount: 1 + products: + CP14EssenceMagic: 0.5 + cp14RandomProducts: + - CP14EssenceWater: 0.5 + - CP14EssenceLife: 0.5 + +# Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions. + +- type: reaction + id: CP14BlueAmanitaAdmixture + minTemp: 500 + reactants: + CP14BlueAmanita: + amount: 1 + CP14BasicEffectEmpty: + amount: 1 + CP14BasicEffectRainbow: + amount: 1 + products: + CP14BasicEffectHealMana: 2 + CP14BasicEffectDrunk: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/chromium_slime.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/chromium_slime.yml new file mode 100644 index 0000000000..77b54734e5 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/chromium_slime.yml @@ -0,0 +1,62 @@ + +# Splitting: Applying magical dispel to split precursor into essences. + +- type: reaction + id: CP14ChromiumSlimeSplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14ChromiumSlime: + amount: 1 + products: + CP14EssenceCycle: 1 + + +# Chromium slime is a special reagent that inverts solution properties. + +- type: reaction + id: CP14ChromiumInverseEffect + quantized: true + minTemp: 350 + conserveEnergy: false + reactants: + CP14ChromiumSlime: + amount: 1 + products: + CP14BasicEffectEmpty: 1 + effects: + - !type:CP14InverseEffect + inversion: + CP14BasicEffectHealBrute: CP14BasicEffectDamageBrute + CP14BasicEffectDamageBrute: CP14BasicEffectHealBrute + # + CP14BasicEffectHealPoison: CP14BasicEffectDamagePoison + CP14BasicEffectDamagePoison: CP14BasicEffectHealPoison + # + CP14BasicEffectDamageHeat: CP14BasicEffectHealHeat + CP14BasicEffectHealHeat: CP14BasicEffectDamageHeat + # + CP14BasicEffectDamageCold: CP14BasicEffectHealCold + CP14BasicEffectHealCold: CP14BasicEffectDamageCold + # + CP14BasicEffectSatiateHunger: CP14BasicEffectVomit + CP14BasicEffectSatiateThirst: CP14BasicEffectSatiateHunger + CP14BasicEffectVomit: CP14BasicEffectSatiateThirst + # + CP14BasicEffectDamageMana: CP14BasicEffectHealMana + CP14BasicEffectHealMana: CP14BasicEffectDamageMana + # + CP14BasicEffectBloodAbsorption: CP14BasicEffectBloodRestore + CP14BasicEffectBloodRestore: CP14BasicEffectBloodAbsorption + # + CP14BasicEffectSpeedDown: CP14BasicEffectSpeedUp + CP14BasicEffectSpeedUp: CP14BasicEffectSpeedDown + # + CP14BasicEffectDamageAirloss: CP14BasicEffectHealAirloss + CP14BasicEffectHealAirloss: CP14BasicEffectDamageAirloss + # + CP14BasicEffectUnsleep: CP14BasicEffectSleep + CP14BasicEffectSleep: CP14BasicEffectUnsleep + # + CP14BasicEffectRainbow: CP14BasicEffectEmoteCough + CP14BasicEffectEmoteCough: CP14BasicEffectRainbow \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/dayflin.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/dayflin.yml new file mode 100644 index 0000000000..58039336e2 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/dayflin.yml @@ -0,0 +1,45 @@ + +# Splitting: Applying magical dispel to split precursor into essences. + +- type: reaction + id: CP14DayflinSplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14YellowDayflinPulp: + amount: 1 + products: + CP14EssenceFire: 0.5 + cp14RandomProducts: + - CP14EssenceLife: 0.5 + - CP14EssenceMotion: 0.5 + +# Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions. + +- type: reaction + id: CP14DayflinAdmixture1 + minTemp: 500 + reactants: + CP14YellowDayflinPulp: + amount: 1 + CP14BasicEffectEmpty: + amount: 1 + CP14BasicEffectSatiateThirst: + amount: 1 + products: + CP14BasicEffectSpeedUp: 2 + CP14BasicEffectJitter: 1 + +- type: reaction + id: CP14DayflinAdmixture2 + minTemp: 500 + reactants: + CP14YellowDayflinPulp: + amount: 1 + CP14BasicEffectEmpty: + amount: 1 + CP14BasicEffectSatiateHunger: + amount: 1 + products: + CP14BasicEffectSpeedUp: 2 + CP14BasicEffectJitter: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/ground_quartz.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/ground_quartz.yml new file mode 100644 index 0000000000..7c27980f2d --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/ground_quartz.yml @@ -0,0 +1,71 @@ + +# Splitting: Applying magical dispel to split precursor into essences. + +- type: reaction + id: CP14GroundQuartzSplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14GroundQuartz: + amount: 1 + products: + CP14EssenceCrystal: 0.5 + cp14RandomProducts: + - CP14EssenceOrder: 0.5 + - CP14EssenceChaos: 0.5 + +# Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions. + +# Idea: Clear all gimmick useless solutions + +- type: reaction + id: CP14GroundQuartzAdmixture1 + minTemp: 500 + reactants: + CP14GroundQuartz: + amount: 1 + CP14BasicEffectEmpty: + amount: 1 + CP14BasicEffectJitter: + amount: 1 + products: + CP14BasicEffectEmpty: 3 + +- type: reaction + id: CP14GroundQuartzAdmixture2 + minTemp: 500 + reactants: + CP14GroundQuartz: + amount: 1 + CP14BasicEffectEmpty: + amount: 1 + CP14BasicEffectDrunk: + amount: 1 + products: + CP14BasicEffectEmpty: 3 + +- type: reaction + id: CP14GroundQuartzAdmixture3 + minTemp: 500 + reactants: + CP14GroundQuartz: + amount: 1 + CP14BasicEffectEmpty: + amount: 1 + CP14BasicEffectEmoteCough: + amount: 1 + products: + CP14BasicEffectEmpty: 3 + +- type: reaction + id: CP14GroundQuartzAdmixture4 + minTemp: 500 + reactants: + CP14GroundQuartz: + amount: 1 + CP14BasicEffectEmpty: + amount: 1 + CP14BasicEffectRainbow: + amount: 1 + products: + CP14BasicEffectEmpty: 3 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/lumishroom.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/lumishroom.yml new file mode 100644 index 0000000000..d25e86487f --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/lumishroom.yml @@ -0,0 +1,49 @@ + +# Splitting: Applying magical dispel to split precursor into essences. + +- type: reaction + id: CP14LumiMushroomSplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14LumiMushroom: + amount: 1 + products: + CP14EssenceLight: 0.5 + cp14RandomProducts: + - CP14EssenceWater: 0.5 + - CP14EssenceEarth: 0.5 + +# Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions. + +# Idea: Full randomness + +- type: reaction + id: CP14LumiMushroomAdmixture + minTemp: 500 + reactants: + CP14LumiMushroom: + amount: 1 + CP14BasicEffectEmpty: + amount: 1 + cp14RandomProducts: + - CP14BasicEffectHealBrute: 2 + - CP14BasicEffectDamageBrute: 2 + - CP14BasicEffectHealHeat: 2 + - CP14BasicEffectDamageHeat: 2 + - CP14BasicEffectHealCold: 2 + - CP14BasicEffectDamageCold: 2 + - CP14BasicEffectHealPoison: 2 + - CP14BasicEffectDamagePoison: 2 + - CP14BasicEffectHealAirloss: 2 + - CP14BasicEffectDamageAirloss: 2 + - CP14BasicEffectBloodRestore: 2 + - CP14BasicEffectBloodAbsorption: 2 + - CP14BasicEffectSatiateHunger: 2 + - CP14BasicEffectSatiateThirst: 2 + - CP14BasicEffectHealMana: 2 + - CP14BasicEffectDamageMana: 2 + - CP14BasicEffectSpeedUp: 2 + - CP14BasicEffectSpeedDown: 2 + - CP14BasicEffectSleep: 2 + - CP14BasicEffectUnsleep: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/whistler_poison.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/whistler_poison.yml new file mode 100644 index 0000000000..8a07270753 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/whistler_poison.yml @@ -0,0 +1,13 @@ + +# Splitting: Applying magical dispel to split precursor into essences. + +- type: reaction + id: CP14WhistlerPoisonSplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14WhistlerPoison: + amount: 1 + products: + CP14EssencePoison: 1 + #CP14EssencePoison: 0.5 #TODO Tenebrae diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/wild_sage.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/wild_sage.yml new file mode 100644 index 0000000000..03bf3cab22 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/wild_sage.yml @@ -0,0 +1,17 @@ + +# Splitting: Applying magical dispel to split precursor into essences. + +- type: reaction + id: CP14WildSageSplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14WildSageSap: + amount: 1 + products: + CP14EssenceEarth: 0.5 + cp14RandomProducts: + - CP14EssenceOrder: 0.5 + - CP14EssenceChaos: 0.5 + +# Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions. \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/alloys.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/alloys.yml deleted file mode 100644 index b09b486a96..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/alloys.yml +++ /dev/null @@ -1,95 +0,0 @@ -- type: reaction - id: CP14MixingAlloyCoconut - minTemp: 600 - reactants: - CP14MoltenIngotCopper: - amount: 1 - CP14MoltenIngotIron: - amount: 3 - products: - CP14AlloyCoconut: 4 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -150 - -- type: reaction - id: CP14MixingAlloyInversium - minTemp: 600 - reactants: - CP14MoltenIngotCopper: - amount: 1 - CP14MoltenIngotMithril: - amount: 2 - products: - CP14AlloyInversium: 3 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -150 - -- type: reaction - id: CP14MixingAlloyNormaldaynium - minTemp: 600 - reactants: - CP14MoltenIngotIron: - amount: 2 - CP14MoltenIngotGold: - amount: 3 - products: - CP14AlloyNormaldaynium: 5 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -150 - -- type: reaction - id: CP14MixingAlloyHealium - minTemp: 600 - reactants: - CP14MoltenIngotCopper: - amount: 2 - CP14MoltenIngotGold: - amount: 1 - products: - CP14AlloyHealium: 5 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -150 - -- type: reaction - id: CP14MixingAlloyDinner - minTemp: 600 - reactants: - CP14MoltenIngotGold: - amount: 1 - CP14MoltenIngotMithril: - amount: 3 - products: - CP14AlloyDinner: 4 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -150 - -- type: reaction - id: CP14MixingAlloySpeedrunnium - minTemp: 600 - reactants: - CP14MoltenIngotIron: - amount: 2 - CP14MoltenIngotMithril: - amount: 1 - products: - CP14AlloyDinner: 3 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -150 - -- type: reaction - id: CP14MixingAlloyBreakingbad - minTemp: 900 - reactants: - CP14MoltenIngotMithril: - amount: 1 - products: - CP14AlloyBreakingbad: 2 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -150 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/essence_combining.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/essence_combining.yml new file mode 100644 index 0000000000..8a9f23e682 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/essence_combining.yml @@ -0,0 +1,143 @@ +# Combine 1 + +- type: reaction + id: CP14EssenceFrost + minTemp: 600 + reactants: + CP14EssenceFire: + amount: 1 + CP14EssenceChaos: + amount: 1 + products: + CP14EssenceFrost: 2 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14EssenceLight + minTemp: 600 + reactants: + CP14EssenceFire: + amount: 1 + CP14EssenceAir: + amount: 1 + products: + CP14EssenceLight: 2 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14EssenceMotion + minTemp: 600 + reactants: + CP14EssenceOrder: + amount: 1 + CP14EssenceAir: + amount: 1 + products: + CP14EssenceMotion: 2 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14EssenceCycle + minTemp: 600 + reactants: + CP14EssenceOrder: + amount: 1 + CP14EssenceChaos: + amount: 1 + products: + CP14EssenceCycle: 2 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14EssenceEnergia + minTemp: 600 + reactants: + CP14EssenceOrder: + amount: 1 + CP14EssenceFire: + amount: 1 + products: + CP14EssenceEnergia: 2 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14EssenceVoid + minTemp: 600 + reactants: + CP14EssenceChaos: + amount: 1 + CP14EssenceAir: + amount: 1 + products: + CP14EssenceVoid: 2 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14EssencePoison + minTemp: 600 + reactants: + CP14EssenceChaos: + amount: 1 + CP14EssenceWater: + amount: 1 + products: + CP14EssencePoison: 2 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14EssenceLife + minTemp: 600 + reactants: + CP14EssenceEarth: + amount: 1 + CP14EssenceWater: + amount: 1 + products: + CP14EssenceLife: 2 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14EssenceCrystal + minTemp: 600 + reactants: + CP14EssenceOrder: + amount: 1 + CP14EssenceEarth: + amount: 1 + products: + CP14EssenceCrystal: 2 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +# Complex tier 2 + +- type: reaction + id: CP14EssenceMagic + minTemp: 600 + reactants: + CP14EssenceVoid: + amount: 1 + CP14EssenceEnergia: + amount: 1 + products: + CP14EssenceMagic: 2 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/inversium.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/inversium.yml deleted file mode 100644 index 8939d65bf9..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/inversium.yml +++ /dev/null @@ -1,22 +0,0 @@ -- type: reaction - id: CP14InversiumEffect - quantized: true - minTemp: 350 - conserveEnergy: false - reactants: - CP14AlloyInversium: - amount: 1 - effects: - - !type:CP14InverseEffect - inversion: - CP14AlloyCoconut: CP14AlloyNotCoconut - CP14AlloyNotCoconut: CP14AlloyCoconut - # - CP14AlloyNormaldaynium: CP14AlloyBaddaynium - CP14AlloyBaddaynium: CP14AlloyNormaldaynium - # - CP14AlloyHealium: CP14AlloyKillium - CP14AlloyKillium: CP14AlloyHealium - # - CP14AlloySpeedrunnium: CP14AlloyTurtle - CP14AlloyTurtle: CP14AlloySpeedrunnium \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/target_effect_creation_on_precurser.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/target_effect_creation_on_precurser.yml new file mode 100644 index 0000000000..90c54afe80 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/target_effect_creation_on_precurser.yml @@ -0,0 +1,41 @@ +# More complex recipes made from T1-T2 essences and precursors as a base +# T1 +# The result is always 50% empty solution + +- type: reaction + id: CP14PrecurserBrewingHealMana + minTemp: 500 + priority: 1 + reactants: + CP14EssenceMagic: + amount: 2 + CP14EssenceMotion: + amount: 1 + CP14BlueAmanita: + amount: 1 + products: + CP14BasicEffectEmpty: 1 + CP14BasicEffectDrunk: 1 + CP14BasicEffectHealMana: 2 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14PrecurserBrewingDamageMana + minTemp: 500 + priority: 1 + reactants: + CP14EssenceMagic: + amount: 2 + CP14EssenceVoid: + amount: 1 + CP14BlueAmanita: + amount: 1 + products: + CP14BasicEffectEmpty: 1 + CP14BasicEffectDrunk: 1 + CP14BasicEffectDamageMana: 2 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/target_effect_creation_on_water.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/target_effect_creation_on_water.yml new file mode 100644 index 0000000000..0236c9974f --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/target_effect_creation_on_water.yml @@ -0,0 +1,333 @@ +# Simple recipes made from T0 and T1 essences and water +# T1 +# The result is always 75% empty solution + +- type: reaction + id: CP14WaterBrewingHealBrute + minTemp: 500 + priority: 1 + reactants: + CP14EssenceLife: + amount: 2 + CP14EssenceOrder: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectEmoteCough: 1 + CP14BasicEffectHealBrute: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingDamageBrute + minTemp: 500 + priority: 1 + reactants: + CP14EssenceLife: + amount: 2 + CP14EssenceChaos: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectEmoteCough: 1 + CP14BasicEffectDamageBrute: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingHealHeat + minTemp: 500 + priority: 2 + reactants: + CP14EssenceLife: + amount: 1 + CP14EssenceFire: + amount: 1 + CP14EssenceOrder: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectEmoteCough: 1 + CP14BasicEffectHealHeat: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingDamageHeat + minTemp: 500 + priority: 2 + reactants: + CP14EssenceLife: + amount: 1 + CP14EssenceFire: + amount: 1 + CP14EssenceChaos: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectEmoteCough: 1 + CP14BasicEffectDamageHeat: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingHealCold + minTemp: 500 + priority: 2 + reactants: + CP14EssenceLife: + amount: 1 + CP14EssenceFrost: + amount: 1 + CP14EssenceOrder: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectEmoteCough: 1 + CP14BasicEffectHealCold: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingDamageCold + minTemp: 500 + priority: 2 + reactants: + CP14EssenceLife: + amount: 1 + CP14EssenceFrost: + amount: 1 + CP14EssenceChaos: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectEmoteCough: 1 + CP14BasicEffectDamageCold: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingHealPoison + minTemp: 500 + priority: 2 + reactants: + CP14EssenceLife: + amount: 1 + CP14EssencePoison: + amount: 1 + CP14EssenceOrder: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectEmoteCough: 1 + CP14BasicEffectHealPoison: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingDamagePoison + minTemp: 500 + priority: 2 + reactants: + CP14EssenceLife: + amount: 1 + CP14EssencePoison: + amount: 1 + CP14EssenceChaos: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectEmoteCough: 1 + CP14BasicEffectDamagePoison: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingHealAirloss + minTemp: 500 + priority: 2 + reactants: + CP14EssenceLife: + amount: 1 + CP14EssenceAir: + amount: 1 + CP14EssenceOrder: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectEmoteCough: 1 + CP14BasicEffectHealAirloss: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingDamageAirloss + minTemp: 500 + priority: 2 + reactants: + CP14EssenceLife: + amount: 1 + CP14EssenceAir: + amount: 1 + CP14EssenceChaos: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectEmoteCough: 1 + CP14BasicEffectDamageAirloss: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingBloodRestore + minTemp: 500 + priority: 2 + reactants: + CP14EssenceLife: + amount: 1 + CP14EssenceWater: + amount: 1 + CP14EssenceOrder: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectRainbow: 1 + CP14BasicEffectBloodRestore: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingBloodAbsorption + minTemp: 500 + priority: 2 + reactants: + CP14EssenceLife: + amount: 1 + CP14EssenceWater: + amount: 1 + CP14EssenceChaos: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectRainbow: 1 + CP14BasicEffectBloodAbsorption: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +# CP14BasicEffectSatiateHunger +# CP14BasicEffectSatiateThirst + +- type: reaction + id: CP14WaterBrewingHealMana + minTemp: 500 + priority: 1 + reactants: + CP14EssenceEnergia: + amount: 2 + CP14EssenceMotion: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectDrunk: 1 + CP14BasicEffectHealMana: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingDamageMana + minTemp: 500 + priority: 1 + reactants: + CP14EssenceEnergia: + amount: 2 + CP14EssenceVoid: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectDrunk: 1 + CP14BasicEffectDamageMana: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingSpeedUp + minTemp: 500 + priority: 2 + reactants: + CP14EssenceMotion: + amount: 2 + CP14EssenceOrder: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectJitter: 1 + CP14BasicEffectSpeedUp: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingSpeedDown + minTemp: 500 + priority: 2 + reactants: + CP14EssenceMotion: + amount: 2 + CP14EssenceChaos: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectJitter: 1 + CP14BasicEffectSpeedDown: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +# CP14BasicEffectSleep +# CP14BasicEffectUnsleep \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Furnace/oldandunfunny.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Furnace/oldandunfunny.yml deleted file mode 100644 index a9580fad3b..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Furnace/oldandunfunny.yml +++ /dev/null @@ -1,32 +0,0 @@ -- type: CP14Recipe - id: CP14BaseAlchemyBomb - tag: CP14RecipeAlchemistFurnace - craftTime: 30 #trollface - requirements: - - !type:ProtoIdResource - protoId: CP14ChromiumSlime - - !type:ProtoIdResource - protoId: CP14LumiMushroom - result: CP14BaseAlchemyBomb - -- type: CP14Recipe - id: CP14BaseLockpick - tag: CP14RecipeAlchemistFurnace - craftTime: 15 - requirements: - - !type:ProtoIdResource - protoId: CP14BloodFlower - - !type:ProtoIdResource - protoId: CP14Dayflin - result: CP14BaseLockpick - -- type: CP14Recipe - id: CP14VialMedium - tag: CP14RecipeAlchemistFurnace - craftTime: 14 - requirements: - - !type:ProtoIdResource - protoId: CP14AgaricMushroom - - !type:ProtoIdResource - protoId: CP14AirLily - result: CP14VialMedium \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Armor/Breastplate/modular_breastplate.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Armor/Breastplate/modular_breastplate.yml deleted file mode 100644 index 1f290381f4..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Armor/Breastplate/modular_breastplate.yml +++ /dev/null @@ -1,80 +0,0 @@ -- type: CP14Recipe - id: CP14ArmorBloodflowerChainmail - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14BloodFlower - result: CP14ArmorBloodflowerChainmail - -- type: CP14Recipe - id: CP14ArmorChromiumslimeChainmail - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14ChromiumSlime - result: CP14ArmorChromiumslimeChainmail - -- type: CP14Recipe - id: CP14ArmorDayflinChainmail - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14Dayflin - result: CP14ArmorDayflinChainmail - -- type: CP14Recipe - id: CP14ArmorBloodflowerCuirass - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14BloodFlower - result: CP14ArmorBloodflowerCuirass - -- type: CP14Recipe - id: CP14ArmorChromiumslimeCuirass - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14ChromiumSlime - result: CP14ArmorChromiumslimeCuirass - -- type: CP14Recipe - id: CP14ArmorDayflinCuirass - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14Dayflin - result: CP14ArmorDayflinCuirass - -- type: CP14Recipe - id: CP14ArmorBloodflowerInfantryCuirass - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14BloodFlower - result: CP14ArmorBloodflowerInfantryCuirass - -- type: CP14Recipe - id: CP14ArmorChromiumslimeInfantryCuirass - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14ChromiumSlime - result: CP14ArmorChromiumslimeInfantryCuirass - -- type: CP14Recipe - id: CP14ArmorDayflinInfantryCuirass - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14Dayflin - result: CP14ArmorDayflinInfantryCuirass \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Armor/Cuisses/modular_cuisses.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Armor/Cuisses/modular_cuisses.yml deleted file mode 100644 index d1b2596c29..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Armor/Cuisses/modular_cuisses.yml +++ /dev/null @@ -1,71 +0,0 @@ -- type: CP14Recipe - id: CP14ModularCuissesBloodflowerChainmail - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14BloodFlower - result: CP14ModularCuissesBloodflowerChainmail - -- type: CP14Recipe - id: CP14ModularCuissesChromiumslimeChainmail - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14ChromiumSlime - result: CP14ModularCuissesChromiumslimeChainmail - -- type: CP14Recipe - id: CP14ModularCuissesLumimushroomChainmail - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14LumiMushroom - result: CP14ModularCuissesLumimushroomChainmail - -- type: CP14Recipe - id: CP14ModularCuissesDayflinChainmail - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14Dayflin - result: CP14ModularCuissesDayflinChainmail - -- type: CP14Recipe - id: CP14ModularCuissesBloodflowerPlate - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14BloodFlower - result: CP14ModularCuissesBloodflowerPlate - -- type: CP14Recipe - id: CP14ModularCuissesChromiumslimePlate - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14ChromiumSlime - result: CP14ModularCuissesChromiumslimePlate - -- type: CP14Recipe - id: CP14ModularCuissesLumimushroomPlate - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14LumiMushroom - result: CP14ModularCuissesLumimushroomPlate - -- type: CP14Recipe - id: CP14ModularCuissesDayflinPlate - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14Dayflin - result: CP14ModularCuissesDayflinPlate \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Armor/Greave/modular_greave.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Armor/Greave/modular_greave.yml deleted file mode 100644 index c1099550cb..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Armor/Greave/modular_greave.yml +++ /dev/null @@ -1,26 +0,0 @@ -- type: CP14Recipe - id: CP14ModularGreaveBloodFlowerChainmail - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14BloodFlower - result: CP14ModularGreaveBloodFlowerChainmail - -- type: CP14Recipe - id: CP14ModularGreaveChromiumslimeChainmail - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14ChromiumSlime - result: CP14ModularGreaveChromiumslimeChainmail - -- type: CP14Recipe - id: CP14ModularGreaveDayflinChainmail - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14Dayflin - result: CP14ModularGreaveDayflinChainmail \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/axe.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/axe.yml deleted file mode 100644 index e88b032ca0..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/axe.yml +++ /dev/null @@ -1,26 +0,0 @@ -- type: CP14Recipe - id: CP14ModularBladeBloodflowerAxe - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14BloodFlower - result: CP14ModularBladeBloodflowerAxe - -- type: CP14Recipe - id: CP14ModularBladeChromiumslimeAxe - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14ChromiumSlime - result: CP14ModularBladeChromiumslimeAxe - -- type: CP14Recipe - id: CP14ModularBladeDayflinAxe - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14Dayflin - result: CP14ModularBladeDayflinAxe \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/dagger.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/dagger.yml deleted file mode 100644 index 2bfef41b59..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/dagger.yml +++ /dev/null @@ -1,26 +0,0 @@ -- type: CP14Recipe - id: CP14ModularBladeBloodflowerDagger - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14BloodFlower - result: CP14ModularBladeBloodflowerDagger - -- type: CP14Recipe - id: CP14ModularBladeChromiumslimeDagger - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14ChromiumSlime - result: CP14ModularBladeChromiumslimeDagger - -- type: CP14Recipe - id: CP14ModularBladeDayflinDagger - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14Dayflin - result: CP14ModularBladeDayflinDagger \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/hammer.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/hammer.yml deleted file mode 100644 index 6bfd96e770..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/hammer.yml +++ /dev/null @@ -1,26 +0,0 @@ -- type: CP14Recipe - id: CP14ModularBladeBloodflowerHammer - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14BloodFlower - result: CP14ModularBladeBloodflowerHammer - -- type: CP14Recipe - id: CP14ModularBladeChromiumslimeHammer - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14ChromiumSlime - result: CP14ModularBladeChromiumslimeHammer - -- type: CP14Recipe - id: CP14ModularBladeDayflinHammer - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14Dayflin - result: CP14ModularBladeDayflinHammer \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/mace.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/mace.yml deleted file mode 100644 index 9c5724206d..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/mace.yml +++ /dev/null @@ -1,26 +0,0 @@ -- type: CP14Recipe - id: CP14ModularBladeBloodflowerMace - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14BloodFlower - result: CP14ModularBladeBloodflowerMace - -- type: CP14Recipe - id: CP14ModularBladeChromiumslimeMace - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14ChromiumSlime - result: CP14ModularBladeChromiumslimeMace - -- type: CP14Recipe - id: CP14ModularBladeDayflinMace - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14Dayflin - result: CP14ModularBladeDayflinMace \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/pickaxe.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/pickaxe.yml deleted file mode 100644 index 2a605a833f..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/pickaxe.yml +++ /dev/null @@ -1,26 +0,0 @@ -- type: CP14Recipe - id: CP14ModularBladeBloodflowerPickaxe - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14BloodFlower - result: CP14ModularBladeBloodflowerPickaxe - -- type: CP14Recipe - id: CP14ModularBladeChromiumslimePickaxe - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14ChromiumSlime - result: CP14ModularBladeChromiumslimePickaxe - -- type: CP14Recipe - id: CP14ModularBladeDayflinPickaxe - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14Dayflin - result: CP14ModularBladeDayflinPickaxe \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/rapier.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/rapier.yml deleted file mode 100644 index 3f3dde59d7..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/rapier.yml +++ /dev/null @@ -1,26 +0,0 @@ -- type: CP14Recipe - id: CP14ModularBladeBloodflowerRapier - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14BloodFlower - result: CP14ModularBladeBloodflowerRapier - -- type: CP14Recipe - id: CP14ModularBladeChromiumslimeRapier - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14ChromiumSlime - result: CP14ModularBladeChromiumslimeRapier - -- type: CP14Recipe - id: CP14ModularBladeDayflinRapier - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14Dayflin - result: CP14ModularBladeDayflinRapier \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/shovel.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/shovel.yml deleted file mode 100644 index 560e347341..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/shovel.yml +++ /dev/null @@ -1,26 +0,0 @@ -- type: CP14Recipe - id: CP14ModularBladeBloodflowerShovel - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14BloodFlower - result: CP14ModularBladeBloodflowerShovel - -- type: CP14Recipe - id: CP14ModularBladeChromiumslimeShovel - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14ChromiumSlime - result: CP14ModularBladeChromiumslimeShovel - -- type: CP14Recipe - id: CP14ModularBladeDayflinShovel - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14Dayflin - result: CP14ModularBladeDayflinShovel \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/sickle.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/sickle.yml deleted file mode 100644 index a36af21189..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/sickle.yml +++ /dev/null @@ -1,26 +0,0 @@ -- type: CP14Recipe - id: CP14ModularBladeBloodflowerSickle - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14BloodFlower - result: CP14ModularBladeBloodflowerSickle - -- type: CP14Recipe - id: CP14ModularBladeChromiumslimeSickle - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14ChromiumSlime - result: CP14ModularBladeChromiumslimeSickle - -- type: CP14Recipe - id: CP14ModularBladeDayflinSickle - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14Dayflin - result: CP14ModularBladeDayflinSickle \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/spear.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/spear.yml deleted file mode 100644 index 57ddd343fd..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/spear.yml +++ /dev/null @@ -1,26 +0,0 @@ -- type: CP14Recipe - id: CP14ModularBladeBloodflowerSpear - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14BloodFlower - result: CP14ModularBladeBloodflowerSpear - -- type: CP14Recipe - id: CP14ModularBladeChromiumslimeSpear - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14ChromiumSlime - result: CP14ModularBladeChromiumslimeSpear - -- type: CP14Recipe - id: CP14ModularBladeDayflinSpear - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14Dayflin - result: CP14ModularBladeDayflinSpear \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/sword.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/sword.yml deleted file mode 100644 index 4f4515288c..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Blade/sword.yml +++ /dev/null @@ -1,26 +0,0 @@ -- type: CP14Recipe - id: CP14ModularBladeBloodflowerSword - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14BloodFlower - result: CP14ModularBladeBloodflowerSword - -- type: CP14Recipe - id: CP14ModularBladeChromiumslimeSword - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14ChromiumSlime - result: CP14ModularBladeChromiumslimeSword - -- type: CP14Recipe - id: CP14ModularBladeDayflinSword - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14Dayflin - result: CP14ModularBladeDayflinSword \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Garde/sharp.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Garde/sharp.yml deleted file mode 100644 index fb0fd0cb4a..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Garde/sharp.yml +++ /dev/null @@ -1,8 +0,0 @@ -- type: CP14Recipe - id: CP14ModularGardeSharpLumimushroom - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14LumiMushroom - result: CP14ModularGardeSharpLumimushroom \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Garde/sturdy.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Garde/sturdy.yml deleted file mode 100644 index b302d476b8..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Garde/sturdy.yml +++ /dev/null @@ -1,8 +0,0 @@ -- type: CP14Recipe - id: CP14ModularGardeSturdyLumimushroom - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14LumiMushroom - result: CP14ModularGardeSturdyLumimushroom \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/RISKOFRAINTWO.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/RISKOFRAINTWO.yml deleted file mode 100644 index 2a1950dd66..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/RISKOFRAINTWO.yml +++ /dev/null @@ -1,26 +0,0 @@ -- type: CP14Recipe - id: CP14ModularGripWoodenRISKOFRAINTWO - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14WoodLog - result: CP14ModularGripWooden - -- type: CP14Recipe - id: CP14ModularGripWoodenLongRISKOFRAINTWO - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14WoodLog - result: CP14ModularGripWoodenLong - -- type: CP14Recipe - id: CP14ModularRodWoodenRISKOFRAINTWO - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14WoodLog - result: CP14ModularRodWooden \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Tip/arrrrrrrrrrrrrrrrrorws.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Tip/arrrrrrrrrrrrrrrrrorws.yml deleted file mode 100644 index 8770f2decb..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Alchemist/Vat/Tip/arrrrrrrrrrrrrrrrrorws.yml +++ /dev/null @@ -1,8 +0,0 @@ -- type: CP14Recipe - id: CP14ModularTipAirlilyArrow - tag: CP14RecipeVat - craftTime: 4 - requirements: - - !type:ProtoIdResource - protoId: CP14AirLily - result: CP14ModularTipAirlilyArrow \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml new file mode 100644 index 0000000000..32246eaee9 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml @@ -0,0 +1,195 @@ +- type: CP14Recipe + id: CP14BaseShield + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14WoodenPlanks + count: 2 + - !type:StackResource + stack: CP14IronBar + count: 2 + result: CP14BaseShield + +- type: CP14Recipe + id: CP14BaseCrowbar + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14IronBar + count: 2 + result: CP14BaseCrowbar + +- type: CP14Recipe + id: CP14BaseWrench + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14IronBar + count: 2 + result: CP14BaseWrench + +- type: CP14Recipe + id: CP14PlatePie + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14IronBar + count: 1 + result: CP14PlatePie + +- type: CP14Recipe + id: CP14Nail20 + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14IronBar + count: 2 + result: CP14Nail20 + +- type: CP14Recipe + id: CP14CrystalLampBlueEmpty + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14CopperBar + count: 2 + - !type:StackResource + stack: CP14IronBar + count: 1 + result: CP14CrystalLampBlueEmpty + +- type: CP14Recipe + id: CP14Scissors + tag: CP14RecipeAnvil + craftTime: 2 + requirements: + - !type:StackResource + stack: CP14IronBar + count: 1 + result: CP14Scissors + +- type: CP14Recipe + id: CP14ClothingOuterClothingCopperArmor + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14CopperBar + count: 4 + result: CP14ClothingOuterClothingCopperArmor + +- type: CP14Recipe + id: CP14ClothingGlovesGirdles + tag: CP14RecipeAnvil + craftTime: 2 + requirements: + - !type:StackResource + stack: CP14IronBar + count: 1 + result: CP14ClothingGlovesGirdles + +- type: CP14Recipe + id: CP14CrossboltCopper + tag: CP14RecipeAnvil + craftTime: 1 + requirements: + - !type:StackResource + stack: CP14CopperBar + count: 1 + result: CP14CrossboltCopper + resultCount: 3 + +- type: CP14Recipe + id: CP14CrossboltIron + tag: CP14RecipeAnvil + craftTime: 1 + requirements: + - !type:StackResource + stack: CP14IronBar + count: 1 + result: CP14CrossboltIron + resultCount: 3 + +- type: CP14Recipe + id: CP14CrossboltGold + tag: CP14RecipeAnvil + craftTime: 1 + requirements: + - !type:StackResource + stack: CP14GoldBar + count: 1 + result: CP14CrossboltGold + resultCount: 3 + +- type: CP14Recipe + id: CP14CrossboltMithril + tag: CP14RecipeAnvil + craftTime: 1 + requirements: + - !type:StackResource + stack: CP14MithrilBar + count: 1 + result: CP14CrossboltMithril + resultCount: 3 + +- type: CP14Recipe + id: CP14BaseLockpick + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14IronBar + count: 1 + result: CP14BaseLockpick + +- type: CP14Recipe + id: CP14ClothingHeadCapellina + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14IronBar + count: 3 + result: CP14ClothingHeadCapellina + +- type: CP14Recipe + id: CP14ClothingHeadBascinet + tag: CP14RecipeAnvil + craftTime: 5 + requirements: + - !type:StackResource + stack: CP14IronBar #Add skin as well? + count: 4 + result: CP14ClothingHeadBascinet + +- type: CP14Recipe + id: CP14BaseLightCrossbow + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14CopperBar + count: 1 + - !type:StackResource + stack: CP14IronBar + count: 3 + - !type:ProtoIdResource + protoId: CP14String + count: 1 + result: CP14BaseLightCrossbow + +- type: CP14Recipe + id: CP14ClothingMaskSteelMask + tag: CP14RecipeAnvil + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14IronBar + count: 2 + result: CP14ClothingMaskSteelMask diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml new file mode 100644 index 0000000000..3ada6f8d61 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml @@ -0,0 +1,142 @@ +- type: CP14Recipe + id: CP14CopperBar1 + tag: CP14RecipeMeltingFurnace + craftTime: 4 + requirements: + - !type:MaterialResource + material: CP14Copper + count: 10 + result: CP14CopperBar1 + +- type: CP14Recipe + id: CP14IronBar1 + tag: CP14RecipeMeltingFurnace + craftTime: 4 + requirements: + - !type:MaterialResource + material: CP14Iron + count: 10 + result: CP14IronBar1 + +- type: CP14Recipe + id: CP14GoldBar1 + tag: CP14RecipeMeltingFurnace + craftTime: 4 + requirements: + - !type:MaterialResource + material: CP14Gold + count: 10 + result: CP14GoldBar1 + +- type: CP14Recipe + id: CP14MithrilBar1 + tag: CP14RecipeMeltingFurnace + craftTime: 4 + requirements: + - !type:MaterialResource + material: CP14Mithril + count: 10 + result: CP14MithrilBar1 + +- type: CP14Recipe + id: CP14GlassSheet1 + tag: CP14RecipeMeltingFurnace + craftTime: 4 + requirements: + - !type:ProtoIdResource + protoId: CP14CrystalShardBase + result: CP14GlassSheet1 + +- type: CP14Recipe + id: CP14GlassSheetShard1 + tag: CP14RecipeMeltingFurnace + craftTime: 2 + requirements: + - !type:ProtoIdResource + protoId: CP14GlassShard + count: 2 + result: CP14GlassSheet1 + +- type: CP14Recipe + id: CP14VialTiny + tag: CP14RecipeMeltingFurnace + craftTime: 3 + requirements: + - !type:StackResource + stack: CP14GlassSheet + count: 1 + result: CP14VialTiny + +- type: CP14Recipe + id: CP14VialTinyReinforced + tag: CP14RecipeMeltingFurnace + craftTime: 3 + requirements: + - !type:StackResource + stack: CP14CopperBar + count: 1 + - !type:StackResource + stack: CP14GlassSheet + count: 1 + result: CP14VialTinyReinforced + +- type: CP14Recipe + id: CP14VialSmall + tag: CP14RecipeMeltingFurnace + craftTime: 3 + requirements: + - !type:StackResource + stack: CP14GlassSheet + count: 2 + result: CP14VialSmall + +- type: CP14Recipe + id: CP14VialSmallReinforced + tag: CP14RecipeMeltingFurnace + craftTime: 3 + requirements: + - !type:StackResource + stack: CP14CopperBar + count: 1 + - !type:StackResource + stack: CP14GlassSheet + count: 2 + result: CP14VialSmallReinforced + +- type: CP14Recipe + id: CP14VialMedium + tag: CP14RecipeMeltingFurnace + craftTime: 3 + requirements: + - !type:StackResource + stack: CP14GlassSheet + count: 6 + result: CP14VialMedium + +- type: CP14Recipe + id: CP14VialMediumReinforced + tag: CP14RecipeMeltingFurnace + craftTime: 3 + requirements: + - !type:StackResource + stack: CP14CopperBar + count: 1 + - !type:StackResource + stack: CP14GlassSheet + count: 6 + result: CP14VialMediumReinforced + +- type: CP14Recipe + id: CP14BaseAlchemyBomb + tag: CP14RecipeMeltingFurnace + craftTime: 4 + requirements: + - !type:StackResource + stack: CP14GlassSheet + count: 9 + - !type:StackResource + stack: CP14GoldBar + count: 1 + result: CP14BaseAlchemyBomb + resultCount: 3 + diff --git a/Resources/Prototypes/_CP14/Skill/skill_tree.yml b/Resources/Prototypes/_CP14/Skill/skill_tree.yml index c996e5f17c..893f68e876 100644 --- a/Resources/Prototypes/_CP14/Skill/skill_tree.yml +++ b/Resources/Prototypes/_CP14/Skill/skill_tree.yml @@ -47,16 +47,7 @@ id: Atlethic name: cp14-skill-tree-atlethic-name desc: cp14-skill-tree-atlethic-desc - color: "#b32e37" + color: "#b32e37" icon: sprite: _CP14/Actions/skill_tree.rsi - state: atlethic - -- type: cp14SkillTree - id: VampireTree - name: cp14-skill-tree-vampire-name - desc: cp14-skill-tree-vampire-desc - color: "#E511B3" - icon: - sprite: _CP14/Actions/Spells/vampire.rsi - state: blood_moon \ No newline at end of file + state: atlethic \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Skill/vampire.yml b/Resources/Prototypes/_CP14/Skill/vampire.yml deleted file mode 100644 index 8cdcdb4b0e..0000000000 --- a/Resources/Prototypes/_CP14/Skill/vampire.yml +++ /dev/null @@ -1,19 +0,0 @@ -- type: cp14Skill - id: CP14ActionSpellVampireHypnosis - skillUiPosition: 2, 0 - tree: VampireTree - icon: - sprite: _CP14/Actions/Spells/vampire.rsi - state: blood_moon - effect: !type:AddAction - action: CP14ActionSpellVampireHypnosis - -- type: cp14Skill - id: CP14ActionSpellVampireBloodStep - skillUiPosition: 0, 4 - tree: VampireTree - icon: - sprite: _CP14/Actions/Spells/vampire.rsi - state: blood_step - effect: !type:AddAction - action: CP14ActionSpellVampireBloodStep \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/secret_weights.yml b/Resources/Prototypes/_CP14/secret_weights.yml index b01a12ef19..f58c13d9aa 100644 --- a/Resources/Prototypes/_CP14/secret_weights.yml +++ b/Resources/Prototypes/_CP14/secret_weights.yml @@ -1,5 +1,5 @@ - type: weightedRandom id: Secret weights: - CP14Sandbox: 0 - CP14Greenshift: 1 \ No newline at end of file + CP14Sandbox: 1 + CP14Greenshift: 0 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/tags.yml b/Resources/Prototypes/_CP14/tags.yml index ebf5d3b3d6..28c16b49a4 100644 --- a/Resources/Prototypes/_CP14/tags.yml +++ b/Resources/Prototypes/_CP14/tags.yml @@ -135,9 +135,3 @@ - type: Tag id: CP14Sheep - -- type: Tag - id: CP14RecipeAlchemistFurnace - -- type: Tag - id: CP14RecipeVat diff --git a/Resources/ServerInfo/_CP14/Guidebook_EN/TOPSECRET.xml b/Resources/ServerInfo/_CP14/Guidebook_EN/TOPSECRET.xml deleted file mode 100644 index 9831320f6d..0000000000 --- a/Resources/ServerInfo/_CP14/Guidebook_EN/TOPSECRET.xml +++ /dev/null @@ -1,7 +0,0 @@ - -# TOPSECRET -They will find you -Use mortar and pestle to get molten metals - - - \ No newline at end of file diff --git a/Resources/ServerInfo/_CP14/Guidebook_RU/TOPSECRET.xml b/Resources/ServerInfo/_CP14/Guidebook_RU/TOPSECRET.xml deleted file mode 100644 index 3cdd8f4112..0000000000 --- a/Resources/ServerInfo/_CP14/Guidebook_RU/TOPSECRET.xml +++ /dev/null @@ -1,7 +0,0 @@ - -# TOPSECRET -They will find you -Используйте ступку и пестик для получения расплавленных металлов - - - \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/mortar_pestle.rsi/mortar_base.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/mortar_pestle.rsi/mortar_base.png index e2676f0327..5c128df368 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/mortar_pestle.rsi/mortar_base.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/mortar_pestle.rsi/mortar_base.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/mortar_pestle.rsi/pestle.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/mortar_pestle.rsi/pestle.png index 8de5e01362..96a7f164fc 100644 Binary files a/Resources/Textures/_CP14/Objects/Specific/Alchemy/mortar_pestle.rsi/pestle.png and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/mortar_pestle.rsi/pestle.png differ diff --git a/Resources/Textures/_CP14/Structures/Decoration/wizard_statue.rsi/statue_wizard.png b/Resources/Textures/_CP14/Structures/Decoration/wizard_statue.rsi/statue_wizard.png index cc73c64822..28ad24e6ec 100644 Binary files a/Resources/Textures/_CP14/Structures/Decoration/wizard_statue.rsi/statue_wizard.png and b/Resources/Textures/_CP14/Structures/Decoration/wizard_statue.rsi/statue_wizard.png differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/full.png b/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/full.png index b87ced8806..5ce89a8332 100644 Binary files a/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/full.png and b/Resources/Textures/_CP14/Structures/Specific/Alchemy/alchemy_vat.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Structures/Specific/Blacksmith/anvil.rsi/icon.png b/Resources/Textures/_CP14/Structures/Specific/Blacksmith/anvil.rsi/icon.png index 1aeaac4cf5..b3688d843b 100644 Binary files a/Resources/Textures/_CP14/Structures/Specific/Blacksmith/anvil.rsi/icon.png and b/Resources/Textures/_CP14/Structures/Specific/Blacksmith/anvil.rsi/icon.png differ