From 548433baca9af82e38f583f6a421a6509c9179b9 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Thu, 21 Nov 2024 22:48:14 +0300 Subject: [PATCH] Torch craft (#603) * fix * Update crates.yml * loadout torch, flint craft workbench --- .../Prototypes/_CP14/Catalog/Fills/crates.yml | 9 ++++++--- .../_CP14/Entities/Objects/Tools/torch.yml | 5 ++++- .../_CP14/Loadouts/Jobs/general.yml | 7 +++++++ .../Construction/Graphs/Furniture/Misc.yml | 3 +++ .../_CP14/Recipes/Workbench/workbench.yml | 18 ++++++++++++++++++ .../Objects/Tools/torch.rsi/inhand-left.png | Bin 606 -> 624 bytes .../Objects/Tools/torch.rsi/inhand-right.png | Bin 606 -> 636 bytes .../_CP14/Objects/Tools/torch.rsi/meta.json | 6 ------ .../Tools/torch.rsi/unlit-inhand-left.png | Bin 624 -> 0 bytes .../Tools/torch.rsi/unlit-inhand-right.png | Bin 636 -> 0 bytes 10 files changed, 38 insertions(+), 10 deletions(-) delete mode 100644 Resources/Textures/_CP14/Objects/Tools/torch.rsi/unlit-inhand-left.png delete mode 100644 Resources/Textures/_CP14/Objects/Tools/torch.rsi/unlit-inhand-right.png diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml index 68bd2c962d..54991d73bb 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml @@ -49,17 +49,20 @@ - id: CP14BaseWrench weight: 2 - id: CP14Scissors + - id: CP14Torch + - id: CP14Lighter - id: CP14ManaOperationGlove - id: CP14BaseShovel - id: CP14BaseMop - id: CP14BaseBroom - id: CP14BasePickaxe - - id: CP14CrystalLampBlueEmpty - - id: CP14CrystalLampOrangeEmpty + - !type:GroupSelector + children: + - id: CP14CrystalLampBlueEmpty + - id: CP14CrystalLampOrangeEmpty - id: CP14Rope - id: CP14Nail10 - id: CP14EnergyCrystalSmall - - id: CP14Lighter - id: CP14BaseSharpeningStone - !type:NestedSelector tableId: CP14RandomVials diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/torch.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/torch.yml index 7d01108acd..fc0ab3c0d3 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/torch.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/torch.yml @@ -11,7 +11,10 @@ - state: torch-unlit map: ["fuel"] - type: Item - size: Small + size: Normal + shape: + - 0,0,0,2 + storedRotation: -65 - type: CP14FlammableAmbientSound - type: AmbientSound enabled: false diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index 992090b552..52584db7b3 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -305,6 +305,7 @@ - CP14BaseSickle - CP14BasePickaxe - CP14Lighter + - CP14Torch - type: loadout id: CP14MagicHealingStaff @@ -395,6 +396,12 @@ back: - CP14Lighter +- type: loadout + id: CP14Torch + storage: + back: + - CP14Torch + # Spells - type: loadoutGroup diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/Misc.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/Misc.yml index c2f9e347f4..154e0b996d 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/Misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/Misc.yml @@ -51,6 +51,9 @@ - material: CP14WoodenPlanks amount: 3 doAfter: 3 + - material: CP14Cloth + amount: 1 + doAfter: 1 - node: CP14WallmountTorch entity: CP14WallmountTorch diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml index 7799b114a4..0880398972 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml @@ -51,3 +51,21 @@ stacks: CP14WoodenPlanks: 3 result: CP14BaseBattleStaff + +- type: CP14Recipe + id: CP14Torch + tag: CP14RecipeWorkbench + craftTime: 4 + stacks: + CP14WoodenPlanks: 3 + CP14Cloth: 1 + result: CP14Torch + +- type: CP14Recipe + id: CP14Lighter + tag: CP14RecipeWorkbench + craftTime: 4 + stacks: + CP14Stone: 1 + CP14IronBar: 1 + result: CP14Lighter diff --git a/Resources/Textures/_CP14/Objects/Tools/torch.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Tools/torch.rsi/inhand-left.png index a8b07a415a1d4a5b7e077926e84928f9f9d02cb3..c03edb2a3cc762a2f015698eb0fb0e9b94455706 100644 GIT binary patch delta 586 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 KMNUMnLSTX%+z?a% diff --git a/Resources/Textures/_CP14/Objects/Tools/torch.rsi/unlit-inhand-right.png b/Resources/Textures/_CP14/Objects/Tools/torch.rsi/unlit-inhand-right.png deleted file mode 100644 index 3802583eb811c04c83d59450e33ccf4ab2ba0aeb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 636 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>U^4S`aSW-5 zdppa}`>=z^as3Ck4hGHP((;qN+OT-@10~sAKNbHl@bUH4am=-15kI)IxmlpJ;Dw4- z*`$Dj>ztm5@-2E&R9?B)S?sz;7FTc?*Na5u4ram1Q$$rST|8uioW+@u=PIdS!+U z3L=63tV3p|u`GDkm;CKGgTa@Y6;D}yJWz6DR%dWN-yY@Hz^|8NQow{qV%3UL+okJD znM#_^x=J*#J-D<`YuObIhR~b~U#Cd1F6inw_4A4Qr?)8~{Y(pH@6})Ap2&NIpO(EBwvIG>Kx@u?1xb8$y