From 452a247d14ea8dd78db69c21ffb6c70cdf79f27c Mon Sep 17 00:00:00 2001 From: Wanne Date: Sun, 1 Apr 2012 15:38:40 +0000 Subject: [PATCH] - New Feature: Allow attaching and using underbarrel weapons (by Flugente & JMich, Pics by smeagol) o Updated XML files and added new KAC masterkey which can be used as an underbarrel weapon o Raider and Kelly have one in their starting kit 4 git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1380 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/BigItems/GUN369.STI | Bin 0 -> 3292 bytes gamedir/Data-1.13/Ja2_Options.INI | 11 +- .../Data-1.13/TableData/AttachmentSlots.xml | 6 +- gamedir/Data-1.13/TableData/Attachments.xml | 252 ++++++++++++++++++ gamedir/Data-1.13/TableData/Items.xml | 34 +++ .../Data-1.13/TableData/MercStartingGear.xml | 54 ++-- gamedir/Data-1.13/TableData/Weapons.xml | 34 +++ gamedir/Data/Ja2_Options.INI | 14 +- 8 files changed, 373 insertions(+), 32 deletions(-) create mode 100644 gamedir/Data-1.13/BigItems/GUN369.STI diff --git a/gamedir/Data-1.13/BigItems/GUN369.STI b/gamedir/Data-1.13/BigItems/GUN369.STI new file mode 100644 index 0000000000000000000000000000000000000000..94cb65bedfd03aa3a88e82e68417e716b53f8168 GIT binary patch literal 3292 zcma)8Z%iA>6(5syv$<%u&haNE;h$mn<4b@zhQ#Kym(+Vi8;4v1ahw2`9F&wau$RC& z;&SDZ2J9FoBK20iyXE$fDjnfNPta4V(CR8hRi%m#_aRbcXZiI|t(1@Zt@O>T z0i$qIf3|04-^{$X*h^~I=srkF!$b}wRRg7#mo2Svz*;LG#8BW7*kcuTzQMd-f> z^#y|=5C3kZ;P$xh9It3<@G4EXFYHgf)9&_$+B!NSXSzntc4@;G;_*IzWT>})=)<0o z`Hx1!qw)KwSASZ`t-D>w4>r5`h?g(l zxA$#N$knd=7^Jv6>(igZJKGD|`>OA?@rIV+A zbn4XPxwo%gI^zvTI)dlMu66gH?g>SDhA#GYo$tRnIPkOKf%wSHP~Yg~E_HDD{hpzC zd@?>hFfnrLT_r!SoeSxMxpfl9=!;ZGVk)Ral@P)#m za5x+Zr!I$&ACm_oozZir&%UMHJ$*iUq1zYgd35#Sl`B{L;l6P=W%%mc*kHJ4XexUB zdhd-7uKoD_osr4+Zl@>4!hP{;(TVi+yLW~kjD48+>FC2m@}V}B8dDz+P0rp+Y4<+T zXP)T4oS7R<&g=7EF3c^A&MpF$7nWC6mM7;|e!H|Xx%hnb`ReTQi`wJ$%XQ`x-?dxL*hy_!_Icc4ue-0ISlnOIU0zaFR$5N6_*HsX`@ z^~am*>zbNQHv4>j-wFK2h1MfgbuGceEjNNKrvk0-wzv8l{P!dNiL=N2fk1a4AiWv5 z^=8`}P3@ij_IEl?pmq2#(A;T2MW_x_(R5MKG=WVibVkR|+(OI{bm01p(re)G~3=q2({h83v3Hqe~4-uY7gy+F& z2{e6&lVzfd#5BQgiXv=>4Gyp&KenS_jSRaqc!p4ftPm9TfyaU+TSM7O0=+D7Kua`@ zycdHxdIdVYRbW>#8Av~9ot{dZ2igf4W+Bihf=wx@VrUdd1c!EKR=UiVlS!EXtx9-K zP{5HJ{-r&*i8+`#jCs#WI$hx^C5?QSgcTG+2>>IAB*JkjoY8S7JtrN1hjZal*v-KD z>=a7YK{P_01Q3EDS~;vjFR>?>f>2lG&)ZZ-d0r*eO-Wt>=-z}ljS}NnHnHPH(*#>F zQGvzzGA_svS^@wN-@HT!FR>v_0g~Nz2FkZh;4q1rKx>TR1e-xgA@)_?;>|@bH^UldPOi3U~7;H$V{BRq$ZV34T3Vsl!X%tsw0-Iz5 zDj9K7(6k|bOxuP6L2T24#ul;cWDHFg$QwwJ4RCNc2y55@Z#LTk6?6uoS&->_3jlv& z94J~w5HpINKyl8NMDR;57(?JfV2@23SpYT*SV5C5=-2`#CruT0``{}UBm!g>{ebuA z{ep}Z1f9|_5%gd%yJ%)GI3t=s381xAlOraE3I=tElR1b;lgB2nT9RaP5TrDm=(X}m z(}WrVRSX{CZy8VH0gm|!He?%p;er^4QQ`w2qX8;mED?xGXAA-wPLK^OXrVAWym@w7 zKY^7bv$Qjl9IdX7YUpT%rbz^m`3i^}#gHDIn1D)}eZWu%$PJd0EJq3_3di6;_U_Rt zEFQK~5;_ePTo$MR-c%Wpn?f_Y;Mx-hsbEKNE3ZkCWic~JiqA?G;S^DwhS#%L{MYYU z;94^cZ|bRC@X|_9Df!!O9%A~D3uKZG?~NIk{`Xyw70xmuQc+RN{6~>YQm}KnD2tOI gk;H%Q0z;E7kYM}}{fEa&hK3ZELgsF8G)|-c0Yq~H&Hw-a literal 0 HcmV?d00001 diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index 72f03564c..1d54c2bec 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/Data-1.13/Ja2_Options.INI @@ -1760,9 +1760,18 @@ CHANCE_TO_DO_LIGHTNING_BETWEEN_TURNS = 35 ; Should a 'thermometer' for guns and replacable barrels be displayed? OVERHEATING_DISPLAY_THERMOMETER = TRUE -; If a barrel is not in someone's inventory, it cools down a little bit better +; Starting amount of red colour in the temperature bar. Must be in [0, 255] +OVERHEATING_DISPLAY_THERMOMETER_RED_OFFSET = 100 + +; If a barrel is not in someone's inventory, it cools down a little bit better. OVERHEATING_COOLDOWN_MODIFICATOR_LONELYBARREL = 1.15 +; Should the temperature of all items lying on the ground in a sector be set to zero upon loading a different sector? +; Due to engine limitations, the temperature will otherwise stay what I was when another sector was loaded. +; This can be exploited, but why would you do that? +; Note: This only applies to items lying on the ground. The inventory of your mercs will cool down wherever they are. +OVERHEATING_SET_ZERO_UPON_NEW_SECTOR = TRUE + ;****************************************************************************************************************************** ;****************************************************************************************************************************** diff --git a/gamedir/Data-1.13/TableData/AttachmentSlots.xml b/gamedir/Data-1.13/TableData/AttachmentSlots.xml index 753cb5367..7a58fa9d0 100644 --- a/gamedir/Data-1.13/TableData/AttachmentSlots.xml +++ b/gamedir/Data-1.13/TableData/AttachmentSlots.xml @@ -135,10 +135,10 @@ Underbarrel Attachments 512 1 - 58 + 18 120 0 - 0 + 1 14 @@ -146,7 +146,7 @@ 1024 1 18 - 120 + 148 0 0 diff --git a/gamedir/Data-1.13/TableData/Attachments.xml b/gamedir/Data-1.13/TableData/Attachments.xml index 213069016..4b48e1402 100644 --- a/gamedir/Data-1.13/TableData/Attachments.xml +++ b/gamedir/Data-1.13/TableData/Attachments.xml @@ -30738,4 +30738,256 @@ 8 0 + + 1522 + 12 + 20 + 0 + + + 1522 + 13 + 20 + 0 + + + 1522 + 21 + 20 + 0 + + + 1522 + 23 + 20 + 0 + + + 1522 + 632 + 20 + 0 + + + 1522 + 633 + 20 + 0 + + + 1522 + 350 + 20 + 0 + + + 1522 + 624 + 20 + 0 + + + 1522 + 646 + 20 + 0 + + + 1522 + 651 + 20 + 0 + + + 1522 + 652 + 20 + 0 + + + 1522 + 653 + 20 + 0 + + + 1522 + 655 + 20 + 0 + + + 1522 + 662 + 20 + 0 + + + 1522 + 665 + 20 + 0 + + + 1522 + 713 + 20 + 0 + + + 1522 + 714 + 20 + 0 + + + 1522 + 749 + 20 + 0 + + + 1522 + 750 + 20 + 0 + + + 1522 + 751 + 20 + 0 + + + 1522 + 752 + 20 + 0 + + + 1522 + 755 + 20 + 0 + + + 1522 + 762 + 20 + 0 + + + 1522 + 782 + 20 + 0 + + + 1522 + 781 + 20 + 0 + + + 1522 + 787 + 20 + 0 + + + 1522 + 788 + 20 + 0 + + + 1522 + 790 + 20 + 0 + + + 1522 + 791 + 20 + 0 + + + 1522 + 792 + 20 + 0 + + + 1522 + 793 + 20 + 0 + + + 1522 + 795 + 20 + 0 + + + 1522 + 796 + 20 + 0 + + + 1522 + 797 + 20 + 0 + + + 1522 + 896 + 20 + 0 + + + 1522 + 1070 + 20 + 0 + + + 1522 + 1072 + 20 + 0 + + + 1522 + 1077 + 20 + 0 + + + 1522 + 1332 + 20 + 0 + + + 1522 + 1187 + 20 + 0 + + + 1522 + 671 + 20 + 0 + + + 1522 + 342 + 20 + 0 + \ 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 c29d03ad2..89471e7a9 100644 --- a/gamedir/Data-1.13/TableData/Items.xml +++ b/gamedir/Data-1.13/TableData/Items.xml @@ -45099,4 +45099,38 @@ + + 1522 + KAC Masterkey + KAC Masterkey + The 12-gauge Masterkey shotgun can be mounted under standard rifles as a breaching tool when used with special ammo. + KAC Masterkey + Tired of having to pack an Assault Rifle and an additional Shotgun? With this specially adapted shotgun, you can carry 2 in 1! + 2 + 512 + 1 + 1522 + 3 + 369 + 24 + 5 + 1900 + 5 + 3 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 4 + 1 + 24 + 100.0 + + + + \ 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 9a9e0d2aa..3cc33726d 100644 --- a/gamedir/Data-1.13/TableData/MercStartingGear.xml +++ b/gamedir/Data-1.13/TableData/MercStartingGear.xml @@ -8095,6 +8095,7 @@ 0 + Breaching 0 293 0 @@ -8105,16 +8106,16 @@ 294 0 0 - 775 + 671 0 92 - 107 - 0 - 2 + 1522 + 97 + 1 0 - 416 - 0 - 1 + 415 + 100 + 2 0 994 91 @@ -8127,12 +8128,12 @@ 213 89 1 - 0 - 0 - 0 - 0 - 0 - 0 + 413 + 100 + 2 + 531 + 100 + 2 0 0 0 @@ -8154,8 +8155,8 @@ 0 0 0 - 0 - 0 + 1098 + 96 0 0 @@ -31112,6 +31113,7 @@ 0 + Breaching 0 285 93 @@ -31133,20 +31135,20 @@ 100 1 0 - 631 - 99 + 1522 + 98 1 0 - 401 - 100 - 2 + 0 + 0 + 0 0 - 0 - 0 - 0 - 0 - 0 - 0 + 414 + 100 + 2 + 415 + 100 + 2 0 0 0 diff --git a/gamedir/Data-1.13/TableData/Weapons.xml b/gamedir/Data-1.13/TableData/Weapons.xml index 8f5aa4137..1e0b9a940 100644 --- a/gamedir/Data-1.13/TableData/Weapons.xml +++ b/gamedir/Data-1.13/TableData/Weapons.xml @@ -13060,4 +13060,38 @@ 87 7 + + 1522 + KAC Masterkey + 5 + 8 + 5 + 20 + 10.41 + 22 + 36 + 26 + 4 + 90 + 200 + 100 + 85 + 8 + 435 + 126 + 103 + 109 + 157 + 20 + 16 + 7 + 10 + 481 + 20 + 3 + 9 + 4000 + 5000 + 134 + \ No newline at end of file diff --git a/gamedir/Data/Ja2_Options.INI b/gamedir/Data/Ja2_Options.INI index f64a5104c..bb869fd59 100644 --- a/gamedir/Data/Ja2_Options.INI +++ b/gamedir/Data/Ja2_Options.INI @@ -1757,11 +1757,21 @@ CHANCE_TO_DO_LIGHTNING_BETWEEN_TURNS = 35 ;****************************************************************************************************************************** ; Should a 'thermometer' for guns and replacable barrels be displayed? -OVERHEATING_DISPLAY_THERMOMETER = TRUE +OVERHEATING_DISPLAY_THERMOMETER = FALSE -; If a barrel is not in someone's inventory, it cools down a little bit better +; Starting amount of red colour in the temperature bar. Must be in [0, 255] +OVERHEATING_DISPLAY_THERMOMETER_RED_OFFSET = 100 + +; If a barrel is not in someone's inventory, it cools down a little bit better. OVERHEATING_COOLDOWN_MODIFICATOR_LONELYBARREL = 1.15 +; Should the temperature of all items lying on the ground in a sector be set to zero upon loading a different sector? +; Due to engine limitations, the temperature will otherwise stay what I was when another sector was loaded. +; This can be exploited, but why would you do that? +; Note: This only applies to items lying on the ground. The inventory of your mercs will cool down wherever they are. +OVERHEATING_SET_ZERO_UPON_NEW_SECTOR = FALSE + + ;****************************************************************************************************************************** ;******************************************************************************************************************************