Commit Graph
918 Commits
Author SHA1 Message Date
rftrdev fcd7ed5ef6 Move text to _EnglishText 2022-10-18 22:08:09 -07:00
rftrdev 61858e472a Move some text around 2022-10-17 13:56:45 -07:00
rftrdev 983aa24b1b Add settings variable for mission refresh time
Fix nullptr derefence when starting a mission with a generic agent

Limit missions to one per batch

Add popup box and screenmsg when a mission activates, fails to activates, and expires
2022-10-17 00:33:38 -07:00
rftrdev feaf9827c9 Set up ASSIGNMENT_REBELCOMMAND
Hook up Start Mission button
2022-10-13 11:31:48 -07:00
rftrdev 7b0830c060 Initial commit - SVN checkpoint to git branch 2022-10-11 00:17:12 -07:00
Sevenfm b7067b860c Chinese translation update (by zwwooooo).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9398 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-08-23 11:14:33 +00:00
Asdow 1f095b7d31 Implemented new IMP gear selection interface to replace the dropdown menus. Requires GameDir rev 2652.
Enrico's letter is forced to the first hired merc in old inventory, similar to new inventory in case a free item pocket is not found.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9391 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-08-01 21:15:34 +00:00
Sevenfm 9441173fba Chinese translation update (by zwwooooo).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9386 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-05-20 11:01:37 +00:00
Sevenfm 01de9164b6 Chinese translation update (by zwwooooo).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9373 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-05-03 06:51:56 +00:00
Sevenfm 3d1f8b1951 New ingame option "Show enemy movement" - show location of recently known enemy (seen/heard last turn).
Improved tooltip for formation movement: SHIFT + click to move in formation.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9372 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-05-01 08:24:46 +00:00
rftr 02a8c48873 fix ARC cashback bug: https://thepit.ja-galaxy-forum.com/index.php?t=msg&th=22776&goto=364578&#msg_364578
also remove incorrect dependency on fAssignTraitsToEnemy for HVT strikes

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9367 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-04-15 16:32:07 +00:00
Sevenfm 5d98b5da8a Chinese translation update (by zwwooooo).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9364 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-04-14 06:19:23 +00:00
Sevenfm 67d5aeadb0 Additional Laptop files (by sun_alf).
Example file: https://github.com/sun-alf/BRAINMOD-o/blob/master/Data-BRAINMOD/TableData/Laptop/AdditionalFiles.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9363 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-04-13 10:43:49 +00:00
rftr 746d15a1ba remove magic numbers from the usLimitedToSystem bitflag
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9355 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-04-02 01:11:25 +00:00
rftr 75d98aecfd add "Disguise" menu to tactical skill menu (alt + rightclick)
add "Fill canteens" action to tactical skill menu, under "various" 

adapted from Seven's +AI

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9350 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-03-29 06:02:44 +00:00
Sevenfm 90850826bb Chinese translation update (by zwwooooo).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9346 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-03-26 07:36:41 +00:00
Sevenfm 9acaa41e95 Added Autobandage option to Skill Menu.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9344 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-03-25 10:50:18 +00:00
Shadooow 033ae4a191 Added two new tags into Items.xml, <FoodSystemExclusive> and <DiseaseSystemExclusive> which prevents specific items to appear without these systems enabled.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9343 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-03-24 05:40:46 +00:00
rftr 87b0c7c6b7 new feature: madlab's robot can be upgraded
requires gamedir r2642

https://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=364403

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9338 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-03-21 17:34:49 +00:00
Sevenfm f7315115af Chinese translation update (by zwwooooo).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9337 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-03-21 07:36:22 +00:00
Shadooow 6bad9f09b2 Fixed some of the tooltips being off by 1 option due to the removal of Stat Progress Bar from r9307.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9316 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-03-03 21:32:10 +00:00
Sevenfm 851f82e2db Russian translation: minor fix.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9310 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-02-23 13:44:27 +00:00
Shadooow a4aa443b32 Stat Progress Bar removed from options and made permanently active.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9307 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-02-19 13:25:39 +00:00
Sevenfm 4f0386be62 ARC: add tooltips to admin actions to show the range of their effect (by rftr).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9303 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-02-16 18:26:11 +00:00
Wanne 44e4f96c0f Updated Chinese Text files (by kmoi)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9293 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-02-07 12:46:18 +00:00
Sevenfm 8c59159213 Added "select all" option for strategic movement popup box (by Asdow).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9269 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-01-20 19:48:56 +00:00
Sevenfm b06b9132a7 Added functions for utf8 <> wstring conversion.
Added message when AI breaks deadlock because cannot complete action.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9262 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-01-16 17:09:09 +00:00
Sevenfm 43c46b9284 Updated ingame options tooltip to reflect hotkey change for grenade launcher angle.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9261 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-01-16 14:07:30 +00:00
Sevenfm c972655886 ESC key:
- close active skill sub-menu
- stop moving merc
- stop moving group of mercs
- stop dragging
- unready weapon

Changed hotkeys:
- [A]: activate skills menu.
- [Alt]+[A]: start autobandage
- [Q]: change scope mode
- [Ctrl]+[Q]: change grenade launcher angle

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9260 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-01-16 13:59:59 +00:00
Sevenfm 8f03709936 Updated text description for sector deployment screen with hint to use arrow keys to scroll map view.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9254 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-01-13 20:26:05 +00:00
Wanne d7a48bbe1a Updated Chinese Text files (by kmoi)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9232 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-01-04 17:11:38 +00:00
Sevenfm be80da650c Various improvements by rftr:
- added more toggles to the features screen: drop all, suppression, drassen/city counterattacks, dynamic opinions and dialogue, and weather
- fixed weather rendering check for individual weather types
- added mousewheel support to options screen and features screen to navigate through pages
- added keyboard inputs to options screen and features screen: TAB toggles between features and options, and A/D/leftarrow/rightarrow navigates through pages

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9230 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-01-03 22:49:43 +00:00
Sevenfm 9dbad2ace5 LOBOT option description update.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9223 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-12-31 09:13:02 +00:00
Wanne c53721f0bd Updated Chinese Text files (by kmoi)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9218 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-12-06 22:17:35 +00:00
Sevenfm 0cc70519d3 Widescreen UI patch (by Asdow).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9216 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-11-21 12:56:27 +00:00
Sevenfm 1ee875be61 New ingame options screen (by rftr).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9212 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-11-17 07:50:20 +00:00
Sevenfm 36d67602fd Added camouflage bonus to the survival trait (by rftr).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9193 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-10-24 09:02:48 +00:00
Sevenfm a8bace71fc Rebel command balancing (by rftr):
- most admin actions' effectiveness now scale with town loyalty
- added the ability to spend supplies to raise town loyalty
- fixed arc website dropdown issues
- minor code cleaning in Rebel Command.cpp

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9192 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-10-22 09:31:38 +00:00
Sevenfm 9f787dd73d QOL change: show additional ammo stats at bobby ray's website (by rftr).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9176 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-10-14 06:40:28 +00:00
Sevenfm 93f8484d56 Added array readers to the ini reader (by rftr).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9171 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-10-04 07:08:32 +00:00
Wanne 7a14a167fb Updated Chinese Text files (by kmoi)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9162 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-09-02 19:14:51 +00:00
Sevenfm b7adaf802a Small arc update (by rftr):
- 2 new directives
- 3 new admin actions
- arc website dropdown fix
- one admin action per region can now be changed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9161 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-09-01 16:48:13 +00:00
Sevenfm 99142603cb Added timer fix suggested by Terapevt to avoid incorrect signed/unsigned comparison later.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9157 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-08-27 18:35:15 +00:00
Flugente eca080f0f9 New feature (by rftr): Arulco Rebel Command (ARC)
Improve you cities and overall campaign by choosing out of several upgrades

Requires GameDir >= r2613

For more info, see https://thepit.ja-galaxy-forum.com/index.php?t=msg&th=24884&start=0&

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9153 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-08-22 19:00:09 +00:00
Wanne 9b189b84f7 Updated Chinese Text files (by kmoi)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9149 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-08-03 16:26:50 +00:00
Flugente e6ea95eb8b Whether a gun shoots fire or fire retardant is now set on the ammo with the <ammoflag>-tag, not the gun.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9144 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-07-15 18:22:53 +00:00
Flugente 6cad680b02 We can now use interactive actions to alter decals on walls, so it is possible to simulate taking off an object from the scenery and add it as an item.
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=363513&#msg_363513

Requires GameDir >= r2601

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9141 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-07-13 19:50:49 +00:00
Flugente 960bb2d4ba New feature (by rftr): Mini events are a feature where the player can receive short text blurbs, and pick one of two outcomes.
Based on game implementations like Gloomhaven (road/city events) or Battletech (travel events).

For more info, see https://thepit.ja-galaxy-forum.com/index.php?t=msg&th=24865&goto=363481&#msg_363481

Requires GameDir >= r2599

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9137 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-07-09 19:38:55 +00:00
Flugente 461f16eacb Added several interactive actions that play a sound when clicking on a structure
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9125 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-07-04 15:59:58 +00:00
Sevenfm 91e6e37c51 Improvement for r9018: code uses enums and includes two more cursor states for both knife and punch cursor which were still not showing circles (by Shadooow).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9019 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-05-13 04:39:54 +00:00