1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,487 Commits 9 Branches 6 Tags
004cb3d482daab32caf0ca7c7f3a50c79dbd4b71
Commit Graph
1487 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
silversurfer 004cb3d482 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
silversurfer 3574c42c65 cleanup of old data after move of difficulty settings to new DifficultySettings.xml 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2156 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-10-02 19:02:14 +00:00
Flugente 299f8af314 Added 3 new opinion events (OPINIONEVENT_BRUTAL_GOOD, OPINIONEVENT_BRUTAL_BAD and OPINIONEVENT_TEACHER) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2155 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-09-27 20:21:30 +00:00
Flugente a0830b21ba New Feature: IMP gear selectino allows choosing what items an IMP starts with instead of relying upon randomness 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2152 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-09-23 22:10:26 +00:00
Wanne d52318e636 - 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
Wanne 77a645d362 Merged from revision: 2146 
- Updated Russian comments for INIEditor (by Valiant)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2147 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-09-14 17:10:43 +00:00
Flugente 7410ce875a Externalised amount of debt to MERC at which Speck complains. 
Note: this does NOT affect wether MERC goes bankrupt, as this is independent of the amount of debt.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2145 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-09-13 15:07:42 +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
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 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
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 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
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 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 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 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
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 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
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 10356266b9 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 f9af947423 Merged from revision: 2118 
Updated description for AGGRESSIVE_STRATEGIC_AI
- Added the info, that it is currently hardcoded for city sectors

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2119 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-08-27 07:37:00 +00:00
Wanne d92bf811f3 Merged from revision: 2112 
Updated INIEditorJA2.xml (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2113 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-08-25 09:48:10 +00:00
Wanne 41a8afcb01 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 b78bd5d6d1 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 ca401e3995 Merged from revision: 7404 
New Version 2.8.0
- Added support for custom resolutions (width, height)
- Added support for FRENCH INI descriptions

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2106 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-08-22 12:07:09 +00:00
Wanne 4e9ae5fa8f 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 a89d66a4ad 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 864675b4d0 Disease feature is off by default. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2100 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-08-10 14:40:32 +00:00
Flugente 3433ec6b1c 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 2f741262b6 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 c5edb6ee1e Merged from revision: 2096 
XML Editor can now work with the "Data" folder
- Fixed "Data\TableData\*.xml" files 
- Added missing BigItems STI files
- Added Lookup XML files for the XML Editor

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2097 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-08-05 21:46:57 +00:00
Wanne 44b243de71 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 9d34110a83 Merged from revision: 2092 
- Removed <GameDir_Taiwanese_Path_1> from XMLEditorInit.xml, because TAIWANESE is not supported anymore

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2093 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-08-05 18:32:41 +00:00
Wanne b764467de1 Merged from revision: 2088 
- Added custom game resolution (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2089 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-08-05 17:04:12 +00:00
Wanne c50f412e9a 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 3166ffed78 Merged from revision: 2078 
- Fixed of gamestart missing settings and cleanup of Profiles folder INI settings (by Buggler)
- Deleted 'Profiles\UserProfile_UnfinishedBusiness\UB' folder

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2079 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-07-26 13:01:58 +00:00
silversurfer 1d3371244d New option in CTHConstants.ini: 
IRON_SIGHTS_MAX_APERTURE_USE_GRADIENT = FALSE/TRUE
When activated it will make iron sights more powerful over longer distances. This is an experimental switch. The formula might need to be tweaked.


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2077 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-07-22 09:56:41 +00:00
Wanne de2efce1cf 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
Wanne 80b08d53d2 Merged from revision: 2073 
Changed default screen resolution to 1024x768

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2074 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-07-19 13:50:25 +00:00
Flugente e4c01d20ff 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 0d8a159b72 Merged from revision: 2069 
Updates (by Buggler)
- Mercs, militia & enemies are now shown with 10x icons on strategic screen
- Changed militia icon order display in strategic map; elite first 

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2070 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-07-14 19:38:46 +00:00
Wanne 02cc79a3e5 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
silversurfer 9d12563ca1 New modifier for NCTH to alter the behaviour of the scope penalty: 
- AIM_TOO_CLOSE_THRESHOLD = 0.8

This defines the point within scope range where the penalty starts.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2066 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-07-11 15:17:40 +00:00
Flugente c3a4cb2cce - Generals are now a separate prisoner type. They cannot join militia, but yield an impressive ransom. 
- prisoners now require less interrogation points, and mercs have less interrogation points

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2065 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-07-10 21:20:45 +00:00
Flugente f52302527b Fix: settings appeared twice 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2064 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-07-08 20:01:35 +00:00
Flugente c4c6895cef - 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
Wanne 3954dc618f Merged from revision: 2060 
- Added French translation to the INI Editor xml files (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2061 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-07-07 19:38:54 +00:00
Flugente 91d5e4d094 New Feature: dynamic dialogue is played when dynamic opinions are active. Mercs can comment on each others actions, and this can influence their opinions further. IMP character answers can even be chosen by the player. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2059 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-06-27 22:11:13 +00:00