From 403344fd46a07d2f092e4cf485aa2b45835c7a66 Mon Sep 17 00:00:00 2001
From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Fri, 24 Jan 2025 21:56:30 +0300
Subject: [PATCH] Ice spectre mob + jobs playtime requirement increase (#806)
* increase roles playtime requirements
* ice spectre
---
.../CP14SharedMagicSystem.DelayedActions.cs | 2 +-
.../Audio/_CP14/Animals/attributions.yml | 6 ++
Resources/Audio/_CP14/Animals/ghost_ambi.ogg | Bin 0 -> 187486 bytes
.../Actions/Spells/Water/T1_ice_shards.yml | 1 -
.../_CP14/Entities/Mobs/NPC/ice_ghost.yml | 93 ++++++++++++++++++
.../Mobs/NPC/{monster.yml => mole.yml} | 84 +---------------
.../_CP14/Entities/Mobs/NPC/mosquito.yml | 80 +++++++++++++++
.../_CP14/Roles/Jobs/Bank/banker.yml | 3 +
.../_CP14/Roles/Jobs/Bank/commandant.yml | 2 +-
.../Roles/Jobs/Guard/guard_commander.yml | 4 +
.../_CP14/Roles/Jobs/Mercenary/alchemist.yml | 4 +
.../_CP14/Roles/Jobs/Mercenary/blacksmith.yml | 4 +
.../Mobs/Monster/ice_spectre.rsi/base.png | Bin 0 -> 1708 bytes
.../Mobs/Monster/ice_spectre.rsi/meta.json | 15 +++
14 files changed, 212 insertions(+), 86 deletions(-)
create mode 100644 Resources/Audio/_CP14/Animals/ghost_ambi.ogg
create mode 100644 Resources/Prototypes/_CP14/Entities/Mobs/NPC/ice_ghost.yml
rename Resources/Prototypes/_CP14/Entities/Mobs/NPC/{monster.yml => mole.yml} (64%)
create mode 100644 Resources/Prototypes/_CP14/Entities/Mobs/NPC/mosquito.yml
create mode 100644 Resources/Textures/_CP14/Mobs/Monster/ice_spectre.rsi/base.png
create mode 100644 Resources/Textures/_CP14/Mobs/Monster/ice_spectre.rsi/meta.json
diff --git a/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.DelayedActions.cs b/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.DelayedActions.cs
index 3ca6d055a3..fc78bd9250 100644
--- a/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.DelayedActions.cs
+++ b/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.DelayedActions.cs
@@ -26,7 +26,7 @@ public abstract partial class CP14SharedMagicSystem
var fromItem = action.Comp.SpellStorage is not null;
- var doAfterEventArgs = new DoAfterArgs(EntityManager, performer, MathF.Max(delayedEffect.CastDelay, 1f), doAfter, action, used: action.Comp.SpellStorage)
+ var doAfterEventArgs = new DoAfterArgs(EntityManager, performer, MathF.Max(delayedEffect.CastDelay, 0.3f), doAfter, action, used: action.Comp.SpellStorage)
{
BreakOnMove = delayedEffect.BreakOnMove,
BreakOnDamage = delayedEffect.BreakOnDamage,
diff --git a/Resources/Audio/_CP14/Animals/attributions.yml b/Resources/Audio/_CP14/Animals/attributions.yml
index c0efda4ff9..c31c70aeef 100644
--- a/Resources/Audio/_CP14/Animals/attributions.yml
+++ b/Resources/Audio/_CP14/Animals/attributions.yml
@@ -57,3 +57,9 @@
license: "CC0-1.0"
copyright: 'by egomassive of Freesound.org.'
source: "https://freesound.org/people/egomassive/sounds/536728/"
+
+
+- files: ["ghost_ambi.ogg"]
+ license: "CC0-1.0"
+ copyright: 'by Litruv of Freesound.org.'
+ source: "https://freesound.org/people/Litruv/sounds/175944/"
diff --git a/Resources/Audio/_CP14/Animals/ghost_ambi.ogg b/Resources/Audio/_CP14/Animals/ghost_ambi.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..81110341581e0b00a61074c1a7e95a0c36666443
GIT binary patch
literal 187486
zcmb5Vby!_Jvp2jp?(Rj4YjLLqiaQ&3mlk(-r??d_P~2UMySuw
J3?y@bd%@*eBz=1(ZdN5Yksh|WKndqAh-Ttto~O!ximRDD?2MI
z4=X1*9oWppHvn1-ZDb>jy_WTN^W5XZjbluOL5hh4+eL;$R_2RwEbF4|e?I|L8Td
zH37l?L(+)8R|f$I0O0>xj-bzfDozamFaRK@oF~O=sQqTcE1*~s$1D7W+AWuy@(gc*
zQ0MJML|&s1o)bBzDJ}rO0RHp{>5f~XC+#<+ga??)L=1y3R7eDC5@Co?@{0B;MdF(1
ziO?Y_0;(1)0O>wq1d3oBuoOkee?{~Ksm77?g{j6P^hLx@V{C)uL1_F(`H4!Ri1hhN
zG7Kg8Nnjb~1#PGEcKCIt3z1v$U<^@+lK+bSwu2l}7YNhzFY`t7Kl=V@7CGP#=@URY
z9%rA*7}%KCh~#p{A$jW;5?zCs6Ql_d!$%Iq!*{9
zAC+Vy{Y?THdYG5m09)>nhwd>J9tnTr^r8>xh5xrf*m8&g5Qg;SpabzgLDG>5{%;Qt
z0gy2j22%|>GD$jd4mt@+I*ScD%MB-~4mao`|JNWuh8^+5}X2o5F+PGWOS&T@`p
z%PVur&;DNo6`X*-_5x`LMV5KWM}Gv4IHSMa;tx?vkc;ph<)4xu3Bq&t$kV6Ne~t5@
zrSIpI;AG5pN2q4dwv?o1I8E>!W?D}W?q)ho(2u0`=cG-gJ55NVq!;`{d0=J0SCq^^
zc!YBXo6R?4wLCQF-qK
z|7mqE#(NaD`WYD}u6cEn=!S!Ar%FC4tAd6FZN>tKfzucKgDA+LlAFefz!Cn%M`)@e
z1Qj`fNdGx-Kd2@#Nv8iJOkNU0jQJmX{%g!?8m=~4pIug)LiCngHWz(17o!dEL(Q~O
z{zv$y>5!HHFL3$`$0Xw@w!zFG1yRI*2KZm(NIKvQ#uE?6Q_0p+$hy*F0)xRvw2su92#YTNi5v)QUh~E5O8rmd
z#O(0KP)a9IX(iD7MNUat_Hjwx{|`AimXSrNkwxK=hv6}F5h))c(o0+NtVb$OTmO&Y
zzmWq03?ztysl@*Wa=O@v-$TGt%OwBnpEe3jLuLnOas2-r008KULy>)%N~n~<%=2Kb
zc`&n@s*u|M>6w3l7Nld7|IW0i{I^72!>N4qRK^HW8Ox^#YPWXd=XboBSm~Z
z*-RtF#UR;ieNk-MMSMOJxLY?j;)Tt=0ao|b+`>SP%0sYY)5wbt<_$z}D{X5C_~
zBldFlVIbaWwTJDr(P^!tlBx3-hp(BYXW@s{!qdCf$&j9aT7L^NVUa+@bTy
zA-j0KyGuUXyb}LikkOLQrn|3^d-h^u^!BySi1n!infI5UW3AEO?*|<3`48POAazlP7$`&)A6*GV6+M0b7@ssm75@<(B!?VxKb}lP
z1w<8nNk2ptbHC<$Y37t9V`lpPCF8M{{uCYf+=e)rC`fg6qWGE?KB5-%Y5r4qRKqpF
zOW_2v3|x>LHeA;$#^rnsDOMkA4)9DS8}=8hCfbV@KFZhZuNaRB9T1p~x4@%|LK=wo
zo}R67;iC=P0r9_u(=R|&F)yq@1b+*kCxWzNVF}V#ix5>M{pnT{-Giwnip&edCSyYV
zDOTexH|aWY5U8W@LKdV{B{&Fd5&yzAn69577>;5fGjWQ%FVzXmFpwD(C)1zmgdsDM
z8Kfj5lLn!r>5~#H5N%=2V++Wd4T(G2j=Ds@lAZ%R2UpW3&jd{F}dNTp)0epLKrWtX})fa;h!5
zm_g=wBbUFN1sfC17tV5{jUJ!vIs_5;p+>1It>^b0Z%_t*$Uy^L*u;Q8lC>tucD^N3
z_1{{-0e}&TC>%uyiYUY@OcIr%rv?DSE)YQ870j+=IV1y+Lp)9LK5eTC$YN<+0*N40
zsLbEj|6TNVRsDaCaDgL@ZD8x!u=fOkR@@{YB(xj`=z%!aCJ-CtKc>o`W8EhR27{#w
zk|o#<$&(VmG8JkQ(ozKl3)-J*92Fp=(152C1u;hLkIVxECT9>U)wW`TP;>CqfN)CKX(VYfe925>GTh
zyl88(QTzy7ck
z{lC26xPN)MNnrMWc+^Qs5Qx5{gYaaA|H=E(X(Z17^5_d*^u0*w3m{H6-9O$+5=8nh
zh4tSQ_`lNSgJu5B0m+6)@i*^FlpFk_<%N1F_bJ&;i|Ygx
z07b_d2Lj*`5W#@3Q9$ndU<8b>U0u!1^^o0;sA;H_7!zCs;=Hgj8wtR~!ny}796BJe
z(huuQxE089&W|CA5s1;Z10YFtbtCc!UWU@HZNX&af#Lt|D@rJlJwGzn?dg`x^Ee%`Hd51Q>vQ>{qjX)+~>(kxe#^>3!L50|!ruZSrtGfmb;
zMMWZIpfHkbsq%H~(3G=KB(nZ!&+LsZzm>)T-qNlE50~hvJejv9K{p8~yb6<&L5}05
z!c~rSjZ^wj*^M%e-bnCvnWJ(i7sVakFu7zK!36^rJ2)LPzsYlu1m=mG5!{&0M<%mmhV$73ugfMRgaeMxfK*MY
z9J<6krEH%#&=f*5l&id0^Ik%yC(W@ah1?o5{R50I+&a$B&eK+F*kdoL!02|z?|B=C
z*VkBHiZF&S%d}8puVshS`bOfUucObKm2F;QGC==JSo&~r{e)BjIW#kiV^k>NXXJq5^&~_$8Nm+dc!~M#
zRb#T$AQbL#0z!KI@WW51t^R_IOfC$n)J4{>nzVMYW0y3{
zOGOnlEP`4a<}kbM?zpfhcfGWmWWCW58DJlwkn)4^ZhR)lxG^`2W9oM-X8G)Y&>IT4
z9vs5CCJ$4dwuQsJF;NP}6)rBNqg_e9S>Zr(ep9=8h-Y0%psL)WRUtvOg8cg++&mH}
zg3G2|CwRJWV&*End?suim+!E$(b9|ctad~PJSQ8=dB$*>=jEjpX-o)r1h3{Cx`KR0O4
zBq$FGRZ|q6Gz$Z8(xTDq1JqcAI8)dA3%s+GdZz9&lPzR#*tTipFLgpn$Hd@%@KkDS
zN8yT#91xw2aV9Fe?SdDQ|!4*p#e%vsXa2#=84MRsLyh_w6(6
z<}xv+7webBP%Yh8c-7Ltl`wDLOyYpWOdxa)K=v#JfKNkpxy*V&zpF3hi;kF1_K6M(>
z^4ocH#G*}NU}|nO(9Um&pF15(NTwe58L~e9c-nckKgF@Vr&4C(hgv<+x*_fUs)*$e
z<;%0qdsijk&mRP
zCUQaJAsG%0wra`Hj9&}}%}G5j+NP&azyN}#VJGPK&>Mqq=a})3-8GzHfw;aDRRqjP
z6#3!3YLt}0meg-7I(xY$;LrfjhgA2f3g4d@cK>30&uyDDCDrbvI&FAu>Z&y7)u5S7
zKw)=bRR(4B-C|1;qSdI+MuK_eO>Hpp;sy$=OTg0^(Z5_>2wX&i&l&DgF{xaRGqdjemgsm`R*oT*%a{j~tS
zq(3~wX2tH%CtcFEUMdTAHLf?YwpuNd14-bw1+C%1oNDfzmUZ9vEy|HhUE!>>il-HKGkBsq+m!k1%~E5>U4>3~&o}e#
zd_8dM$h5^L&0b!KvTKo#yePrdy~tD25z4k=t?F~#aRR2W)oYs669`vu-#?xrjAb4+
z_dvH#JD>u-lI!k2&=0v((qlSx*dAD5!DUUwu|ey@QvQOTXCt9$P+{?nmu{2*v2^`kTVWvRI9L>gr{*h>qgF5?;W)AvMzR-1*oUCDwOiRxM%~`50
zg^|K4{fKaT_>-&4%U;(K9gGQY<`%TWQk
z!h)YBdd&el0dD75{ByR%*2h&un()y|H)SCndM^6&p(?2PL9qnY^+u8w9B=6vr6wq+
zX5&Q>^g(KaQQ-1+ILhxR={Od71j)0A7*E1$3YhCp@@D*)H^VKos`Sf3H#5U)6ZQ9T
zpNRMmlB>PFAG2SrYE+5(w}jnDOvWeSKDVzwNvgTVphcqfLFs}xKyP{0P3xDl0ax5?
z@4(ITvGcUO{a>LQLAnx1GKIoIiM8@GBUB`h+=V2&+p8jvUcBWwdo?0dI$WtNR;p^T
zp4svl1aBrN+&;_69J!X`cEQd%EjZr(8dmZ{JBdsV349B7U(Ok(s(}|YMwSzfI4JEA
z-97~!hgKB5{pAJs73+was&;)=(pVR@q9{mInMv}ikZUcJlIUg}*c%GpFS#uy@0}QG
zrY96C@K$o2s(P74xGv|RE&fMm_n!9k4LjO;MPg8hG9R7U=QOAd)ech$j+w{f&zUnW
z*>xxm=Dk_HI{Xg@8XN@p(~?@@HkRYAuH){Qo3RF>#CC(}GS^Dfctc)QlG`W+d7pEp
z!qNp?zOPY<>ZB|uT4fv&vPvI35xBT5+WtPd0*U0WFQFy>hIZU$}5rMHT_SRxChKeMd
zoV9DQsb87tEEctXzVGk|Wv5W?KlMCMf}7lUMwoV4_Nj+{ROz*AE$;F4
z9IrS}dQgra6Q=2LKo#!7s9i^^JNAStZ|*&1n~(D}l73ATt2n-F-_6UfK2Y
z>DFP7n+SD1dI{+=e|Z$(0aF7LEdy6gRbxhpEOhFjmq69HjQ0op%3QK8{oU+b083Ic
z&VVcDVdl<>4~ij(Tv}dP0|El#4AG+|0?y
z;RM_EAZfmrA>RBQDaSa*0*a&>OV~G^OgDrD#EN8BH5}h-lv6Y;^V*8)xIG)OtDKt`
zuES!Tw|aRp#Adwr_CCj&aBQKsVT|tn<*$_xk2$Q!YKN
zp25q5osO@=E8jIpXq^V#FkdY0+v65*g|BUrSR?{Plz!mn+olb!6rWhoY|mw*AOkc(
z)SC#uo`Wv;+xqa-1M4xh56o-@;W#Kalsb_Cznq%63Pzj>q%Rgftl_C1h!FZUgcI_o
zC)W-mPMKJ_3!?)YZtHYQXNM!)EKeI-Zadymj$}^3jckejy6vr;p@?+VI!~P`RCmk{
z(v=Ixch9{t^VahuUn0zyyKBLERYyyuICNI>&T-9UxcQ~W0(t_qP!|z2$E1xx6%M3X
zjH{kJDZ_^5xzT)DGcB?x;SW;vqByv*Ih(fD3!&=D(XmI8S(sZkJNdy}6H<0yzfc^J
z55!%!Gvsw+H(ipy>mEdstTNMG|A-bV_9JY=fASCrpe!s3hZ(Dv+sKyMnS1bwaM
z*sC_%*OPCkKZSthBXNuj4utZ_Lj-7MV1bNMr-}xIzCS@7;t4VJ=>$zs;UhTw>#~;{
z!!VWj;WYV`C
z6m=>V3qqCTCW)wqb5jbf41~h#QBM=TyLT2@aEj&{j^BT=RZH3u#V9iH
zlOY^4kFF1E&i})%=ykXzVs_d`H)?5rn^~>Yux{O~$2}NF109?)BA{pkJ6qAt8O~cv
z&(%|sbE-lNE%&pMJ2`W1_AKZO3ikSDDZu)0;NB@hre9HZg^Vk0q%sNx9B$?B>j1m^
zx324FkKmNN!+W^Rrbf)x=$qzFd=6R%t}X&Ty1W}XdW^{yH`|IkH&VUGlyIfX4?av{=
z_#Rv4nmk7TG@zly;|oAahxqTYMBD#5mVlhA06m`5ukb5NN^?r9N*n5{>Kp6ZTbt^?
zb#*q@eS5N4k9%?f9YpW2#Y4Gk9XVEBf
z30cj;dkxN^JZnodOhu#VLB`bR6$?v?cU758J4_mMly8sf-WK`^chmHb=zTc)V%^#0
zFp5|`1WGeU+&-=(*6bM~(+{0nG`ap3^AIV87YXj02{x{dNfu2szfKRei48|*p5v*8p8wTS5V
zNpb=6pKE`o&%XZC-ms(du)^!}$!Ym$8|1v^e6Bnr-1DuOakM3kdX0c7t3_S3`S`fB3tAoZ>*_6QDo;G@DC68HC;(cNqHUx*A4uFY$(wX}00?X-r%+cAx9iSuv%hoo6Bm9G4mYvccuIJXaQzM<_)WIGf
z(Pgwx^|P|truy_p>XqDP|8?jKhNfyVo!lLSA|C0xDfT!<=kZ|&3XmxkHto`{I$!7z
z7Il4;COB}4gN)+R-n&iM;nn<47}mAi9AWh7m}wdQC!W#$WKqS{F7kLt5p9!qH>Y1)
z(SGJr0xBTi@b#&Oy+G+ZrKcw+$}>Ls2`i})Chp?hHI$)b$pq?S3?)Nvn;R9pN1X>~
zS9#iJ`4lFWs=hX~f`^=rNpZ0gy--!6G6up>mEovy`u)%iU!*d_%MM)-k7@OVaZGav
zwD3u~IB4WE6$&D*VQG0^m2E=38Ttfb;topBhZrx~U94JWy*d;prXL70WY-CE
z|De=wq9~54JjBt`yE%5t@EHDR0IBqNx`sy