From 1cca337fa05317ed20299c67f98537550a874431 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 --- gamedir/Data-1.13/Ja2_Options.INI | 10 ++++++++-- gamedir/Data-1.13/TableData/Items/Items.xml | 4 ++++ gamedir/Data/Encyclopedia/BUTTONF.sti | Bin 1984 -> 1984 bytes gamedir/Data/Ja2_Options.INI | 8 +++++++- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index ff332ff14..3bb799e22 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/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/gamedir/Data-1.13/TableData/Items/Items.xml b/gamedir/Data-1.13/TableData/Items/Items.xml index 5cbfc285c..e30a90414 100644 --- a/gamedir/Data-1.13/TableData/Items/Items.xml +++ b/gamedir/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/gamedir/Data/Encyclopedia/BUTTONF.sti b/gamedir/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/gamedir/Data/Ja2_Options.INI b/gamedir/Data/Ja2_Options.INI index 9ea0bff0a..289147907 100644 --- a/gamedir/Data/Ja2_Options.INI +++ b/gamedir/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