From e8079fcceedfc7f2b4b7c3bf6a8fa6f09b4b0a4f Mon Sep 17 00:00:00 2001 From: Wanne Date: Thu, 12 Apr 2012 08:47:13 +0000 Subject: [PATCH] - New Feature: Toggle scope modes (by Flugente) o This allows you to toggle between a gun's different scopes via the '.' key. Y o You get the boni for vison, tunnel vison, sight range, scope magnification etc. only for the scope you use. o 2 new ja2_options.ini properties: USE_SCOPE_MODES, DISPLAY_SCOPE_MODES: Allows the display of an icon on your gun, to tell what scope is currently in use. If it is a scope, the magnification factor also gets written. Both options can be found under the [Tactical Gameplay Settings] section in the ja2_options.ini o new tag in items.xml () now enables to specifiy what an attachment can do. At the moment used by grenades/rockets/scopes/sights. Items.xml changed accordingly, modders need to add this tag for those items. o More infos: First post in: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=303038&#Post303038 - WARNING: This feature breaks savegame compatibility. - New Feature: Tripwire-triggered mines (by Flugente) o This allows creating complex networks of tripwire that can detonate multiple mines attached to them. o 2 new Items.xml tags: tripwireactivation, tripwire o More infos: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=303205&#Post303205 - Overheating addition (by Flugente) o Severe overheating now temporarily reduces a gun's accuracy. This exact amount is displayed in the UDB. - Bugfix (by Flugente) o Removed foregrip as an attachment from the Saiga 12K git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1397 4f8fa57e-7814-0410-bad4-adc449f26b7c --- Data-1.13/Ja2_Options.INI | 10 ++ Data-1.13/TableData/Attachments.xml | 27 ++- Data-1.13/TableData/Items.xml | 167 +++++++++++++++++- Data-1.13/TableData/MercStartingGear.xml | 13 +- .../TableData/NPCInventory/DevinInventory.xml | 10 ++ .../TableData/NPCInventory/TonyInventory.xml | 13 ++ Data/Interface/ItemInfoAdvancedIcons.sti | Bin 11960 -> 12289 bytes Data/Ja2_Options.INI | 11 ++ INIEditorJA2Options.xml | Bin 826564 -> 828544 bytes 9 files changed, 242 insertions(+), 9 deletions(-) diff --git a/Data-1.13/Ja2_Options.INI b/Data-1.13/Ja2_Options.INI index 1d54c2bec..109d098cd 100644 --- a/Data-1.13/Ja2_Options.INI +++ b/Data-1.13/Ja2_Options.INI @@ -1176,6 +1176,16 @@ WEAPON_RESTING_DISPLAY = TRUE ; Value Range: 0 - 100. WEAPON_RESTING_PRONE_BONI_PERCENTAGE = 50 +;------------------------------------------------------------------------------------------------------------------------------ +; scope modes +;------------------------------------------------------------------------------------------------------------------------------ + +; Allow manual toggle between a gun's different scopes/sights (toggle via '.' in tactical) +USE_SCOPE_MODES = FALSE + +; Allow display of scope modes on weapon +DISPLAY_SCOPE_MODES = TRUE + ;------------------------------------------------------------------------------------------------------------------------------ ; Set the grid number for the initial merc arrival location. ; The JA2 default grid number is 4870 (Sector A9 Omerta). diff --git a/Data-1.13/TableData/Attachments.xml b/Data-1.13/TableData/Attachments.xml index 1fec7f155..7d5633a42 100644 --- a/Data-1.13/TableData/Attachments.xml +++ b/Data-1.13/TableData/Attachments.xml @@ -4906,6 +4906,16 @@ 142 20 + + 223 + 1523 + 20 + + + 223 + 1525 + 20 + 224 137 @@ -4925,6 +4935,16 @@ 224 142 20 + + + 224 + 1523 + 20 + + + 224 + 1525 + 20 235 @@ -20956,12 +20976,7 @@ 1011 333 20 - - - 1011 - 340 - 20 - + 1011 342 diff --git a/Data-1.13/TableData/Items.xml b/Data-1.13/TableData/Items.xml index ce9bccd0e..55fc9d6a8 100644 --- a/Data-1.13/TableData/Items.xml +++ b/Data-1.13/TableData/Items.xml @@ -159,6 +159,9 @@ 0.0 0.0 0.0 + 0 + 0 + 0 0 0 @@ -4198,6 +4201,7 @@ 2 1 100.0 + 1024 @@ -4400,6 +4404,7 @@ 1 1 100.0 + 1024 @@ -4432,6 +4437,7 @@ 1 1 100.0 + 1024 @@ -4464,6 +4470,7 @@ 1 1 100.0 + 1024 @@ -4496,6 +4503,7 @@ 1 1 100.0 + 1024 @@ -6219,6 +6227,7 @@ 1 100.0 -0.2 + 2 -3 20 @@ -6262,6 +6271,7 @@ 90 10.0 100.0 + 16 @@ -6291,6 +6301,7 @@ 1 10 100.0 + 1 20 @@ -7074,6 +7085,7 @@ 100 1.3 100.0 + 4 @@ -8886,6 +8898,7 @@ -10 100.0 -0.15 + 262144 -3 20 @@ -16336,6 +16349,7 @@ 1 100.0 -0.2 + 2 -3 20 @@ -22135,7 +22149,7 @@ -1 30 946 - 100.0 + 100.0 -20 -20 @@ -28563,6 +28577,7 @@ 1 1 100.0 + 1024 @@ -28595,6 +28610,7 @@ 1 1 100.0 + 1024 @@ -28705,8 +28721,10 @@ -10 20 20 + 1.0 1.7 100.0 + 12 -1 @@ -28741,6 +28759,7 @@ 4 4 100.0 + 4097 -5 50 @@ -28787,8 +28806,10 @@ -20 20 30 + 1.0 3.5 100.0 + 12 @@ -28827,6 +28848,7 @@ -5 3.0 100.0 + 4 @@ -28866,6 +28888,7 @@ 30 3.0 100.0 + 4 @@ -28898,6 +28921,7 @@ 1 1 100.0 + 1024 @@ -28927,6 +28951,7 @@ 1 1 100.0 + 1024 @@ -28956,6 +28981,7 @@ 1 1 100.0 + 1024 @@ -28985,6 +29011,7 @@ 1 1 100.0 + 1024 @@ -29014,6 +29041,7 @@ 1 1 100.0 + 1024 @@ -29043,6 +29071,7 @@ 1 1 100.0 + 1024 @@ -29071,6 +29100,7 @@ 1 1 1 + 1024 100.0 @@ -29101,6 +29131,7 @@ 1 1 100.0 + 1024 @@ -29130,6 +29161,7 @@ 1 1 100.0 + 1024 @@ -29159,6 +29191,7 @@ 1 1 100.0 + 1024 @@ -29188,6 +29221,7 @@ 1 1 100.0 + 1024 @@ -29217,6 +29251,7 @@ 1 1 100.0 + 1024 @@ -29246,6 +29281,7 @@ 1 1 100.0 + 1024 @@ -29276,6 +29312,7 @@ 1 1 100.0 + 1024 @@ -29306,6 +29343,7 @@ 1 1 100.0 + 1024 @@ -29339,6 +29377,7 @@ 1 1 100.0 + 1024 @@ -29369,6 +29408,7 @@ 1 1 100.0 + 1024 @@ -29399,6 +29439,7 @@ 1 1 100.0 + 1024 @@ -29429,6 +29470,7 @@ 1 1 100.0 + 1024 @@ -29463,6 +29505,7 @@ 1 1 100.0 + 1024 @@ -29491,6 +29534,7 @@ 1 1 100.0 + 1024 @@ -29519,6 +29563,7 @@ 1 1 100.0 + 1024 @@ -29547,6 +29592,7 @@ 1 1 100.0 + 1024 @@ -29575,6 +29621,7 @@ 1 1 100.0 + 1024 @@ -29603,6 +29650,7 @@ 1 1 100.0 + 1024 @@ -29635,6 +29683,7 @@ 2 1 100.0 + 2048 @@ -29667,6 +29716,7 @@ 1 1 100.0 + 2048 @@ -29699,6 +29749,7 @@ 1 1 100.0 + 2048 @@ -29756,6 +29807,7 @@ 1 1 100.0 + 1024 @@ -29789,6 +29841,7 @@ 1 1 100.0 + 1024 @@ -29820,6 +29873,7 @@ 1 1 100.0 + 1024 @@ -29850,6 +29904,7 @@ 1 1 100.0 + 1024 @@ -29880,6 +29935,7 @@ 1 1 100.0 + 1024 @@ -29910,6 +29966,7 @@ 1 1 100.0 + 1024 @@ -29940,6 +29997,7 @@ 1 1 100.0 + 1024 @@ -29970,6 +30028,7 @@ 1 1 100.0 + 1024 @@ -30000,6 +30059,7 @@ 1 1 100.0 + 1024 @@ -30027,6 +30087,7 @@ 1 1 100.0 + 1024 @@ -30054,6 +30115,7 @@ 1 1 100.0 + 1024 @@ -30084,6 +30146,7 @@ 1 1 100.0 + 1024 @@ -30112,6 +30175,7 @@ 1 1 100.0 + 1024 @@ -30140,6 +30204,7 @@ 1 1 100.0 + 1024 @@ -30206,6 +30271,7 @@ 1 1 100.0 + 1024 @@ -30255,6 +30321,7 @@ 45 -30 100.0 + 64 -2 10 @@ -30291,6 +30358,7 @@ 1 20 100.0 + 8 -1 @@ -30333,6 +30401,7 @@ 30 4.0 100.0 + 16 @@ -30374,6 +30443,7 @@ 80 9.0 100.0 + 16 @@ -30408,6 +30478,7 @@ 70 -30 100.0 + 64 -2 10 @@ -30446,6 +30517,7 @@ 70 -30 100.0 + 64 -2 10 @@ -30480,6 +30552,7 @@ 1 100.0 -0.03 + 2 @@ -30521,6 +30594,7 @@ 1 4.0 100.0 + 24 -1 @@ -30564,6 +30638,7 @@ 20 1.6 100.0 + 4 @@ -30595,6 +30670,7 @@ 1 20 100.0 + 8 -1 @@ -30636,6 +30712,7 @@ 70 7.0 100.0 + 16 @@ -30669,6 +30746,7 @@ -5 33 100.0 + 32 -40 -20 @@ -30706,6 +30784,7 @@ -5 33 100.0 + 32 -40 -20 @@ -30738,6 +30817,7 @@ 5 5 100.0 + 4096 @@ -30769,6 +30849,7 @@ 5 5 100.0 + 4096 -10 70 @@ -30813,6 +30894,7 @@ -1 100.0 -0.2 + 2 -3 20 @@ -31184,6 +31266,7 @@ -3 3 100.0 + 256 @@ -31279,6 +31362,7 @@ 10 2.0 100.0 + 16 @@ -31318,6 +31402,7 @@ 20 4.0 100.0 + 16 @@ -36248,6 +36333,7 @@ 20 5.0 100.0 + 16 @@ -36285,6 +36371,7 @@ 20 4.0 100.0 + 16 @@ -36322,6 +36409,7 @@ 20 4.0 100.0 + 16 @@ -36349,7 +36437,9 @@ 1 20 7 + 1.0 100.0 + 8 -1 @@ -36408,6 +36498,7 @@ 1 2 100.0 + 256 @@ -36436,6 +36527,7 @@ 1 2 100.0 + 256 @@ -36810,6 +36902,7 @@ 20 1 100.0 + 8192 -2 -3 @@ -36843,6 +36936,7 @@ 30 1 100.0 + 32768 @@ -36874,6 +36968,7 @@ 40 1 100.0 + 16384 -5 -2 @@ -41240,6 +41335,7 @@ 1 1 100.0 + 1024 @@ -41268,6 +41364,7 @@ 2 1 100.0 + 1024 @@ -41296,6 +41393,7 @@ 2 1 100.0 + 1024 @@ -41326,6 +41424,7 @@ 2 1 100.0 + 1024 @@ -41356,6 +41455,7 @@ 2 1 100.0 + 1024 @@ -41384,6 +41484,7 @@ 2 1 100.0 + 1024 @@ -41415,6 +41516,7 @@ 1 1 100.0 + 1024 @@ -45125,7 +45227,6 @@ 1 1 1 - 1 1 4 1 @@ -45135,4 +45236,66 @@ + + 1523 + M18 Claymore + M18 Claymore + The M18 Claymore directional mine can be triggered by a remote detonator, by a tripwire or simply be used as a mine. Pro-Tip: Front towards enemy. + M18 Claymore + Lay ambushes with networks of tripwire and these babies. Be careful in what direction you aim, though. Can also be activated remotely. + 512 + 1 + 10 + 18 + 1 + 46 + 8 + 1 + 17 + 1050 + 5 + -4 + 1 + 1 + 1 + 4 + 1 + 1 + 100.0 + 1 + + + + + + 1524 + Tripwire + Tripwire + If you want to build intricate, complex systems of mines, you'll need tripwire to connect your devices. You know you want to. + Tripwire + Tripwire for mines. Only 10 bucks per meter, just this week! + 512 + 1 + 29 + 18 + 2 + 35 + 1 + 8 + 10 + 10 + 3 + 1 + 0 + 1 + 40 + 25 + 1 + 100.0 + 1 + 1 + + + + \ No newline at end of file diff --git a/Data-1.13/TableData/MercStartingGear.xml b/Data-1.13/TableData/MercStartingGear.xml index aa90e7ff1..a6a4f8063 100644 --- a/Data-1.13/TableData/MercStartingGear.xml +++ b/Data-1.13/TableData/MercStartingGear.xml @@ -138,6 +138,7 @@ 98 + Sapper 50 -1 176 @@ -146,6 +147,12 @@ 98 744 91 + 1524 + 100 + 8 + 1523 + 100 + 2 71 100 4 @@ -158,7 +165,7 @@ 1 224 89 - 1 + 3 242 86 1 @@ -433,6 +440,7 @@ 50 + Scoped -1 176 94 @@ -451,6 +459,9 @@ 212 97 214 + 1006 + 98 + 1 1079 94 1098 diff --git a/Data-1.13/TableData/NPCInventory/DevinInventory.xml b/Data-1.13/TableData/NPCInventory/DevinInventory.xml index 10b46bad1..c09d1d523 100644 --- a/Data-1.13/TableData/NPCInventory/DevinInventory.xml +++ b/Data-1.13/TableData/NPCInventory/DevinInventory.xml @@ -464,4 +464,14 @@ 1376 3 + + 93 + 1523 + 3 + + + 94 + 1524 + 14 + \ No newline at end of file diff --git a/Data-1.13/TableData/NPCInventory/TonyInventory.xml b/Data-1.13/TableData/NPCInventory/TonyInventory.xml index 11f161ce9..739f185bb 100644 --- a/Data-1.13/TableData/NPCInventory/TonyInventory.xml +++ b/Data-1.13/TableData/NPCInventory/TonyInventory.xml @@ -4472,4 +4472,17 @@ 1022 50 + + 1023 + 1522 + + + 1024 + 1523 + + + 1025 + 1524 + 6 + \ No newline at end of file diff --git a/Data/Interface/ItemInfoAdvancedIcons.sti b/Data/Interface/ItemInfoAdvancedIcons.sti index 50ff4aba0e3a688a4b5c2958887dd69d040d8c78..29322d3d48207b7905dfa35061d08c6639a2d90b 100644 GIT binary patch delta 375 zcmaJ+F%H5o47>zXwG}Tg>fTO_z|6#0!3siR;}gY62dMfAet=kb4o|@eX+a2K+18!! z94q$?@3Pf;v4lifxDMn}4|UW~!1S8!qsdH02d@DsMz{#y_B;h-v+Q|ttD<>cwP>M< zPEufLCKP`$H+Q=C;4h0Qgn{|M4eZbf7AB%Xf(*EdJrp7b9oG6c_6x!D#^Dg7L9M8U f9lQ=GVxMwBk@3k$g4_MHn~oVGcjmC}pE~0S3d}#p delta 43 scmZon*byrm9OCTB00b5qAd-OrL_J_^U}9ioU@+Mzo6NR(1Dk~g0J}{HX8-^I diff --git a/Data/Ja2_Options.INI b/Data/Ja2_Options.INI index bb869fd59..edaa43faa 100644 --- a/Data/Ja2_Options.INI +++ b/Data/Ja2_Options.INI @@ -1173,6 +1173,17 @@ WEAPON_RESTING_DISPLAY = FALSE ; Value Range: 0 - 100. WEAPON_RESTING_PRONE_BONI_PERCENTAGE = 50 +;------------------------------------------------------------------------------------------------------------------------------ +; Scope modes +;------------------------------------------------------------------------------------------------------------------------------ + +; Allow manual toggle between a gun's different scopes/sights (toggle via '.' in tactical) +; Info: To see the difference field of views for the scopes, enable the mercenary-view by pressing SHIFT + V +USE_SCOPE_MODES = FALSE + +; Allow display of scope modes on weapons in tactical +DISPLAY_SCOPE_MODES = FALSE + ;------------------------------------------------------------------------------------------------------------------------------ ; Set the grid number for the initial merc arrival location. ; The JA2 default grid number is 4870 (Sector A9 Omerta). diff --git a/INIEditorJA2Options.xml b/INIEditorJA2Options.xml index 346dc435f8b2007397f6740853c58ceb8cc9790a..598f024970a66df69c0083563346656cd90c2c82 100644 GIT binary patch delta 459 zcmah_!Ab&A6g@LJG252!Soqz(qs}CD|e?GK!#;nvNEzBUwf}seu+P2YmP+ zqO^*@O^d#v+_wl?R8-I%-MDLU-o5Xh`_4O@-d(iu7;TuG$(v)Qqb<~9%|&6xs-`91 z9@emf6xNZ(HgyTMd(F43m#w2X3LOdBIzrNN^G)f{WlL$lXrNGoJYa9W-@{ delta 58 zcmZoTX>??#Q9}!33sVbo3(FSPGMniKdO021i(FWNm<@>8ftUk`If0l9h`F~Hx$y8M F004kf6ej=x