From 6a77aa33e0bacb6a12f0bd40cd088d4a995fc0ec Mon Sep 17 00:00:00 2001 From: Ladyayla <125931230+TeaTimeDino@users.noreply.github.com> Date: Fri, 25 Oct 2024 15:48:20 -0400 Subject: [PATCH] Tires and BoS Flagpole (#627) * Flagpole yaml added midwestflag pole yml. Sorry its late * Added Tires added tire sprites and yml. Still needs the entity created * Added tire yaml Added yaml for the tires, also moved folder that held the tire pngs. Do not know if either are in their correct locations * The actual yaml He he... didnt save it the first time... * Wrong Sprite Size Did not notice i copy and pasted 32x62 and not 32x32. Oppsies * Solving this one at at time, hurray it needed to be named icon, so i fixed that * maybe? rsi folders hate me and i cant figure out why * fix meta --------- Co-authored-by: Peptide90 --- .../Entities/Objects/Decoration/flags.yml | 46 +++++++++++++++++- .../Entities/Structures/Furniture/junk.yml | 23 ++++++++- .../{midwestflagpole.png => icon.png} | Bin .../Flags/bos_flagpole.rsi/meta.json | 4 +- .../Decoration/tires.rsi/groundtires.png | Bin 0 -> 627 bytes .../Structures/Decoration/tires.rsi/meta.json | 17 +++++++ .../Decoration/tires.rsi/stackedtires.png | Bin 0 -> 496 bytes 7 files changed, 86 insertions(+), 4 deletions(-) rename Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/{midwestflagpole.png => icon.png} (100%) create mode 100644 Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/groundtires.png create mode 100644 Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/meta.json create mode 100644 Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/stackedtires.png diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Decoration/flags.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Decoration/flags.yml index d19cdc35347..589854a01a6 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Decoration/flags.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Decoration/flags.yml @@ -41,4 +41,48 @@ collection: WoodDestroy - !type:DoActsBehavior acts: [ "Destruction" ] - # N14TODO: Needs inhands sprites \ No newline at end of file + # N14TODO: Needs inhands sprites + + #BoS Flagpole +- type: entity + parent: BaseItem + id: N14DecorationFlagpoleBOS + name: BoS flag pole + description: A Midwest Brotherhood flag on a wooden pole. + components: + - type: Sprite + sprite: _Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi + state: icon + noRot: true + - type: MeleeWeapon + wideAnimationRotation: -135 + damage: + types: + Blunt: 10 + Structural: 5 + soundHit: + collection: MetalThud + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 5 + Structural: 10 + - type: Item + size: Huge + - type: UseDelay + delay: 1 + - type: Damageable + damageModifierSet: Wood + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - !type:DoActsBehavior + acts: [ "Destruction" ] \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/junk.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/junk.yml index 95bb7376fdc..e2265672492 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/junk.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/junk.yml @@ -293,4 +293,25 @@ - type: Sprite state: junk_clock drawdepth: Overdoors - - type: WallMount \ No newline at end of file + - type: WallMount + +#Tires +- type: entity + parent: N14JunkMetalBase #for the moment + id: N14JunkStackedTires + name: stack of tires + description: A stack of old, unusable tires. + components: + - type: Sprite + sprite: _Nuclear14/Structures/Decoration/tires.rsi + state: stackedtires + +- type: entity + parent: N14JunkMetalBase #for the moment + id: N14JunkGroundTires + name: a pile of tires + description: A pile of old, unusable tires spread on the ground. + components: + - type: Sprite + sprite: _Nuclear14/Structures/Decoration/tires.rsi + state: groundtires \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/midwestflagpole.png b/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/icon.png similarity index 100% rename from Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/midwestflagpole.png rename to Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/icon.png diff --git a/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/meta.json b/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/meta.json index 9f34352fe1a..63cfc9d1b9c 100644 --- a/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/meta.json +++ b/Resources/Textures/_Nuclear14/Objects/Decoration/Flags/bos_flagpole.rsi/meta.json @@ -4,11 +4,11 @@ "copyright": "made by ladyayla for Nuclear 14", "size": { "x": 32, - "y": 64 + "y": 32 }, "states": [ { - "name": "midwestflagpole" + "name": "icon" } ] } diff --git a/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/groundtires.png b/Resources/Textures/_Nuclear14/Structures/Decoration/tires.rsi/groundtires.png new file mode 100644 index 0000000000000000000000000000000000000000..2ba781f193c143bded269251508a73d9eb05bb9f GIT binary patch literal 627 zcmV-(0*w8MP)Px%ElET{R9HvFRxxhEKoC3%5_d)c1O+Mi|D!?y0wOFLClo~EWSsGO?`(o2uClH3 z&Ft>X-j2e9*XY6c;ok@>7K^JF+-|pPU=B`zz)$0G_`F=A2_})j2*e^zl^7%jAz;A~ zJy$9V*fTf*3tkjOBMEt)*YDVSHvupD{oxSJ{Cqa6wQ)BAfLpOK;<7AT!DU%iIfGe9 z66j+iB|st|;DIwGudCJdWjYPp?KZdsJYXKK(L%wN06-u*>venwFiDU=ON6ngDJ&eW z&nXfrMiqpDHwbirGddntr~Fie`MfDCfW+4O@z@q&A8_?`%W4jZR0Cor_xr=Q4P$lp z>;xO>V$HMX?3z!0J>GT66{jMUALVGIKdRWeysR0a=x~+-TS5Tk0(hkXOMn|dAm(Lc z0d;0QJ=NnJONgLKvL;|v`?lG%8VRjLk#!O1Dnp%tsyj{c%3^9Y?*Ik2zVCY@YR0N4 zS%wq=wHCS<7sb>Uoc}fE0juEUa@otrUEqC&lDf{C1>3p!u1y5rK)|z}mq~9fXbdDa z3s#i&fLQeW&)Qh$04-lb>9kF(p?E&l+AFxVFs@=YG2RC_&mBmte{J*75?KPV{!xkj zheRiVKK|t%?@IQ12>0te5Y50}2&6irW{D1il?NqYFDQLquh-#xKG&bPx$s!2paR9HvtR>7)+Fc7pLf(P*s5d8m-69f;UAc)X1@+RzC5@R%_6q<{gL}zw( zcg!RE@OXR}Kl>5*DexT%7-OEYTZ*FCAJ=vL*F?iGL%WhKQE{!Ko(t`l*Imc@>0eqZk&?I#3W%VZ|fZXbW@_7Md=3d+r@Kc!Aifc6WyW!`x&jfo0iP5+!ur@$q@{NRxZVU0C#nE>2R`?=42 ze9_-hz-Pa%e*lTm0oj7L2}mh@(Q9x#OApZ9ak>Vi{T_i!@5jgG*)jHX6n%>I5z{AU m?z?m#2}z%FJ(&VmNxc9!k-0F>!FH$s0000