From 06733fbb5beb1caf61135e4584c52a8910065ce1 Mon Sep 17 00:00:00 2001 From: Wanne Date: Thu, 31 Oct 2013 09:22:42 +0000 Subject: [PATCH] Reworked Encyclopedia (by Moa) - Updated INI options, INIEditor xml files - Updated other game dir files git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1849 4f8fa57e-7814-0410-bad4-adc449f26b7c --- Data-1.13/Ja2_Options.INI | 10 ++++++++-- Data-1.13/TableData/Items/Items.xml | 4 ++++ Data/Encyclopedia/BUTTONF.sti | Bin 1984 -> 1984 bytes Data/Ja2_Options.INI | 8 +++++++- INIEditorJA2Options.xml | Bin 858046 -> 871010 bytes 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Data-1.13/Ja2_Options.INI b/Data-1.13/Ja2_Options.INI index ff332ff14..3bb799e22 100644 --- a/Data-1.13/Ja2_Options.INI +++ b/Data-1.13/Ja2_Options.INI @@ -1301,6 +1301,8 @@ SOLDIER_TOOLTIP_DISPLAY_ACTIONPOINTS = TRUE SOLDIER_TOOLTIP_DISPLAY_HEALTH = TRUE SOLDIER_TOOLTIP_DISPLAY_ENERGY = FALSE SOLDIER_TOOLTIP_DISPLAY_MORALE = TRUE +SOLDIER_TOOLTIP_DISPLAY_SUPPRESSION = TRUE +SOLDIER_TOOLTIP_DISPLAY_SHOCK = TRUE SOLDIER_TOOLTIP_DISPLAY_TRAITS = TRUE ; Armor, Headgear SOLDIER_TOOLTIP_DISPLAY_HELMET = TRUE @@ -2756,8 +2758,12 @@ MORALE_MOD_BACKGROUND_XENOPHOBIC = 5 ; If set to TRUE, you can browse to the briefing room website on the laptop BRIEFING_ROOM = FALSE -; Currently not used! If set to TRUE, you can browse to the encyclopedia website on the laptop -ENCYCLOPEDIA = FALSE +; If set to TRUE, you can browse to the encyclopedia website on the laptop +ENCYCLOPEDIA = TRUE + +; Determines when to show items in Encyclopedia. 4: Spotted item in merc inventory. 3: Spotted in dealers inventory (or 4), +; 2: Spotted at Bobby Rays or at AIM/M.E.R.C. website (or 3 or 4). 1: Spotted item on enemy (or 2 to 4). Values from 1 to 4. +ENCYCLOPEDIA_ITEM_MASK = 1 ; If disabled, the transition will be skipped when opening/closing the laptop DISABLE_LAPTOP_TRANSITION = TRUE diff --git a/Data-1.13/TableData/Items/Items.xml b/Data-1.13/TableData/Items/Items.xml index 5cbfc285c..e30a90414 100644 --- a/Data-1.13/TableData/Items/Items.xml +++ b/Data-1.13/TableData/Items/Items.xml @@ -7298,6 +7298,7 @@ Duckbill Attach this metal object to the end of a shotgun barrel for a real deadly effect. It causes buckshot fired from the shotgun to spread out along a horizontal line instead of its standard circular pattern. Say good-bye to anyone who gets into its path. 268435456 + 2 2 1 90 @@ -40948,6 +40949,7 @@ Imp. Mod. Shotgun Choke When attached to the end of a shotgun barrel, causes shot fired from the shotgun to group tighter, permiting longer range and more shot to hit the target. 268435456 + 2 2 365 2 @@ -40977,6 +40979,7 @@ Full Shotgun Choke When attached to the end of a shotgun barrel, causes shot fired from the shotgun to group much tighter, permiting longer range and more shot to hit the target. Not for use with slugs! 268435456 + 2 2 365 2 @@ -41006,6 +41009,7 @@ Rifled Shotgun Choke Makes your slugs to fire long and straight, but throws shot all over tarnation! 268435456 + 2 2 365 2 diff --git a/Data/Encyclopedia/BUTTONF.sti b/Data/Encyclopedia/BUTTONF.sti index 5a2eb5462f548dfd8386ef9014743db357989531..172bf82d143896b409ae9d4af043629e2dcbe6ae 100644 GIT binary patch literal 1984 zcmWFzarP8pVqi#MVE_XSAj!v|#=yYHz`(@7!NCC$29wBagz$e$Lk=fHj^bp^>ST$Q zV#~ctqmHdjKDQN!vj1ZMQ&k2Gu~C815E!Z<0Lljj!2AOOpnL;jBlFcb2?KUkCI&T5 z79s%Ss5-2nM1yeQz-keiAkbbmG$E{9pgLwIMn*;^5P=UcsId|Qfa!&mi3lJtst#)? N4S{fB79a*N001Fi0E7Sl delta 27 jcmX@We}I2N0kfqh!^Xz_OcN*YZFXP|WZIm_tj`1hhcO7Z diff --git a/Data/Ja2_Options.INI b/Data/Ja2_Options.INI index 9ea0bff0a..289147907 100644 --- a/Data/Ja2_Options.INI +++ b/Data/Ja2_Options.INI @@ -1300,6 +1300,8 @@ SOLDIER_TOOLTIP_DISPLAY_ACTIONPOINTS = FALSE SOLDIER_TOOLTIP_DISPLAY_HEALTH = FALSE SOLDIER_TOOLTIP_DISPLAY_ENERGY = FALSE SOLDIER_TOOLTIP_DISPLAY_MORALE = TRUE +SOLDIER_TOOLTIP_DISPLAY_SUPPRESSION = FALSE +SOLDIER_TOOLTIP_DISPLAY_SHOCK = FALSE SOLDIER_TOOLTIP_DISPLAY_TRAITS = FALSE ; Armor, Headgear SOLDIER_TOOLTIP_DISPLAY_HELMET = FALSE @@ -2755,9 +2757,13 @@ MORALE_MOD_BACKGROUND_XENOPHOBIC = 5 ; If set to TRUE, you can browse to the briefing room website on the laptop BRIEFING_ROOM = FALSE -; Currently not used! If set to TRUE, you can browse to the encyclopedia website on the laptop +; If set to TRUE, you can browse to the encyclopedia website on the laptop ENCYCLOPEDIA = FALSE +; Determines when to show items in Encyclopedia. 4: Spotted item in merc inventory. 3: Spotted in dealers inventory (or 4), +; 2: Spotted at Bobby Rays or at AIM/M.E.R.C. website (or 3 or 4). 1: Spotted item on enemy (or 2 to 4). Values from 1 to 4. +ENCYCLOPEDIA_ITEM_MASK = 1 + ; If disabled, the transition will be skipped when opening/closing the laptop DISABLE_LAPTOP_TRANSITION = FALSE diff --git a/INIEditorJA2Options.xml b/INIEditorJA2Options.xml index b13f0c87fc133884a8f70013e7ea72bed9b92614..4f6c93c6864fc0d606a3110118703340af8af10a 100644 GIT binary patch delta 5520 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