Commit Graph
815 Commits
Author SHA1 Message Date
silversurfer 79cdc1409e Updates to aim levels of shotguns and AIM_DRAW_COST (by Strohmann)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2173 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-10-25 14:01:55 +00:00
Wanne c0bafeee86 Merged from revision: 2169
Externalized (by Buggler):
- Kingpin's faction sector and roaming gridno around tony shop if they become hostile
- Queen's alternate grid no if basement sector is cleared
- Hotkey corrections in LoadScreenHints.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2170 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-10-17 16:26:36 +00:00
Flugente 2b8f21b167 removed wirecutter concertina deconstruction, as it can be confused with the regular wirecutting (both work on the same tileset)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2168 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-10-15 21:08:24 +00:00
Flugente 4479da09f6 - Fix: Mauser M-03 gets the SF-42 scope.
- Altered IMPItemChoices.xml: more reasonable weapon choices, items teasing food and other new features.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2167 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-10-14 21:11:50 +00:00
silversurfer 4375aebf0a Fix: From testing volatility was left at 0 for land mines. Changed back to 2.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2162 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-10-04 07:56:59 +00:00
silversurfer 4595480aed Changed fragmentation explosives to emit fragments like they should. All values are experimental.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2161 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-10-03 10:51:35 +00:00
silversurfer 12deb9ae5a Fix (by Ocular and Strohmann):
wrong aim levels and handling for Sphinx pistol
wrong Need for sleep values for Lance Fisher and Turtle

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2158 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-10-03 07:44:48 +00:00
Wanne 36f2d46528 - Fixed items lacking an outline in smp2 tilesets (by Off_Topic)
- Fixed 7rd Shotgun Pocket to hold 3x 2 Shells and 1x 4 Shells (by Off_Topic)
- A slight change to Rifle Sling Pocket also (by Off_Topic)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2148 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-09-15 18:15:09 +00:00
Flugente 4a39df6b47 Feature improvement:
- via StructureConstruct.xml and StructureDeconstruct.xml, one can now define which structures can be removed and created via items and the fortifications feature.
- added building materials to create wooden debris and walls

For more information, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/335557#Post335557

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2140 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-09-06 23:58:11 +00:00
Flugente fe2feeb114 Lowered duration of Trip Flare and Break Lights from 35 to 10
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2139 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-09-02 20:15:16 +00:00
Flugente daba2726e8 New Feauture: a private military company allows hiring of advanced militia. For more info, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/335279#Post335279
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2130 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-30 17:19:34 +00:00
Wanne d5deb981ac "Carrier Bladder" (by Off_Topic)
1. Added a hydration system, the ArmorBak can be worn as a backpack, which allows you to place a "bladder" inside it. This carries twice as much water as a canteen.
The US ILBE Rucksack has an integral carrier but needs the bladder, it can be attached to certain MOLLE items also.
Created a new attachment point: 4 for the carrier and 7 to include all MOLLE and the hydration carrier. There is also a new food item.
2. There is a Tactical sling now that acts like a backpack pocket which allows you to carry ONE Rifle etc... on your back. (Need to get a different image, will upload soon.)
3. Added a better image for the MOLLE single pistol mag and Sniper Ammo.
4. Added 3 new MOLLE pouches: Speed Loader, Ammo Drum, and Single Rifle.
5 Added silhouettes for above and also for Throwing Knives.


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2128 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-28 21:13:18 +00:00
Flugente 190de755e5 New xml: FoodOpinion.xml allows individual opinions on individual food items for each merc, the <bMoraleMod>-tag in Food.xml was removed.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2125 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-28 20:08:28 +00:00
Wanne 504544ced3 New Feature: Added up to 15 game difficulty settings (by Jazz)
- Externalized the difficulty setings to "TableData\DifficultySettings.xml" file
- Some INI Settings (ja2_options.ini, CTHConstants.ini and Creature_Settings.ini) moved from INI file to this xml file

These parameters were moved to the file DifficultySettings.xml.
** Ja2_Options.INI **
ENEMY_AP_BONUS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
NUM_KILLS_PER_PROGRESS_POINT_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
INITIAL_GARRISON_PERCENTAGES_NOVICE  , _EXPERIENCED, _EXPERT, _INSANE
MIN_ENEMY_GROUP_SIZE_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
UNLIMITED_POOL_OF_TROOPS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEENS_INITIAL_POOL_OF_TROOPS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
ENEMY_STARTING_ALERT_LEVEL_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
ENEMY_ALERT_DECAY_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
NUM_AWARE_BATTLES_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
BASE_DELAY_IN_MINUTES_BETWEEN_EVALUATIONS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
EVALUATION_DELAY_VARIANCE_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
GRACE_PERIOD_IN_HOURS_AFTER_SECTOR_LIBERATION_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
GRACE_PERIOD_IN_DAYS_AFTER_PATROL_DESTROYED_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
AGGRESSIVE_QUEEN_AI_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_POOL_INCREMENT_PER_DIFFICULTY_LEVEL
PERCENT_EXTRA_ELITES_EXPERIENCED , _EXPERT, _INSANE
MAX_MERC_DEATHS_EASY , _EXPERIENCED, _EXPERT, _INSANE
		
** Creatures_Settings.INI **
CREATURE_SPREAD_TIME_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_REPRODUCTION_BASE_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_REPRODUCTION_BONUS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_INIT_BONUS_SPREAD_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
CREATURE_POPULATION_MODIFIER_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
CREATURE_TOWN_AGGRESSIVENESS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_POOL_INCREMENT_PER_DIFFICULTY_LEVEL
		
** CTHConstants.ini **
BASE_DIFFICULTY_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
AIM_DIFFICULTY_NOVICE , _EXPERIENCED, _EXPERT, _INSANE

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2123 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-28 10:51:26 +00:00
Wanne dd47c9a504 Bugfix: Pockets.xml (by Off_Topic)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2110 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-25 09:36:39 +00:00
Wanne 81e3271e18 Pocket Fixes (by Off_Topic)
1. Fixed Gen Misc. Pocket.
2. Removed excess pockets from newly added LBE.
3. Added silhouette of small revolver. (Just Aesthetic for R:Holster.
4. Added silhouette for rifle molle.
5. Minor changes to weight of newly added LBE.
6. Adjusted some pocket values to better suit their purpose.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2109 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-24 19:34:05 +00:00
Wanne aafb39445c Merged from revision: 2103
- Added comments to history.xml (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2104 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-20 19:27:45 +00:00
Wanne c9ab23b443 Merged from revision: 2101
Externalized History Log texts (by Jazz)
- see TableData\History.xml
- added support for language specific history (German.History.xml, French.History.xml, ...)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2102 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-20 04:28:38 +00:00
Flugente 66fc68ef67 New feature: Diseaes affect your mercenaries. They can be contracted in varíous ways and have varying effects.
For more info, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/334918#Post334918

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2099 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-10 13:05:18 +00:00
Flugente d1936cdba8 Adjusted aim level and gun handling values (by Strohmann)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2098 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-10 12:49:03 +00:00
Wanne 8bf0168398 Merged from revision: 2094
- Added missing "Lookup/AmmoChoices.xml" file

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2095 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-08-05 18:49:48 +00:00
Wanne c8c5d4fa17 Merged from revision: 2084
- Fixed wrong decimal value instead of int value in GunChoices_*.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2085 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-30 18:04:00 +00:00
Wanne 9c758c3b69 Merged from revision: 2075
- Fixed extra spaces in names and nicknames in MercProfiles.xml (by Buggler)

- Changed Ja2Options.ini settings (by Buggler & Sevenfm):
MAX_NUMBER_PLAYER_MERCS = 32
DIRT_SYSTEM = FALSE
AUTO_FAST_FORWARD_ENEMIES = 2
AUTO_FAST_FORWARD_MILITIA = 1
AUTO_FAST_FORWARD_CIVS = 1
AUTO_FAST_FORWARD_CREATURES = 1
CLOCK_SPEED_PERCENT = 120
ENEMY_CLOCK_SPEED_PERCENT = 120

- Removed unused Ja2Options.ini:
MIN_RANGE_FOR_FULL_COWERING_TARGET_PENALTY
STAMINA_HIT

- Updated ReadMe in Windows 8 Fix.zip (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2076 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-21 18:09:59 +00:00
Flugente 669f982338 Throwing knifes can get bloody again.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2071 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-14 21:02:12 +00:00
Wanne b3e5689b46 Merged from revision: 2067
- Added missing email merc availability texts for the new DG mercs (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2068 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-12 20:55:29 +00:00
Flugente 05ada754c1 - Adjusted military headquarter description.
- Extended SquadNames.xml.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2063 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-08 18:58:43 +00:00
Flugente ea4f49a711 - New Feature: dynamic opinions allows mercs to form opinions about each other depening on actions they/the player take or do not take. These can be viewed in the 'MeLoDY 'website. See also http://www.bears-pit.com/board/ubbthreads.php/topics/333259.html#Post333259
- new background property: <dislikebackground> allows mercs to dislike specific backgrounds

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2050 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-28 22:03:13 +00:00
Wanne 0ad234f175 Merged from revision: 2044
- Reworked/improved english texts for LoadScreenHints.xml and CampaignStatsEvents.xml (by John A Smith)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2045 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-22 18:48:55 +00:00
Wanne a0990d6f59 Merged from revision: 2042
- Fixed typo in LoadScreenHints.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2043 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-20 19:00:04 +00:00
Wanne 0362b874d0 Driveable vehicle Update: Externalized vehicle seats (by anv)
- externalised vehicle seats (TableData\Vehicles.xml) influence position of passenger, field of view, ability to shoot and being hidden,
- seat can chosen by using ctrl+RMB on vehicle (ctrl + LMB just takes the first visible seat)
- seats can be changed or swapped while inside vehicle,
- remade JSD files for cars,
- vehicles aren't transparent anymore,
- vehicles are louder than people, depending how fast they move.
see: http://www.bears-pit.com/board/ubbthreads.php/topics/332790/5.html


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2038 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-18 15:27:09 +00:00
Wanne 2de1911218 Merged from revision: 2036
- Eldorado, hummer, jeep animation cleanup (by rummtata)
- Minor language touchups for CampaignStatsEvents.xml, LoadScreenHints.xml (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2037 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-18 14:44:04 +00:00
Flugente e0cb222237 - new background property: if <loyalitylossondeath> is set to 1, global loyalty drops drastically if the character dies (used for Miguel)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2031 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-01 23:47:45 +00:00
Flugente 7e10c414bc Merged revision(s) 2029 from branches/ja2_data_official_2014:
added neurotoxin darts to Howard's inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2030 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-05-01 22:04:14 +00:00
Flugente c7b5ea26fe Merged revision(s) 2026 from branches/ja2_data_official_2014:
AI will no longer choose illumination rounds for mortars and grenade launchers during the day

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2027 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-04-30 22:56:16 +00:00
Wanne 4d20f08479 Merged from revision: 2017
- Fixed wrong item updates from commit 2014 (custom souns for non-guns)
o Now the hedge trimmer has the correct new sound

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2018 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-04-21 06:58:21 +00:00
Wanne ef54e5ebfd Merged from revision: 2013
Custom sounds for non-guns (by anv)
- knives, throwing knives, blunt weapons can use attack sounds specified with <sSound> tag - previously their sound was chosen depending on animation used and hardcoded - it should open space for exotic weapons like chainsaws, lawn mowers, jackhammers, etc. If <sSound> is left unspecified, default hardcoded sound will be used normally.
- knives, throwing knives, blunt weapons, launchers on attack can cause noise specified with <ubAttackVolume>, previously it was ignored for anything but guns,
- For presentation purposes: Reuban's hedge trimmer using its original DG attack sound effect and making a lot of noise.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2014 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-04-19 09:25:08 +00:00
Wanne 03754e519b Merged from revision: 2006
- Externalized country name and noun to cities.xml (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2007 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-04-06 14:44:23 +00:00
Wanne d139968876 Merged from revision: 2002
- Bugfix: Each CampaignStatsEvents entry in CampaignStatsEvents.xml should have exactly 9 szText entries, so it works in multi language

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2003 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-31 08:53:47 +00:00
Wanne ba97d8f006 Updates/Fixes (by Sevenfm)
- Added grenade throwing range modifier to item_settings.ini:
RANGE_GRENADE_MODIFIER = 1.0
This modifier is applied to grenades and regular thrown items.
- Added xml tags for merge type <13>: you can use u.knife on tripwire roll to get 2 tripwires. Status of tripwire roll will be reduced by 2 points. 
Also lookup table for merges is updated for xml editor to work correctly.
- Added several new loadscreenhints.


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2000 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-24 20:06:38 +00:00
Wanne 31f4f12752 - Added comment to CampaignStatsEvents.xml
- Removed empty tags (which are not needed) from CampaignStatsEvents.xml 

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1998 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-24 09:49:33 +00:00
Flugente 79283ee6b9 Merged revision(s) 1985 from branches/ja2_data_official_2014:
Fixed typos.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1986 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-16 13:03:41 +00:00
Flugente fe1bed45d1 - New feature: Ammotype flag AMMO_ANTIMATERIEL (<ammoflag>4</ammoflag>) gives bullets the ability to destroy walls and other structures.
- Fix: Charlie's ammo was not fitting

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1984 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-15 17:55:11 +00:00
Flugente afbf387c30 Merged revision(s) 1980 from branches/ja2_data_official_2014:
- new background ability: disarm_trap alters effectivity at defusing bombs
- lowered signal shell light duration

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1981 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-12 22:32:22 +00:00
Flugente bd6204cc75 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 e366af5740 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 177e6450c3 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 905c6bec17 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
Flugente 458695ae0e 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 2f2c2cfe8a 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 1ddccf4d5e 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