From cb3e6356ddba38f349b27f8df0f84b3a19a6eda1 Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Sun, 20 Jun 2021 21:42:56 -0400 Subject: [PATCH] Move the Dwarvish Miner unit to core This also changes the tracking of what they're carrying to be a status instead of a role, which should be more portable to other use-cases. --- .../scenarios/4_Gathering_Materials.cfg | 42 +++++++++--------- .../images/units/dwarves/miner-attack-1.png | Bin 895 -> 0 bytes .../images/units/dwarves/miner-attack-2.png | Bin 1389 -> 0 bytes .../images/units/dwarves/miner-attack-3.png | Bin 1152 -> 0 bytes .../images/units/dwarves/miner-attack-4.png | Bin 1063 -> 0 bytes .../images/units/dwarves/miner-attack-5.png | Bin 1273 -> 0 bytes .../images/units/dwarves/miner-attack-6.png | Bin 1094 -> 0 bytes .../images/units/dwarves/miner-defend-1.png | Bin 702 -> 0 bytes .../images/units/dwarves/miner-defend-2.png | Bin 835 -> 0 bytes .../images/units/dwarves/miner.png | Bin 706 -> 0 bytes .../units/Dwarvish_Miner.cfg | 40 ----------------- .../images/units/dwarves/miner-attack-1.png | Bin .../images/units/dwarves/miner-attack-2.png | Bin .../images/units/dwarves/miner-attack-3.png | Bin .../images/units/dwarves/miner-attack-4.png | Bin .../images/units/dwarves/miner-attack-5.png | Bin .../images/units/dwarves/miner-attack-6.png | Bin .../images/units/dwarves/miner-defend-1.png | Bin .../images/units/dwarves/miner-defend-2.png | Bin .../images/units/dwarves/miner-laden.png | Bin .../images/units/dwarves/miner.png | Bin .../units/dwarves/Miner.cfg} | 21 +++++---- 22 files changed, 31 insertions(+), 72 deletions(-) delete mode 100644 data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-1.png delete mode 100644 data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-2.png delete mode 100644 data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-3.png delete mode 100644 data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-4.png delete mode 100644 data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-5.png delete mode 100644 data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-6.png delete mode 100644 data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-defend-1.png delete mode 100644 data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-defend-2.png delete mode 100644 data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner.png delete mode 100644 data/campaigns/Secrets_of_the_Ancients/units/Dwarvish_Miner.cfg rename data/{campaigns/Sceptre_of_Fire => core}/images/units/dwarves/miner-attack-1.png (100%) rename data/{campaigns/Sceptre_of_Fire => core}/images/units/dwarves/miner-attack-2.png (100%) rename data/{campaigns/Sceptre_of_Fire => core}/images/units/dwarves/miner-attack-3.png (100%) rename data/{campaigns/Sceptre_of_Fire => core}/images/units/dwarves/miner-attack-4.png (100%) rename data/{campaigns/Sceptre_of_Fire => core}/images/units/dwarves/miner-attack-5.png (100%) rename data/{campaigns/Sceptre_of_Fire => core}/images/units/dwarves/miner-attack-6.png (100%) rename data/{campaigns/Sceptre_of_Fire => core}/images/units/dwarves/miner-defend-1.png (100%) rename data/{campaigns/Sceptre_of_Fire => core}/images/units/dwarves/miner-defend-2.png (100%) rename data/{campaigns/Sceptre_of_Fire => core}/images/units/dwarves/miner-laden.png (100%) rename data/{campaigns/Sceptre_of_Fire => core}/images/units/dwarves/miner.png (100%) rename data/{campaigns/Sceptre_of_Fire/units/Dwarvish_Miner.cfg => core/units/dwarves/Miner.cfg} (81%) diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg index 56a35c7a18e..751fe94bce2 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg @@ -813,11 +813,11 @@ type=Dwarvish Miner [not] - role=has_coal + status=has_coal [/not] [not] - role=has_gold + status=has_gold [/not] [/filter] @@ -825,7 +825,7 @@ speaker=unit message= _ "I have all the coal I can carry..." [/message] - {VARIABLE unit.role has_coal} + {VARIABLE unit.status.has_coal yes} [unstore_unit] variable=unit find_vacant=no @@ -852,11 +852,11 @@ type=Dwarvish Miner [not] - role=has_coal + status=has_coal [/not] [not] - role=has_gold + status=has_gold [/not] [/filter] @@ -864,7 +864,7 @@ speaker=unit message= _ "I have all the coal I can carry..." [/message] - {VARIABLE unit.role has_coal} + {VARIABLE unit.status.has_coal yes} [unstore_unit] variable=unit find_vacant=no @@ -911,11 +911,11 @@ type=Dwarvish Miner [not] - role=has_coal + status=has_coal [/not] [not] - role=has_gold + status=has_gold [/not] [/filter] @@ -923,7 +923,7 @@ speaker=unit message= _ "I have all the gold I can carry..." [/message] - {VARIABLE unit.role has_gold} + {VARIABLE unit.status.has_gold yes} [unstore_unit] variable=unit find_vacant=no @@ -950,7 +950,7 @@ [filter] side=1 type=Dwarvish Miner - role=has_coal + status=has_coal [/filter] [item] @@ -970,11 +970,11 @@ type=Dwarvish Miner [not] - role=has_coal + status=has_coal [/not] [not] - role=has_gold + status=has_gold [/not] [/filter] @@ -990,7 +990,7 @@ message= _ "I have all the coal I can carry..." [/message] - {VARIABLE unit.role has_coal} + {VARIABLE unit.status.has_coal yes} [unstore_unit] variable=unit @@ -1025,7 +1025,7 @@ [filter] side=1 type=Dwarvish Miner - role=has_gold + status=has_gold [/filter] [item] @@ -1045,11 +1045,11 @@ type=Dwarvish Miner [not] - role=has_coal + status=has_coal [/not] [not] - role=has_gold + status=has_gold [/not] [/filter] @@ -1065,7 +1065,7 @@ message= _ "I have all the gold I can carry..." [/message] - {VARIABLE unit.role has_gold} + {VARIABLE unit.status.has_gold yes} [unstore_unit] variable=unit @@ -1096,7 +1096,7 @@ first_time_only=no [filter] type=Dwarvish Miner - role=has_coal + status=has_coal [filter_location] find_in=resource_return_locations @@ -1107,7 +1107,7 @@ message= _ "My load of coal is delivered!" [/message] - {CLEAR_VARIABLE unit.role} + {VARIABLE unit.status.has_coal no} [unstore_unit] variable=unit @@ -1161,7 +1161,7 @@ first_time_only=no [filter] type=Dwarvish Miner - role=has_gold + status=has_gold [filter_location] find_in=resource_return_locations @@ -1172,7 +1172,7 @@ message= _ "Here’s the gold." [/message] - {CLEAR_VARIABLE unit.role} + {VARIABLE unit.status.has_gold no} [unstore_unit] variable=unit diff --git a/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-1.png b/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-1.png deleted file mode 100644 index 1ec4b2892ff12764f28eb7368cc6d5a08e4eda5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 895 zcmV-_1AzRAP)_ET}xJI zPfuA?H83S5Emk!#EFmK;At5hRYgs56Sz2XaPD*EKZZs-8X=rL`a(r!UaBoU6H7!1P zb9Xg0C4_;3HZDImF+z?`6qCfom5qrvI!PxcEeZ+;sW zMBs~hMonHwM_BQ4tSlTTH-kkD00004bW%=J005cS3#Smi0006;NklMredaXoN<{ z7--G}IcJOjDo%}S8ZL&+bhXNoYTMR?^s;HnAmap@M$;%GsT3SELm`mFkz#ZPRHoW! z91MhjBy=%mr*=vMDbuztwlD|+Ov$5hE(*1ZwK2?`rFPl^^oIbwXF^lEIy=tQij&pN z4I?wT{tyU6%&1iDoKoFlp`K(&fV?*cJt2_DXUNnF#aS*FoID?VY~!jAbm$OirHs<+ zwOcNgPi(W3rKw0gA@ZI=@VZfY(Z%)tzE0L==(p4#Vn#|+ueI*BmRk$v#MTbJYa7QH z6};CwJKf?dW~VNK2#u>1c}DqV9f!oR1VZL3uj**D_C#H0ZFXV_MEv>rqgp9V%tV1L zXJ;TJ2}IxT+`9Wy=Ryjb4V6J}9@kHwsc#n_zOX)}U~LgZNUtBfyMO7+hs!otA2Os$ zARyAx?T`1a-VByKTdhhUiOydW>HVkcn%P>7sLLRU2sOUdImB762$Be^3bQktZO>=B zKSU~oh%&LaS7m9w>#+<1oJsTf_Jt}-J|%`SNF=JZLxqSHa|lELg%Gn(fdP@2*fY~$ z2o7TA6i`GGGNcr!KLm#%<}rvS6QnHp;Cn%EEMYhVW`QQz%;Drz=rl(Tv-c@@Ih?~y zlRrbpnGA`<;v8!TG&wrNnV?e}xT6hl=pGe@L2#6Tg2yPFOqc@bB=?`c{6}bnegXJl VHAU3Thy?%u002ovPDHLkV1k0^ZutNJ diff --git a/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-2.png b/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-2.png deleted file mode 100644 index 2c68fc56367bbbd99f430b3470fd27c1f59eac0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1389 zcmV-z1(N!SP)R4D zl#Lt`4T~}vX#hE%09`)-7O_i9H8mx}0CdXQ*WinK>;Q~lUtc~03lImNmWW#XiZpX zPD4pgPgPS;UsPObRA6yc04OXTELBxkR#sP6S63kx5iTJxT^cA|TVr2cWnW`#UuAJG z2m)a~9%C*VV`5=vV{B+$TrnguX=-k2X=rV2Yj1UdaBOceF+p>5dUS4cGAcZGbaQuv zk9jLpetUZ|D?NaHe}#X1hJSm8fq#jLiZdN0G%Gudg@KKVhmDYqk7+=Uh=Y)ja5XPN zB_%F4Ge@AMrlG5;qoA6muB;%-01G~^!i%-$TR=|0@g`HK~#8N?bp?h+(;0>;dYpgX~K9^jbM8i zmNCrC%*@Qpbj-~652m~mDUr3(?sWVTWqz+#e=4{9P$phNy*yAIszXEG8uMNv(Cgn# zOJbq{Q+~YpW)jfbpWGUk#2pQreBskKNCMD17xzsd2~0F}_iqh@5`f6q%iHFSOyE0u z?W6S#qX#Acjk<&6OX&&j7gLT3dq>fD^QLwOlb6L2e9hZwI54ae^k^*z@IwBM>T-{sm(#XsrMo zpm(P(+W7%KopYwtiUJs8wX)#wYQsGuFu$uSCLV3!0oDA~ZshVN!Db*JJ53<^rK3 z*6jaTGGF?EWSfygr&cI(G)O8pJd%MQ_>!gb1xE-pJh--fE>kDSLkI+SPPx+|^_7KY9A zm)RZ5{yh47rt)ji848=T*=%O!H+1>BmSVA@sWX(xWQxV^N;U_X7HusMHz=eTk!vwI z>d_p4F+vdH1Q80LtpSpy0t9FPQ8PrU0f04>5QIP*YmMkXM4m-yG=>nV6cv%AjqVpj zVj%;@03ei#%qW`b6N)={7#GKlo-mC47s!-gm v8nrEB?D)hw9K1FiyM-3Jej500000NkvXXu0mjftz|lH diff --git a/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-3.png b/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-3.png deleted file mode 100644 index 3a048f4dfbc19715c83d56f50bd583dfae857e25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1152 zcmV-`1b_R9P)mNmN)^SXfwC763FO097z0HSX^1EFCL!ad9jiD|B&j%G%dhSXfwC zSnKQRb8v7vI#3)E4LUkdSSTP85)C>M4RmpFfIt|SSP-6+jlh5iRRAiBG8rr#D_I~A zI1~;_R%lpQSe^h~5D*ZtOH0by*Up4v;EQ@WIZrDX2ow|)S65d*02Yh@QS1PW?(XgO z)0-#|5bs-|TwGjT8Yp6AZDj{EX#hECYHn-*J8*7rb8vP$6)t%zRGpKIf`WgBj*^Q2 zP(Ktm{<=b zB`qu*Dt>!=fIS(*0CYGvOv~EWIXO-$BPQkP=jkt&bZ~G(N?jTn74dScH8mx)n=r!w z000(rQchC<000331O^D1ndpHu1Q2eRCr$P*F}#TK@f)F znGHG2Rn_bv^Fp!^W@ct)X8if7ww2@%B}%t_^ryLv^yuwTUnWUMv@tY>hT9lwwMGNA zjBAYqA~za{gUo0kXJ`Zv5jl2-hQK+asWo&FIIUe-0#P|6M4(IKN-`zlkWgvLvZP9> z3NZ{y)@@(*6Do-n%~YkVWhx9>`R@ACUw6@z#v&w2VaM7E10a?*o^LGaJ764@)+Pyd z=H?Ks3WQcaRJd3H00#jn+d;)p$6^@7(%M6+fru>*0#KG6p5>qlLm-ycKWa1@o9~bT z4+&+hca+M*AeJ_8Q)BX_OaQ7%C}o+NCgi035$M67OE`{c`>uk|=+K*8X&YszK_1VFvmoI(F>(LO@o6X$^-io_B_8xux?G464-kIGt+ic!A zw`;3*4x%BVdS4P-h>VecWc()tg0`A1Vz$}8=TyQU9sdatX=g|@>jOv=$%v!XYBeHq zMu>XqA=1V<1ECNzLih+NMd~3hX`^Kz#Ey?JhDa`FH1(>V2!STpVTcQy(Ijevf$&R% zpxOXpiP-tI3I8qxstqRm2F`D5BCP1|3xob8g+YS@`~?Vu{4=s2zcDn1#?TM<^m)oL St`U;}0000rJmpnrOJ-{$0qkB%G?4RmpFEFCL45)DdL zXjmv9C=d{UKp38sjo8@Oi!vEHI#8Hc5LEywu}e$E%*t6H5Ws*4&V*x5SZUykdPyA? zD;NkA6ckb;98+9tL?#WM0A1?p>g)iF?(XgO)0;a-T0IvMKSfeO7Y#xf5<^K`L>dt& z7!gJr6et)YNh2956b(%v8BQS@784CmOpCW@u$=Xl7+lm26Ix zjfs|yh?bn2G!hM%WG|SVn=~aZG&4n@nUt%st~E6!ysn15zP>d#M>aG=%G%dB5)3&C z895RSIT#Q*9}yfK9q(JA8WRqxN^6w>000hjQchC5E`_V%pg`8yrX0S0YcnAjY1)3 zrl+0j|95l5Lq^X^0S@!=j*r&Fg*QS`D1c~PI-Jl@2ucYCM~L>+wB{}xVnV=i!b^t` zP6Hvvl!qwggixAWOKI3$!juAIppH{`r`@*neGkfNI_%s2M=y6%>L^A=NV`q*Fi0c^ zF5md@|!8oCBu8oeqVCbe@ zn<4;;7^IZSeOkX}_4e;S*s$%Uc@PA|N&&ylUiiFe==LrvH%EDDWN1l%xwVNOFpTyEEG(^r-+G}Efii# zh~iXMrkuJzYt`|Khch$T|D$&4kq3V1{+;OTul-)n-2=AC)9oHPL~e)}$J hA`6zSSQP!Y`3pB&R#dqSzJ>q*002ovPDHLkV1g3vwl)9& diff --git a/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-5.png b/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-5.png deleted file mode 100644 index 45085b1c0a0aca11fa2e5506853616e8508ff87f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1273 zcmVtj%9V>Kk zaV#Ax&fM8WL{?Z>Sm5B_SXfwcZ*V#~P&^Y3b#H9Y-P$)bN?2G}zs<@V5)CL25G)-l zIuZ>!I#5bhXjmv9ba8QjKp0sd5Q{Pyo|KKifC#ZmOHNp6RRAg&DKVH>5YB{S;EQ@# zSXfdc98+9tD;Nl#09{vCS41WaNgWmx6cpIl*b)*A>;R1J?(O!|n>iQ|IUf-@HAy)* zO*uGDIXO=p9UU4I4m&$gJr@!^JW)SBQa?pfK^F}|7!pHCTtpfXC>Rk&8x%-MTS!S= zC>SG2BN-|b4NV{!P9Yi=6Ae#IT2N3pQ867+P*f`!4pSl!Qzjl$Dh@0hC{zS4R8&_S z93NFxS1lbXEgvo~8X_-LYg$@aTVZToU0q-+6lZ54sZ8*OZDZg6*Ra&dET zaCABrF&q_nc6NF^7kYPhdqOcXA0mKD7JyO{fqHs^b#H>2qJ>2lh=^!26c3DoevMNV zkdSbbRt=QK#+7VNm5qs(j)*fUIhbTGn2(5=S`eF(i=2{-G!hLoB`&6(m^3p*wt5S? z$Hcs@hP{0Vy}rIRH6_H;(8}7^H8)2#G($KN3^+GTISLu?TcJ4;4S*(*LI3~&A#_qs zQvd(}000695*#HiE}6^N+1}sc@YJkGcz+YGjo1rTHdPI*U`8tmwgxAzItjM)FjnI`R`B} zDnn(c43(iWRE9jyOAdKmNd$S_(_@h54wV3+wIInMLPSe@yAX*WVk0y{EuocMA;K}} zV8T!fXNW))82}xI){&Z_u4>pk^|%s&J9A0Nv#?4 zgMhg~gc}2#0~3+~I)y^OK081jH~iQ3`%gD9CKxm~>q3F~E)d}=yZiFh4-cnZVi5RY zb4N#^4#yoE>YVeVCs%Hs-2&jJ3+bRENCP(YVnZA;6pTbwM%hgTstGfV?pPvyYwnzP#zjqK!N#Le>q65ZbA0A78uPw01Gv z^8tfQT*#v)A5mDf;m{{5Xnjkg;{X9QMj47k%MFAiO4f0JfKsJs8zQxEK!;L-BcxCQ zTK_wn&4QLPl;F8QP)c59>)X%?ACwBkh5#p>H`Gdy#cH9{K!#RT#f2(CnY^OZN`TKt zH9+g&Nt^GCj0;slXY4_hQh5rkWcbfr?^jmDgHS5PN=8KnRO|TZv-YeQkm?l+>TZEC z2BLg!#|$y|xZ6+ruMVq%GrjkSb7M%YwrjNZ?GN}LIi_b>&PQI`YJo;wJFp^3Rot`*)2s+83 j5rc?zl0%kpfSmFdR(7L~=|)UT00000NkvXXu0mjf+x-Bm diff --git a/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-6.png b/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-attack-6.png deleted file mode 100644 index 66bc5a4d944694dc209f5b100deef8d6414f4379..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1094 zcmV-M1iAZ(P)O!Zh=nd1Bt14k zkcx(piG-1xp_9bLl*Yy)A}v2YPn?~Zon{X|KT$wHQKzx5Lqbrqv#>)$QbZykF)2FC z*w#iyQ_suD)7sfbQ(Wu-j4~=bPFQIxcM{(K0013yQchC<01+@oU~q7Fi;a$%q^GE? zzsJeV)Y;|l^ZNY!lpKJs0007oNkl|8~DWyx3j=+oS+7NS*ZEkGk^1dX5(G=iYlP!KF_)gV|6$XZ;91XT{U zXJ-+IhtM+AP7sEK*x{1IA`A{G&e$aJPGRN1kSR-N(AtEl*`z=m5Hik@GFaHcJJuEw z27!PfMP#Hbtd%m&GC3#&%6SM2Y1rv>sw7y(QHmF#G}F_z(~+qG2w%jGQ+e)KGFh5T z&&_qlQ3gYtKaeWh&KQ$6JI!n^YZ{a%LLu-DqRbsjH`A=!O`BtWQWyjgXwn94A(bPO zW?7mwvuw-`0x6ACMS=^GpTvubLWbVRL%*-J3n`5vQl{JN`Wsmj;fp;15HO^03JWWd zC8fr*ZZkD#qG<1<>&HSM(1iAR!jN8sx(2ZoJ^S_b&eQEdP{SsO4JqZkq_U(TglKK} z{Pz68kQ+hNK${4mef~_T5YCC#ZN!gP10b%ESW)IV30g>yD@*b4%Gt{p2C*daykx1I zPq34JI{oI<>)-EXW z$%&e-QGJ5f5xhL}ST)KE@T{xtP9G{y>MT#5|Y}$W!-?jh< z79*lE*B)Xr=gaRn@?a-aLj8``euh$Utd*Bs4jYd?j#majFJ|~KL=45={U6U&xV;ecHGA#<#=FE(`TD9%6~u>9ytEhqwajb9y6|H~_o8_`fI+>IHw>`W?7X z2>SXrJPNuI^w$Hbpz122evI9rpz3V_Pz6{41yBLda@ZRCUK>Gw05z?6>))&^;s5{u M07*qoM6N<$f(e||@c;k- diff --git a/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-defend-1.png b/data/campaigns/Secrets_of_the_Ancients/images/units/dwarves/miner-defend-1.png deleted file mode 100644 index 061b24d8df6715594f16cc09caeaa8291e62fb1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 702 zcmV;v0zv(WP)z<>zK+Sks6WA5(l;EQ^U08zsLbQBa65D*YQ02TlM0QS?HD;Nk>04igQl$DK% zL?#VwY;6`34eS7nPFQL2a;#8LINbM#d;kCd19VbOQvh(8T$+~10005$Nklpl`zL;1!?R+uGXN+S=M8!iP9GEek$? zLQ-f-_y9*s>7UMH%}`3!$pot%GmgO^QBrD28F8%>g0R6%xjIA{Rzoae05TCkR|>4Y zjYEYngHdOmRa)&Z8vq1zI?+5sXI46aV+<;p(xubwHa{ca8b}0qoPsf?8|In90PN(6X^xcKP3K;IKm8)UDP z5U&7GCGiqQJqvqEedDAnQhN28WfAsw2Y~v1YJ_Z}S3kxmUTPtVnhFu=q^7RACyo`0 zBDPMm3J~gdH)egP2Pt4_nJA$`8coy;)r&k}raUEbN017nWod=#J@McippJ6ie;%Q3 z(%)|E<;Agchof_s`Wz2>=v``staI+D9WMIK_97A^a|PNVz8vD^kIKRlMC_M#$BKk8 z^6s8O65=>U+w8DtAD}9QDCagtCrHpeL98k@t8(qUYho&-lBn}HTRW@S1gUgy_o>!J kD}~R}2leScYHMrjH^z*ba8Q5C?Gl#4IB~;5)ut45D7KlANNG#Kjg94Mt2~M?FSJ92Q7NS;gbyN=aED7#A%d zE>~b~Ei5c9Au;iCtT8A#{{H@QJtD9G0007XQchCqnTAb-rq~4BF8UR5b9no|Om8iWOr@VI}>9Pt( z$H&tJ2E-l^bFSLXX|1bf+LXs-ql*rqhodzI-o1RC02M2>DEE!E%up1Bi4xyF|MQW^W7qN#E%qi~z)ob7=h1o0-T3TbRo!2#>Y*n9pUc*Wxxprdaa8PwUU)S{} ze%AF|o@(UY$&gW-xo5T6$U>RfFnh0*0O=6B_UEWk@nmv+lkCVO3pDwjQBiW9SBcK# zY#+yF@xG5)D{bSc@_lSs)N;06EIq z*FOLju}e$Ngk#`~dcy#8i~v#Y?(Gy56!z1b>;Q~JCJieX2$hYAPFQJeY;Ey!tQHdu zJVD8v00002bW%=J0Ga_~Th`x=qnS&pKn*XZ3y}iA?JrR6~gVXhjFQ8B|G(~)YlZ#RQMuHqkjKv9}f8=_R zQZho3n5kh_|=5<0tAJ;=9yM8zo>SNRzc~ zJ1obgf9sd_F0mOm4dzX<)j?FZEd3h#(`i^f)=B2}^{dJz2nZ!87}L=AL%;O>hhzxc zc|GXjbpu39_$@?Sr7|fm3PBrB#aX3kgG4~ze@sD@fEn7;aw^|Q2oiAfkTyZU5Ja&& z;j=$217XX~4vz!b0s&hxRMoo#{fQ9S%n~MH$b^4Ao9UIe_tU8AruTj_*IuYTVSf zLgVE;j&pgO-;KCH_0gC+pD#1bJYFoN!aOO#eDRr@EU`Pl(-5;I=PUvP8}ri=Gbg7z z#O5jaa}rUR0dP1F6v^D+@Qee@?#vlF6thJ6y^_htY?j>eafwRnYaLUdEUhCR)jN+7 o523yd8!DjY6=mk1Y;SMxH&*}{tqZ>|hX4Qo07*qoM6N<$f>*04zyJUM diff --git a/data/campaigns/Secrets_of_the_Ancients/units/Dwarvish_Miner.cfg b/data/campaigns/Secrets_of_the_Ancients/units/Dwarvish_Miner.cfg deleted file mode 100644 index a13f796cddf..00000000000 --- a/data/campaigns/Secrets_of_the_Ancients/units/Dwarvish_Miner.cfg +++ /dev/null @@ -1,40 +0,0 @@ -#textdomain wesnoth-sota -[unit_type] - id=Dwarvish Miner - name= _ "Dwarvish Miner" - race=dwarf - image=units/dwarves/miner.png - hitpoints=25 - movement_type=dwarvishfoot - movement=4 - level=1 - alignment=neutral - advances_to=null - {AMLA_DEFAULT} - experience=50 - cost=19 - usage=fighter - description= _ "Dwarvish miners are the grunt workers of dwarvish society. They take the precious ores out of the ground, but do not ever take part in the crafting of weapons or artifacts. They have no military training, but they can still do some damage with their picks." - {DEFENSE_ANIM "units/dwarves/miner-defend-2.png" "units/dwarves/miner-defend-1.png" {SOUND_LIST:DWARF_HIT} } - die_sound={SOUND_LIST:DWARF_DIE} - [attack] - name=pick - description= _"pick" - type=pierce - range=melee - damage=4 - number=2 - icon=attacks/pick-axe.png - [/attack] - [attack_anim] - [filter_attack] - name=pick - [/filter_attack] - start_time=-350 - offset=0.0~0.3,0.3~0.5,0.5~0.6,0.6~0.5,0.5~0.3,0.3~0.0 - [frame] - image=units/dwarves/miner-attack-[1~6].png:100 - [/frame] - {SOUND:HIT_AND_MISS axe.ogg {SOUND_LIST:MISS} -50} - [/attack_anim] -[/unit_type] diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-1.png b/data/core/images/units/dwarves/miner-attack-1.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-1.png rename to data/core/images/units/dwarves/miner-attack-1.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-2.png b/data/core/images/units/dwarves/miner-attack-2.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-2.png rename to data/core/images/units/dwarves/miner-attack-2.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-3.png b/data/core/images/units/dwarves/miner-attack-3.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-3.png rename to data/core/images/units/dwarves/miner-attack-3.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-4.png b/data/core/images/units/dwarves/miner-attack-4.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-4.png rename to data/core/images/units/dwarves/miner-attack-4.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-5.png b/data/core/images/units/dwarves/miner-attack-5.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-5.png rename to data/core/images/units/dwarves/miner-attack-5.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-6.png b/data/core/images/units/dwarves/miner-attack-6.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-attack-6.png rename to data/core/images/units/dwarves/miner-attack-6.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-defend-1.png b/data/core/images/units/dwarves/miner-defend-1.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-defend-1.png rename to data/core/images/units/dwarves/miner-defend-1.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-defend-2.png b/data/core/images/units/dwarves/miner-defend-2.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-defend-2.png rename to data/core/images/units/dwarves/miner-defend-2.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-laden.png b/data/core/images/units/dwarves/miner-laden.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner-laden.png rename to data/core/images/units/dwarves/miner-laden.png diff --git a/data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner.png b/data/core/images/units/dwarves/miner.png similarity index 100% rename from data/campaigns/Sceptre_of_Fire/images/units/dwarves/miner.png rename to data/core/images/units/dwarves/miner.png diff --git a/data/campaigns/Sceptre_of_Fire/units/Dwarvish_Miner.cfg b/data/core/units/dwarves/Miner.cfg similarity index 81% rename from data/campaigns/Sceptre_of_Fire/units/Dwarvish_Miner.cfg rename to data/core/units/dwarves/Miner.cfg index 3e16d308d4f..f09645f0985 100644 --- a/data/campaigns/Sceptre_of_Fire/units/Dwarvish_Miner.cfg +++ b/data/core/units/dwarves/Miner.cfg @@ -1,4 +1,4 @@ -#textdomain wesnoth-sof +#textdomain wesnoth-units [unit_type] id=Dwarvish Miner name= _ "Dwarvish Miner" @@ -6,7 +6,7 @@ image=units/dwarves/miner.png hitpoints=25 movement_type=dwarvishfoot - movement=5 + movement=4 level=1 alignment=neutral advances_to=null @@ -14,7 +14,7 @@ experience=50 cost=19 usage=fighter - description= _ "Dwarvish miners are the grunt workers of dwarvish society. They take the precious ores out of the ground, but do not ever take part in the crafting of weapons or artifacts." + description= _ "Dwarvish miners are the grunt workers of dwarvish society. They take the precious ores out of the ground, but do not ever take part in the crafting of weapons or artifacts. They have no military training, but they can still do some damage with their picks." {DEFENSE_ANIM "units/dwarves/miner-defend-2.png" "units/dwarves/miner-defend-1.png" {SOUND_LIST:DWARF_HIT}} die_sound={SOUND_LIST:DWARF_DIE} [attack] @@ -27,21 +27,20 @@ icon=attacks/pick-axe.png [/attack] [standing_anim] + start_time=0 [if] [filter] - role=loaded - [or] - role=has_coal - [/or] - [or] - role=has_gold - [/or] + status=has_coal,has_gold [/filter] - start_time=0 [frame] image=units/dwarves/miner-laden.png:1000 [/frame] [/if] + [else] + [frame] + image=units/dwarves/miner.png:1000 + [/frame] + [/else] [/standing_anim] [attack_anim] [filter_attack]