7623 Commits
Author SHA1 Message Date
Asdow 5cf0ef4bde Correct variables from INT8 to INT16 2024-11-09 22:52:21 +02:00
Asdow fdd6859726 Implement multiselection for contract renewal 2024-11-09 20:23:38 +02:00
Asdow 2b024d63c6 Fix endless loop 2024-11-09 16:46:55 +02:00
Asdow a81820d0d7 Fix UB compilation 2024-11-09 16:46:39 +02:00
Asdow f99065d0c6 Remove unused button callback functions
Unimplemented feature of browsing 4 mercs forward/backwards in personnel page.
2024-11-09 15:30:42 +02:00
Asdow bc870123bf Implement page scrolling in Laptop Personnel page
Pressing Shift and right or left arrow buttons, 'a' or 'd' buttons, or previous or next ingame buttons now advance one whole page. Without shift pressed down, all three function as original and move one merc at a time.
2024-11-09 15:29:07 +02:00
Asdow 17875978e0 Update LOS.cpp
Fix missing variable declaration
2024-11-09 15:24:30 +02:00
Asdow 4e253d0ec0 Update Dialogue Control.cpp
Fix an access to member variable that prevented compilation
2024-11-09 15:24:10 +02:00
Asdow 10250dc035 Merge branch 'master' into ExtraMercs 2024-11-09 13:44:53 +02:00
AsdowandGitHub f48fadb802 Improve AbstractXMLParser error reporting (#330)
The more detailed error message that used to go only to Livelog.txt is now also displayed in the ingame error screen, providing more helpful error message to players when making bug reports/asking for help
2024-11-08 23:50:52 +02:00
HazapuzaandGitHub 92d14f22a5 Merge branch '1dot13:master' into 1dot13-gamedir-dev 2024-11-08 23:45:13 +02:00
KittyandGitHub 1ab6838b30 Updated AttachmentPoint.xml (#99)
- Surgical Mask and Gloves use AttachmentPoint to attach to PPE Bag
- updated xml with that
2024-11-08 10:55:14 +01:00
kitty624 bf07967961 Updated AttachmentPoint.xml
- Surgical Mask and Gloves use AttachmentPoint to attach to PPE Bag
- updated xml with that
2024-11-08 10:45:09 +01:00
KittyandGitHub 6497a35af9 Text EDB Pop-up Disease Protection adjusted ( #329)
- face protection had a misleading text, stating item should be worn at face
- that's no longer true, so adjusted text to avoid player confusion
- adjusted text to distinguish between both disease protections variations
2024-11-08 09:37:53 +01:00
kitty624 85ad2e5e72 Text EDB Pop-up Disease Protection adjusted
- face protection had a misleading text, stating item should be worn at face
- that's no longer true, so adjusted text to avoid player confusion
- adjusted text to distinguish between both disease protections variations
2024-11-08 09:08:38 +01:00
HazapuzaandGitHub 89e0ab80ae Merge branch '1dot13:master' into 1dot13-gamedir-dev 2024-11-07 21:39:40 +02:00
HazapuzaandAsdow 3af47a0967 Update Filters.xml
Removed unnecessary item ID exclusions from several filters.
2024-11-07 20:42:57 +02:00
HazapuzaandAsdow 6bc0417d3f Thicken the barrel on the P-08's graphics 2024-11-07 20:42:57 +02:00
HazapuzaandAsdow a97a98acea Changed the OA-93 and CMMG 7.3 into one-handed weapons
While AR-15 pistols such as these two are usually somewhat awkward to shoot with one hand only, it's still perfectly possible to do so.
2024-11-07 20:42:57 +02:00
HazapuzaandAsdow 2e55533f04 Add tons more LOBOT weapon graphics
Added unique LOBOT graphics for the vast majority of 1.13's firearms.

Also edited and re-rendered some of the existing LOBOT weapon graphics, in order to fix missing pixels (mainly thin barrels disappearing on some animation frames), and made wooden parts somewhat lighter for slightly better shading.
2024-11-07 20:42:57 +02:00
KittyandGitHub eb7d7d4231 Merge pull request #97 from kitty624/dev-gamedir
New item PPE Bag
2024-11-07 08:14:14 +01:00
kitty624 8e9cabe749 BigItem sti for PPE Bag
- missed in previous commit
2024-11-07 07:58:55 +01:00
kitty624 c1bc6de3d0 New Item PPE Bag
- empty PPE Bag will transform into full PPE Bag when Surgical Mask and Gloves get attached
- full PPE Bag will have both disease protection qualities (face and hand)
- instead of two inventory slots (mask and glove) it takes only one while providing same level of protection
- replaced mask and gloves in Fox's Starting Gear with PPE Bag
- added PPE Bag to (one) Starting Gear of Stella and Hurl
- added PPE Bag to dealer inventory of Rebel-Quartermaster, Pharmacy Cambria and Tina
- empty PPE Bag available at BR (can be filled/transformed with surgical mask and gloves also available at BR)
2024-11-07 07:28:07 +01:00
kitty624 39b688530b Comments on Merges.xml 2024-11-07 04:39:26 +01:00
Hazapuza 68807e41fe Update Filters.xml
Removed unnecessary item ID exclusions from several filters.
2024-11-01 18:28:19 +02:00
Hazapuza 564fe9fdba Thicken the barrel on the P-08's graphics 2024-10-26 12:54:06 +03:00
Hazapuza 0396cdaf90 Changed the OA-93 and CMMG 7.3 into one-handed weapons
While AR-15 pistols such as these two are usually somewhat awkward to shoot with one hand only, it's still perfectly possible to do so.
2024-10-23 18:54:47 +03:00
Hazapuza b81618a43b Add tons more LOBOT weapon graphics
Added unique LOBOT graphics for the vast majority of 1.13's firearms.

Also edited and re-rendered some of the existing LOBOT weapon graphics, in order to fix missing pixels (mainly thin barrels disappearing on some animation frames), and made wooden parts somewhat lighter for slightly better shading.
2024-10-22 20:51:12 +03:00
AsdowandGitHub 8040c5d826 Use functions for logging load & save game times (#328)
Less copy and paste. Allows these very simple timings to be logged from elsewhere as well.
2024-10-04 17:29:47 +03:00
AsdowandGitHub 93e89798ec Merc can be assigned to patient in well-fed state (#327)
Previously merc had to be in overfed state for both food and water
2024-10-02 21:24:02 +03:00
AsdowandGitHub 49a119e6b9 Convert INVTYPE boolean fields to flagmask (#325)
Rearranged fields from largest to smallest to remove alignment padding
2024-08-22 08:48:29 +03:00
AsdowandGitHub ce02a488f0 Remove sleep() (#324)
Near instantaneous program exit when we let the CPU do its thing :)
2024-08-15 00:50:13 +03:00
AsdowandGitHub caa02cd6b7 Read new MercOpinions.xml format (#323)
Requires accompanying gameDir change.

MercOpinions.xml now only contains opinions that are not 0. A new tag with fields "id" and "modifier" are used instead of old ones that had 255 <Opinion%d> $value$ </Opinion%d> tags for all profiles.

Loading time of MercOpinions.xml went down from ~4.047 s to 0.011 s due to this change with default 1.13 VFS config.

A small cmd utility tool for converting existing MercOpinions.xml data into the new format is available at https://github.com/Asdow/JA2-ConvertXMLData/tree/master
2024-08-13 00:29:48 +03:00
AsdowandGitHub af15468bbe Replace MercOpinion.xml files with the new format (#95)
Instead of storing all opinions in unique <Opinion1>, <Opinion2>, ... <Opinion254> tags for all profiles, only opinions with a value other than 0 is now stored in <AnOpinion id = "1" modifier = "-10" /> tag

This change changed the loading time for merc opinions from 4.047 s to 0.011 s

A small cmd utility tool for converting existing MercOpinions.xml data into the new format is available at https://github.com/Asdow/JA2-ConvertXMLData/tree/master
2024-08-13 00:29:17 +03:00
AsdowandGitHub 3391c6d777 Ignore mercs away on minievents for food status updates (#322) 2024-08-11 13:30:49 +03:00
AsdowandGitHub 2307508a85 Use auto & to prevent an unnecessary copy (#321) 2024-08-10 21:56:35 +03:00
AsdowandGitHub a26845b608 Check that a dropped backpack belongs to a controllable merc (#320)
Fixes handle BP pickup behavior if a merc drops a backpack and then leaves the sector.
2024-08-10 20:14:15 +03:00
AsdowandGitHub 9063f87359 Added item graphics up to Barrett M82A2 for Vanilla config (#94)
Fixes CTD / Assertion error from missing graphics when playing the game with Vanilla config and seeing the M82A2 in BR shop or when encountering the item in strategic/tactical modes
2024-08-06 18:34:21 +03:00
AsdowandGitHub f7f214f347 Fix CTD (#304)
Fix illegal array access when creating an IMP and the help texts are referenced.
With the missing comma, the array length was 5 and it's supposed to be 6.
2024-05-25 20:59:00 +03:00
KittyandGitHub e8c27816b5 Merge pull request #92 from kitty624/gamedir-dev
Fix to C5.npc and CIV36.edt
2024-04-30 07:33:26 +02:00
kitty624 e762250ba6 Fix to CIV36.edt
The correspomding .npc-file for CIV35.edt and CIV36.edt  is Miners.npc
This .npc is looking for quote lines up to 14 in those .edt
CIV36.edt did only have up to line 9 which was resulting in an "AAAA" in dialogue box when lines 10-14 couldn't be found
In vanilla this "only up to 9" was working, but sometime inbetween the Quote system had a code-rework and the .edt probably wasn't adjusted at that time

Fix: added lines 10-14 to CIV36.edt
2024-04-30 07:28:10 +02:00
kitty624 0de48d3591 Fix to C5.npc
Record 03 in the .npc-file was pointing to non existing line 03 in corresponding .edt-file, resulting in an "AAAAA" in dialogue text when trying to call it

fixed record
2024-04-30 07:20:29 +02:00
KittyandGitHub 15b4fd8b46 Merge pull request #13 from zwwooooo/master
Chinese translation update(by Forum of Playbar)
2024-04-30 05:44:51 +02:00
zwwooooo a77f9d4b62 Chinese translation update(by Forum of Playbar) 2024-04-29 22:46:24 +08:00
KittyandGitHub 2dcff7a8cf UB added missing subdirectory for Extra Items (#91)
added rhe missing subdirectory for Extra Items and moved existing files into the new subdirectory
2024-04-15 18:48:02 +02:00
KittyandGitHub bc53a0865a Merge pull request #90 from kitty624/gamedir-dev
Accompanying to rework of  r9343
2024-04-15 07:18:54 +02:00
KittyandGitHub c32d09b88e Merge pull request #302 from kitty624/source-dev
Rework of r9343 - simplyfied some things and removed unnecessary parts
2024-04-15 07:18:14 +02:00
kitty624 d85dc98621 Update Items.xml
accompanying to rework of  r9343

- a tag introduced with r9343 never got actually implemented in gamedir

- added the tag, items with this tag will be exclusive to disease feature

- added a few other tags suitable for those items

- slightly adjusted their coolness
2024-04-15 06:01:29 +02:00
kitty624 3bab6ef3b7 Update XML_Items.cpp
reworking r9343

- some leftover cleanup and formating
2024-04-15 02:28:49 +02:00
kitty624 b13bcaac71 Update Items.cpp
reworking r9343

- the part about Food System is obsolete, already was happening in code prior to r9343

- the flags got removed and a boolean is used instead, allowing a simpler function for the remaining disease

- wether an item is considered exclusive to disease feature or not is decided by usage of tag in items.xml
2024-04-15 01:33:47 +02:00