Commit Graph

220 Commits

Author SHA1 Message Date
lambdatiger
b7807044bf white space/formatting changes 2024-01-15 18:47:21 -06:00
lambdatiger
b2666fceec Config lookup optimization mentioned by johnb432 here: https://github.com/acemod/ACE3/pull/9728#discussion_r1452726505 2024-01-15 18:47:06 -06:00
lambdatiger
c4a93c775d Implemented changes discussed here https://github.com/acemod/ACE3/pull/9728#discussion_r1452726904 2024-01-15 18:44:15 -06:00
lambdatiger
a8e268cdff
Optimized approach to classifying blacklist type
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-15 18:40:03 -06:00
lambdatiger
f713791602 fixed a loop that got caught in the merge crossfire 2024-01-15 18:35:26 -06:00
lambdatiger
e3c8e8d6ab Merge branch 'master' of https://github.com/lambdatiger/ace_frag-overhaul 2024-01-15 18:18:58 -06:00
lambdatiger
bd33ab0e91 removed return of sphere object, not required or useful. 2024-01-15 18:16:40 -06:00
lambdatiger
902af64d7e
avoid mismatch sides when debugging frags with unconcious or captive shooters
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-15 18:16:06 -06:00
lambdatiger
4ef116643d
Small optimization to optimize config lookup
quick testing shows a whole 600ns increase in

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-15 18:10:30 -06:00
lambdatiger
d683be853f Merge branch 'master' of https://github.com/lambdatiger/ace_frag-overhaul 2024-01-15 17:55:37 -06:00
lambdatiger
6e209ba4f0
slight performance increase using forEach loops
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-15 17:54:22 -06:00
lambdatiger
6fc950a5f1 Comments fixed 2024-01-15 17:53:12 -06:00
lambdatiger
dd7fc86295 fixed comment to properly state variable purpose 2024-01-15 17:40:31 -06:00
lambdatiger
133f0b1da4 Updated type checks in line with recommendation from johnb432 2024-01-15 17:36:02 -06:00
lambdatiger
3874146b23 formatting 2024-01-15 16:32:43 -06:00
lambdatiger
c05be02530 formatting 2024-01-15 16:27:29 -06:00
lambdatiger
054b9cda23 fixed more spacing issues 2024-01-15 16:13:48 -06:00
lambdatiger
96dc215f09 Merge branch 'master' of https://github.com/lambdatiger/ace_frag-overhaul 2024-01-15 16:10:55 -06:00
lambdatiger
8683e0aa56 Fixed array of double spaced format errors 2024-01-15 16:10:01 -06:00
lambdatiger
c7a2769bdd
Really obvious isNull instead of isEqualTo
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-15 16:05:58 -06:00
lambdatiger
4dee712d70 fixed example syntax 2024-01-15 15:37:18 -06:00
lambdatiger
2f1c7d9bf7 Merge branch 'master' of https://github.com/lambdatiger/ace_frag-overhaul 2024-01-15 15:29:26 -06:00
lambdatiger
7581a480eb
Optimized isNull check
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-15 15:24:47 -06:00
lambdatiger
ced7aeb50c
Deleted whitespace in doFrag
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-01-15 15:24:11 -06:00
lambdatiger
22e26ee452 change of switch statements as referenced here https://github.com/acemod/ACE3/pull/9728#discussion_r1452728046 2024-01-15 15:23:12 -06:00
lambdatiger
54c4f45cf9 possilbe "magic number" cleanup and formatting 2024-01-15 15:18:42 -06:00
lambdatiger
ff462333cb Comment & documentation spelling and grammar improved 2024-01-15 14:39:41 -06:00
lambdatiger
a0812371c9 missed a trailing space 2024-01-15 14:27:29 -06:00
lambdatiger
0f82f59955 typos from last commit 2024-01-15 14:08:27 -06:00
lambdatiger
3f45f7735b Convereted toLower to toLowerANSI 2024-01-15 13:55:15 -06:00
lambdatiger
4bd866b97d Merged commits 2024-01-15 13:55:01 -06:00
lambdatiger
eeb08c3f05 Made variable names more verbose and added trailing newlines 2024-01-15 13:42:45 -06:00
lambdatiger
62a82ec71d added trailing newlines 2024-01-15 13:39:19 -06:00
lambdatiger
0e1bd6ab0e Got a little overzealous pruning & expanding variable names in the dev functions 2024-01-15 13:37:12 -06:00
lambdatiger
f28d5d2372 Reswept dev functions to match ACE code guidelines 2024-01-15 13:13:59 -06:00
lambdatiger
5273b002f9 Replaced a magic number 2024-01-15 01:18:47 -06:00
lambdatiger
97547700d2 Added spall info caching and made variable name changes for clarity 2024-01-14 23:10:15 -06:00
lambdatiger
eb61f5f7c0 Updated debugging, by default tracking spheres sync properly and messages are a bit clearer 2024-01-14 23:08:37 -06:00
lambdatiger
3da173e0a9 spall debug sphere improvements 2024-01-14 18:56:57 -06:00
lambdatiger
e1578188c9 Made debug mode semi-MP compliant 2024-01-14 18:47:18 -06:00
lambdatiger
fe1850a34a Fixed issue with spalling happening on thin surfaces instead of thicker surfaces hit afterwards 2024-01-14 18:46:52 -06:00
lambdatiger
fbcf196402 Attempt to clean up formatting onall files 2024-01-13 00:35:22 -06:00
lambdatiger
fb8f010332 made default frag info (when not defined) perform more middle of the road for munitions 2024-01-12 20:27:07 -06:00
lambdatiger
21c72313f4 Adding useful TRACE statement 2024-01-12 02:08:41 -06:00
lambdatiger
ad1916f513 Blacklisting error 2024-01-12 01:54:58 -06:00
lambdatiger
2805699c0c Working updating all previously unused/undefined vanilla round definitions 2024-01-12 01:50:01 -06:00
lambdatiger
3d3fb434a7 Someday I will not accidentally hit a key an break things 2024-01-12 01:49:25 -06:00
lambdatiger
40810f282f Updated debug dump functions for ease of use 2024-01-11 17:58:47 -06:00
lambdatiger
1cf901703a Fixed a few issues script errors that went under the radar until now 2024-01-11 16:13:02 -06:00
lambdatiger
fbc710ce47 Removed tabs 2024-01-11 15:47:48 -06:00
lambdatiger
e290fd7c04 Fixed MP compat issue 2024-01-11 15:44:15 -06:00
lambdatiger
b1d54a1907 Fixed names and updated formatting 2024-01-11 14:01:50 -06:00
lambdatiger
3e3ed12503 Final submunition code cull 2024-01-10 19:47:05 -06:00
lambdatiger
a64fff960a Fixed more comments 2024-01-10 19:02:07 -06:00
lambdatiger
eef48da6bc Converetd all stray tabs to spaces 2024-01-10 18:51:38 -06:00
lambdatiger
a04e7a83e6 Small bug & config name fixes 2024-01-10 18:34:54 -06:00
lambdatiger
2a1f609e3c changed files names and small optimizations 2024-01-10 17:41:13 -06:00
lambdatiger
ebf1a707c1 Added initialization of material cache for performance 2024-01-10 17:40:36 -06:00
lambdatiger
7c399b8c9e Forgot to actually cache the spall material 2024-01-10 17:39:46 -06:00
lambdatiger
0da454d270 removed unused functions 2024-01-10 15:47:50 -06:00
lambdatiger
3578b7a2fb Fixed small bugs with material selection 2024-01-10 15:46:17 -06:00
lambdatiger
0af6a74a41 Updated debug settings and staged localization strings 2024-01-10 00:55:33 -06:00
lambdatiger
8f70fa971a clarified variable names and removed submunition function call paths 2024-01-10 00:30:46 -06:00
lambdatiger
1e93453963 switch from loadFile to preprocessFile and dusted off the regex brain cell 2024-01-10 00:17:56 -06:00
lambdatiger
98fd580540 Fixed authors 2024-01-10 00:16:46 -06:00
lambdatiger
d25d6a61b3 readded seperate debug draw define 2024-01-09 23:17:08 -06:00
lambdatiger
fc7d68e129 Fixed additional quotes causing issues in .bisurf files 2024-01-09 23:16:08 -06:00
lambdatiger
71f26f5df6 Updated spall to use material 2024-01-09 21:07:01 -06:00
lambdatiger
acb7249039 added impact angle calculation handle to minimize spawning spall inside walls 2024-01-09 19:03:12 -06:00
lambdatiger
210a876c0c missed underscore 2024-01-09 17:36:36 -06:00
lambdatiger
a9a5a4a9ba dealt with cases were projectile is deleted before fragmentation 2024-01-09 17:25:38 -06:00
lambdatiger
026e12b2f9 Added methods to retrieve impact surface type 2024-01-09 17:25:09 -06:00
lambdatiger
48d37a96e0 update caching access function names to align with each other and added some preliminary material consideration for spalling 2024-01-09 14:00:43 -06:00
lambdatiger
132dc6d4c8 Fixed author lists 2024-01-09 11:54:52 -06:00
lambdatiger
601083bce3 Increased readability to doSpallMomentum 2024-01-09 00:54:11 -06:00
lambdatiger
3a088bb24c Returned some missing variable names. 2024-01-09 00:26:43 -06:00
lambdatiger
fe310760fc Fixed variable names and mislabeled inequalities 2024-01-09 00:25:58 -06:00
lambdatiger
76c2c32493 Updated to use cached info 2024-01-08 23:59:06 -06:00
lambdatiger
02dd35f63f Reformatted for readability and optimized first if statement 2024-01-08 21:55:02 -06:00
lambdatiger
c3f04596c0 removed some redundant switch cases 2024-01-08 21:41:52 -06:00
lambdatiger
f852a3ab2d Added a config defined holdoff per vehicle fragmenting for performance 2024-01-08 21:41:31 -06:00
lambdatiger
1933ea4cfe reworked formatting and debug functions to increase readability 2024-01-08 21:41:05 -06:00
lambdatiger
53976e39a3 fixed spelling errors 2024-01-08 21:40:12 -06:00
lambdatiger
990667b24b changed some WARNINGs to TRACEs 2024-01-08 21:38:55 -06:00
lambdatiger
596240a57d Added init event handlers instead of fired 2024-01-08 21:38:15 -06:00
lambdatiger
14e7ef7cba removed leftover script profiler calls 2024-01-08 18:07:15 -06:00
lambdatiger
bfb3fa851c added fnc_initRound 2024-01-08 18:06:57 -06:00
lambdatiger
42832aa95c Clarified variable names 2024-01-08 15:38:26 -06:00
lambdatiger
370f1ce67f Added shot parents to spalling 2024-01-08 15:38:19 -06:00
lambdatiger
3c1e912787 Initial commit:
- Added new ammo cfg types
 - Added new caching functions
 - Added dev functions
 - Transfered core system to vanilla projectile EHs
 - Added stringtable sub categories
 - Reworked fragmenting and spalling to us submunitions
   - Frag
     - Implemented system around chance to hit
     - Switched from hitbox estimation to hitting specific HPs
     - Updated chance to miss method based on solid angle hit chance
     - Split random & targeted frag to their own subfunctions
   - Spall
     - Uses a system of estimated momentum changes to generate spall
2024-01-08 15:22:52 -06:00
PabstMirror
6bc5193a79
Tools - Check example funcs in document_functions.py (#9630) 2023-11-08 12:00:05 -06:00
jonpas
742626ff1a
General - Relative script_component.hpp includes (#9378)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-12 20:58:10 +02:00
GhostIsSpooky
76524f7c26
Frag - Fix fuse-arming distance calculation (#8628) 2021-11-08 00:20:57 +01:00
Ozan Eğitmen
2a7eb07803
Use modelToWorldVisualWorld (#8489)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-10-10 15:37:05 +02:00
Neviothr
75f7ed7532
Utilize isNotEqualTo (#7929)
* Utilize isNotEqualTo

* undo changes to some files

* redo some changes, fix based on @Vdauphin 's comment

* fix validator issues

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-02-27 11:05:05 -06:00
PabstMirror
270a5a930f
Frag - Fix spallTrack (#7492) 2020-01-28 19:12:11 -06:00
Josuan Albin
5ae0ef6bbe Replace remaining lineIntersects with lineIntersectsSurfaces (#6898)
* Fix explosive placement while underwater

* Apply suggestions from code review

Co-Authored-By: alganthe <alganthe@live.fr>

* Change placeApprove header to reflect changes

* Replace lineIntersectsWith in isInMedicalFacility

* Replace linesIntersects in isInRepairFacility, fix params

Public func, params should have an expected type.

* Replace linesIntersects in spallTrack

* Replace lineIntersects in getFirstObjectIntersection and findReflection

* Replace lineIntersects in advanced throwing

grenades can pass glass underwater now, I bet all of 0 person will be glad that horrendous bug is now fixed.

* Fix possible issue in pointing while underwater

* Fix possible issue while underwater in attach

* Replace count with isEqualTo in lineIntersectsSurfaces replacements

* Fix inverted conditions

* Fix drawArc

* Fix fnc_attach

* Reverse advanced_throwing and spallTrack lineIntersects changes

* Fix issues raised from code review
2019-12-07 14:58:21 -06:00
Dedmen Miller
e2ac18a05d [WIP] Fix script errors reporting wrong line numbers (#6407)
* advanced_ballistics

* advanced_fatigue

* advanced_throwing

* ai

* aircraft

* arsenal

* atragmx

* attach

* backpacks

* ballistics

* captives

* cargo

* chemlights

* common

* concertina_wire

* cookoff

* dagr

* disarming

* disposable

* dogtags

* dragging

* explosives

* fastroping

* fcs

* finger

* frag

* gestures

* gforces

* goggles

* grenades

* gunbag

* hearing

* hitreactions

* huntir

* interact_menu

* interaction

* inventory

* kestrel4500

* laser

* laserpointer

* logistics_uavbattery

* logistics_wirecutter

* magazinerepack

* map

* map_gestures

* maptools

* markers

* medical

* medical_ai

* medical_blood

* medical_menu

* microdagr

* minedetector

* missileguidance

* missionmodules

* mk6mortar

* modules

* movement

* nametags

* nightvision

* nlaw

* optics

* optionsmenu

* overheating

* overpressure

* parachute

* pylons

* quickmount

* rangecard

* rearm

* recoil

* refuel

* reload

* reloadlaunchers

* repair

* respawn

* safemode

* sandbag

* scopes

* slideshow

* spectator

* spottingscope

* switchunits

* tacticalladder

* tagging

* trenches

* tripod

* ui

* vector

* vehiclelock

* vehicles

* viewdistance

* weaponselect

* weather

* winddeflection

* yardage450

* zeus

* arsenal defines.hpp

* optionals

* DEBUG_MODE_FULL 1

* DEBUG_MODE_FULL 2

* Manual fixes

* Add SQF Validator check for #include after block comment

* explosives fnc_openTimerUI

* fix uniqueItems
2018-09-17 14:19:29 -05:00
PabstMirror
b1526ccb86
Spall - Don't throw script errors in doSpall if input is bad (#6322)
- Fix #5614
- Don't run tracking siumlation on small calibre ammo that won't ever spall
2018-05-09 10:08:26 -05:00
SilentSpike
81722abeac Use engine command to select weighted spall size (#5985)
* Use engine command to select weighted spall size

* Remove multi-line macro
2017-12-28 19:08:11 -06:00