From c572e85ebf1b0ee6bfa07ef15c02571839f1ac5c Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Mon, 29 Apr 2024 20:26:42 +0300 Subject: [PATCH] Pirate and Syndicate hoverbikes (#1293) * Pirate and Syndiecate Hoverbikes * tweak * Update vehicles.yml * contra component for hoverbikes, syndie flatpack in contravend --- .../Inventories/contravend.yml | 1 + .../Entities/Objects/Devices/flatpacks.yml | 11 ++ .../Entities/Objects/Vehicles/vehicles.yml | 164 +++++++++++++++++- .../Objects/Vehicles/hoverbike.rsi/meta.json | 50 ++++++ .../Objects/Vehicles/hoverbike.rsi/pirate.png | Bin 0 -> 1564 bytes .../Vehicles/hoverbike.rsi/piratemusket.png | Bin 0 -> 981 bytes .../Vehicles/hoverbike.rsi/syndicatebags.png | Bin 0 -> 1254 bytes .../Vehicles/hoverbike.rsi/syndicategun.png | Bin 0 -> 874 bytes .../hoverbike.rsi/syndicatelights.png | Bin 0 -> 1054 bytes 9 files changed, 225 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/pirate.png create mode 100644 Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/piratemusket.png create mode 100644 Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/syndicatebags.png create mode 100644 Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/syndicategun.png create mode 100644 Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/syndicatelights.png diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contravend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contravend.yml index c9c74e6c0a8..3f4eedbf778 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contravend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/contravend.yml @@ -21,3 +21,4 @@ ClothingBackpackDuffelSyndicateEVABundle: 12 BoxHoloparasite: 2 VestineChemistryVial: 2 + HoverbikeSyndicateFlatpack: 3 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml index 464a1404327..c863edaf1eb 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/flatpacks.yml @@ -631,3 +631,14 @@ entity: VehicleHoverbikeNfsdKey - type: StaticPrice price: 750 + +- type: entity + parent: HoverbikeFlatpack + id: HoverbikeSyndicateFlatpack + name: syndicate hoverbike flatpack + description: A flatpack used for constructing a hoverbike. Keys already slotted in the ignition. + components: + - type: Flatpack + entity: VehicleHoverbikeSyndicateKey + - type: StaticPrice + price: 750 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml b/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml index be0f216aede..fdda560c9e7 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml @@ -355,4 +355,166 @@ whitelist: components: - Stunbaton - priority: 2 \ No newline at end of file + priority: 2 + +# Pirate +- type: entity + parent: VehicleHoverbikeMailcarrier + id: VehicleHoverbikePirate + name: pirate hoverbike + description: Yarr! Dis be me sovereign space shuttle. Now, whaur me rum? + components: + - type: Storage + grid: + - 0,0,5,3 + maxItemSize: Huge + - type: Sprite + sprite: _NF/Objects/Vehicles/hoverbike.rsi + layers: + - state: hull + color: "#3d2712" + - state: engine + map: ["enum.VehicleVisualLayers.AutoAnimate"] + - state: pirate + - state: lights + shader: unshaded + noRot: true + - type: ItemSlots + slots: + key_slot: + name: vehicle-slot-component-slot-name-keys + whitelist: + requireAll: true + tags: + - VehicleKey + - HoverbikeKeys + priority: 1 + insertSound: + path: /Audio/Effects/Vehicle/vehiclestartup.ogg + params: + volume: -5 + piratemusket: + name: gun + whitelist: + components: + - Gun + priority: 2 + - type: ItemMapper + mapLayers: + piratemusket: + whitelist: + components: + - Gun + sprite: _NF/Objects/Vehicles/hoverbike.rsi + - type: Appearance + - type: Contraband + +- type: entity + parent: VehicleHoverbikePirate + id: VehicleHoverbikePirateKey + suffix: With key + components: + - type: ItemSlots + slots: + key_slot: + name: vehicle-slot-component-slot-name-keys + whitelist: + requireAll: true + tags: + - VehicleKey + - HoverbikeKeys + startingItem: VehicleKeyHoverbikeNF + priority: 1 + insertSound: + path: /Audio/Effects/Vehicle/vehiclestartup.ogg + params: + volume: -5 + piratemusket: + name: gun + whitelist: + components: + - Gun + priority: 2 + +# Syndicate +- type: entity + parent: VehicleHoverbikeMailcarrier + id: VehicleHoverbikeSyndicate + name: syndicate hoverbike + description: This thing screams style. And war crimes. + components: + - type: Storage + grid: + - 0,0,8,4 + - type: Sprite + sprite: _NF/Objects/Vehicles/hoverbike.rsi + layers: + - state: hull + color: "#b51e0e" + - state: engine + map: ["enum.VehicleVisualLayers.AutoAnimate"] + - state: syndicatebags + - state: syndicatelights + shader: unshaded + noRot: true + - type: ItemSlots + slots: + key_slot: + name: vehicle-slot-component-slot-name-keys + whitelist: + requireAll: true + tags: + - VehicleKey + - HoverbikeKeys + priority: 1 + insertSound: + path: /Audio/Effects/Vehicle/vehiclestartup.ogg + params: + volume: -5 + syndicategun: + name: gun + whitelist: + components: + - Gun + priority: 2 + - type: ItemMapper + mapLayers: + syndicategun: + whitelist: + components: + - Gun + sprite: _NF/Objects/Vehicles/hoverbike.rsi + - type: Appearance + - type: PointLight + enabled: false + color: green + radius: 6 + energy: 3 + - type: Contraband + +- type: entity + parent: VehicleHoverbikeSyndicate + id: VehicleHoverbikeSyndicateKey + suffix: With key + components: + - type: ItemSlots + slots: + key_slot: + name: vehicle-slot-component-slot-name-keys + whitelist: + requireAll: true + tags: + - VehicleKey + - HoverbikeKeys + startingItem: VehicleKeyHoverbikeNF + priority: 1 + insertSound: + path: /Audio/Effects/Vehicle/vehiclestartup.ogg + params: + volume: -5 + syndicategun: + name: gun + whitelist: + components: + - Gun + priority: 2 diff --git a/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/meta.json b/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/meta.json index 93c306e5887..57a68c7d20c 100644 --- a/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/meta.json @@ -81,6 +81,56 @@ [ 0.2, 0.2, 0.2, 0.2 ] ] }, + { + "name": "pirate", + "directions": 4, + "delays": [ + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ] + ] + }, + { + "name": "piratemusket", + "directions": 4, + "delays": [ + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ] + ] + }, + { + "name": "syndicatebags", + "directions": 4, + "delays": [ + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ] + ] + }, + { + "name": "syndicatelights", + "directions": 4, + "delays": [ + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ] + ] + }, + { + "name": "syndicategun", + "directions": 4, + "delays": [ + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ], + [ 0.2, 0.2, 0.2, 0.2 ] + ] + }, { "name": "lights", "directions": 4, diff --git a/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/pirate.png b/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/pirate.png new file mode 100644 index 0000000000000000000000000000000000000000..d3d5554b3315f6abd9e0892e3d7c58b7ca9ce8ef GIT binary patch literal 1564 zcmX|A2~?6<6#h}hOf5Cg%(2lHqbSREFp^Tt&@>~f5iM}sGPhDxN`G(}$Iv#FGIMF8 zZQKv0xkRR>l9nkoWRx&k3Xzfqn4mB)bDHm+d++z|d-uI_?>(2{=j*w^#MT4=fCc!y zID*cm>BZPcr`uhFdjJ6Pd!)O&AKu;F;beSVcw}@K0Ibdf^LFfQ-(}bN#Fe%D^1>tw ziA9Y|fCUNVWtB_5S!YE|bZ(UYsfsGT)A@Alf10mbQz=ZdW^Ny3L%50(#pLQ$Mt~ z^P6q@;<3|X;zCm+LyWyoc!FS9Sq6(vxQ@u51 zK7FukMiybQ_tDP(uyUSLWryirT!(IlKTs~3yP{t+Mth>KDr2mmJT(h zb+%U&V01twtaaKf=)qEY<@{b+{*d^1{|bk?1wlc{TO!RLy@wcG-*RAa4A+wvxXwTp zA@?~=7Fmk}6V61*M&yug!jYcstxuOZ6K{PtI^H1&#NB{s+m|h^jwGtbha~=in<1tSRwX;}fmAB_WDF8s1;BmYC zsqe-=Y>XNv+q6z1&=>1p-4Xqjzs!wGa5;-wT`6=EZ?CcMT;@Irqa-9p-}JUbSh}F0 zxtZw;oo$l-%th}TIUk?UlME8 zoX7YUVx<>*@Z5)?=xuk1l{r<2bWWM(o#_pKB>r~)rT*jaW^jwGo)R9g!W29{kCXy2 z%XWX@j~s4_{gT8_yhC`J03i^uA>#IoV^1ZjBN}4l*sue8l%5yMg31v~I4a8DO zH3;qg6pvNUaiF^`nnBAx-6jzOX$+bmztBLy^S=A{zgdO7r==@&h5CW!^XL|e96O7@ zI)Y+of*~Lql!8<`o!;1AAHxl2PksGLE;=KUzff*2|63pkw6tt&YTCpZmLPZy!s@0& zJc)ms^J@-FULXy;Fmiu-he*u{B9U?lUP`4Bhx;gza0e77H?9W>7iP3x+qY^{@r%%H z#SEF6Q2qwD#_<50OT}2{3HkT>YYpWE;~T~dn1ox*d}8IQ18_XtV-Ymn3YxBjIjFdb z%10#Z@U613HKh?Od4Yufz00+DJ(!xhWy!Qx9Dl?)qjGbo)i!C)}Vo*r-R*tg|VDM*Dzb8Kj6sH0N>Jr&@jBvJt884K35?a zKY^X?-+wm_tcR61`0S*r1pV`V)ENLoJ5on<^LHLR#Tr2&xq~UHNzi-xvuV5E=r^n| z3{|ubx00sH;>^%GKO%!l>7F_0b!Upv^s3Febkm%^n&t<39WHB3Y}aRx M_wdD4xsfye0l7s0x&QzG literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/piratemusket.png b/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/piratemusket.png new file mode 100644 index 0000000000000000000000000000000000000000..84d6821ec8f8bb70a7838f6665b2511597e38b4e GIT binary patch literal 981 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrU~I{Bb`J1#c2+1T%1_J8No8Qr zm{>c}+T*Z;%(4A;OO&Sal?l8Q*kBbY5O3in+MTd)i)d7-!OkzNzEYD!#N7{WeefW8 zV@?%h7-J!iFodH!20Sg~xL-;vgs zx=@Zihx$33W*pmaf=72|KKkhpj3nNz!*Y+PlgicbBs z*RnnJT=bl&S#!6(KN&BfvqD>P-Q^yIMpc!GO$?l+ApxzO5^J?I*)DC7FaOAY^Pk90 zm7>rCCpI=niF9m}|HEHbo-LxTK4(dS%!|s6Yx)HhHgIo|n)bCeCvvUuf$uyqD`o4~ za-ON1bnivRMP-F8yfHE5CYk&@?l7{=HwhHaJ?VZqT8HU<`WN5Iga=|TqKm7t-#`As zcp@nLwE2O9iUv`O-jq%+|6ca}+xwYi_4ZGf7G2dV{SXF>7PcgBcNd0k5L{6|#S|#Q zS>O>_%)r1c48n{Iv*t(u1=&kHeO=jKu*e9?>QA`(bQLfrFL}B+hE&{od)F}gN`l0J zkLpV&bBNyhs?e-3ca`^aX_;NApSa#v4WQq2x-n&ZQ%C;#h zJ$i6BaQ%1XzwdspEo%S@*458;4-GXuQnuoL?f$DwGtNJcEY|Moh}-TAQZk>huiow3 zk0-${E;W|6-FxT0eet=$c}+T*Z;%(4A;OO&Sal?l8Q*kBbY5O3in+MTd)i)d7-!OkzNzEYD!#N7{WeefW8 zV@?%h7-J!iFodH!20Sg~xL-;vgs zx=@Zihx$33W*pmaf=72|KKkhpj3nNz!*Y+PlgicbBs z*RnnJT=bl&S#!6(KN&BfvqD>P-Q^yIMpc!GO$?l+ApxzO5^J?I*)DC7FaOAY^Pk90 zm7>rCCpI=niF9m}|HEHbo-LxTK4(dS%!|s6Yx)HhHgIo|n)bCeCvvUuf$uyqD`o4~ za-ON1bnivRMP-F8yfHE5CYk&@?l7{=HwhHaJ?VZqT8HU<`WN5Iga=|TqKm7t-#`As zcp@nLwE2O9iUv`O-jq%+|6ca}+xwYi_4ZGf7G2dV{SXF>7PcgBcNd0k5L{6|#S|#Q zS>O>_%)r1c48n{Iv*t(u1=&kHeO=jKu*e9TsG1*gH)LR7dhF@q7*cWT?cM!;w;f~- ze7vuksu0Ac=RD&NgIkD4En~+N&3lo*na*ek^IsHy;cTLPll@Kd{XJxPAo-D7pjKW|ueKgUn4|BG$s;~VodLw_*M*GzqEvCZy$*e}y>Kt_1- zM$btiZj)3th9`gA#_{XxH&x%@>Qz&0YoGF*$@ji|B$SKl_7&Ye zzgRhQYgF9*4Hxd$><=tEUbkQW*o<)HwPD^phL_%d-z#HNYybC>`hkZZ3$#yfT5i0d z!O(4!&g8?7A5QC6fAFDVN9?BkzW0^aZY{m(_doe7Bf3}r_gnPs^*?i|K003X?#hhg zr%!u7l`7xM|M$b+R@p7rzCC&8=i;*O-=s%e`)=8esn+mka#sOzkksQx4^LhI}ye+$ZE^YGzkY1PlAGaH?^omI-TxL7Jw0v%H z{`TA3PId2JS$Fri{G$EeSXLO_pLhGnoZmTS!J%<~e80Z7`?u@&RKw^0>wcYjt~BHG s|L?y~eFu6WQ_mdKI;Vst03u{Sa{vGU literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/syndicategun.png b/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/syndicategun.png new file mode 100644 index 0000000000000000000000000000000000000000..d8148cbc0b963f7c243fe5c67cf891da615bccfd GIT binary patch literal 874 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrU~I{Bb`J1#c2+1T%1_J8No8Qr zm{>c}+T*Z;%(4A;OO&Sal?l8Q*kBbY5O3in+MTd)i)d7-!OkzNzEYD!#N7{WeefW8 zV@?%h7-J!iFodH!20Sg~xL-;vgs zx=@Zihx$33W*pmaf=72|KKkhpj3nNz!*Y+PlgicbBs z*RnnJT=bl&S#!6(KN&BfvqD>P-Q^yIMpc!GO$?l+ApxzO5^J?I*)DC7FaOAY^Pk90 zm7>rCCpI=niF9m}|HEHbo-LxTK4(dS%!|s6Yx)HhHgIo|n)bCeCvvUuf$uyqD`o4~ za-ON1bnivRMP-F8yfHE5CYk&@?l7{=HwhHaJ?VZqT8HU<`WN5Iga=|TqKm7t-#`As zcp@nLwE2O9iUv`O-jq%+|6ca}+xwYi_4ZGf7G2dV{SXF>7PcgBcNd0k5L{6|#S|#Q zS>O>_%)r1c48n{Iv*t(u1=&kHeO=jKu*itA>i#~tg&7!=>7Fi*Ar-gY-Z9KOWFXOS zaes%kgW2huH+C=uO}o>qo#yyRB4$ht+>uBkQ4g)S~aI+Jd^fbuKPfVi@$HT9Qi`rf*~`xvVZ|8wr|IB6L!%kua6cllWiwfEi6?YzZx zp}wyE+vK?~cCEW21C;stynoM+0*fOSeHXviy12~zbbaH$>|f>k50+kAIz>q-X=~I` z1D?rq7rofOtp2;=gAyxOmpk)Z&3T-cOi}x7b*0|-|2yXcA1nUs_-DBB{`>sf%cB^7 zmHs|=^ef!E4dvHOd^2Y)d+~qYzdutSeyxhto9?YM{d9zmn4sX(8aw|o$<1|l|83tK f_`eqFRi78aGP=gwB@|Q_g8c63>gTe~DWM4fPo9Hd literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/syndicatelights.png b/Resources/Textures/_NF/Objects/Vehicles/hoverbike.rsi/syndicatelights.png new file mode 100644 index 0000000000000000000000000000000000000000..89a0aa013f8a299e51673a0d39a0936e5bbdc360 GIT binary patch literal 1054 zcmV+(1mXLMP)EX>4Tx04R}tkvmAkKpe)uKBOX*4t5af5U@H~5MMY-6^me@v=v%)FuC*vO&XFE z7e~Rh;NWAi>fqw6tAnc`2tGiZ9h?+hq{ROvg%&X$9QWh9`#$cz1H8>DQw;w&ps1#v zPQ-;=epLv(!jA|-n8vWk3@w>i%))hi-NVDzyBN=MKlkV8mkS01JOc3?({z(~gLr1s z)Hv@Ghgn&aiO-40bh;q%BiAK|-#C|S_VUcIo=wjahlzz!7fW5t%DO^4MI4nCmGZqg zhh@%NoRw;wweQJa7%ZqO8LrceAb}+$k%9mTbyQG=i5RUaDF)KCA9wK&+5Qx{Byv^2 z$gzML6o|GT{11M2YZNCZoTOkJ=y|cMj}aiS3$z-R^?htvtrNia3|y%lf2|43ev;nk zXwf4ev<+NbcQk1axZD8-pEOYyZOKQ|TPy#WzIF95e%y0W)W2_G) z@<+*^w;uU>;Bj5aPn!<_KxP)JeO#>eapDQ{s0-$9{>OV00000003IsB(7kWUp-;nwA(}MQi(fB5o0|XTHC;E(M<>b@*I)qv z00000004lSph{MiuKbMiy#?~U1x|tKDGOJYZV_w(003ZeS8LbR+NYiW*u56!Z3cC% zHSb%~{+>Ry_I+ylug$+pzk{LkyY^b>+tcC0w{VJU{`Vle)Y{kMhOEy|)t`XG8!!j| Y08WMP?6|`E@&Et;07*qoM6N<$f}3>i+5i9m literal 0 HcmV?d00001