From ac173284c40444aa20f7a22a8468e47552a05da3 Mon Sep 17 00:00:00 2001 From: Wanne Date: Mon, 11 Jun 2012 08:34:38 +0000 Subject: [PATCH] New Feature: static fortifications can now be built by mercs (by Flugente) - if the terrain allows it, an empty sandbag (item 1540) can be filled to a full sandbag (item 1541). You need to have a shovel (item 1015) in your second hand. You will notice the new hammer cursor - by using a full sandbag, you can build a sandbag barrier - by using a concertina stack, you can build a concertina wire barrier - this only works if the current map has sandbags/concertina wire in its tileset - with a shovel in your hand, you can remove a sandbag barrier - changed the size of shovel so it can actually be put in inventories. It was also necessary to remove its ability to be used as a melee weapon. - for further info, see this thread: http://www.bears-pit.com/board/ubbthreads.php/topics/305822.html#Post305822 o Fidel will have a shovel and a few sandbags in his kit #3 to test the feature. - new code: added a new flagmask variable to items. This one is separately from the attachments index, and can be used to determine item properties without adding up to 32 BOOLEAN varaibles git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1455 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/APBPConstants.ini | 5 ++ gamedir/Data-1.13/BigItems/p1item892.sti | Bin 0 -> 1763 bytes gamedir/Data-1.13/BigItems/p1item893.sti | Bin 0 -> 1662 bytes gamedir/Data-1.13/Ja2_Options.INI | 5 +- .../TableData/Item_Transformations.xml | 17 ++++ gamedir/Data-1.13/TableData/Items.xml | 76 +++++++++++++++++- .../Data-1.13/TableData/MercStartingGear.xml | 20 ++--- gamedir/INIEditorAPBPConstants.xml | 7 ++ 8 files changed, 118 insertions(+), 12 deletions(-) create mode 100644 gamedir/Data-1.13/BigItems/p1item892.sti create mode 100644 gamedir/Data-1.13/BigItems/p1item893.sti diff --git a/gamedir/Data-1.13/APBPConstants.ini b/gamedir/Data-1.13/APBPConstants.ini index 6b6c0b982..20ab75b8c 100644 --- a/gamedir/Data-1.13/APBPConstants.ini +++ b/gamedir/Data-1.13/APBPConstants.ini @@ -394,6 +394,11 @@ AP_LOSS_PER_LEGSHOT_DAMAGE = 4 DEFAULT_APS = 80 DEFAULT_AIMSKILL = 80 +;*********************************************************************** +;* The APs needed build a fortification structure * +;*********************************************************************** +AP_FORTIFICATION = 80 + [BPConstants] BP_RATIO_RED_PTS_TO_NORMAL = 100 BP_RUN_ENERGYCOSTFACTOR = 3 diff --git a/gamedir/Data-1.13/BigItems/p1item892.sti b/gamedir/Data-1.13/BigItems/p1item892.sti new file mode 100644 index 0000000000000000000000000000000000000000..f2204befa742e35d286c790e49564d5671f62073 GIT binary patch literal 1763 zcmYk5TTB~A6oxlV8b|G_X-Y1HJI2QM%h=egjlGV+fY-)eUzPweHwP=RAcRXcQ3y>! zNx(ozQZ=EeW5w+#53NY6sH)V5)@@aUT8TbX;-PuX+p1M*BuiAvlY7>H(wUvn?sv}o z=bzDRlxtxKX!rMvGeIa}yx2GM2C2qlx(J zM~}!7XMzTU>6FFz^Xin{VjSqA>&xViZzs!-m-v}e4;IfGwVDX)tU6JBe#jg2hMH^* z_z~ZL^u3{GX?gWoe#Gr+OkEn%$?LdQ>d4#2dWX98^;(Zr|J!%p*cy#vT=3dt$YwGz zeoyv;gh{6z8Xg=UY7crDkHftB$)wGw>F)MVBs=`>#>J~KwNe@IyA!>BX;q!oqpxr=DEvZgQA{kcP65ax|&+2MYFOn z+K4nE#x~gRb=mY+MuT#xH0ZT=MO<~&Qmaw* zRy`1PCSt922Q_upr>w1QaZ^34v$mqP!KA-7olvV3e%c!C@>&}WSWzdz9<{s(*ij-IF@vc%ne)IH+P{t^fIyZR$4-JJS6{~y^&rb7RkfgvpfPB{wJ$Q>hM8#HbWzL0BhAHU%14C0T&vF5(4?WfHSPfsjR3Y%I+)xx#W%?k>`ru zA)N-jtz8Z>oG2p7~Us8i%cyqgdDP!(`-4|yTKr@vmTyQ2fA20DBD74yLlBVYl_ z?(&uOcrMOi4Br@I(AnemU6W!_T=ZGgk-a2Ifx`$orfC`rXvhENOK{KeEEa$xurH9$ z#eMNbj(AK%7t07-k+0~$4FHH^8ow1-ONv4}-;^#tTKMU!TE6DR0rqzDSTY0mNh}QF`8-Af dX0QZIl~B~yR`U7Q8bz&bL0gkhaR0N={{sdBn&I_qNivOcp**xruac#X)Jm;Nl}czI_KEg!`;r%{-p7@qeb|muRl7&${5s!v z{`3F(Z<)dFD4{KTRYeknNjtyj<_-`#Lfh5V)z8`A#sA;`NB`Fs=(sZ6WobAzyFBA} zIph7&fBp2`RXxQ(5eD|{8u%0*(pO*XLq4u@6Ml2>%A|A?(#tn^( z*VVRjsdTr?>Iii3OLIA!rM0ii+tko>a->i2 z@iXHChQ`Klhm)*Y?(YvBt*hs4=5Ie*cetG+apA(bM4QnV?CDy*I>5EIM0*3djGsBy z9N?{Zb+X-Q?T-rMW09a>e{(WvG#HW*-*7s}G#R`O^Uiyh+;-DYto`CxPpH%L&XobP z(HQA=j|_Ht?Dk-XXZ`vqn~6>Ic!$R_e!+b?7iXKAy92JoV63tJ2yZukcz?E?cb}Ae zaxO7l`gb7YU%N11GcsYRb9}(p%C;bneREEBSd58YGslKc=O{ zVY`!m-Db07GlASlkI#>;osF5Ao4Z5kWGc{nq}k)Lzdf6?m|NqW-pp{s+s;jm#*ZC6 z8WvoMMEJ<7^}LDw z$sR}BXwsj%bUM-3wK_d!W!M2p7#Sb3wwOfT^5a)`1h4D-K+o*ubR^bw?|Rm4Gbb{M zOXHz#zx$KhR|U>=VlX^?E*cZj>a|fzt05Wf{Ok0|${hSLJ2t{jd`@g0KxnZF9ip~~ zTZfQ>S*wgO%keCY(Yr+9&&nZ8(_)DR08ZpN9?*gg-6RUNNZkjPK0|}TZZJG>K$jIv ztrItNX#QXsWAzF~94x*FKv5ek!Z`ISxvvgM%3~5`0VI?sR`lgQ1n7=lVP%@qFi>buR`iM$fwDrZR8j1qdn5%Z z`Jc)Xv0Q~}mHT>B1`k>y76DNhJ=B{>{tabOgDegBp`Mz9jpy(drr{CLdooN)e^{7~ap^6z~k{G3@Qz||ncc0CPY9%ZZsXqvLxJRNnX%4hB zERm@ALtsTwDDOQxsLvL{(UYrr|Y) zEN>mOKB?;yF<@nxSguiaG5?g*v4C&YAoZD4N2@?mT1Eb(WI2W;ixRWXamva8Q08Am z(VhQDdn+o7%UaR$O=ZejBuT!Y+o}6mLAxxlAE!_)Efq_9Dj;Q*SZh$qlEmql0$*5VqSo75+ndneh|Plt0kEnB)WQKpxkYS|z$psAmNqND0lXvY AZvX%Q literal 0 HcmV?d00001 diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index ff5f14f4a..d9984bfd6 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/Data-1.13/Ja2_Options.INI @@ -1841,9 +1841,12 @@ ZOMBIE_CAN_CLIMB = TRUE ; This still results in deadlocks! ZOMBIE_EXPLODING_CIVS = TRUE -; Normal and energy damage is reduced by this percentage. Valid valus from -50 to 95 +; Damage is reduced by this percentage. Valid values from -50 to 95 ZOMBIE_DAMAGE_RESISTANCE = 0 +; Breath damage is reduced by this percentage. Valid values from -50 to 95 +ZOMBIE_BREATH_DAMAGE_RESISTANCE = 0 + ; Extra challenge: If true, only headhots will do any damage, hits to the body or legs won't. Only applies to bullets, though ZOMBIE_ONLY_HEADSHOTS_WORK = FALSE diff --git a/gamedir/Data-1.13/TableData/Item_Transformations.xml b/gamedir/Data-1.13/TableData/Item_Transformations.xml index 030ef0b97..4276314d4 100644 --- a/gamedir/Data-1.13/TableData/Item_Transformations.xml +++ b/gamedir/Data-1.13/TableData/Item_Transformations.xml @@ -170,4 +170,21 @@ Remove tripwire Remove tripwire from smoke grenade. + + 1541 + 1540 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 50 + 20 + Empty sandbag + Empty sand from sandbag. + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Items.xml b/gamedir/Data-1.13/TableData/Items.xml index 96d2e962d..561440f31 100644 --- a/gamedir/Data-1.13/TableData/Items.xml +++ b/gamedir/Data-1.13/TableData/Items.xml @@ -166,6 +166,7 @@ 0.0 0.0 0 + 4 0 0 @@ -30975,7 +30976,7 @@ 197 20 1 - 30 + 32 10 1 -2 @@ -30988,6 +30989,7 @@ 1 1 100.0 + 4 @@ -45751,4 +45753,76 @@ + + 1540 + Sandbags + Sandbags, empty + A bunch of rugged, empty bags. What could you possibly store in there? + Sandbags, empty + Only a fool would not fortify his position, especially at these prices! + 268435456 + 1 + 1 + 891 + 3 + 4 + 10 + 2 + 2 + 15 + 10 + 100.0 + 1 + + + + + + 1541 + Sandbags + Sandbags, filled + Whenever you need fortification, flood control, or cheap weigzt lifting equipment, these come in handy. + Sandbags + Not for sale through BR. + 268435456 + 1 + 1 + 892 + 200 + 1 + 22 + 2 + 2 + 1 + 100.0 + 2 + + + + + + 1542 + Concertina + Concertina Stack + A cheap way of denying access to areas. Be careful, don't hurt yourself while planting this. + Concertina Stack + Useful for serious fortification of your base, and ruining your fatigues in the process. + 268435456 + 1 + 1 + 893 + 5 + 1 + 18 + 75 + 2 + 10 + 6 + 1 + 100.0 + 8 + + + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/MercStartingGear.xml b/gamedir/Data-1.13/TableData/MercStartingGear.xml index 650b76d58..96c3c0e85 100644 --- a/gamedir/Data-1.13/TableData/MercStartingGear.xml +++ b/gamedir/Data-1.13/TableData/MercStartingGear.xml @@ -4428,24 +4428,24 @@ 0 2 0 - 134 + 1015 89 1 0 - 134 - 93 - 1 + 1540 + 100 + 8 0 49 91 1 0 - 0 - 0 - 0 - 0 - 0 - 0 + 134 + 89 + 1 + 134 + 93 + 1 0 0 0 diff --git a/gamedir/INIEditorAPBPConstants.xml b/gamedir/INIEditorAPBPConstants.xml index 4e492c6ef..2f016cb79 100644 --- a/gamedir/INIEditorAPBPConstants.xml +++ b/gamedir/INIEditorAPBPConstants.xml @@ -780,6 +780,13 @@ Represents the AP cost to reload a single round of ammunition. Значение меткости по умолчанию для расчета требуемых АР в описании оружия. 枪械信息栏内计算 AP 消耗的默认值，以一个技能值为基准。（大概是技能高低影响 AP 消耗？） + + + The APs needed build a fortification structure. + + + +