1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,616 Commits 9 Branches 6 Tags
86b23474cfdca5efeb495c5732cd95171825f459
Commit Graph
64 Commits
Author SHA1 Message Date
noooooo4499andAsdow cb6a988298 Use guiHour lua global instead of cHour, add HealBoxers 
- The cHour variable was not being properly updated in the code creating a discrepancy between the game clock and it in this script. The guiHour variable already exists and is a direct copy of the guiHour in Game Clock.cpp so use this

- Add HealBoxers function after boxers rest so they don't die as easily after multiple fights
 2026-02-12 10:24:33 +02:00
noooooo4499andAsdow 05094330c6 Fix lua hourly update script 
Use lua setters instead of reassigning the global so it actually does something
Reverted the time conditionals so that it only updates on the opening/closing hours instead of every hour in between. Why was this change necessary to begin with? It also makes it so it resets all the boxing variables every hour instead of daily (not that it even worked before the setter change anyway)

In practice, this fixes a few things so they work as originally intended:
Boxers will actually rest for 1 day after every 3 fights as originally intended
After every rest, boxers will get progressively stronger and harder to beat as originally intended
 2026-02-09 15:57:51 +02:00
Asdow 150c499c98 Add externalized emails 
* Data -> Emails.xml contains both JA2 and JA2UB emails, which simplified things and we no longer need 4 different EmailSenderNameList.xml files either

* Gameinit.lua scripts have been switched over to use externalized emails
 2026-01-03 17:31:33 +02:00
kitty624 4f693c4151 Update strategicmap.lua 
fix to comment in latest commit

- comment in lua said B2, but it's B8
 2023-08-21 02:58:04 +02:00
kitty624 dc531cfcf2 fix invalid GridNo Maria/Angel BH-quest 
maria/angel bountyhunter quest

- the common used GridNo for one bountyhunter was invalid in some of the possible sectors
- this had been already addressed for B14 in original commit
- now expanded to use altenate GridNo in B2 and B12 as well
- checked in MapEditor, other possible sectors allow a valid spawn at common used GridNo
 2023-08-21 02:38:39 +02:00
Sevenfm 19097a49cb Fix invalid minievent coordinate, encountered here: https://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=363663 (by rftr) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2616 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2021-09-05 05:43:55 +00:00
Flugente 49972c0874 Some additional merchant shops are only open some hours of the day 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2607 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2021-07-28 20:58:18 +00:00
Flugente faa6ffabab Minor improvement for mini events (by rftr): town names are provided by the game for lua 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2603 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2021-07-13 20:28:48 +00:00
Flugente ff13abe2a9 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

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2601 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2021-07-13 19:48:14 +00:00
Flugente 8116f6dedb 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

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2599 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2021-07-09 19:37:59 +00:00
Flugente a82fd824c3 Added interactive actions example: cooking a steak 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2598 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2021-07-08 19:33:03 +00:00
Flugente ef1782394a Interactive actions now allows displaying images. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23144&goto=363478&#msg_363478

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2597 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2021-07-07 20:05:25 +00:00
Flugente ca3f83b583 Added several interactive actions that play a sound when clicking on a structure 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2596 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2021-07-04 15:59:35 +00:00
Flugente 31e39739b7 Major rework of getting captured quests and mechanics. (by Shadooow) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2594 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2021-06-23 20:15:52 +00:00
Sevenfm 67967f8086 Fix for issue reported on forum where the quest markers for Skyrider position shows even when player already found/escort him (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2590 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2021-05-24 17:55:37 +00:00
Flugente d91b6d5d76 We can play external dialogue lines for NPC merchants via the lua function HandleNPCMerchantQuote(...) 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20611&goto=360388&#msg_360388

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2550 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2020-06-17 20:21:10 +00:00
Flugente 93da107e60 New feature: factories allows facilities to create items 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=360075&#msg_360075

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2534 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2020-05-17 20:50:47 +00:00
Sevenfm 5a8ff9ff20 Added new background tags: <animal_friend>, <civgroup_loyal>. 
Lua: spelling corrected.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2505 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2020-01-15 20:22:21 +00:00
Flugente 0e94a5e21c - Added dialogue events for using a lockbomb (ADE_LOCKBOMB) and sniper warning (ADE_SNIPERWARNING) 
- Character lines can be replaced before playing via HandleReplaceQuote(...) in Overhead.lua.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2497 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2019-12-02 22:14:26 +00:00
Flugente ae56d285fe Additional dialogue event ADE_ZOMBIESRISE is called when new zombies are created from corpses 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2464 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2019-02-04 20:07:27 +00:00
Flugente ca9328eeb4 - Added new additional dialogue events for commenting upon other merc's skill/kills, comment during bandaging 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23604&goto=356522&#msg_356522

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2458 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2019-01-21 19:38:53 +00:00
Flugente 6b5e1b7aa4 New merc (somewhat): Similar to Larry's two personalities, Buns now has an alternate personality as well. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=tree&th=23806&goto=354149&#msg_354149

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2430 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-07-25 20:11:27 +00:00
Flugente 7bc0da91e7 Added additional dialogue for Buns (made from Wizardry8 files (F_CHAOS20) provided by townltu) 
For feature description, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23604&goto=351982&#msg_351982


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2428 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-06-18 21:15:28 +00:00
Flugente c033d7ad8f New feature: quest & intel map overlay 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23742&goto=353499&#msg_353499

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2424 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-05-14 21:22:43 +00:00
Flugente 68c1de68c7 Additional dialogue can be used for consuming specific items 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2408 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-02-28 20:33:00 +00:00
Flugente 9cf666a038 New feature: Getting and using intel allows for more spy-related roleplay 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2401 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-02-18 23:12:21 +00:00
Flugente 30759b3e7f New feature: additional dialogue allows modders to play additional dialogue on man occasions, including reactions to other people speaking 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=tree&goto=351982&#msg_351982 and for a demonstration http://thepit.ja-galaxy-forum.com/index.php?t=tree&goto=351981&#msg_351981

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2400 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-01-10 23:40:24 +00:00
Flugente 8c231e6f55 New minigame: Pong 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2353 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2017-01-04 19:30:46 +00:00
Flugente d5429f5372 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 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2350 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2016-12-11 12:37:27 +00:00
Flugente 72d567a06e New feature: SAM site cover can now overlap, and SAM sited 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_v1.13_data@2343 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2016-10-05 21:55:45 +00:00
Flugente 0969339db9 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

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2333 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2016-08-02 18:51:14 +00:00
Flugente 83020d3702 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_v1.13_data@2331 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2016-07-26 20:45:47 +00:00
Flugente d639452893 New feature: We can now create non-profile-based merchants via lua.scripts. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23061&goto=345526&#msg_345526

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2320 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2016-05-15 17:09:14 +00:00
Flugente 45dd9465f4 New feature: spawn extra civilains via Lua, see also http://thepit.ja-galaxy-forum.com/index.php?t=tree&th=22998&goto=344843&#msg_344843 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2311 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2016-04-03 14:38:13 +00:00
Flugente 33fe5aae59 Moved start of new quest to code from lua, as otherwise the player can exploit NPC presence and finish quest too easy 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2256 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-06-19 18:56:53 +00:00
Flugente 965b8c993c Fix: delay email to stop player from finishing quest too fast 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2253 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-06-13 18:14:46 +00:00
Flugente 31edbbfb97 - New Quest: if Kingpin is unaware Maria escaped with the player's help, he enlists the player to kill the DaSilvas 
- Moved civ factions for mod compatibility (UC)


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2252 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-06-13 17:18:29 +00:00
Flugente 397a6091f3 Kyle takes over the San Mona leather shop once his quest is over 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2251 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-06-04 12:55:36 +00:00
Flugente a923411446 - Lua function HandleSectorLiberation(...) is called whenever we liberate a sector 
- Lua function RecruitRPCAdditionalHandling(...) is called whenever we recruit a RPC

For the moment, both functions add volunteers once important prisons are liberated or Miguel is recruited.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2246 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-05-31 15:11:32 +00:00
Wanne 10356266b9 New Feature: Added up to 15 game difficulty settings (by Jazz) 
- Externalized the difficulty setings to "TableData\DifficultySettings.xml" file
- Some INI Settings (ja2_options.ini, CTHConstants.ini and Creature_Settings.ini) moved from INI file to this xml file

These parameters were moved to the file DifficultySettings.xml.
** Ja2_Options.INI **
ENEMY_AP_BONUS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
NUM_KILLS_PER_PROGRESS_POINT_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
INITIAL_GARRISON_PERCENTAGES_NOVICE  , _EXPERIENCED, _EXPERT, _INSANE
MIN_ENEMY_GROUP_SIZE_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
UNLIMITED_POOL_OF_TROOPS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEENS_INITIAL_POOL_OF_TROOPS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
ENEMY_STARTING_ALERT_LEVEL_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
ENEMY_ALERT_DECAY_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
NUM_AWARE_BATTLES_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
BASE_DELAY_IN_MINUTES_BETWEEN_EVALUATIONS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
EVALUATION_DELAY_VARIANCE_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
GRACE_PERIOD_IN_HOURS_AFTER_SECTOR_LIBERATION_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
GRACE_PERIOD_IN_DAYS_AFTER_PATROL_DESTROYED_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
AGGRESSIVE_QUEEN_AI_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_POOL_INCREMENT_PER_DIFFICULTY_LEVEL
PERCENT_EXTRA_ELITES_EXPERIENCED , _EXPERT, _INSANE
MAX_MERC_DEATHS_EASY , _EXPERIENCED, _EXPERT, _INSANE
		
** Creatures_Settings.INI **
CREATURE_SPREAD_TIME_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_REPRODUCTION_BASE_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_REPRODUCTION_BONUS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_INIT_BONUS_SPREAD_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
CREATURE_POPULATION_MODIFIER_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
CREATURE_TOWN_AGGRESSIVENESS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_POOL_INCREMENT_PER_DIFFICULTY_LEVEL
		
** CTHConstants.ini **
BASE_DIFFICULTY_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
AIM_DIFFICULTY_NOVICE , _EXPERIENCED, _EXPERT, _INSANE

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2123 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-08-28 10:51:26 +00:00
Wanne c76520133a Merged from revision: 2051 
- Fixed resetting boxes fought (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2052 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-06-03 18:42:57 +00:00
Flugente a861099ac3 Merged revision(s) 2024 from branches/ja2_data_official_2014: 
There is no reason why the IDs that boxers are reset to before they are reinitialised would ever need to be altered by a modder.


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2025 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2014-04-30 21:39:44 +00:00
Wanne dd7a893b1b Externalizations (by Buggler) 
- Externalized BR shipping destination
- Externalized Drassen item dropoff grid no

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1828 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-10-15 19:53:05 +00:00
Wanne bcc9d88efd 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_v1.13_data@1822 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-10-14 11:57:51 +00:00
silversurfer f81665cbba Fixed LUA script for sex in brothel 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1792 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-09-26 18:20:24 +00:00
Wanne 0c2c5945e2 - Externalized Kingpin money sector and Hospital sector (by Buggler) 
[San Mona]
;Kingpin's private stash. He will come looking for you if stolen
KINGPIN_MONEY_SECTOR_X = 5
KINGPIN_MONEY_SECTOR_Y = 4
KINGPIN_MONEY_SECTOR_Z = 1

[Cambria]
;The Hospital sector
HOSPITAL_SECTOR_X = 8
HOSPITAL_SECTOR_Y = 6
HOSPITAL_SECTOR_Z = 0



git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1780 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-09-20 08:20:39 +00:00
Wanne 371b24a82f - Fixed (Improved) create cutscene not playing after liberating 3 mine sectors (by Jazz) 
o Reworked / optimized LUA script

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1764 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-09-11 07:30:18 +00:00
Wanne 762a939e59 - Bugfix: Creature Quest Cutscene was not triggered 
o There was a wrong condition in LUA script (In the ja2 source code this condition works, but not in LUA!!!)
-> WRONG:   if ( giLairID )           -> this is always triggered as TRUE and therefore never starts the cutscene
-> CORRECT: if ( giLairID ~= 0 )      -> if the quest has not started ( value != 0), start the cutscene

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1763 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-09-10 11:24:11 +00:00
Wanne a36de16fd6 - Fixed X-Y coordinate mixed up for CheckConditionsForTriggeringCreatureQuest (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1762 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-09-10 07:25:38 +00:00
Wanne c0f6e37770 - LUA Script Bugfix (by silversurfer) 
o Added missing ProfileID parameter when calling the LUA method: CheckFact( fact, profileID )

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1746 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-30 20:40:20 +00:00