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
2,892 Commits 9 Branches 6 Tags
6ce47c4cef3501cd49fc32710e712c44bacfde80
Commit Graph
754 Commits
Author SHA1 Message Date
TheBob 3c4da04532 Cleaned up attachment removal code 
Fixed rare issue with squads and movement groups not being defined at game start.
Fixed wrong type declarations in header files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8407 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-06-12 17:09:25 +00:00
TheBob b60a94afc5 Added: Ctrl+Shift+E now fill LBE items in sector with other items and places them in vehicles first. 
Added: Right-Click on remove attachments button on sector inventory screen will not empty LBE items in sector
Changed: SLAY_STAYS_FOREVER disables Slay's hourly chance to leave when unattended
Added: SLAY_HOURLY_CHANCE_TO_LEAVE setting to Ja2_Options.ini
Fixed: a bunch of array index out of bounds bugs
Fixed: a bunch of typos in if contitions
Fixed: BuildListFile() function loading items from index 1 instead 0
Added translation: Polish text for some map inventory screen items
Added translation: English texts for new functionality for other language files
Cleaned up some old TODOs

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8404 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-05-19 13:40:34 +00:00
Flugente baf68cd7e6 Fix: performance of GetItem check 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8402 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-04-15 20:48:04 +00:00
silversurfer d7f91064f0 Fixes (by The_Bob): 
- Fixed index out of bounds in get items assignment check
- Fixed attachment popup not allowing more than one of the same attachment
- Improved timer control sanity check code
- Added timer adjustment for variable CPU frequency
- Added shortcut: ctrl+left-click on attachment to remove and drop it in sector inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8400 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-04-14 08:34:20 +00:00
silversurfer fef0722178 Fixes (by The_Bob): 
- Fixed random freeze on win8/10
- Fixed crash on mercs entering sector
- Fixed crash when using cover display (del/end)
- Fixed attachment popup showing incompatible attachments (crash/freeze/confusion on clicking the option)
- Fixed attachment popup positioning
- Fixed LBE contents corruption/deletion
- Fixed access violation (out of array bounds) in interrupt code
- Fixed a bunch of random old stuff
- Got the project to build on VS2015
- Improved popup class handling of grayed out options
- Improved performance of get item assignment check (added by Flugente)
- Added Ctrl+Space bind for testing/fixing broken LBE contents


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8399 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-04-12 08:09:12 +00:00
silversurfer dbec9c6ca0 - Added external parameter CounterAttackGroupSize to DifficultySettings.xml for counter attack strength. This replaces the old hard coded value. Requires GameDir >= 2363! 
- Changed counter attack elite soldier distribution to replace regulars just like the rest of the code handles elites.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8396 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-03-14 17:21:40 +00:00
Flugente 125fda3905 minor code cleanup 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8393 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-03-11 13:19:20 +00:00
Flugente 79ee1522f9 If 'GetItem' assignment isn't possible due to no valid items in target sector, indicate this to the player. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8386 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-02-01 19:05:58 +00:00
Flugente 70473557cd - Fix: ASD did not take mercs on assignment into account 
- Fix: crash when entering combat without any mercs in sector on duty

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8380 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-28 20:00:52 +00:00
Flugente fd09d16b4d Added new records: total healing (combined healing, stat repair and diesease cure) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8377 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-27 20:37:28 +00:00
Flugente 5f2da3707c Added new records: diseases caught, interrogations, total damage taken, total damage dealt 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8376 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-26 20:46:26 +00:00
Flugente e643c1ea57 - Hospital healing now uses the same function as normal healing 
- If surgery would not heal anything, don't do it
- removed unnecessary defines

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8375 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-23 23:05:30 +00:00
silversurfer a6b2568e24 - new jam damage thresholds for guns - when a gun jams it can only take damage if its status is below the threshold 
- modified damage calculation for jam damage
- modified cleaning point calculation for mercs
- natural dirt level of sectors now halved if the shooter is inside a building

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8370 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-22 13:33:44 +00:00
Flugente e2c05ce1c6 minor code cleanup 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8363 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-13 20:19:44 +00:00
Flugente 3419fd1c5d dded new character trait "Coward" (charrcter trait #13) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8362 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-12 23:24:41 +00:00
Flugente 556ce68586 Fix: jeeps were not properly counted 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8361 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-12 00:51:46 +00:00
Flugente 4d48876c1f added new disability "Self-Harming" 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8359 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-11 22:32:33 +00:00
Flugente bb6872787d - Fix: if merc cannot complain about his equipment due to being asleep or on duty, retry an hour later 
- Fix: in AIM bios, show max life, not life at start of game
- Fix: typo resulted in AIM mercs not refusing job because of hated mercs present when they should do so
- Dialogue clarification: QUOTE_PRE_NOT_SMART is now used for complaints about food, QUOTE_POST_NOT_SMART to refuse smoking

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8354 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-06 01:17:45 +00:00
Flugente 3ab70dde90 - added new disability "Fear of heights" 
- Fix: wrong backgrounds were filtered out when checking for personality/disability/traits

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8351 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-12-31 12:00:45 +00:00
Flugente d08b4d13b9 New feature: Minigames are interactive actions that happen in a dedicated screen. For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=347722&#msg_347722 
GameDir >= r2350 is required.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8346 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-12-11 12:43:41 +00:00
Wanne 6c737fefd3 Fixed compilation errors in VS 2005: std::sqrt() -> sqrt() 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8339 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-11-02 13:24:17 +00:00
Flugente d6d4841d85 When loading a savegame with version < WORKERS, set up town worker population to initial rate 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8333 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-24 18:44:13 +00:00
silversurfer 372adc37b8 repair and dirt system change: 
Dirt is now part of gun status. The original dirt system has been removed. For details see:
http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20198&goto=347370&#msg_347370


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8325 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-19 15:58:02 +00:00
Flugente c086b98b4c Fix: tanks and jeeps can only be assigned to enemy patrols if ASD is active 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8318 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-16 00:07:23 +00:00
silversurfer 5f4a7e2331 - turned off compiler warning in VS2010 
- fixed compiler error in VS2010

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8317 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-15 18:18:10 +00:00
Flugente 68294910b8 - New command: On [Alt] + [N], all team members in the sector try to put on gas masks 
- Fix: gasmask status was not always evaluated correctly

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8315 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-14 21:07:49 +00:00
Flugente a0c2b0a39a SAM site repair is now an assignment. For this, old code has been repurposed. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=22916&goto=347318&#msg_347318

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8314 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-14 17:20:23 +00:00
Flugente 258e9c24a0 New feature: SAM site cover can now overlap, and SAM sites can be hacked to lower their radius. For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23211&goto=347188&#msg_347188 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8309 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-05 22:22:50 +00:00
Flugente 8523a1dead Fix: enemy jeeps are not always counted as enemies 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8308 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-04 19:57:27 +00:00
Wanne 8c3902e1b6 Fixed compilation error that was popping up when compiling a non English version 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8299 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-09-13 09:18:33 +00:00
silversurfer f1f0ba7aed Fix: Tag <BadSector> was overlooked in the r8295 change causing the game to crash on startup. This is now handled differently and properly. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8297 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-09-12 18:39:52 +00:00
silversurfer 9395fcc8a2 Enhancement: 
- SCROLL_SPEED_FACTOR in Ja2_Options.ini allows to modify scroll speed
- while reading MovementCosts.xml the game checks now for valid traversal type and asserts instead simply assigning type GROUNDBARRIER

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8295 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-09-11 11:42:48 +00:00
Flugente a332b1943c Fix: one could remove Nails' jacekt via [Ctrl] + [W] in strategic inventory 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8288 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-08-12 22:34:30 +00:00
Flugente 99f5be0ed7 New feature: interactive actions allow various actions (hacking/reading/drinking/...) from user-defined xml acttions. The exact results can be set in a lua function. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23144&goto=346447&#msg_346447

This is fully savegame compatible.

GameDir >= r2333 is required.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8278 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-08-02 19:03:28 +00:00
Flugente 41dcb598dd - New background property: <snake_defense> alters snake defense chance 
- New sector property: <numsnakes> sets maximum number of snakes per snake attack

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8277 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-07-26 22:39:28 +00:00
Flugente 7b6f3d8441 New LUA functions: via GetModderLUAFact and SetModderLUAFact, a modder can set up to 1000 INT32 values exclusively in LUA scripts. This can be used to store mod-specific data in save games without additional code required 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8276 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-07-26 20:44:42 +00:00
silversurfer ab554b937c Fix: 
- price and militia resource points display in sector inventory was incorrect and didn't take Shift key into account
- display of militia resource below the map didn't work if MILITIA_VOLUNTEER_POOL was FALSE

Enhancements:
- militia resource points display below map now better organized
- militia resource points display below map now available when in sector inventory and pressing ALT key
- conversion of items to militia resource points now available with ALT + RMB, ALT + Shift + RMB and ALT + Shift + Y + RMB just like quick sell feature works


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8275 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-07-17 13:44:58 +00:00
Flugente 6acbd72c89 Slightly altered militia resource display 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8274 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-07-16 22:13:53 +00:00
Flugente 57ec4e7fa1 Due to erroneous code, the encyclopedia feature has been deactivated. for more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23090&goto=345928&#msg_345928 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8273 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-07-16 12:21:22 +00:00
Flugente 7a34e9a154 New feature: militia resources requires the player to convert items to resources to be able to train and promote militia 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8271 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-07-15 19:33:44 +00:00
Flugente 06be86a471 If enemy conquers a sector, remove workers. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8268 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-07-05 17:03:30 +00:00
Flugente 951da7812d New feature: mines require workers for maximum income, these can be trained like militia. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8267 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-07-04 22:31:37 +00:00
Flugente ce6e63831d New feature: environment hazards pose danger to soldiers in certain sectors - first use are snakes that attack anybody in water sources in swamps. 
Requires GameDir >= r2327.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8266 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-07-03 21:26:45 +00:00
Sevenfm d2c1579786 HandleSnitchExposition: assignment instead of value check 
HourlySnitchUpdate: NUM_PROFILES limit
Strategic AI.cpp: MAP_WORLD_X * MAP_WORLD_Y limit
RemoveMPButtonsForMapScreen: MAX_MP_BUTTONS limit
WrapString: '/0' char instead of '\0'

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8257 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-06-25 09:04:58 +00:00
Sevenfm 120507a9fd UpdateStrategicDetectionLevel fix: reset detection level 
ScoutIsPresentInSquad: allow scouting only if soldier is not in a vehicle and not on assignment
StartCivQuote fix: uninitialized ubCivQuoteID2

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8256 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-06-25 08:48:40 +00:00
Flugente 0955d6ddfd Fix: bad LUA functions (by sevenfm) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8254 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-06-18 21:30:39 +00:00
Flugente 503523a9fa New feature: localized weather adds more weather types, different weather can happen in different sectors at the same time. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23094&#msg_345949

Requires GameDir >= r2325

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8253 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-06-18 20:57:03 +00:00
Flugente 2c85d6dc03 Fix: determining a militia path in strategic map could cause the sector militia size to be cut to MAX_STRATEGIC_ENEMY_GROUP_SIZE 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8243 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-28 15:07:44 +00:00
Flugente c20232a740 Fix: when starting a new campaign, NULL the StrategicMap flagmask 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8237 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-26 12:27:49 +00:00
Flugente db00927287 - Fix: same militia profile is used several times in autoresolve 
- Fix: sometimes no battle repoer is written for autoresolve
- Fix: no militia profile found in autoresolve due to bad sector

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8229 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-22 23:04:05 +00:00