1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,637 Commits 9 Branches 6 Tags
98c1e6a1f529104f2984c3192da76472ce7a53be
Commit Graph
7637 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Flugente a642ab500d Covert Ops trait improvements: 
- performing suspicious activities renders a spy easily identifiable for a short time (realtime) or until he ha spend enough AP (turnbased). This should make exploiting disguises harder.
- if a spy is closer than COVERT_ELITES_UNCOVER_RADIUS to an elite or officer, they can uncover the spy, depending on uniform worn an experience levels.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7514 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-13 13:12:46 +00:00
Flugente 309edbc80c Covert Ops trait change: if a spy is closer than COVERT_ELITES_UNCOVER_RADIUS to an elite or officer, they can uncover the spy, depending on uniform worn an experience levels. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2144 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-09-13 12:49:57 +00:00
Wanne 260f09356c Merged from revision: 7512 
- Translated skills menu entries for French version (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7513 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-12 16:21:36 +00:00
Flugente 029da88b51 Added missing translations. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7510 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-11 22:39:54 +00:00
Flugente 81644fef04 If walking with an aimed gun, do not return to standing animation but to aiming animation. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7509 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-11 22:23:10 +00:00
Flugente e3a94de7a3 Merged revision(s) 7507 from branches/ja2_source_official_2014: 
Fix: under certain circumstances, picking up LBE that could be worn, while slots this LBE would use were already in use, corrupted objects.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7508 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-11 20:14:43 +00:00
Flugente 68dbf0da05 Merged revision(s) 7505 from branches/ja2_source_official_2014: 
Increased maximum number of random items to 2000 (from 1000). These extra random items should NOT be placed in maps. They are intended to be used in other random items, in case a modder creates random items from other random items.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7506 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-10 20:03:11 +00:00
silversurfer a2be5b06c2 added new option to CTHConstants.ini: 
IRON_SIGHTS_MAX_APERTURE_MODIFIER = 3.0

This modifies how fast the aperture grows for iron sights when IRON_SIGHTS_MAX_APERTURE_USE_GRADIENT = TRUE

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7504 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-10 12:16:45 +00:00
silversurfer 72d642b292 set BASE_SIGHT_RANGE = 14 for Data-1.13 like the official 2014 release 
added new option to CTHConstants.ini:
IRON_SIGHTS_MAX_APERTURE_MODIFIER = 3.0

This modifies how fast the aperture grows for iron sights when IRON_SIGHTS_MAX_APERTURE_USE_GRADIENT = TRUE


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2143 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-09-10 12:15:47 +00:00
Wanne 84089c3c0c Merged from revision: 7500 
- Fixed wrong camo type worn off message (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7501 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-08 19:32:17 +00:00
Wanne 724f738a74 Merged from revision: 2141 
- ja2_options.ini: Fixed wrong ";" after AIMING_LEVELS_REDUCTION_ON_ALTWEAPHOLD (thx to LootFragg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2142 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-09-07 14:46:07 +00:00
Wanne 7a6f3ec91a Merged from revision: 7495 
- Updated French MercEdt files (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7496 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-07 13:56:19 +00:00
Wanne 4177e73aeb Merged from revision: 7493 
- Updated French MercEdt files (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7494 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-07 12:53:42 +00:00
Flugente 760a1b16f1 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.

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

does not break savegame compatibility. Requires GameDir >= r2140.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7491 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-07 00:11:16 +00:00
Flugente 360bac0909 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 3f4973b54c Fix: disease magnitude should be 0 if feature is off 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7487 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-04 20:00:35 +00:00
Flugente 5ad522e4a7 - Fix: disease notification should not be visible to the player 
- Fix: disease infection happened even though disease feaure was off
- Disease Improvement: infection chance by corpse is now affected by age of corpse

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7486 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-04 19:55:56 +00:00
Wanne d3100e3c4e Merged from revision: 7484 
Fixes (by Buggler)
- Commented code due to weird results when swapping filled LBE items that has pockets of the same size
- Fixed militia remains in loaded sector on using Unassign All button and then not assigning any militia to the loaded sector

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7485 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-03 16:29:19 +00:00
Flugente f07dbef356 Feature improvement (PMC): 
- when PMC militias arrive, loyalty in player towns can be lowered
- PMC militia arrival time is slightly randomized around the ETA

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7483 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-02 22:12:08 +00:00
Flugente e8412f6d9d 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 650deb67a5 Fix: light sources did not decay in turnbased mode 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7482 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-02 20:11:16 +00:00
Wanne 3f4f8004ec Merged from revision: 7478 
- Updated _RussianText.cpp (by Valiant)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7481 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-02 19:49:28 +00:00
Wanne 284493892b Merged from revision: 7479 
- Updated Russian Xml files (by Valiant)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7480 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-02 19:43:14 +00:00
Flugente 2cb2e89a33 Fix: error when building UB exe 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7476 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-01 21:53:15 +00:00
Flugente 15083befa2 Feature improvement: Battle reports in campaign history get a proper Operation name 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7474 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-01 20:20:13 +00:00
Wanne 64ed0c22b7 Merged from revision: 7472 
- Updated _Ja25RussianText.cpp (by Sevenfm)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7473 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-01 19:38:05 +00:00
Wanne a16c6caadb Merged from revision: 7470 
- Added russian EDT file for 169 (Mike) and 149 (PGmale4) (by Sevenfm)
- Updated FAQ-2014.txt and HotKeys.txt for Russian Version (by Sevenfm)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7471 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-01 19:33:20 +00:00
Wanne c02317ac50 Added language specific *.DifficultySettings.xml file 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7469 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-01 04:30:30 +00:00
Wanne ebda58074d Merged from revision: 7467 
- Deleted new merc (Wildfire) EDT files from "Data" folder for French version

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7468 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-01 04:29:32 +00:00
Wanne 0e17a15556 Merged from revision: 2137 
Moved the vanilla Merc Edt files from "Data-1.13" to "Data" folder (thx to Sevenfm)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2138 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-09-01 04:24:55 +00:00
Flugente ee27f27895 removed obsolete code 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7464 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-31 20:42:20 +00:00
Flugente fce1904d12 Fix: When starting a game, the entire map is grey. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7463 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-31 16:14:04 +00:00
Flugente 05a2e2afce Merged revision(s) 2135 from branches/ja2_data_official_2014: 
Fix: vanilla magazine class indizes were wrong

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2136 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-08-31 14:22:05 +00:00
Wanne 684e1d6148 Externalized Difficulty Settings 
- Removed #ifdef DIFFICULTY_SETTING. Now the new difficulty settings code is always active (by Jazz)
- Removed unused INI reading settings

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/trunk/GameSource/ja2_v1.13/Build@7461 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-31 13:39:23 +00:00
Wanne 120baf8325 Merged from revision: 2133 
Deleted Temp file/folders for "Merc Profile Editor 2" (thx to Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2134 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-08-31 12:12:27 +00:00
Flugente a2bbeebc54 Fix: graphical glitch when equipping a twohand item 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7460 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-31 00:27:10 +00:00
Flugente 0c425491bd Fix: typo 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7458 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-30 18:04:19 +00:00
Flugente e00897b91b New Feature: a private military company allows hiring of advanced militia. For more info, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/335279#Post335279 
Does not break savegame compatibility.

Requires GameDir revision >= r2130.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7457 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-30 17:34:25 +00:00
Flugente 060171298e 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 ef8165db1a Bugfixes: "Carrier Bladder" (by Off_Topic) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2129 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-08-28 22:32:25 +00:00
Flugente 5fc358f70c Fix: tanks automatically uncovered spies 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7456 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-28 21:38:24 +00:00
Wanne a772197c7c "Carrier Bladder" (by Off_Topic) 
- Updated XML files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7455 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-28 21:21:53 +00:00
Wanne cb8da2c6d7 "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
Wanne e08eda31ba Merged from revision: 2126 
Updated INIEditorAPBPConstants.xml (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2127 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-08-28 21:08:42 +00:00
Flugente a37cf0f8f1 - New xml: FoodOpinion.xml allows individual opinions on individual food items for each merc, the <bMoraleMod>-tag in Food.xml was removed. 
- Maximum number of food items was increased to 500 (was 128).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7454 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-28 20:12:06 +00:00
Flugente 926be78f6b 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
Flugente d8cdfc927c Singleshot rocket launcher explosions were always hardcoded C1-explosions, regardless of Weapon settings. As of now, the buddyitem tag can be used to specify the exploding item. (by DepressivesBrot) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7453 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-28 14:39:45 +00:00
Wanne df1969af10 Merged from revision: 2122 
Added new "Tools" folder which contains additional Editors
- Added new Version of the "Merc Profile Editor 2.0" (by Jazz)
- Moved "Faces Viewer" to Tools folder

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2124 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-08-28 11:02:23 +00:00
Wanne 746d89eef9 Merged from revision: 7449 
- Added new French Hotkeys (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7451 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-28 10:56:53 +00:00
Wanne 2bbd80892c Merged from revision: 7436 
- Changed MP Version to 3.0
- Changed default value for BASE_SIGHT_RANGE to 14 (as suggested by silversurfer)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7450 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-28 10:55:00 +00:00