Commit Graph
2080 Commits
Author SHA1 Message Date
Kriplo a3a9b29ead Brief: //dnl ch83
- Fix BigMaps cliff-prone problem.
Details:
- Bug which prevent merc to go prone and crawl in big maps with cliffs was reported by Buggler who already find source of problem which lies in DB_STRUCTURE_TILE struct variable sPosRelToBase. This variable contains relative position to base tile which and cannot simply be change to INT32 as data from JSD files are loaded into it. However reason for problem is because sPosRelToBase is not updated for quite bunch of structures when map size is changed so add macro which in real time perform conversion and update sPosRelToBase value.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6740 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-08 21:16:35 +00:00
Flugente 49de642d7d IDs use NOBODY, profiles use NO_PROFILE
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6736 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-07 21:04:07 +00:00
Flugente b387091a8c IDs use NOBODY, profiles use NO_PROFILE
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6735 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-07 20:32:51 +00:00
Flugente 8044ea108d Fix: error message when repairing
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6733 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-06 17:04:09 +00:00
Wanne c0d49d3f16 Externalizations (by Buggler)
- creature xml to use other insertion directions if per-determined direction is invalid
- swapped East and South Insertion_Code enum to be align with Strategic_Move enum
- option for crepitus to attack a random player-controlled town, not just the originating town
- externalized creatures spreading hardcoded defines to Creatures_Settings.ini

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6732 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-06 15:35:52 +00:00
Wanne 27fb0562ee Alternate new shortcut "ALT + Right Mouse Button" for showing skill (traits) menu in Tactical (by Sevenfm)
- Old also working shortcut: "SHIFT + 4"
- moved menu to cursor position instead of soldier's position
- see (youtube): https://www.youtube.com/watch?v=RS7AKv0rWq0



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6731 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-06 15:30:18 +00:00
Flugente 907a4b6b40 Fix: backgrounds not showing up
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6728 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-03 17:17:52 +00:00
Wanne 3fc109b02d Improved health bar in tactical (by Sevenfm)
Option SHOW_HEALTHBARSOVERHEAD is now integer:
0 - no bar
1 - default health bar
2 - small version of new bar
3 - large version of new bar
4 - small health bar + AP indicator
5 - large health bar + AP indicator

New health bar offers you:
- Suppression shock indicator (shock affects your CTH)
- Optional larger version (useful for hires playing)
- Cover indicator that will tell you if your cover is not perfect
- Target movement tile cover indicator (hold SHIFT)
- Sneaking indicator (sneaking is shown by brown border color)
- AP indicator (red if AP<10, dark grey if AP<MIN_APS_TO_INTERRUPT )

Note: cover indicators are enabled only in turnbased combat or when sneaking

see: http://www.bears-pit.com/board/ubbthreads.php/topics/172712/17.html


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6727 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-03 17:14:35 +00:00
Wanne daa0a32335 - Fixed variable typo for creature xml code (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6726 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-02 10:07:08 +00:00
Wanne ac83a9600d - Externalized creature feeding sector CREPITUS_FEEDING_SECTOR (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6725 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-02 07:42:24 +00:00
Wanne e3752a00fc Creatures Externalizations (by Buggler)
- externalized creatures placement and composition to CreaturePlacements.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6724 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-01 12:41:16 +00:00
Wanne d5b4599e9c New Trait: Snitch (Trait 22) (by anv)
Every midnight snitches will give you a report about their collegues' opinions. Information includes:
- merc whining about high death rate,
- merc whining about player reputation,
- merc whining about his low morale,
- merc whining about some other merc (unliked, not only hated),
- merc planning to quit (leave without renewing contract, only AIM mercs) next day,
- merc whining about player inactivity,
- merc whining about player owing them money (you can only owe money to MERC mercs).

List of snitches (trait 22)
Beth
Bud
Buzz
Carp
Ears
Gary
Hurl
Lance
Leon
Weasel

see: http://www.bears-pit.com/board/ubbthreads.php/topics/329412/Snitches_+_Externalised_morale.html

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6723 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-01 12:02:23 +00:00
Wanne 224ebe9ba3 Visual info feature (by Sevenfm)
New option SHOW_ENEMY_ADDITIONAL_INFO in ja2_options.ini
0 - nothing
1 - show awareness sign above enemy soldier (useful for sneaking and covert operations)
Eye sign means that enemy sees you.
Color shows enemy alert level (green, yellow, orange, red)
2 - show if enemy wears gas mask or nvg
3 - show if enemy has any armour (helmet, vest, leggings)
Note: additional info is shown only at limited range (based on current vision distance and merc's experience), similar to dynamic tooltips.
see: http://www.bears-pit.com/board/ubbthreads.php/topics/172712/17/Code_Snippets.html

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6722 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-30 17:34:25 +00:00
Wanne 536913fd44 - Added missing "Show Merc Ranks" option for French version (thx to hrvg)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6721 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-29 20:32:15 +00:00
Wanne 95332d38a5 - Bugfix: Fixed VICTORY music not played after battle is won
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6720 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-28 19:54:05 +00:00
Wanne 44cf72a2e0 - Fixed compilation error for JA2UB define (by anv)
- Added missing string to _FrenchText.cpp
- Renamed the "#if (defined JA2UB)" to "#ifdef JA2UB" so we are consistent through the code


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6719 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-28 18:27:09 +00:00
Wanne 5bf82b9d82 Heli Refuel Updates (by Buggler)
- heli refuel site marking in airspace mode
- fixed missing remaining fuel & distance to fuel site text in other languages

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6715 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-27 09:37:32 +00:00
Wanne 0ec3c152f9 - Translated a few texts in German
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6714 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-27 09:22:56 +00:00
Wanne 8de274df73 - Minor correction in text files
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6713 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-27 09:22:32 +00:00
Wanne f6e2c3aed8 - Bugfix: Playing in high screen resolution (> 1024x768) and reaching the tactical placement screen UI, the loadscreen image was still visible in the lower left and right part of the tactical placement screen
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6712 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-27 09:21:53 +00:00
Wanne 02bdbf2ed7 - Bugfix: SaveLoad-Dialog does not automatically jump to the correct page, when trying to load the last savegame (by Sionus)
o Before patch: openned first page, none saved game slot selected.
o Now: openned page with last save game, slot with last saved game selected.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6711 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-27 08:05:51 +00:00
Flugente aa5a28ac33 Fix: invalid text
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6710 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-25 15:09:58 +00:00
Flugente 24d76b6b06 Fix: battle reports were wrongly copied
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6709 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-24 22:10:29 +00:00
Flugente 603b1422d4 Fix: multiplayer starting coordinates were wrong
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6708 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-23 13:46:39 +00:00
Wanne 6668b31bd4 Mutliplayer: Disabled the "client interrupt fix", because it does not work (once AI stuck, you cant give the turn by pressing ALT + E on the server back to the client ...)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6707 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-23 10:26:01 +00:00
Wanne 644ca237a4 Updated VS 2013 project files
- Added links to new Campaign Stats files (H, CPP)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6706 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-23 09:34:18 +00:00
Flugente f4dcc15ffa New Feature: Campaign History collects combat data and displays battle reports on the website.
requires GameDir >= r1901.

For more info, see http://www.bears-pit.com/board/ubbthreads.php/topics/329205.html#Post329205

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6705 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-22 23:22:45 +00:00
inshy b3df6f55b5 Small fixes by hrvvillers
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6704 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-22 17:27:42 +00:00
Flugente e9a4ef52dd Fix: wrong language define
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6703 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-22 14:42:45 +00:00
Wanne 5485610411 - Updated French Translations (by hrvg)
- Renamed any forms of the // TODO.Translate comments spelling to "// TODO.Translate", so we can find them easily

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6701 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-22 11:48:24 +00:00
Wanne 0ae8ce2408 Code Cleanup (by Buggler)
- Unused vanilla code cleanup on zoomed strategic map & raising/lowering level

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6700 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-22 02:58:17 +00:00
Flugente 3e11cb58c4 Fix: missed target caused display of uninitialized text
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6699 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-21 13:22:49 +00:00
Flugente cbc661d1af Spotter skill effectivity is now affected by sniper or spotter having 'sociable' or 'loner' character
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6698 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-20 18:54:10 +00:00
Flugente fedbbf5df2 Fix: missing popup texts
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6696 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-19 22:36:09 +00:00
Flugente faba9ea713 Helicopter features (by anv):
- Waldo can now repair the helicopter for money
- alternative fuel system
- damage to helicopter can damage passengers

Appropriate Data in GameDir r1897.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6695 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-19 22:01:44 +00:00
Flugente 80c1b65494 - New Feature: Spotter skill (available to every merc) allows a merc to be spotter for other snipers. Spotter items have to be in hands, spending APs cancels action.
- renamed GetObjectNCTHModifier to GetObjectModifier, as function is no longer used exclusively for NCTH

Warning: GameDir >= r1896 is required.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6694 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-19 20:03:48 +00:00
Wanne eff779a966 Improved Auto Fast Forward (by Sevenfm)
- New options in ja2_options.ini

AUTO_FAST_FORWARD_ENEMIES:
0 - default behavior
1 - auto fast forward only enemies that are not seen by player's team
2 - auto fast forward only invisible enemies
3 - auto fast forward all enemies

AUTO_FAST_FORWARD_MILITIA:
0 - default behavior
1 - auto fast forward only militia that does not see enemies
2 - auto fast forward militia always

Note: only movement is accelerated, most of specific actions like shooting and tossing grenades are performed at normal speed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6693 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-18 13:50:38 +00:00
Flugente a7522989ab deleted unnecessary code duplication: several NCTH-related functions have been unified an now take scope modes into account
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6692 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-17 20:18:44 +00:00
Wanne f8a0a5eb2c New options in ja2_options.ini (by Sevenfm)
1) PLAYER_HIT_COUNT = 0
This works as ENEMY_HIT_COUNT option, but for player mercs.
Possible values: 0 - 4

2) SOLDIER_TOOLTIP_DISPLAY_SUPPRESSION_INFO = TRUE
Show additional info in tactical tooltip:
- APs lost due to suppression
- Suppression Tolerance
- Effective Shock Level ( Shock level modified by traits and backgrounds. This value is compared with current suppression tolerance to determine "cowering" effect )
- AI morale level

3) SHOW_ENEMY_WEAPON = TRUE
Show enemy weapon name above soldier - after health, name and rank.
You can see exact weapon name only on short distances, range calculation is similar to dynamic tooltips and based on soldiers actual viewing range and experience.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6691 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-16 09:13:55 +00:00
Flugente 9691b728db - Fix: not checking for NOBODY
- Fix: uninitialised variable

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6690 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-12 21:20:01 +00:00
Wanne 534af956c8 Small visual changes (by Sevenfm)
see: http://www.bears-pit.com/board/ubbthreads.php/topics/172712/16/Code_Snippets.html

1) ENEMY_HIT_COUNT in ja2_options.ini accepts 2 new parameters:
  3 - show damage as white asterisks
  4 - show damage as red asterisks
  Number of asterisks is scaled (maximum 5): >0, >10, >30, >60, >100

2) Suppression tactical tooltip now shows suppression points from last attacks.
Previously it was always = 0 because ubSuppressionPoints value is cleared after each attack.

3) It is now possible to show suppression values above soldier, just as hit count.
There are new options in ja2_options.ini

Possible values:
 0 - do not show
 1 - show on moving hit counter
 2 - show above soldier
The values are color coded:
 Suppression is light gray
 Shock is yellow
 AP loss is blue
 Morale hit is green

SHOW_SUPPRESSION_COUNT = 0
SHOW_SHOCK_COUNT = 0
SHOW_AP_COUNT = 0
SHOW_MORALE_COUNT = 0

This option defines if values are shown as numbers or asterisks (1..5, using scale)
SHOW_SUPPRESSION_USE_ASTERISK = FALSE

This option defines if only 1 asterisk is shown or several (1..5) to represent value
SHOW_SUPPRESSION_SCALE_ASTERISK = TRUE

Show suppression above soldier during enemy attack. All other values are shown after attack, when HandleSuppressionFire function is calculated.
SHOW_SUPPRESSION_COUNT_ALT = TRUE

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6689 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-10 11:04:59 +00:00
Flugente 467649c7a4 Fix: crash when soldier dies without an attacker
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6688 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-06 21:46:00 +00:00
Kriplo 37bd981181 Brief: //dnl ch81
- Fix several problems with summary windows and improve map loading to any map for mapeditor.
Details:
- Add option from CTRL+L list box to load any map from any listed profiles.
- Fix incorrect loading of items option in summary window for non vanilla maps.
- Fix improper popup of radio boxes for when items is selected in summary window and summary file or map not exist.
- Summary items information is now show for non sector custom map files too.
- Fix glitches when switching from overhead map to sector summary windows.
- Fix improper opening of exit screen text box during exit from overhead map.
- Change size to fixed macro of all temporary buffers for map filename.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6687 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-06 21:14:09 +00:00
Wanne d3e92041ce Updated Merc Random Stats Feature (Jenilee)
- tweaked the stats generation so should see less super high level marks/agi, especially on low level mercs
- randomization will now only affect AIM/MERC mercs.
- randomized gear kits are now an ini setting: MERCS_RANDOM_GEAR_KITS = TRUE/FALSE.
I made the gear randomization optional because it seems to cause trouble for people that don't use AIMNAS. SO hopefully this still lets them enjoy the random merc feature!

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6686 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-06 17:54:37 +00:00
Wanne 6a538f1ef8 Added support for turnbased mode to extended disarm dialog (by Sevenfm)
- AP/BP costs:
o Disarm: AP_DISARM_MINE, BP_DISARM_MINE
o Inspect: AP_DISARM_MINE/2, BP_DISARM_MINE/2
o Remove Blue Flag: AP_DISARM_MINE/2, BP_DISARM_MINE/2
o Blow Up: AP_DISARM_MINE/4, BP_DISARM_MINE/4
- Note: AP_DISARM_MINE value is modified if merc has ambidextrous trait.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6685 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-06 16:53:01 +00:00
Wanne 0bae7724a0 New option ALTERNATE_MOUSE_COMMANDS in Ja2_Options.ini (by Sevenfm)
- With this option = TRUE, mousewheel is inverted for changing stance with ALT+mousewheel, also some new mouse actions are possible.
- Alternate mouse actions: see "Docs\Manual\JA2_113_Alternate_Mouse_Commands.xlsx"
  https://ja2svn.no-ip.org/source/ja2_v1.13_data/GameDir/Docs/Manuals/JA2_113_Alternate_Mouse_Commands.xlsx

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6684 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-06 16:47:10 +00:00
Wanne 4cf6aa49d2 New MOD-Setting (by Jazz)
- CREATURE_MEANWHILE_CUTSCENE: Play the meanwhile cutscene ordering the release of creatures?

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6683 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-05 08:24:46 +00:00
Wanne b9b58fe790 Ctrl + D in turnbased - skip player interrupts for that turn (by Sevenfm)
- This only works for singleplayer
- This only works for Old interrupt system

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6682 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-05 08:08:20 +00:00
Wanne 60d9fae2b0 Added new merge type "USE_ITEM_NEW" -> MergeType: 13 (by Sevenfm)
1.) USE_ITEM_NEW
- It creates new items with firstResultingItemIndex and secondResultingItemIndex (if defined) and deducts 1 point from firstItemIndex's status (for each new item).
- When firstItemIndex's status reaches 0, the item is destroyed.
- With this type of merge, you can use knife on tripwire roll, for example, to get 2 new tripwire items. So you can think of tripwire roll as container for 100 tripwires.
 
  <MERGE>
     <firstItemIndex>299</firstItemIndex>
     <secondItemIndex>1640</secondItemIndex>
     <firstResultingItemIndex>1524</firstResultingItemIndex>
     <secondResultingItemIndex>1524</secondResultingItemIndex>
     <mergeType>13</mergeType>
     <APCost>20</APCost>
  </MERGE>

2) USE_ITEM merge creates secondResultingItemIndex item if defined.
- With this secondResultingItemIndex defined, you can use knife on T-Shirt to get 2 rags.

  <MERGE>
     <firstItemIndex>299</firstItemIndex>
     <secondItemIndex>195</secondItemIndex>
     <firstResultingItemIndex>1022</firstResultingItemIndex>
     <secondResultingItemIndex>1022</secondResultingItemIndex>
     <mergeType>6</mergeType>
     <APCost>20</APCost>
   </MERGE>

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6681 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-05 08:05:27 +00:00
Wanne 39f32c2e71 - Bugfix: Fixed infinite loops that could occur in AI Actions (by Mae)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6680 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-12-05 07:55:26 +00:00