From 9cda45064bf344cbbecb6215c1f5c0f737693b36 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Tue, 6 Aug 2024 22:59:00 +0300 Subject: [PATCH 1/4] Meteor Defense Turret --- .../Weapons/Guns/Projectiles/meteors.yml | 4 + .../Entities/Objects/Weapons/Guns/turrets.yml | 83 ++++++++++++++++++ Resources/Prototypes/_NF/ai_factions.yml | 11 +++ .../Weapons/Guns/Turrets/pdw.rsi/base.png | Bin 0 -> 839 bytes .../Weapons/Guns/Turrets/pdw.rsi/icon.png | Bin 0 -> 538 bytes .../Guns/Turrets/pdw.rsi/inhand-left.png | Bin 0 -> 732 bytes .../Guns/Turrets/pdw.rsi/inhand-right.png | Bin 0 -> 732 bytes .../Weapons/Guns/Turrets/pdw.rsi/mag-0.png | Bin 0 -> 153 bytes .../Weapons/Guns/Turrets/pdw.rsi/mag-1.png | Bin 0 -> 109 bytes .../Weapons/Guns/Turrets/pdw.rsi/mag-2.png | Bin 0 -> 119 bytes .../Weapons/Guns/Turrets/pdw.rsi/mag-3.png | Bin 0 -> 131 bytes .../Weapons/Guns/Turrets/pdw.rsi/mag-4.png | Bin 0 -> 134 bytes .../Weapons/Guns/Turrets/pdw.rsi/mag-5.png | Bin 0 -> 134 bytes .../Weapons/Guns/Turrets/pdw.rsi/mag-6.png | Bin 0 -> 136 bytes .../Weapons/Guns/Turrets/pdw.rsi/mag-7.png | Bin 0 -> 135 bytes .../Weapons/Guns/Turrets/pdw.rsi/meta.json | 59 +++++++++++++ .../Weapons/Guns/Turrets/pdw.rsi/packed.png | Bin 0 -> 538 bytes .../Weapons/Guns/Turrets/pdw.rsi/unshaded.png | Bin 0 -> 233 bytes RobustToolbox | 2 +- 19 files changed, 158 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/base.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-0.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-1.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-2.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-3.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-4.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-5.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-6.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-7.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/packed.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/unshaded.png diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml index 3468cade76b..34ce3f778c2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml @@ -41,6 +41,10 @@ explosionType: Default intensitySlope: 4 maxIntensity: 100 + - type: MobState # Frontier (otherwise NPCs won't attack the entity) + - type: NpcFactionMember # Frontier + factions: # Frontier + - SpaceDebris # Frontier - type: entity parent: BaseMeteor diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/turrets.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/turrets.yml index 2125ea1e1b4..b993a6f34c4 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/turrets.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/turrets.yml @@ -177,6 +177,89 @@ factions: - HostileUniversally +# Meteor defense turret +- type: entity + parent: + - BaseWeaponTurretEnergyNF + id: WeaponTurretLaserDebrisDefenseDeployed + name: PDALT + description: |- + A Point Defence Automated Laser Turret (PDALT). A laser turret designed for protection of vessels from space debris. Use screwdriver to disassemble. + suffix: Frontier, Debris Defense + components: + - type: HTN + rootTask: + task: TurretCompound + blackboard: + RotateSpeed: !type:Single + 9.423 + SoundTargetInLOS: !type:SoundPathSpecifier + path: /Audio/Effects/double_beep.ogg + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Turrets/pdw.rsi + - type: Gun + fireRate: 12 + minAngle: 1 + maxAngle: 5 + projectileSpeed: 70 + soundGunshot: + path: /Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg + params: + variation: 0.125 + soundEmpty: + path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg + - type: ProjectileBatteryAmmoProvider + proto: BulletEnergyGunLaser + fireCost: 10 + - type: NpcFactionMember + factions: + - DebrisDefenseWeapon + - type: Construction + deconstructionTarget: null + graph: WeaponTurretLaserDebrisDefensePackingGraph + node: WeaponTurretLaserDebrisDefensePacked + +- type: entity # folded turret + parent: BaseItem + id: WeaponTurretLaserDebrisDefensePacked + name: packed PDALT + description: |- + A disassembled and packed Point Defence Automated Laser Turret (PDALT). + suffix: NT, Packed + components: + - type: WeaponCaseInsertable + - type: MultiHandedItem + - type: SpawnAfterInteract + prototype: WeaponTurretLaserDebrisDefenseDeployed + doAfter: 5 + removeOnInteract: true + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Turrets/pdw.rsi + state: packed + - type: Item + size: Ginormous + shape: + - 0,0,3,3 + sprite: _NF/Objects/Weapons/Guns/Turrets/pdw.rsi + +- type: constructionGraph # deconstruction graph + id: WeaponTurretLaserDebrisDefensePackingGraph + start: WeaponTurretLaserDebrisDefensePacked + graph: + - node: WeaponTurretLaserDebrisDefensePacked + entity: WeaponTurretLaserDebrisDefenseDeployed + edges: + - to: WeaponTurretLaserDebrisDefensePacked + completed: + - !type:SpawnPrototype + prototype: WeaponTurretLaserDebrisDefensePacked + amount: 1 + - !type:EmptyAllContainers + - !type:DeleteEntity {} + steps: + - tool: Screwing + doAfter: 14 + ## Magazine fed, deployable NanoTrasen turret - type: entity # deployed turret parent: diff --git a/Resources/Prototypes/_NF/ai_factions.yml b/Resources/Prototypes/_NF/ai_factions.yml index 5c8dea137bf..6bfa69a46a0 100644 --- a/Resources/Prototypes/_NF/ai_factions.yml +++ b/Resources/Prototypes/_NF/ai_factions.yml @@ -465,3 +465,14 @@ - SiliconsExpeditionNF - AberrantFleshExpeditionNF - ContrabandClothing + +# Space debris and meteors +- type: npcFaction + id: SpaceDebris + +- type: npcFaction + id: DebrisDefenseWeapon + friendly: + - NanoTrasen + hostile: + - SpaceDebris diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..4c212958673091ed308449c615365af86779b4bb GIT binary patch literal 839 zcmV-N1GxN&P)Px&0ZBwbR9J<@S4~J8K@|StwxG~JQivqNx(15N=CDgKm}&)SS_)~27b%qf?8Sq< z^iaq}q&ax;(yP#3Qx8HfLTQD9@z6sW$YpadRf{oQ&_F-~RuI~CdkC}HMK_sAL;WBy zym{}N5;rHYBIMYhNceZ@YN5JV? zM{{nVR$y-SkqH2qUB#8P!7G@XZ1^p{`#@EY)CBUyGJ*jgI9-FONEiBWx`s;M5vsL1 zZCdskcsf}}WqT1-egHoj#g8F=0Kx4=2$OzP4%qTh)j)hKY6b&7>ZHMd5Am@mRZF%d zKo+mo>JUPHh=SMER}{PuLVi?hb!rkV2|Ss)X9BR!G+!(`<|l^Bm>722h!2S&IhY9$ z_Ivt1)TE4<97ZtUgBWQRpb+vy2sJMxF(M%t@F6CLp(bVQ>HCgcOa$z(FKWkBViZ$} zQKp!V2yAVZ&W&So*s_uFMSktjwhf2)0c1WFZI(e)YjsDjH*2FgmoGMA|CxZj{qEly zL^{I(xQPYTz?W}70RU=JMmobGodFh9*|O8Xl|VLE@Q~smB*cgWgYQF+BH{HRfZ>Mk z*F)fpFM-oFh!M#mKvc@+3a;03O9e<^d@O3lo?j)N6#FrM-1W3Pgy4F$w;!FEMq9TyZ6+AIH zYyzNCfW&l-fE{)PNPDVD*`WXnm|sK&uQ1uWNC9J0JuLqJ9&_H zM8Lk&Y_8xT)&5@;m`|-(JDpFhw6%AYKz@A}3g2t(bb7qsnwuW)x9kevi~Ra76A3E3 zx^vqEfSu(Tb7y(x+zZEUC%!bGRzTBFv7{!f#PJ&=7mkPx$)Ja4^R9J=Wl`(6=P!PxeYC8t(AXuqHyM#E{Ez(a=GBkATq7?UzUFu#CM|UZ9 zshj9f>KD+snZfWDV~m7CmqNx;?U4FvYOqfcIy65B+`IRGm*aAm2LuEJ{4t?T#NB3P z-g@do;5pRW8VcuG0H8K89VoJd(~BGCxXi-)yW*Uf4phxRE}Qn%EcOJR!_{q#DR!7e z)NNKgFIQv<0?&CKMV1hcMWJd2i0Po)tjt+r@3Dx;P=~4+h{vK(WC^XO{;J08?{F4 zi0OboJfQZru=T)K1IA-f2pJK8?yD0rB09YZRLub3KPg)!;FdG(cKA?7y{-A`3IJYS z-{>grE`f{)V)l{CrcrNe7+W^pFCQ=)xRnT>h}eJ3quvH>R<}~W!!!k@a)WmLg4sYv z#2O%C4QL_&=v0)-4WDvB0iSvMO$=wleN>abpp$zk_n6-^WP5L^=$*w zCm35cwd1iU#+Hp#GJ(<54vnUED3wfjG(XR*gZVN#K1$Gk`)F#1me+p1(bV4PrVR)P c2>8Ez0)~0LityZ%Qvd(}07*qoM6N<$fPx%mPtfGRCt{2nmudVP!xurl&%41FgPOq$|9`6LnyVfc5vv>(xqez#Y?A*CA53e zA!Da5A$08$+`+U%SI4H4h88bzoCMe4p$7i|b+9FD;f5=8ZL}^Btba=g{(FA`~0#WR>b*bAAleUg{;NdRbSgCP4Xa4@NR93s+$AA-Eb&mEectS zpfaj%j@{ap{#`PuGL^XI$)QqQfN}!%_qM4w+H`tj0P?FVWYQ@z=@j|Z6#zQDG4)29 z{k`otdr;O_q26f6T30y%ou9t|Xn9?Bo|S2NT?WGugW+iI+H9;&Heb9^nknx;evUPJ zlxIMvH>Txv$)r=*PKlk!ecLIKIlY)Bp%`ZmH;Qrs?EErNr1$$z_z!tq(RX2z2l&+1{!Q0m_m4=&YT!3-{?EG@rKOpEdjw2tBuc;{&j9H42$BUuYXJOhAskAP_nEw8Jyk1A6hf&ZZ)2!bF8_l&Px%mPtfGRCt{2nmudVP!xurl&%41FgPOq$|9`6LnyVfc5vv>(xqez#Y?A*CA53e zA!Da5A$08$+`+U%SI4H4h88bzoCMe4p$7i|b+9FD;f5=8ZL}^Btba=g{(FA`~0#WR>b*bAAleUg{;NdRbSgCP4Xa4@NR93s+$AA-Eb&mEectS zpfaj%j@{ap{#`PuGL^XI$)QqQfN}!%_qM4w+H`tj0P?FVWYQ@z=@j|Z6#zQDG4)29 z{k`otdr;O_q26f6T30y%ou9t|Xn9?Bo|S2NT?WGugW+iI+H9;&Heb9^nknx;evUPJ zlxIMvH>Txv$)r=*PKlk!ecLIKIlY)Bp%`ZmH;Qrs?EErNr1$$z_z!tq(RX2z2l&+1{!Q0m_m4=&YT!3-{?EG@rKOpEdjw2tBuc;{&j9H42$BUuYXJOhAskAP_nEw8Jyk1A6hf&ZZ)2!bF8_l&Nn{1`ISV`@iy0XB4ude`@%$AjKtVlE7srqc=eNfi7DSR~!WG s{>98_mdKI;Vst01J{SFaQ7m literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..c5bf0bcad20f39b9f41a459f2dcd1ebfdeaf841b GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}>Ygr+ArY-_ z&oS~cFt9KfNNy4FcS@S^*8c-X!}(2Bo2u5yGcbI(&1CVPCA=*-c{xxEgQu&X%Q~lo FCIEcZ9>M?s literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..8c6b7d450354ea5b6aa7ac9ba14ef52b8cdc3dc3 GIT binary patch literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}hMq2tArY-_ z&loZ?7;qdpz_Yc{`_02ub60l67gsY)5?L{C?L1#O_0IddJ@q^%sc<&%yH~K+Zoi=U Q0;rk6)78&qol`;+09+9z761SM literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-3.png new file mode 100644 index 0000000000000000000000000000000000000000..093ce0cf91ea8762534044f96fe94e3ca18381f3 GIT binary patch literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}ww^AIArY-_ z&n@I-P!M1_C~6T<;#q0Z_Q+J^W7C8;KlaLa{EC$S{Ke2eZE?z@C~1b*R~tL#o>cXm cq{3LhD7=uvH~Y(p1fW3-p00i_>zopr08axdl>h($ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-4.png new file mode 100644 index 0000000000000000000000000000000000000000..59fd6a9d582d2db69151183d940ef5fb53247436 GIT binary patch literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}4xTQKArY-_ zFD&F`P!Mpw$aQBUQ}n&6H7$=!cmjpa)bH~R=4?oOVx#=L&}x?Ox?6sC%i%#^LMNAmM^w=*rDYqwViE^>D(Rm e54zcb+8Jct#PB$?-Mu>-#PM|Xb6Mw<&;$T6Z7h`l literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-6.png new file mode 100644 index 0000000000000000000000000000000000000000..ba6211c710229fe296378b5748ce4d5bcbad54f1 GIT binary patch literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}PM$7~ArY-_ zFD&F`P!Mpw$aQBUQ}n&6H7$=!cmjpa)bH~R<}~P;lm5iU&%O9i=Srim48F#nIsMP|HW1I#)z4*}Q$iB}{S7MK literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-7.png new file mode 100644 index 0000000000000000000000000000000000000000..a80b33723521b337900a0bd88da23e2c0ce17b95 GIT binary patch literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}j-D=#ArY-_ zFD&F`P!Mpw$aQDojY%K#3`H^|7BxBi`Z9Bhy4UB8Mph#f;gV8elF{r5}E)wQY(4@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/meta.json new file mode 100644 index 00000000000..f4a9fbef54c --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/meta.json @@ -0,0 +1,59 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Sprites made by Stagnation (discord) for SS14 New Frontier", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-0", + "delays": + [ + [ 0.2, 0.2 ] + ] + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + }, + { + "name": "mag-5" + }, + { + "name": "mag-6" + }, + { + "name": "mag-7" + }, + { + "name": "packed" + }, + { + "name": "icon" + }, + { + "name": "unshaded" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/packed.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/packed.png new file mode 100644 index 0000000000000000000000000000000000000000..7e06d52b64e1cb7a871240c1f2310f4c49948092 GIT binary patch literal 538 zcmV+#0_FXQP)Px$)Ja4^R9J=Wl`(6=P!PxeYC8t(AXuqHyM#E{Ez(a=GBkATq7?UzUFu#CM|UZ9 zshj9f>KD+snZfWDV~m7CmqNx;?U4FvYOqfcIy65B+`IRGm*aAm2LuEJ{4t?T#NB3P z-g@do;5pRW8VcuG0H8K89VoJd(~BGCxXi-)yW*Uf4phxRE}Qn%EcOJR!_{q#DR!7e z)NNKgFIQv<0?&CKMV1hcMWJd2i0Po)tjt+r@3Dx;P=~4+h{vK(WC^XO{;J08?{F4 zi0OboJfQZru=T)K1IA-f2pJK8?yD0rB09YZRLub3KPg)!;FdG(cKA?7y{-A`3IJYS z-{>grE`f{)V)l{CrcrNe7+W^pFCQ=)xRnT>h}eJ3quvH>R<}~W!!!k@a)WmLg4sYv z#2O%C4QL_&=v0)-4WDvB0iSvMO$=wleN>abpp$zk_n6-^WP5L^=$*w zCm35cwd1iU#+Hp#GJ(<54vnUED3wfjG(XR*gZVN#K1$Gk`)F#1me+p1(bV4PrVR)P c2>8Ez0)~0LityZ%Qvd(}07*qoM6N<$f Date: Wed, 7 Aug 2024 00:09:00 +0300 Subject: [PATCH 2/4] Revert "Meteor Defense Turret" This reverts commit 9cda45064bf344cbbecb6215c1f5c0f737693b36. --- .../Weapons/Guns/Projectiles/meteors.yml | 4 - .../Entities/Objects/Weapons/Guns/turrets.yml | 83 ------------------ Resources/Prototypes/_NF/ai_factions.yml | 11 --- .../Weapons/Guns/Turrets/pdw.rsi/base.png | Bin 839 -> 0 bytes .../Weapons/Guns/Turrets/pdw.rsi/icon.png | Bin 538 -> 0 bytes .../Guns/Turrets/pdw.rsi/inhand-left.png | Bin 732 -> 0 bytes .../Guns/Turrets/pdw.rsi/inhand-right.png | Bin 732 -> 0 bytes .../Weapons/Guns/Turrets/pdw.rsi/mag-0.png | Bin 153 -> 0 bytes .../Weapons/Guns/Turrets/pdw.rsi/mag-1.png | Bin 109 -> 0 bytes .../Weapons/Guns/Turrets/pdw.rsi/mag-2.png | Bin 119 -> 0 bytes .../Weapons/Guns/Turrets/pdw.rsi/mag-3.png | Bin 131 -> 0 bytes .../Weapons/Guns/Turrets/pdw.rsi/mag-4.png | Bin 134 -> 0 bytes .../Weapons/Guns/Turrets/pdw.rsi/mag-5.png | Bin 134 -> 0 bytes .../Weapons/Guns/Turrets/pdw.rsi/mag-6.png | Bin 136 -> 0 bytes .../Weapons/Guns/Turrets/pdw.rsi/mag-7.png | Bin 135 -> 0 bytes .../Weapons/Guns/Turrets/pdw.rsi/meta.json | 59 ------------- .../Weapons/Guns/Turrets/pdw.rsi/packed.png | Bin 538 -> 0 bytes .../Weapons/Guns/Turrets/pdw.rsi/unshaded.png | Bin 233 -> 0 bytes RobustToolbox | 2 +- 19 files changed, 1 insertion(+), 158 deletions(-) delete mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/base.png delete mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/icon.png delete mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/inhand-left.png delete mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/inhand-right.png delete mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-0.png delete mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-1.png delete mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-2.png delete mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-3.png delete mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-4.png delete mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-5.png delete mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-6.png delete mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-7.png delete mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/meta.json delete mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/packed.png delete mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/unshaded.png diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml index 34ce3f778c2..3468cade76b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml @@ -41,10 +41,6 @@ explosionType: Default intensitySlope: 4 maxIntensity: 100 - - type: MobState # Frontier (otherwise NPCs won't attack the entity) - - type: NpcFactionMember # Frontier - factions: # Frontier - - SpaceDebris # Frontier - type: entity parent: BaseMeteor diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/turrets.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/turrets.yml index b993a6f34c4..2125ea1e1b4 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/turrets.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/turrets.yml @@ -177,89 +177,6 @@ factions: - HostileUniversally -# Meteor defense turret -- type: entity - parent: - - BaseWeaponTurretEnergyNF - id: WeaponTurretLaserDebrisDefenseDeployed - name: PDALT - description: |- - A Point Defence Automated Laser Turret (PDALT). A laser turret designed for protection of vessels from space debris. Use screwdriver to disassemble. - suffix: Frontier, Debris Defense - components: - - type: HTN - rootTask: - task: TurretCompound - blackboard: - RotateSpeed: !type:Single - 9.423 - SoundTargetInLOS: !type:SoundPathSpecifier - path: /Audio/Effects/double_beep.ogg - - type: Sprite - sprite: _NF/Objects/Weapons/Guns/Turrets/pdw.rsi - - type: Gun - fireRate: 12 - minAngle: 1 - maxAngle: 5 - projectileSpeed: 70 - soundGunshot: - path: /Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg - params: - variation: 0.125 - soundEmpty: - path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg - - type: ProjectileBatteryAmmoProvider - proto: BulletEnergyGunLaser - fireCost: 10 - - type: NpcFactionMember - factions: - - DebrisDefenseWeapon - - type: Construction - deconstructionTarget: null - graph: WeaponTurretLaserDebrisDefensePackingGraph - node: WeaponTurretLaserDebrisDefensePacked - -- type: entity # folded turret - parent: BaseItem - id: WeaponTurretLaserDebrisDefensePacked - name: packed PDALT - description: |- - A disassembled and packed Point Defence Automated Laser Turret (PDALT). - suffix: NT, Packed - components: - - type: WeaponCaseInsertable - - type: MultiHandedItem - - type: SpawnAfterInteract - prototype: WeaponTurretLaserDebrisDefenseDeployed - doAfter: 5 - removeOnInteract: true - - type: Sprite - sprite: _NF/Objects/Weapons/Guns/Turrets/pdw.rsi - state: packed - - type: Item - size: Ginormous - shape: - - 0,0,3,3 - sprite: _NF/Objects/Weapons/Guns/Turrets/pdw.rsi - -- type: constructionGraph # deconstruction graph - id: WeaponTurretLaserDebrisDefensePackingGraph - start: WeaponTurretLaserDebrisDefensePacked - graph: - - node: WeaponTurretLaserDebrisDefensePacked - entity: WeaponTurretLaserDebrisDefenseDeployed - edges: - - to: WeaponTurretLaserDebrisDefensePacked - completed: - - !type:SpawnPrototype - prototype: WeaponTurretLaserDebrisDefensePacked - amount: 1 - - !type:EmptyAllContainers - - !type:DeleteEntity {} - steps: - - tool: Screwing - doAfter: 14 - ## Magazine fed, deployable NanoTrasen turret - type: entity # deployed turret parent: diff --git a/Resources/Prototypes/_NF/ai_factions.yml b/Resources/Prototypes/_NF/ai_factions.yml index 6bfa69a46a0..5c8dea137bf 100644 --- a/Resources/Prototypes/_NF/ai_factions.yml +++ b/Resources/Prototypes/_NF/ai_factions.yml @@ -465,14 +465,3 @@ - SiliconsExpeditionNF - AberrantFleshExpeditionNF - ContrabandClothing - -# Space debris and meteors -- type: npcFaction - id: SpaceDebris - -- type: npcFaction - id: DebrisDefenseWeapon - friendly: - - NanoTrasen - hostile: - - SpaceDebris diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/base.png deleted file mode 100644 index 4c212958673091ed308449c615365af86779b4bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 839 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 s{>98_mdKI;Vst01J{SFaQ7m diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-1.png deleted file mode 100644 index c5bf0bcad20f39b9f41a459f2dcd1ebfdeaf841b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}>Ygr+ArY-_ z&oS~cFt9KfNNy4FcS@S^*8c-X!}(2Bo2u5yGcbI(&1CVPCA=*-c{xxEgQu&X%Q~lo FCIEcZ9>M?s diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-2.png deleted file mode 100644 index 8c6b7d450354ea5b6aa7ac9ba14ef52b8cdc3dc3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}hMq2tArY-_ z&loZ?7;qdpz_Yc{`_02ub60l67gsY)5?L{C?L1#O_0IddJ@q^%sc<&%yH~K+Zoi=U Q0;rk6)78&qol`;+09+9z761SM diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-3.png deleted file mode 100644 index 093ce0cf91ea8762534044f96fe94e3ca18381f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}ww^AIArY-_ z&n@I-P!M1_C~6T<;#q0Z_Q+J^W7C8;KlaLa{EC$S{Ke2eZE?z@C~1b*R~tL#o>cXm cq{3LhD7=uvH~Y(p1fW3-p00i_>zopr08axdl>h($ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-4.png deleted file mode 100644 index 59fd6a9d582d2db69151183d940ef5fb53247436..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}4xTQKArY-_ zFD&F`P!Mpw$aQBUQ}n&6H7$=!cmjpa)bH~R=4?oOVx#=L&}x?Ox?6sC%i%#^LMNAmM^w=*rDYqwViE^>D(Rm e54zcb+8Jct#PB$?-Mu>-#PM|Xb6Mw<&;$T6Z7h`l diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-6.png deleted file mode 100644 index ba6211c710229fe296378b5748ce4d5bcbad54f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}PM$7~ArY-_ zFD&F`P!Mpw$aQBUQ}n&6H7$=!cmjpa)bH~R<}~P;lm5iU&%O9i=Srim48F#nIsMP|HW1I#)z4*}Q$iB}{S7MK diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-7.png deleted file mode 100644 index a80b33723521b337900a0bd88da23e2c0ce17b95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}j-D=#ArY-_ zFD&F`P!Mpw$aQDojY%K#3`H^|7BxBi`Z9Bhy4UB8Mph#f;gV8elF{r5}E)wQY(4@ diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/meta.json deleted file mode 100644 index f4a9fbef54c..00000000000 --- a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/meta.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-NC-SA-4.0", - "copyright": "Sprites made by Stagnation (discord) for SS14 New Frontier", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "base" - }, - { - "name": "mag-0", - "delays": - [ - [ 0.2, 0.2 ] - ] - }, - { - "name": "mag-1" - }, - { - "name": "mag-2" - }, - { - "name": "mag-3" - }, - { - "name": "mag-4" - }, - { - "name": "mag-5" - }, - { - "name": "mag-6" - }, - { - "name": "mag-7" - }, - { - "name": "packed" - }, - { - "name": "icon" - }, - { - "name": "unshaded" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/packed.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/packed.png deleted file mode 100644 index 7e06d52b64e1cb7a871240c1f2310f4c49948092..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 538 zcmV+#0_FXQP)Px$)Ja4^R9J=Wl`(6=P!PxeYC8t(AXuqHyM#E{Ez(a=GBkATq7?UzUFu#CM|UZ9 zshj9f>KD+snZfWDV~m7CmqNx;?U4FvYOqfcIy65B+`IRGm*aAm2LuEJ{4t?T#NB3P z-g@do;5pRW8VcuG0H8K89VoJd(~BGCxXi-)yW*Uf4phxRE}Qn%EcOJR!_{q#DR!7e z)NNKgFIQv<0?&CKMV1hcMWJd2i0Po)tjt+r@3Dx;P=~4+h{vK(WC^XO{;J08?{F4 zi0OboJfQZru=T)K1IA-f2pJK8?yD0rB09YZRLub3KPg)!;FdG(cKA?7y{-A`3IJYS z-{>grE`f{)V)l{CrcrNe7+W^pFCQ=)xRnT>h}eJ3quvH>R<}~W!!!k@a)WmLg4sYv z#2O%C4QL_&=v0)-4WDvB0iSvMO$=wleN>abpp$zk_n6-^WP5L^=$*w zCm35cwd1iU#+Hp#GJ(<54vnUED3wfjG(XR*gZVN#K1$Gk`)F#1me+p1(bV4PrVR)P c2>8Ez0)~0LityZ%Qvd(}07*qoM6N<$f Date: Wed, 7 Aug 2024 00:13:54 +0300 Subject: [PATCH 3/4] submodule begone --- .../Entities/Objects/Weapons/Guns/turrets.yml | 83 ++++++++++++++++++ Resources/Prototypes/_NF/ai_factions.yml | 11 +++ .../Weapons/Guns/Turrets/pdw.rsi/base.png | Bin 0 -> 839 bytes .../Weapons/Guns/Turrets/pdw.rsi/icon.png | Bin 0 -> 538 bytes .../Guns/Turrets/pdw.rsi/inhand-left.png | Bin 0 -> 732 bytes .../Guns/Turrets/pdw.rsi/inhand-right.png | Bin 0 -> 732 bytes .../Weapons/Guns/Turrets/pdw.rsi/mag-0.png | Bin 0 -> 153 bytes .../Weapons/Guns/Turrets/pdw.rsi/mag-1.png | Bin 0 -> 109 bytes .../Weapons/Guns/Turrets/pdw.rsi/mag-2.png | Bin 0 -> 119 bytes .../Weapons/Guns/Turrets/pdw.rsi/mag-3.png | Bin 0 -> 131 bytes .../Weapons/Guns/Turrets/pdw.rsi/mag-4.png | Bin 0 -> 134 bytes .../Weapons/Guns/Turrets/pdw.rsi/mag-5.png | Bin 0 -> 134 bytes .../Weapons/Guns/Turrets/pdw.rsi/mag-6.png | Bin 0 -> 136 bytes .../Weapons/Guns/Turrets/pdw.rsi/mag-7.png | Bin 0 -> 135 bytes .../Weapons/Guns/Turrets/pdw.rsi/meta.json | 59 +++++++++++++ .../Weapons/Guns/Turrets/pdw.rsi/packed.png | Bin 0 -> 538 bytes .../Weapons/Guns/Turrets/pdw.rsi/unshaded.png | Bin 0 -> 233 bytes 17 files changed, 153 insertions(+) create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/base.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-0.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-1.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-2.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-3.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-4.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-5.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-6.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-7.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/packed.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/unshaded.png diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/turrets.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/turrets.yml index 2125ea1e1b4..b993a6f34c4 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/turrets.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/turrets.yml @@ -177,6 +177,89 @@ factions: - HostileUniversally +# Meteor defense turret +- type: entity + parent: + - BaseWeaponTurretEnergyNF + id: WeaponTurretLaserDebrisDefenseDeployed + name: PDALT + description: |- + A Point Defence Automated Laser Turret (PDALT). A laser turret designed for protection of vessels from space debris. Use screwdriver to disassemble. + suffix: Frontier, Debris Defense + components: + - type: HTN + rootTask: + task: TurretCompound + blackboard: + RotateSpeed: !type:Single + 9.423 + SoundTargetInLOS: !type:SoundPathSpecifier + path: /Audio/Effects/double_beep.ogg + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Turrets/pdw.rsi + - type: Gun + fireRate: 12 + minAngle: 1 + maxAngle: 5 + projectileSpeed: 70 + soundGunshot: + path: /Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg + params: + variation: 0.125 + soundEmpty: + path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg + - type: ProjectileBatteryAmmoProvider + proto: BulletEnergyGunLaser + fireCost: 10 + - type: NpcFactionMember + factions: + - DebrisDefenseWeapon + - type: Construction + deconstructionTarget: null + graph: WeaponTurretLaserDebrisDefensePackingGraph + node: WeaponTurretLaserDebrisDefensePacked + +- type: entity # folded turret + parent: BaseItem + id: WeaponTurretLaserDebrisDefensePacked + name: packed PDALT + description: |- + A disassembled and packed Point Defence Automated Laser Turret (PDALT). + suffix: NT, Packed + components: + - type: WeaponCaseInsertable + - type: MultiHandedItem + - type: SpawnAfterInteract + prototype: WeaponTurretLaserDebrisDefenseDeployed + doAfter: 5 + removeOnInteract: true + - type: Sprite + sprite: _NF/Objects/Weapons/Guns/Turrets/pdw.rsi + state: packed + - type: Item + size: Ginormous + shape: + - 0,0,3,3 + sprite: _NF/Objects/Weapons/Guns/Turrets/pdw.rsi + +- type: constructionGraph # deconstruction graph + id: WeaponTurretLaserDebrisDefensePackingGraph + start: WeaponTurretLaserDebrisDefensePacked + graph: + - node: WeaponTurretLaserDebrisDefensePacked + entity: WeaponTurretLaserDebrisDefenseDeployed + edges: + - to: WeaponTurretLaserDebrisDefensePacked + completed: + - !type:SpawnPrototype + prototype: WeaponTurretLaserDebrisDefensePacked + amount: 1 + - !type:EmptyAllContainers + - !type:DeleteEntity {} + steps: + - tool: Screwing + doAfter: 14 + ## Magazine fed, deployable NanoTrasen turret - type: entity # deployed turret parent: diff --git a/Resources/Prototypes/_NF/ai_factions.yml b/Resources/Prototypes/_NF/ai_factions.yml index 5c8dea137bf..6bfa69a46a0 100644 --- a/Resources/Prototypes/_NF/ai_factions.yml +++ b/Resources/Prototypes/_NF/ai_factions.yml @@ -465,3 +465,14 @@ - SiliconsExpeditionNF - AberrantFleshExpeditionNF - ContrabandClothing + +# Space debris and meteors +- type: npcFaction + id: SpaceDebris + +- type: npcFaction + id: DebrisDefenseWeapon + friendly: + - NanoTrasen + hostile: + - SpaceDebris diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/base.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..4c212958673091ed308449c615365af86779b4bb GIT binary patch literal 839 zcmV-N1GxN&P)Px&0ZBwbR9J<@S4~J8K@|StwxG~JQivqNx(15N=CDgKm}&)SS_)~27b%qf?8Sq< z^iaq}q&ax;(yP#3Qx8HfLTQD9@z6sW$YpadRf{oQ&_F-~RuI~CdkC}HMK_sAL;WBy zym{}N5;rHYBIMYhNceZ@YN5JV? zM{{nVR$y-SkqH2qUB#8P!7G@XZ1^p{`#@EY)CBUyGJ*jgI9-FONEiBWx`s;M5vsL1 zZCdskcsf}}WqT1-egHoj#g8F=0Kx4=2$OzP4%qTh)j)hKY6b&7>ZHMd5Am@mRZF%d zKo+mo>JUPHh=SMER}{PuLVi?hb!rkV2|Ss)X9BR!G+!(`<|l^Bm>722h!2S&IhY9$ z_Ivt1)TE4<97ZtUgBWQRpb+vy2sJMxF(M%t@F6CLp(bVQ>HCgcOa$z(FKWkBViZ$} zQKp!V2yAVZ&W&So*s_uFMSktjwhf2)0c1WFZI(e)YjsDjH*2FgmoGMA|CxZj{qEly zL^{I(xQPYTz?W}70RU=JMmobGodFh9*|O8Xl|VLE@Q~smB*cgWgYQF+BH{HRfZ>Mk z*F)fpFM-oFh!M#mKvc@+3a;03O9e<^d@O3lo?j)N6#FrM-1W3Pgy4F$w;!FEMq9TyZ6+AIH zYyzNCfW&l-fE{)PNPDVD*`WXnm|sK&uQ1uWNC9J0JuLqJ9&_H zM8Lk&Y_8xT)&5@;m`|-(JDpFhw6%AYKz@A}3g2t(bb7qsnwuW)x9kevi~Ra76A3E3 zx^vqEfSu(Tb7y(x+zZEUC%!bGRzTBFv7{!f#PJ&=7mkPx$)Ja4^R9J=Wl`(6=P!PxeYC8t(AXuqHyM#E{Ez(a=GBkATq7?UzUFu#CM|UZ9 zshj9f>KD+snZfWDV~m7CmqNx;?U4FvYOqfcIy65B+`IRGm*aAm2LuEJ{4t?T#NB3P z-g@do;5pRW8VcuG0H8K89VoJd(~BGCxXi-)yW*Uf4phxRE}Qn%EcOJR!_{q#DR!7e z)NNKgFIQv<0?&CKMV1hcMWJd2i0Po)tjt+r@3Dx;P=~4+h{vK(WC^XO{;J08?{F4 zi0OboJfQZru=T)K1IA-f2pJK8?yD0rB09YZRLub3KPg)!;FdG(cKA?7y{-A`3IJYS z-{>grE`f{)V)l{CrcrNe7+W^pFCQ=)xRnT>h}eJ3quvH>R<}~W!!!k@a)WmLg4sYv z#2O%C4QL_&=v0)-4WDvB0iSvMO$=wleN>abpp$zk_n6-^WP5L^=$*w zCm35cwd1iU#+Hp#GJ(<54vnUED3wfjG(XR*gZVN#K1$Gk`)F#1me+p1(bV4PrVR)P c2>8Ez0)~0LityZ%Qvd(}07*qoM6N<$fPx%mPtfGRCt{2nmudVP!xurl&%41FgPOq$|9`6LnyVfc5vv>(xqez#Y?A*CA53e zA!Da5A$08$+`+U%SI4H4h88bzoCMe4p$7i|b+9FD;f5=8ZL}^Btba=g{(FA`~0#WR>b*bAAleUg{;NdRbSgCP4Xa4@NR93s+$AA-Eb&mEectS zpfaj%j@{ap{#`PuGL^XI$)QqQfN}!%_qM4w+H`tj0P?FVWYQ@z=@j|Z6#zQDG4)29 z{k`otdr;O_q26f6T30y%ou9t|Xn9?Bo|S2NT?WGugW+iI+H9;&Heb9^nknx;evUPJ zlxIMvH>Txv$)r=*PKlk!ecLIKIlY)Bp%`ZmH;Qrs?EErNr1$$z_z!tq(RX2z2l&+1{!Q0m_m4=&YT!3-{?EG@rKOpEdjw2tBuc;{&j9H42$BUuYXJOhAskAP_nEw8Jyk1A6hf&ZZ)2!bF8_l&Px%mPtfGRCt{2nmudVP!xurl&%41FgPOq$|9`6LnyVfc5vv>(xqez#Y?A*CA53e zA!Da5A$08$+`+U%SI4H4h88bzoCMe4p$7i|b+9FD;f5=8ZL}^Btba=g{(FA`~0#WR>b*bAAleUg{;NdRbSgCP4Xa4@NR93s+$AA-Eb&mEectS zpfaj%j@{ap{#`PuGL^XI$)QqQfN}!%_qM4w+H`tj0P?FVWYQ@z=@j|Z6#zQDG4)29 z{k`otdr;O_q26f6T30y%ou9t|Xn9?Bo|S2NT?WGugW+iI+H9;&Heb9^nknx;evUPJ zlxIMvH>Txv$)r=*PKlk!ecLIKIlY)Bp%`ZmH;Qrs?EErNr1$$z_z!tq(RX2z2l&+1{!Q0m_m4=&YT!3-{?EG@rKOpEdjw2tBuc;{&j9H42$BUuYXJOhAskAP_nEw8Jyk1A6hf&ZZ)2!bF8_l&Nn{1`ISV`@iy0XB4ude`@%$AjKtVlE7srqc=eNfi7DSR~!WG s{>98_mdKI;Vst01J{SFaQ7m literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-1.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-1.png new file mode 100644 index 0000000000000000000000000000000000000000..c5bf0bcad20f39b9f41a459f2dcd1ebfdeaf841b GIT binary patch literal 109 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}>Ygr+ArY-_ z&oS~cFt9KfNNy4FcS@S^*8c-X!}(2Bo2u5yGcbI(&1CVPCA=*-c{xxEgQu&X%Q~lo FCIEcZ9>M?s literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-2.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-2.png new file mode 100644 index 0000000000000000000000000000000000000000..8c6b7d450354ea5b6aa7ac9ba14ef52b8cdc3dc3 GIT binary patch literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}hMq2tArY-_ z&loZ?7;qdpz_Yc{`_02ub60l67gsY)5?L{C?L1#O_0IddJ@q^%sc<&%yH~K+Zoi=U Q0;rk6)78&qol`;+09+9z761SM literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-3.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-3.png new file mode 100644 index 0000000000000000000000000000000000000000..093ce0cf91ea8762534044f96fe94e3ca18381f3 GIT binary patch literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}ww^AIArY-_ z&n@I-P!M1_C~6T<;#q0Z_Q+J^W7C8;KlaLa{EC$S{Ke2eZE?z@C~1b*R~tL#o>cXm cq{3LhD7=uvH~Y(p1fW3-p00i_>zopr08axdl>h($ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-4.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-4.png new file mode 100644 index 0000000000000000000000000000000000000000..59fd6a9d582d2db69151183d940ef5fb53247436 GIT binary patch literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}4xTQKArY-_ zFD&F`P!Mpw$aQBUQ}n&6H7$=!cmjpa)bH~R=4?oOVx#=L&}x?Ox?6sC%i%#^LMNAmM^w=*rDYqwViE^>D(Rm e54zcb+8Jct#PB$?-Mu>-#PM|Xb6Mw<&;$T6Z7h`l literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-6.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-6.png new file mode 100644 index 0000000000000000000000000000000000000000..ba6211c710229fe296378b5748ce4d5bcbad54f1 GIT binary patch literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}PM$7~ArY-_ zFD&F`P!Mpw$aQBUQ}n&6H7$=!cmjpa)bH~R<}~P;lm5iU&%O9i=Srim48F#nIsMP|HW1I#)z4*}Q$iB}{S7MK literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-7.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/mag-7.png new file mode 100644 index 0000000000000000000000000000000000000000..a80b33723521b337900a0bd88da23e2c0ce17b95 GIT binary patch literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}j-D=#ArY-_ zFD&F`P!Mpw$aQDojY%K#3`H^|7BxBi`Z9Bhy4UB8Mph#f;gV8elF{r5}E)wQY(4@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/meta.json new file mode 100644 index 00000000000..f4a9fbef54c --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/meta.json @@ -0,0 +1,59 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Sprites made by Stagnation (discord) for SS14 New Frontier", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "mag-0", + "delays": + [ + [ 0.2, 0.2 ] + ] + }, + { + "name": "mag-1" + }, + { + "name": "mag-2" + }, + { + "name": "mag-3" + }, + { + "name": "mag-4" + }, + { + "name": "mag-5" + }, + { + "name": "mag-6" + }, + { + "name": "mag-7" + }, + { + "name": "packed" + }, + { + "name": "icon" + }, + { + "name": "unshaded" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/packed.png b/Resources/Textures/_NF/Objects/Weapons/Guns/Turrets/pdw.rsi/packed.png new file mode 100644 index 0000000000000000000000000000000000000000..7e06d52b64e1cb7a871240c1f2310f4c49948092 GIT binary patch literal 538 zcmV+#0_FXQP)Px$)Ja4^R9J=Wl`(6=P!PxeYC8t(AXuqHyM#E{Ez(a=GBkATq7?UzUFu#CM|UZ9 zshj9f>KD+snZfWDV~m7CmqNx;?U4FvYOqfcIy65B+`IRGm*aAm2LuEJ{4t?T#NB3P z-g@do;5pRW8VcuG0H8K89VoJd(~BGCxXi-)yW*Uf4phxRE}Qn%EcOJR!_{q#DR!7e z)NNKgFIQv<0?&CKMV1hcMWJd2i0Po)tjt+r@3Dx;P=~4+h{vK(WC^XO{;J08?{F4 zi0OboJfQZru=T)K1IA-f2pJK8?yD0rB09YZRLub3KPg)!;FdG(cKA?7y{-A`3IJYS z-{>grE`f{)V)l{CrcrNe7+W^pFCQ=)xRnT>h}eJ3quvH>R<}~W!!!k@a)WmLg4sYv z#2O%C4QL_&=v0)-4WDvB0iSvMO$=wleN>abpp$zk_n6-^WP5L^=$*w zCm35cwd1iU#+Hp#GJ(<54vnUED3wfjG(XR*gZVN#K1$Gk`)F#1me+p1(bV4PrVR)P c2>8Ez0)~0LityZ%Qvd(}07*qoM6N<$f Date: Wed, 7 Aug 2024 01:33:15 +0300 Subject: [PATCH 4/4] meteor faction --- .../Entities/Objects/Weapons/Guns/Projectiles/meteors.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml index 3468cade76b..34ce3f778c2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml @@ -41,6 +41,10 @@ explosionType: Default intensitySlope: 4 maxIntensity: 100 + - type: MobState # Frontier (otherwise NPCs won't attack the entity) + - type: NpcFactionMember # Frontier + factions: # Frontier + - SpaceDebris # Frontier - type: entity parent: BaseMeteor