1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-12 14:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,507 Commits 9 Branches 6 Tags
604e2f7eba46bbc8b7e85183f03e0352c3b4bc7b
Commit Graph
1244 Commits
Author SHA1 Message Date
Wanne 604e2f7eba Merged from revision: 2185 
Fixed typos (thx to ATigersClaw)
- Dr. Mitch (AIM Bio)
- Backgrounds.xml
- LoadScreenHints.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2186 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-11-24 16:56:12 +00:00
Wanne 3bdcfc8226 Added missing entry 11 and 12 for explosion types in ExplosionType.xml. Now the XML Editor starts again without any errors (thx to JMich) 
- I just added placeholders "???" for the 2 new explosion names. Feel free to change them to the correct names :)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2184 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-11-09 20:18:44 +00:00
silversurfer 633c242953 Fix: added missing options to Ini Editor and some typo fixes. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2181 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-11-07 12:30:07 +00:00
Flugente cd18967530 DISEASE_CONTAMINATES_ITEMS controls wether contaminated food/blades/throwing knifes can infect people 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2180 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-11-05 21:51:57 +00:00
Flugente 7ab994aaf2 ROOF_COLLAPSE controls whether roofs can be destroyed. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2179 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-11-04 20:36:53 +00:00
Flugente 6bf7464d02 New Feature: tracking allows rangers to track past movements. 
For more info, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/337545#Post337545

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2178 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-11-04 20:04:55 +00:00
silversurfer 7b37a4898d Fix: Removed the invalid property <PercentCounterForceFrequency> from Items.xml 
Change: Set IRON_SIGHTS_MAX_APERTURE_USE_GRADIENT to TRUE as the new default in CTHConstants.ini. This should reduce problems with NCTH at game start when there are no scopes available. It also helps enemy soldiers so it will make the game more difficult.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2176 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-11-03 13:19:38 +00:00
Flugente bd9b600be8 Fix: Sounds.xml changes were missing. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2175 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-10-26 11:26:52 +00:00
Flugente 8d11eda385 New Feature: roof tiles can be destroyed. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2174 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-10-25 23:45:09 +00:00
silversurfer 904691298c 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 56cc070c62 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 68e3909d05 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 61f6322ab5 - 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 19cf8d6518 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 2d3fc62bb6 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
Wanne 19f1b82c84 Driveable Vehicles Tanks Update (by Ocular) 
- New ja2_options.ini entry: TANK_MINIMUM_PROGRESS
- This defines the progress (0-100), when the enemy can use tanks for attacks and patrols
- For Data-1.13, the progress value is set to 30.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2159 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-10-03 09:51:35 +00:00
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
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
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 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
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 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 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 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 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 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
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 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