Commit Graph
1916 Commits
Author SHA1 Message Date
Wanne 73be285e09 Fixes (by Moa)
-SGP debugging now works again (corrected some typos and one missing include).
-Memmory debugging works again (wrong types corrected)
-Laptop screen heigth macro and all references is now usable. (was 'C: y + A' 'D: B - C' which translates to 'D: B - y + A' instead of 'D: B - y - A')
-Laptop screens do not need to rerender as often then before as the laptop screen width/heigth macros works now and invalidating screen will do the trick -> almost no render calls neccessary.
-MercProfile.ubMiscFlag was used instead of .ubMiscFlag2 -> enter sector action schedule for soldiers which dont need to be insertered is now canceled as intended

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6509 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-19 12:47:53 +00:00
Wanne 8e17fb3fd2 - Added missing changes from revision: 6503 (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6507 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-19 12:13:09 +00:00
Wanne 484b353b1c - Fixed compilation error
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6506 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-18 07:03:41 +00:00
Wanne e58ce236b5 Externalizations (by Buggler)
- Externalized airport sectors
- Leave equipment in Drassen used airport sector instead of bobbyr shipping location, allowing possibility of separate airport and bobbyr location 
- Used actual sector names instead of Omerta and Drassen hardcoded text in leave equipment message prompt

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6503 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-17 14:49:52 +00:00
Wanne 7ccdd5f7ab - Missing changes for revision 6500 (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6501 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-16 10:53:15 +00:00
Wanne 772e99924a Improvements (by Buggler)
- Externalized BR shipping destination
- Externalized Drassen item dropoff grid no
- Used profile name instead of hardcoded value on message prompt for marrying Daryl, sparing Krott and finding queen's POW sector
- Hid names on message prompt when attempt to talk to out of LOS hidden NPC

Mapeditor (by Buggler)
- Show index no within usItemClass on item selection screen for another easy reference
- Lighten quantity and selected tiles color in tile selection screen 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6500 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-15 19:51:53 +00:00
Wanne 9128ee0e4b - Chinese translations (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6498 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-15 19:38:50 +00:00
Wanne 7f489a1b53 Externalized (by Buggler)
- AWOL scientist location
- Brothel sector
- Call Kingpin over for boxing match
- fact Tony in building
- meet Carmen for reward
- moved John & Mary unescort sector from Mod_Settings.ini to LUA

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6495 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-14 11:57:08 +00:00
silversurfer dcf1df3c72 Bugfix for BR mail order screen
- items with long names displayed only ... when index >= 20

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6494 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-14 10:54:31 +00:00
Flugente bd8ede4f06 visionrange calculation was performed twice when once was enough
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6493 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-13 20:07:37 +00:00
Flugente ab501386d5 Fix: negative poison values
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6492 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-13 19:51:29 +00:00
Wanne c3eb3a5434 Turned WINFONTS macro into the ja2.ini property (USE_WINFONTS) (by scodec)
- Set USE_WINFONTS = 1, if you play Chinese version of 1.13, otherwise 0 (Default)
- This is the first step in a process making only ONE executable file for ALL the different languages

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6488 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-13 19:02:27 +00:00
silversurfer 90dabd20ad Bugfix for JaggZilla bug #515
When we fly to a sector with enemies and assign at least one of our passengers in the heli to a squad the game will remove everyone from the heli and start combat. This prevents the exploits that existed before where we could assign our men to anything in hostile sectors.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6486 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-13 18:10:51 +00:00
silversurfer 9602a67946 Bugfix for JaggZilla bug #566
- max coolness was calculated wrong and was below min coolness. This couldn't work well...

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6485 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-13 14:31:43 +00:00
silversurfer 1f6a7be646 - bugfix for scrolling items on BR mail order screen
- bugfix for display errors on empty lines on BR mail order screen
- externalized noise threshold for silenced shots to Ja2_Options.ini (MAX_PERCENT_NOISE_SILENCED_SOUND)
- updated version numbers

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6484 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-13 12:30:25 +00:00
silversurfer c5873e956d - changed MAX_PERCENT_NOISE_VOLUME_FOR_SILENCED_SOUND from 35 to 50 so that all shots with silencers use the silenced sound instead of the normal weapons sound
- New item tag <SleepModifier>:
This is a percentage bonus to breath regain while resting.
It could be applied to sleeping bags for example.
Reasonable values are from 0 (no bonus) to 100 (twice the regeneration).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6483 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-12 15:02:10 +00:00
Wanne f72e4424eb Externalizations (by Buggler)
- Queen Palace & Interrogate meanwhile stuff
- Initial POW stuff in Alma
- Sectors for triggering Meduna outskirts meanwhile scene
- Add Iggy to location when game progress condition met
- Add Rat to location after creature meanwhile scene

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6479 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-11 06:55:31 +00:00
Wanne 3ab6da635f Externalizations (by Buggler)
- 'Kingpin wants his money' history log hardcoded location to his actual location
- John & Mary sector to disappear on quest completion
- Dynamo prison sector for Matt's quest
- Joey primary & alternate location to be found
- Spike sector relocation when assassins are sent
- Weapon cache locations

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6477 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-09 19:44:15 +00:00
silversurfer e59e951e31 Bugfix for JaggZilla Bug #635
- NPCs that turn neutral cannot end a battle for an entire sector anymore if there is other enemies around.
- Enemies that bled to death won't stop the code anymore to grant us victory.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6476 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-09 19:32:19 +00:00
silversurfer fa56d63ce4 Bugfix for JaggZilla Bug #623
The crash was caused by Mike or Iggy because they are created from an Elite but don't have ubSoldierClass set to SOLDIER_CLASS_ELITE. Therefore ubNumElites and num remained at 1 when the for loop was done.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6475 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-08 17:55:45 +00:00
Wanne c14e76622a - Fixed Tixa & Orta location not shown on NPC quote trigger (by Buggler)
- Fixed Merc Formation text positioning and other minor text tweaks in option screen (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6474 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-08 16:08:50 +00:00
silversurfer 48ceea04ee Fix for JaggZilla Bug #591
Mercs that were set to student with a trainer that was not good enough could practice without breath loss. They will still practice with this fix but they will lose breath as normal.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6473 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-06 14:53:43 +00:00
silversurfer 9eedf3d45d new modifiers for item properties:
- APs to reload
- APs to reload manually
- max distance for messy death
- gun handling
- best laser range

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6472 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-06 12:50:36 +00:00
silversurfer c16971b9f2 New weapon type modifiers for:
- damage
- single shot AP
- burst AP
- auto fire AP

Fixed some parts where the raw item property was used instead of the Get... function that should be used.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6470 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-05 15:15:50 +00:00
silversurfer 2b19bd1959 - new Item_Settings.ini modifiers for weapon class specific range
- renamed weapon overheating modifiers to get a common naming scheme
- added weapon overheating modifiers for launchers
- renamed TURNING_FROM_PRONE_FOR_PUNCH_OR_STUB to TURNING_FROM_PRONE_FOR_PUNCH_OR_STAB for search reasons


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6469 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-04 18:55:50 +00:00
Kriplo d83f23ce2b Brief: //dnl ch73
- Fixing bad APs deduction when using blade or blunt weapons and punching in general from different stances when need turn to your target.
Details:
- Fix wrong APs deduction and animation change when go to attack with knife or punch from prone.
- Fix no APs cost for martial artist when perform turning.
- When target was prone there was several problems in defining turnover and stance cost as range to them could vary depending of obstacles between, and as punch or stub in general use same logic put all stubbing and punching under one function MinAPsToPunch which should solve current problems with APs calculations.
- Still there are no turning cost when going to stub or punch from moving, but this problem is not related with MinAPsToAttack but with UIPlotPath which don't add turning cost, hope someone in the future will add this feature which never exist.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6465 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-03 20:22:35 +00:00
silversurfer 0668d04e1f Bugfix for JaggZilla bug #543
During an interrupt it is not possible anymore to drop the backpack with Shift+B if you are not among the interrupters.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6464 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-02 13:45:19 +00:00
silversurfer cc51c13529 New modifiers for Item Properties
The new Item_Settings.ini is there to host modifiers for item properties in the different XML files. For now it is only used for the Weapon Overheating feature to adjust parameters based on gun class.
It uses the new struct gItemSettings which is populated in function void LoadItemSettings() on game start.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6463 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-02 12:40:08 +00:00
silversurfer bc7b3e2d62 Bugfix for superheated weapons in loaded sector inventory after saving the game (by Moa)
In revision 6434 a bug was introduced where all weapons in a loaded sector would be set to 45000 temperature after the game was saved. This is a temporary fix.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6459 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-01 17:31:18 +00:00
Wanne 7b1124a596 Reduces render calls when mouse over compatible item in stash and soldier inventory (highlighting) (by Moa)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6456 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-29 19:46:59 +00:00
Flugente 3c01b5364e - new item: when planting tripwire roll (Item# 1640), a tripwire item is created, thereby making planting multiple wires much easier. Teipwires can be merged to create a roll
- new item tag: <buddyitem> connects items to other items. Connection specifics depend on items involved

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6455 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-29 17:06:37 +00:00
silversurfer 2169fbd6a9 New trait modifier for Ranger
POSSIBLE_AIM_CLICK_ADDED_SHOTGUNS was added to adjust the number of aim clicks for shotguns. The default is 1.

Also fixed the broken aim click modifiers for Gunslinger and Sniper.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6454 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-29 16:03:35 +00:00
silversurfer 5fc1ab95a1 Fixed Carmen's terrorist counter
When terrorists had fixed placements in MercProfiles.xml they were not taken into account for the terrorist counter. Now all terrorists count no matter if fixed placement or random placement.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6451 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-29 09:28:05 +00:00
Kriplo f65719e801 Brief: //dnl ch72
- Fixing bad APs deduction when using hand grenades, mortars, rocket launchers, grenade launchers and attached grenade launchers from different stances and need turn to your target.
Details:
- Add APs cost for stance change and turnover for mortar and rocket launchers.
- Rocket launchers cannot be fire from prone any more as there are no animation for that stance.
- Attached grenade launchers now take raise gun cost for launcher instead for gun.
- No more problems with APs for grenades from different stances and turnover, add proper costs for crouch too as someone add animation for that.
- Fix wrong APs deduction for grenade launcher from prone and turnover in general.
- Fix incorrect values for APs cost under throwing/launching cursor.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6447 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-27 22:03:42 +00:00
Wanne ebef9b6df3 Bugfix: Repair assignment sub-menu goes out of rendering range (by Moa)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6446 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-27 06:41:49 +00:00
silversurfer 09ea0d8ec2 Changed code for sex in brothel to use the externalized grid numbers.
This change only helps if you use the fixed LUA script in GameDir 1792.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6445 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-26 18:23:29 +00:00
silversurfer 393790f817 Bugfix for game clock mouse region in map screen (by Moa)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6441 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-25 06:47:17 +00:00
silversurfer a389081a9a Bugfix for crash with empty sector inventory (by Moa)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6440 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-24 20:34:43 +00:00
silversurfer 08f5b05c82 When checking if a gun barrel extender should be damaged and fall off the game will not use item ID GUN_BARREL_EXTENDER anymore because that was tied to item 310.
Instead the game will now use the attachment class AC_EXTENDER. 
With this we can have more extenders that can be damaged and fall off and also other extenders that are not damaged by shooting.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6438 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-24 15:13:56 +00:00
Flugente deb0a65f46 Carried weight percentage can now change on uneven strength points.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6436 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-23 19:29:13 +00:00
Wanne 5df38d5042 Improve loading speed of stash (by Moa)
- improved processing of sector stash (opening/closing)
- improved loading speed of save games
- improved processing of items droped by militia (most noteable after autoresolve)
- and some other code related changes
see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/325332/FIX_improve_loading_speed_of_s.html#Post325332

Notes:
removed some functions, still in code so but renamed to *_OLD() because they are from Sirtech and should be kept as I have read in "§18) If possible, we don't just delete the old code, but comment it out (or #ifdef it out) for reference. We delete it only if it's really necessary."

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6434 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-23 06:59:29 +00:00
silversurfer 78b4e784b6 New trait bonus for Ranger
Oops. Forgot to copy two files.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6430 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-22 18:31:43 +00:00
silversurfer 810df5bce0 New trait bonus for Ranger
FIRING_SPEED_BONUS_SHOTGUNS will reduce the APs needed to fire shotguns. Default is 10 (percent).


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6429 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-22 18:25:57 +00:00
silversurfer f3a36ee7c6 New feature for UDB
It is now possible to see secondary attributes on the general tab for weapons. Just click on the tab a second time.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6428 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-21 16:03:47 +00:00
inshy 6f2c3bc833 French translation by hrvvillers
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6427 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-21 06:42:24 +00:00
silversurfer 9094283046 Bugfix for advanced repair system
The pSoldier that was passed to the ability check was the owner of the item and not the person that does the repairs.
So no Technician trait on the owner -> no repair...

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6426 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-20 19:10:56 +00:00
silversurfer 58f6e2d188 ATTENTION! This requires at least GameDir 1782!
More secondary attributes are now shown on general page of UDB. The following item tags were added:

<Damageable>0
<Metal>1
<Sinks>1
<TwoHanded>1
<BlockIronSight>1

The new icons were added to ItemInfoSecondaryIcons.sti.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6425 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-20 14:46:06 +00:00
Wanne 8221472bc2 - Externalized Kingpin money sector and Hospital sector (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6423 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-20 08:19:56 +00:00
silversurfer 1e06d2a725 Bugfix for merc availability on M.E.R.C
When loading a savegame mercs that became available automatically where not enabled because they couldn't meet a condition anymore. This condition will not be checked anymore because it is not needed for functionality.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6421 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-19 16:57:53 +00:00
silversurfer 113e54b4b1 Fix for new repair ease display
- tooltip takes into account if MERCS_CAN_DO_ADVANCED_REPAIRS = TRUE/FALSE
- added forgotten tooltip for OCTH
- formatting changes

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6420 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-18 20:03:18 +00:00