Commit Graph
1391 Commits
Author SHA1 Message Date
Wanne ca35c38b48 Merged from revision: 1976
Feature Improvement: Fast Forward Turn (by Sevenfm)
0 - default behaviour
1 - auto fast forward only invisible
2 - auto fast forward always

AUTO_FAST_FORWARD_CIVS = 0
AUTO_FAST_FORWARD_CREATURES = 0


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1977 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-10 19:20:02 +00:00
Flugente be825b9242 Merged revision(s) 1974 from branches/ja2_data_official_2014:
Militia improvement: If MILITIA_TRAINING_CARRYOVER_PROGRESS is set to TRUE, militia training progress is carried over to the next training session once a session finishes. This way no training is lost.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1975 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-07 22:16:16 +00:00
Wanne 0a84d7e7ab Additional Tile Properties - Update
- Moved the global location of the xml files from the "AdditionalProperties" to the "Tilesets\AdditionalProperties" folder because this place fits better
- Of course you can also add special tilesets xml files in the tilesets specific folders "Tilesets\XX"
- Addded missing INI value: COVER_SYSTEM_STATIC_SHADOWS_DECREASE_BRIGHTNESS
- Updated comments for COVER_SYSTEM_ADDITIONAL_TILE_PROPERTIES

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1973 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-03 20:57:16 +00:00
Flugente 42caadc5f3 Update (by anv):
- fix: data read from Data/AdditionalProperties,
- new tag: <bTrapBonus> + updated data for tiles, trap level influenced by terrain,
- new feature/option: COVER_SYSTEM_STATIC_SHADOWS_DECREASE_BRIGHTNESS.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1972 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-03 20:37:24 +00:00
Flugente 99857261cd Merged revision(s) 1970 from branches/ja2_data_official_2014:
Added sleeping bag item (#1709), as <SleepModifier> was unused.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1971 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-01 22:26:43 +00:00
Wanne 242b44989c New Feature: Additional Tile Properties (by anv)
- Feature can be completely disabled in .ini as COVER_SYSTEM_ADDITIONAL_TILE_PROPERTIES under Tactical Cover System Settings.

- With Additional Tile Properties it's possible to supply all tiles with additional data, just like with .jsd files, except in XML.
Files need to have same name as tile's .sti and .jsd files, and be put in \tilesets\AdditionalProperties\, or in specific \tilesets\xx\.

- With additional properties it's possible to specify which camo type, and how effectively will work on any tile. Only snow camo will work on snow covered roofs, red carpet in palace won't perfectly cooperate with urban camo anymore, thick grass in the middle of the forest will provide better camouflage than sparse grass near the road.

- It's now possible to specify footstep volume and stealth difficulty modifier of any tile. Carpets will absorb noise, tile floors amplify it, twigs laying on the tile will make sneaking harder. Choose your path carefully, taffer. 

- More infos: http://www.bears-pit.com/board/ubbthreads.php/topics/330942.html#Post330942


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1969 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-01 09:51:17 +00:00
Wanne 94988a2b84 Replaced ` with ' in Items.xml (thx to hrvg)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1967 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-27 20:36:42 +00:00
Flugente 8562acde61 Merged revision(s) 1965 from branches/ja2_data_official_2014:
Fix: wrong background number


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1966 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-27 00:42:45 +00:00
Flugente 6ca631008c Merged revision(s) 1963 from branches/ja2_data_official_2014:
Mercs get individual backgrounds, with the same number as their profile number, which is not selectable by IMPs. This allows better ordering and finetuning descriptions.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1964 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-26 23:28:05 +00:00
Wanne 9a84514beb Merged from revision: 1961
Autofire bullets (by Sevenfm)
Set default number of autofire bullets:
0 = Max bullets allowed with max aiming
1..10 = Set default number of bullets

1. For MPs and SMGs
SET_DEFAULT_AUTOFIRE_BULLETS_SMG = 1
2. For ARs, Rifles and Shotguns
SET_DEFAULT_AUTOFIRE_BULLETS_AR = 1
3. For MGs
SET_DEFAULT_AUTOFIRE_BULLETS_MG = 1

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1962 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-26 18:57:10 +00:00
Wanne 9f5d441db5 Merged from revision: 1959
- Fixed errors in Enemy Taunts files (by Kriplo)
o Accent [`] -> apostrophe [']

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1960 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-26 18:46:00 +00:00
Wanne 74c47d5808 - Correct some texts for EnemyTaunts (by anv, eternal)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1957 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-26 14:54:27 +00:00
Flugente d55d5166cf Merged revision(s) 1955 from branches/ja2_data_official_2014:
Trait adjustments
- Raven and Lynx are sharpshooters, so they get the 'sniper' trait
- Sidney and Wink are notable throwers, so get the 'throwing' trait
- Cliff is a Doctor without any other qualities, so gets the 'Paramedic (Expert)' trait

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1956 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-25 19:24:42 +00:00
Wanne 01f0a43161 Merged from revision: 1953
- Trimmed texts in LoadScreenHints.xml to max. 190 characters

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1954 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-21 21:24:24 +00:00
Flugente 47cbae3352 Merged revision(s) 1951 from branches/ja2_data_official_2014:
Fix: Sam Garver had wrong ammo in Kits 2 & 4

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1952 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-21 20:33:26 +00:00
Wanne c7bc997835 Merged from revision: 1949
- Added missing ini properties for UB-Version

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1950 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-19 13:50:52 +00:00
Flugente c152eaacd4 New Feature: strategic militia command allows ordering militia around in the map if someoen performs the STRATEGIC_MILITIA_MOVEMENT facility assignment.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1946 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-18 21:23:44 +00:00
Wanne 6cc3476b89 Merged from revision: 1944
- Splitted big file "EnemyTaunts.xml" into several action specific Taunt files (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1945 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-14 07:33:35 +00:00
Wanne 93c9242827 Merged from revision: 1941
- Removed EnemyTaunts_Attack.xml, because it is missing the action xml tags. I will add the complete file later

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1942 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-13 08:04:45 +00:00
Wanne ecc24e1466 Merged from revision: 1939
Improved Snitch Trait (by anv)
- The snitch actions can be selected in the strategy view "Assignment" menu
o Spreading Propaganda: Accessible in town sectors
o Gathering Rumours: Accessible in town sectors
o Undercover Prison Snitch: Accessible from Facilities menu (Prison)
o Preventing Misbehaviour: New Snitch Menu
o Passive Reputation Increase
see: http://www.bears-pit.com/board/ubbthreads.php/topics/329412/1.html


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1940 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-12 17:23:44 +00:00
Wanne 7d67ad85d9 Merged from revision: 1937
- Added new Enemy Taunts "Attack" file (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1938 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-12 11:00:27 +00:00
Flugente a3fd17b5d8 Merged revision(s) 1932-1933 from branches/ja2_data_official_2014:
- Enlarged move item toggle button in sector inventory (by anv)
- switched performance bonus of Hospital and Combat Support Hospital

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1934 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-06 18:28:29 +00:00
silversurfer 4b1ccbca19 - values added for scope effectiveness mechanism
- new defaults:
IRON_SIGHT_PERFORMANCE_BONUS = 20.0
LASER_PERFORMANCE_BONUS_HIP = 25.0
LASER_PERFORMANCE_BONUS_IRON = 15.0
LASER_PERFORMANCE_BONUS_SCOPE = 10.0
GRAVITY_COEFFICIENT = 6.0
SCOPE_RANGE_MULTIPLIER = 0.7
MAX_EFFECTIVE_RANGE_MULTIPLIER = 1.4
MAX_EFFECTIVE_RANGE_REDUCTION = 0.5
MAX_EFFECTIVE_USE_GRADIENT = TRUE


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1930 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-02 10:20:34 +00:00
Flugente a21c8dc7d2 Merged revision(s) 1928 from branches/ja2_data_official_2014:
Meduna SAM site terminal restoration orientation was wrong

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1929 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-01 02:18:09 +00:00
Wanne 33571338f0 Merged from revision: 1926
4 new MOLLE items (by Off_Topic)
- 1 MOLLE Backpack/Combat Combo, 
- 1 Stand alone MOLLE Combat pack and 1 stand alone MOLLE Backpack
see: http://www.bears-pit.com/board/ubbthreads.php/topics/329539/Creating_a_MOLLE_backpack_set_.html#Post329539

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1927 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-28 08:13:03 +00:00
Flugente df4cdfdab2 Added transformations from map-editor tripwire to standard tripwire (#1524).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1924 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-27 21:37:54 +00:00
Wanne 581c1cc3c5 Merged from revision: 1922
- Updated Ja2_Options.INI and INIEditorJA2Options.xml comments (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1923 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-22 08:05:51 +00:00
Wanne b63b43f648 Merged from revision: 1920
Fixes (by Buggler)
- removed IMPROVED_BOMB_PLANTING option, enabled by default
- removed AIMED_BURST_ALTERNATE_KEY option, enabled by default. Alternate Aiming Hotkey reassigned to ',' (comma) for increasing aim

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1921 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-20 08:50:35 +00:00
Wanne 56056b8841 Merged from revision: 1917
- Added missing updated snitch traits for some mercs. This feature was added in GameDir revision: 1906 (by anv)
Beth
Bud
Buzz
Carp
Ears
Gary
Hurl
Lance
Leon
Weasel

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1919 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-13 16:32:19 +00:00
Flugente 59c4dfc8f7 Spotter ini settings were lost in previous commit
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1916 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-10 18:39:21 +00:00
Wanne 8503fc26c2 Visual tactical improvements (by Sevenfm)
1) Improved cover indicator:
SHOW_COVER_INDICATOR
0 - nothing
1 - show as small square to the right of health bar
2 - show using color of merc's name
3 - same as 1, show only in stealth or when disguised
4 - same as 2, show only in stealth or when disguised

2) Enemy rank (exp. level) icons:
SHOW_ENEMY_RANK_ICON
0 - do not show
1 - show icon
2 - show icon from .sti (not yet implemented)

3) Enemy health bar:
SHOW_ENEMY_HEALTH
0 - do not show
1 - show health as text (default)
2 - show health bar
3 - show health + ap
4 - show health + ap + shock
5 - show health + ap + shock + morale
6 - show health + ap + shock + morale + bp

4) Minor improvements:
Enemy awareness sign now shows up only in stealth/disguised mode.
Turned on Extended Disarm Dialog for turnbased (it was implemented but turned off)

Recommended settings for regular gameplay (from video example above):
INDIVIDUAL_ENEMY_NAMES = FALSE
INDIVIDUAL_ENEMY_RANK = FALSE
SHOW_ENEMY_RANK_ICON = 1
SHOW_ENEMY_HEALTH = 4
SHOW_COVER_INDICATOR = 2
SHOW_ENEMY_ADDITIONAL_INFO = 1
SHOW_ENEMY_WEAPON = TRUE

see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/329674/Re:_Code_Snippets.html#Post329674

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1915 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-10 16:22:25 +00:00
Wanne 626c89e9ce Externalizations (by Buggler)
- option for crepitus to attack a random player-controlled town, not just the originating town
- externalized creatures spreading hardcoded defines to Creatures_Settings.ini

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1913 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-06 15:36:51 +00:00
Wanne f28b6686aa Improved health bar in tactical (by Sevenfm)
Option SHOW_HEALTHBARSOVERHEAD is now integer:
0 - no bar
1 - default health bar
2 - small version of new bar
3 - large version of new bar
4 - small health bar + AP indicator
5 - large health bar + AP indicator

Note: cover indicators are enabled only in turnbased combat or when sneaking
see: http://www.bears-pit.com/board/ubbthreads.php/topics/172712/17.html


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1912 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-03 17:15:57 +00:00
Wanne 2ea80d5ec4 Bugfix: Fixed crash when closing laptop and playing with vanilla settings ("Data" folder)
- The Game looked for files (Helicopter feature repair, GameDir rev. 1897) in the "Data" folder, but those files were only in the "Data-1.13" folder
- I moved the files in the "Data" folder


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1911 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-02 09:53:25 +00:00
Wanne 0f402562b9 - Added CampaignStatsEvents.xml for "Data" folder, so the game can start with the Vanilla ja2.ini settings
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1910 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-02 08:14:47 +00:00
Wanne e236f90db6 Creature Externalization (by Buggler)
- externalized creature feeding sector CREPITUS_FEEDING_SECTOR to Mod_Settings.xml
- added more comments to CreaturePlacements.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1909 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-02 07:43:00 +00:00
Flugente fd72b7fbee Radio set battery can now be bought from BR.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1908 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-01 14:17:46 +00:00
Wanne 3a3665895b Creatures Externalizations (by Buggler)
- externalized creatures placement and composition to CreaturePlacements.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1907 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-01 12:52:31 +00:00
Wanne 0f8b6d9408 New Trait "Snitch" (by anv)
- Every midnight snitches will give you a report about their collegues' opinions
- All values configurable in Skills_Settings.ini, section [Snitch].
- Externalised Morale and Reputation Settings
  Morale_Settings.INI, Reputation_Settings.INI
  All values of events moved from code to Morale_Settings.ini and Reputation_Settings.ini.

Currently list of snitches (trait 22)
Beth (Data)
Bud (Data-1.13)
Buzz (Data-1.13)
Carp (Data-1.13)
Ears (Data-1.13)
Gary (Data-1.13)
Hurl (Data-1.13)
Lance (Data-1.13)
Leon (Data-1.13)
Weasel (Data-1.13)

- Separate traits limits for IMP and predefined mercs.
MAX_NUMBER_OF_TRAITS = 10
NUMBER_OF_MAJOR_TRAITS_ALLOWED = 5

MAX_NUMBER_OF_TRAITS_FOR_IMP = 3
NUMBER_OF_MAJOR_TRAITS_ALLOWED_FOR_IMP = 2

see: http://www.bears-pit.com/board/ubbthreads.php/topics/329412/Snitches_+_Externalised_morale.html

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1906 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-01-01 12:34:18 +00:00
Wanne c9cdc92121 Visual info feature (by Sevenfm)
New option SHOW_ENEMY_ADDITIONAL_INFO in ja2_options.ini
0 - nothing
1 - show awareness sign above enemy soldier (useful for sneaking and covert operations)
Eye sign means that enemy sees you.
Color shows enemy alert level (green, yellow, orange, red)
2 - show if enemy wears gas mask or nvg
3 - show if enemy has any armour (helmet, vest, leggings)
Note: additional info is shown only at limited range (based on current vision distance and merc's experience), similar to dynamic tooltips.
see: http://www.bears-pit.com/board/ubbthreads.php/topics/172712/17/Code_Snippets.html

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1905 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-12-30 17:34:53 +00:00
Wanne 5aab654ee6 - Bugfix: Fixed email subject for Gaston on salary increase
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1903 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-12-27 09:42:03 +00:00
Wanne 7b92c317ea Hide heli refuel site in airspace mode before discovering them (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1902 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-12-27 09:36:07 +00:00
Flugente 0ff363a309 New Feature: Campaign History collects combt data and displays battle reports on the website
For more info, see http://www.bears-pit.com/board/ubbthreads.php/topics/329205.html#Post329205

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1901 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-12-22 23:19:49 +00:00
Wanne 01652ce342 Externalization (by Buggler)
- Externalized HELICOPTER_TOWN_LOYALTY_CHECK in Helicopter_Settings.INI
- Added more comments to CREATURE_MEANWHILE_CUTSCENE in Mod_Settings.ini 

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1900 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-12-22 02:59:25 +00:00
Flugente e7a6adc1aa swapped vision boni of low-quality and high-quality binoculars
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1899 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-12-20 23:54:01 +00:00
Wanne 6e7181cf7e - Helicopter Feature (Repair, Fuel, ...)
see: http://www.bears-pit.com/board/ubbthreads.php/ubb/showflat/Number/329091/gonew/1/Helicopter_repair_and_refuel.html

- Spotters for snipers feature
see: http://www.bears-pit.com/board/ubbthreads.php/topics/329093/New_feature:_Spotter.html

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1898 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-12-20 10:30:25 +00:00
Flugente 5e89f4e366 Helicopter features (by anv):
- Waldo can now repair the helicopter for money
- alternative fuel system
- damage to helicopter can damage passengers

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1897 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-12-19 22:00:52 +00:00
Flugente 74e0be1cce New Feature: Spotter skill (available to every merc) allows a merc to be spotter for other snipers. Spotter items have to be in hands, spending APs cancels action.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1896 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-12-19 19:54:34 +00:00
Wanne 85ea4716a8 Improved Auto Fast Forward (by Sevenfm)
- New options in ja2_options.ini

AUTO_FAST_FORWARD_ENEMIES:
0 - default behavior
1 - auto fast forward only enemies that are not seen by player's team
2 - auto fast forward only invisible enemies
3 - auto fast forward all enemies

AUTO_FAST_FORWARD_MILITIA:
0 - default behavior
1 - auto fast forward only militia that does not see enemies
2 - auto fast forward militia always

Note: only movement is accelerated, most of specific actions like shooting and tossing grenades are performed at normal speed

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1895 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-12-18 13:50:50 +00:00
Flugente 59e6c62db4 Corrected radio set description.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1894 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-12-17 18:23:00 +00:00