From 3cac75f117bf389a792f795f20963c6cad2b36ef Mon Sep 17 00:00:00 2001 From: Alpaccalypse <21291379+Alpaccalypse@users.noreply.github.com> Date: Wed, 15 Jan 2025 18:20:01 +0000 Subject: [PATCH] Smite vending machine (#34420) * Added smite machine to YAML * Added smite ads and inventory * Added smite vendor sprites * Changed the description of the machine to not repeat and ad line. * Added newline to end of inventory .yml * Corrected erroneous edit. * Tweaked all sprites * Added tesla toy to contraband. Reduced number of drinks available * Reduced soda varieties but increased can numbers. * Removed tesla toy from contraband inventory * Removed speech component from vending machines that already inherit it * Moved Sprite component to top of list * Added Smite vendors to random spanwers * Alphabetised spawn prototypes, commented where name is unclear --- .../en-US/advertisements/vending/smite.ftl | 12 ++++ .../VendingMachines/Inventories/smite.yml | 13 ++++ .../VendingMachines/advertisements.yml | 6 ++ .../Catalog/VendingMachines/goodbyes.yml | 6 ++ .../Markers/Spawners/Random/vending.yml | 23 +++---- .../Markers/Spawners/Random/vendingdrinks.yml | 17 +++--- .../Structures/Machines/vending_machines.yml | 56 +++++++++++------- .../VendingMachines/smite.rsi/broken.png | Bin 0 -> 511 bytes .../smite.rsi/deny-unshaded.png | Bin 0 -> 436 bytes .../smite.rsi/eject-unshaded.png | Bin 0 -> 888 bytes .../VendingMachines/smite.rsi/meta.json | 56 ++++++++++++++++++ .../smite.rsi/normal-unshaded.png | Bin 0 -> 532 bytes .../VendingMachines/smite.rsi/normal.png | Bin 0 -> 496 bytes .../VendingMachines/smite.rsi/off.png | Bin 0 -> 481 bytes .../VendingMachines/smite.rsi/panel.png | Bin 0 -> 150 bytes 15 files changed, 150 insertions(+), 39 deletions(-) create mode 100644 Resources/Locale/en-US/advertisements/vending/smite.ftl create mode 100644 Resources/Prototypes/Catalog/VendingMachines/Inventories/smite.yml create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/broken.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/deny-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/eject-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/meta.json create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/normal-unshaded.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/normal.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/off.png create mode 100644 Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/panel.png diff --git a/Resources/Locale/en-US/advertisements/vending/smite.ftl b/Resources/Locale/en-US/advertisements/vending/smite.ftl new file mode 100644 index 0000000000..e6214f4627 --- /dev/null +++ b/Resources/Locale/en-US/advertisements/vending/smite.ftl @@ -0,0 +1,12 @@ +advertisement-smite-1 = SMITE! Ban your thirst! +advertisement-smite-2 = An eldritch blast of lemon and lime! +advertisement-smite-3 = Over 1 million drinks sold! +advertisement-smite-4 = SMITE! Roll 2d8 for FLAVOR. +advertisement-smite-5 = SMITE! Let's get that paperwork done! +advertisement-smite-6 = The janitor has it in for you! +advertisement-smite-7 = SMITE! It won't get you hammered. +advertisement-smite-8 = It's lemon-lime time! +thankyou-smite-1 = Smite makes right! +thankyou-smite-2 = You DEFINITELY wanted lemon-lime! +thankyou-smite-3 = The office won't know what hit them. +thankyou-smite-4 = Banish your thirst. diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/smite.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/smite.yml new file mode 100644 index 0000000000..fc0b64b6ca --- /dev/null +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/smite.yml @@ -0,0 +1,13 @@ +- type: vendingMachineInventory + id: SmiteInventory + startingInventory: + DrinkLemonLimeCan: 4 + DrinkLemonLimeCranberryCan: 2 + DrinkColaCan: 2 + DrinkSolDryCan: 2 + contrabandInventory: + ToyHammer: 1 + DrinkStarkistCan: 2 + emaggedInventory: + DrinkNukieCan: 2 + DrinkChangelingStingCan: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml index 6967c97f5a..3422f564b0 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml @@ -88,6 +88,12 @@ prefix: advertisement-gibb- count: 8 +- type: localizedDataset + id: SmiteAds + values: + prefix: advertisement-smite- + count: 8 + - type: localizedDataset id: CondimentVendAds values: diff --git a/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml b/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml index 61ccc2b044..b63c22d06f 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml @@ -46,6 +46,12 @@ prefix: thankyou-gibb- count: 4 +- type: localizedDataset + id: SmiteGoodbyes + values: + prefix: thankyou-smite- + count: 4 + - type: localizedDataset id: DiscountDansGoodbyes values: diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml index d55a7916b4..746cbc7932 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml @@ -11,24 +11,25 @@ state: any - type: RandomSpawner prototypes: + - VendingMachineChang - VendingMachineCigs - VendingMachineCoffee - - VendingMachineCola - - VendingMachineColaRed - - VendingMachineColaBlack + - VendingMachineCola #Robust Sofdrinks + - VendingMachineColaBlack #Robust Sofdrinks [Black] + - VendingMachineColaRed #Space Cola - VendingMachineDiscount + - VendingMachineDonut + - VendingMachineDrGibb + - VendingMachinePwrGame + - VendingMachineShamblersJuice + - VendingMachineSmite - VendingMachineSnack - VendingMachineSnackBlue - VendingMachineSnackGreen - VendingMachineSnackOrange - VendingMachineSnackTeal - - VendingMachineSovietSoda - - VendingMachineChang - - VendingMachineDonut - - VendingMachineShamblersJuice - - VendingMachinePwrGame - - VendingMachineDrGibb - - VendingMachineSoda - - VendingMachineStarkist + - VendingMachineSoda #Robust Sofdrinks [Soda] + - VendingMachineSovietSoda #Boda - VendingMachineSpaceUp + - VendingMachineStarkist chance: 1 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/vendingdrinks.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/vendingdrinks.yml index a911b7ebfc..1c90664b3d 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/vendingdrinks.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/vendingdrinks.yml @@ -12,14 +12,15 @@ - type: RandomSpawner prototypes: - VendingMachineCoffee - - VendingMachineCola - - VendingMachineColaRed - - VendingMachineColaBlack - - VendingMachineSovietSoda - - VendingMachineShamblersJuice - - VendingMachinePwrGame + - VendingMachineCola #Robust Sofdrinks + - VendingMachineColaBlack #Robust Sofdrinks [Black] + - VendingMachineColaRed #Space Cola - VendingMachineDrGibb - - VendingMachineSoda - - VendingMachineStarkist + - VendingMachinePwrGame + - VendingMachineShamblersJuice + - VendingMachineSmite + - VendingMachineSoda #Robust Sofdrinks [Soda] + - VendingMachineSovietSoda #Boda - VendingMachineSpaceUp + - VendingMachineStarkist chance: 1 diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 92a88c6d06..41d5edf4d4 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -135,7 +135,6 @@ pack: CondimentVendAds - type: SpeakOnUIClosed pack: GenericVendGoodbyes - - type: Speech - type: Transform noRot: false @@ -154,7 +153,6 @@ pack: AmmoVendAds - type: SpeakOnUIClosed pack: GenericVendGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/ammo.rsi layers: @@ -183,7 +181,6 @@ pack: BoozeOMatAds - type: SpeakOnUIClosed pack: BoozeOMatGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/boozeomat.rsi layers: @@ -218,7 +215,6 @@ pack: BruiseOMatAds - type: SpeakOnUIClosed pack: BruiseOMatGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/bruiseomat.rsi layers: @@ -318,7 +314,6 @@ pack: CigaretteMachineAds - type: SpeakOnUIClosed pack: CigaretteMachineGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/cigs.rsi layers: @@ -346,7 +341,6 @@ pack: ClothesMateAds - type: SpeakOnUIClosed pack: GenericVendGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/clothing.rsi layers: @@ -378,7 +372,6 @@ pack: ClothesMateAds - type: SpeakOnUIClosed pack: GenericVendGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/winterdrobe.rsi layers: @@ -417,7 +410,6 @@ pack: HotDrinksMachineAds - type: SpeakOnUIClosed pack: HotDrinksMachineGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/coffee.rsi layers: @@ -457,7 +449,6 @@ pack: RobustSoftdrinksAds - type: SpeakOnUIClosed pack: RobustSoftdrinksGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/cola.rsi layers: @@ -601,7 +592,6 @@ initialStockQuality: 0.33 - type: Advertise pack: RobustSoftdrinksAds - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/shamblersjuice.rsi layers: @@ -638,7 +628,6 @@ pack: RobustSoftdrinksAds - type: SpeakOnUIClosed pack: GenericVendGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/pwrgame.rsi layers: @@ -675,7 +664,6 @@ pack: DrGibbAds - type: SpeakOnUIClosed pack: DrGibbGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/gib.rsi layers: @@ -691,6 +679,42 @@ energy: 1.6 color: "#D82929" +- type: entity + parent: VendingMachine + id: VendingMachineSmite + name: Smite Vendor + description: Popular with the administration. + components: + - type: Sprite + sprite: Structures/Machines/VendingMachines/smite.rsi + layers: + - state: "off" + map: [ "enum.VendingMachineVisualLayers.Base" ] + - state: "off" + map: [ "enum.VendingMachineVisualLayers.BaseUnshaded" ] + shader: unshaded + - state: panel + map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + - type: VendingMachine + pack: SmiteInventory + dispenseOnHitChance: 0.25 + dispenseOnHitThreshold: 2 + offState: off + brokenState: broken + normalState: normal-unshaded + ejectState: eject-unshaded + denyState: deny-unshaded + ejectDelay: 1.9 + initialStockQuality: 0.33 + - type: Advertise + pack: SmiteAds + - type: SpeakOnUIClosed + pack: SmiteGoodbyes + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#00E645" + - type: entity parent: VendingMachine id: VendingMachineDinnerware @@ -772,7 +796,6 @@ pack: DiscountDansAds - type: SpeakOnUIClosed pack: DiscountDansGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/discount.rsi layers: @@ -989,7 +1012,6 @@ pack: GetmoreChocolateCorpAds - type: SpeakOnUIClosed pack: GetmoreChocolateCorpGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/snack.rsi layers: @@ -1135,7 +1157,6 @@ pack: BodaAds - type: SpeakOnUIClosed pack: BodaGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/sovietsoda.rsi layers: @@ -1169,7 +1190,6 @@ pack: AutoDrobeAds - type: SpeakOnUIClosed pack: GenericVendGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/theater.rsi layers: @@ -1205,7 +1225,6 @@ pack: VendomatAds - type: SpeakOnUIClosed pack: GenericVendGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/vendomat.rsi layers: @@ -1238,7 +1257,6 @@ pack: VendomatAds - type: SpeakOnUIClosed pack: GenericVendGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/robotics.rsi layers: @@ -1337,7 +1355,6 @@ pack: ChangAds - type: SpeakOnUIClosed pack: ChangGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/changs.rsi layers: @@ -1403,7 +1420,6 @@ pack: DonutAds - type: SpeakOnUIClosed pack: DonutGoodbyes - - type: Speech - type: Sprite sprite: Structures/Machines/VendingMachines/donut.rsi layers: diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..941a4688d45a5a1795df51524f766ed479aed218 GIT binary patch literal 511 zcmV7;wZH#@n$HU@Ge2nmVSxW^Y;2gLC8MoOpQ8oxNhhC{=LL&JUm zo}ZsnM^KfOl^MA<8KkI000001bW%=J06^y0W&i*IHAzH4R5(wKk?m50Fc3v)y<%+| zS_rTL>QWK<{%`0mA7v8w;h7->?wOk%h$7{%OSE!0zHB(|3z%16D@X<`-kzXu*L>%Q zXFTl#;WY;0w|L@oisN@rIGf7_7aw!>1Y=-~HA#|~g-|e%{Cd5mx&^YWV2!y6D!3#M zgrX>{Eeg$3*=s}L31w+*S(cQhDal=h4^OD9b9GZyL{teXe0qXy98vwXpfh}X0>d#g zgl>uXmJbMD9 zq92qVl3V>9p740AhiI-d1%e>Sbdv>vuuJqW{s4RsC&Jm8ztjK#002ovPDHLkV1ndl B*+T#T literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/deny-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..0e184b422b4f1055edc3de551f89dff2602e2d32 GIT binary patch literal 436 zcmV;l0ZaagP)P)t-s0002& zhlub1V4OEjjgF4l=K%5lTk`*1?fn1%*k|mAi0}YloHtJ8=H|!MF!Y@O8D@0<|Nrgo z?&9O)^sWH^%U1u)R{y>L)z;P>I#(zF000DZQchC z)2u&Vu7VE%_2~*Zo>(cxBsPe=(4f)USeIZQW#QR^+0Pa5m?>{1Y{}Hw44^;k2Z40#T ei1PFQbpM|Ks1}4X`$&-h0000E>YVc()gJfFC|NsBrzI*rR@#8P+82+CQ`+p|v|2~GR*RIi1SFn4) z)TvXAjg3po!_EL*tXdM}7tF8<12kZOZ@RMi3=B*mo-U3d5$N?}HPfafxm-6nb{r~a5jl!_<#c4LedostofB4$fzxJp$xg9S|63u@7I;RsWy9x1T2pUr>7OgA zBzI(?K;Z9;nF+yW=C|K|oAdQy;Eg*zYQoaXSDEnLp1;4$`m~&~T>G-aPrkk_$(rpj zbAy2PGo>I3M}4Uq0|lR%6==kHWow7bxiMaP?{WyO!Pa z{RT4w_Kmxpj(nBAzoy2wMM%wtQ7x{Nz5z4u^N9NB=F@TK;LV;6qKWgoX+RDGQ*~_WIzL zYuxt~x=EX4Tv(v4H|4+Ztg~t27DA`~zxn^|ZtSZk9vc7EUCMRtKKR?-AKTaRsXj?+ z$v)u)f7bu?T$ZVIGMj12|H(SDpWkuxvUYd+X@AmK^ZDDw$5}M~pWpl}ZDYg@3z1X* zE7PoW?C$DMw*%_aH?HHXiOq_%5IglBj zUTa)8Ytc02`P=OkI^&xkdrtqa-{dhhEmV1i`uboFyt I=akR{0G!O$C;$Ke literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/meta.json new file mode 100644 index 0000000000..a294fc116f --- /dev/null +++ b/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/meta.json @@ -0,0 +1,56 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Alpaccalypse for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "normal-unshaded", + "delays": [ + [ + 2.5, + 0.1, + 3.4, + 0.1 + ] + ] + }, + { + "name": "broken" + }, + { + "name": "normal" + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.5, + 0.1, + 1.0, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "panel" + } + ] +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/normal-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..919e308cb73e0087a8a008cf1151dc4620129f2e GIT binary patch literal 532 zcmV+v0_**WP)z_0004N zNklML?)A2QHZiE zS-z^OLtnnWU22A}uGd?0;Kjw_0?6wAkiS`6f~V&f#7_b0y$a8G7k{q<=LOVt4Faw3 zoNt=Od8C6vsaD$^0I@mgrR>a+*9xHZkDCffZzMqHACV4P6|e00zV9*LNo+Mht1!d% zjDLLp{xJ-QH!{qCbO6d8a=eK6!GU>cUjnio>uvM1!@BVK@RbqkYz$eYe|2Yzfl zsrRJzGt@4or>fxl;|+h;&nB7AWHSE)YX0X!&Hr4AW&TeBHUD#2&Ho9Y=6^2H{GR~o ze!ymZKS%&|Kj8BV8HoDew6I7{j-sQH{ry7+m%NBIWF WgBNGe+4}DQ0000|Nrgo?&9O)Bc`q&%X=HRZywV> z^sWFJzc~NPR{zXa|Gog#*49%;P?eRH8M!v#6^14N0004WQchCK@B4z>JUZX|G&?f1nLQ4;nKSyJ@1~Iv?!R}CdDti{Z+>P z{|VRPMu=MxIUIzzON67m&ydGN2q<|vo#a9;(EjjvF6pGTu5v+1c_vtRdVX06#u%lH z;k~3Y7fd45wNiCmLs^zUUoN~RLZhs0UDE(SLvZ0O5tOq4?fU{3J`w?2i;=GD5V_z} z!P#hZpI?2CTu22EmL5Su&x8V|0?tMhHVTM9ibJ3sHs0X*1uT#U7z(Q^zUcZ5b0;exKR#hf=T=Hr@WdA}h1Py&w(Br_2dak6xM8YsKgQlGXKc&LtFIVvH m{j?ScTH+`CN`*~|Kk)-<6f}JpZQ;290000zc|B&L&Jwd z!+rpspPy4lP?eRH8M!tW86{l+0004WQchC?L0O$xVyeEQk2B7~~;leEuus0ZKng)>zJ{6paM)UbK49JC4@L=c> zBn(U_U@G8ZL}90Z2&6a!+F|Dno?pNMd4Qp?x#F8{;60#r3gCLzL!1?kVI4_@7~W_fuJRR!mm`=rT7y+ XWeP9o^Wf_V00000NkvXXu0mjf$V1Kz literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/smite.rsi/panel.png new file mode 100644 index 0000000000000000000000000000000000000000..9ef52cc2cb1f78403f6e8afe594a73a3e219a6c1 GIT binary patch literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvi2$DvS0HU~Z@X;1oQjIdt}Tix zO3DnzGa1s1!(MG!1e9Ye3GxeOaCmkj4am{)ba4#P2u@CrU~QJ=SoCqG4^sf^jI%5O ttPwpz0jxKiFS2k+Twt)?#lXVAaNs}FDv^IC_ksEtJYD@<);T3K0Ra0HCqw`M literal 0 HcmV?d00001 -- 2.51.2