Commit graph

8102 commits

Author SHA1 Message Date
Sezz
bec7d99d38
Squash and stretch bubbles (#970)
* Redo underwater bubble effect

* Damagic

* Remove temp block

* Fix naming ambiguity

* Demagic

* Spawn rudimentary bubbles when splash entering water

* Spawn epic bubble cone when jumping into water

* Simplify Splash(); maybe improve bubble cone

* Templatise particle effect getter; don't use static

* Slow down bubble oscillation; make bubbles scale grow from spawn point; templatise effect removal

* Use deque as container for bubbles

* Rename constant

* Disambiguate template type; simplify bubble cone

* Rotate bubble clumps

* Fix chaff bubbles

* Update constants; rename member variable

* Remove constant

* Move chaff bubble spawn function; update constants

* Derive ripple scale from bubble

* Update bubble spawning for harpoon and rubber boat

* Update chaff bubbles

* Move constant

* Remove bubble clumps entirely

* Further abstraction

* Remove stray newline

* Fix bubble init

* Simplify constants

* Simplify constants

* Simplify

* Make larger bubbles more buoyant

* Add space

* Update chaff bubbles

* Reduce max bubble life

* Add comment

* Update bubble.cpp

* Update chaff bubbles

* Update bubble spawning; update SinkInfo struct

* Remove spaces

* Update effects.h
2023-02-07 14:14:06 +00:00
Stranger1992
b5b4e54d67 Revert "Lua script parameter update"
This reverts commit 60dce8befd.
2023-02-06 18:01:24 +00:00
Stranger1992
3d12336eb2 Revert "Fixed Combine ingame stage 1"
This reverts commit 29c4aa1c52.
2023-02-06 18:01:20 +00:00
Stranger1992
38a1af767d Lua script parameter update
ItemAction.COMBINE
2023-02-06 18:01:07 +00:00
Stranger1992
97b867edf4 Fixed Combine ingame stage 1
Works only if the player does not save /load with only one piece as both are not remembered.
2023-02-06 18:01:07 +00:00
Stranger1992
60dce8befd Lua script parameter update
ItemAction.COMBINE
2023-02-06 17:49:41 +00:00
Stranger1992
29c4aa1c52 Fixed Combine ingame stage 1
Works only if the player does not save /load with only one piece as both are not remembered.
2023-02-06 17:49:41 +00:00
Nemoel-Tomo
0c1b739f4a
added individual explosion color (#985)
* added individual explosion color

useful for Puna, Sophia and Tony boss explosions

* added some smoke to the boss explosion

* formatting

* formatting

* Formatting

---------

Co-authored-by: Sezz <sezzary@outlook.com>
2023-02-06 23:16:24 +11:00
Kubsy
e5f4f5bc94 Merge branch 'develop' into test 2023-02-05 10:58:35 +00:00
Sezz
9798b2487a
"None" state for creatures (#825)
* Adopt NO_STATE (-1) as empty designator for RequiredState instead of 0; syntax in creature files

* Convert sme TestProbability arguments to fractions

* Syntax for TR4 creatures

* Syntax for TR5 creatures

* Fix thing

* Make angle functions constexpr; move constants; organise includes

* Update Lua input action functions

* Convert angle const to constexpr

* Don't shorten std:: types

* Remove remaining instances of WALL_SIZE

* Remove double semicolons

* Reformat fractions for consistency

* Formatting

* Fix merge errors

* Initialise RequiredState properly

* Merge branch 'develop' into no_state_for_creatures

---------

Co-authored-by: Lwmte <3331699+Lwmte@users.noreply.github.com>
2023-02-05 10:50:30 +00:00
Adngel
fedf1fe36b Update PlayCamera doc description. 2023-02-04 20:41:00 +01:00
Adngel
665f30279e Update PlayCamera doc description. 2023-02-04 15:11:38 +01:00
Adngel
3b5328241b Changes in lua GetSet ItemFlags description 2023-02-04 12:28:44 +01:00
Kubsy
c15dd45570 Update Changes.txt 2023-02-04 11:18:04 +00:00
Adngel
dcdaac50ff Error fix
from pointer to reference update.
2023-02-04 11:49:05 +01:00
Adngel
99e050f4f8
Airlock Switch recreated. (#986)
* Airlock Switch recreated.

* Updated feedback

* Changed pointers by references.

* Formatting

* Add parentheses

* Unmade SwitchTrigger feedback from int to bool

Will be remade on a future branch once the airlock and switches were merged.

* Update Changes.txt

---------

Co-authored-by: Sezz <sezzary@outlook.com>
Co-authored-by: Kubsy <kubadd475@gmail.com>
2023-02-04 10:44:13 +00:00
Adngel
0e69e1cdf5
Tiger polishment adngel (#983)
* Update tr3_tiger.cpp

- Changed melee attack ranges, so now it does both bites animation (looks like a combo), although it it gets Lara against a wall, may do only the quick one. Or if lara is a bit far, he may do the jumping one.
- When running, but Lara is stopped, I put a probability condition, to incentivate the swipe attack over the melee bites.
- If Lara melee attack do not happen, there is another condition to check that Lara is ahead before do the swipe attack, to reduce the number of missdirected attacks.
- Separated the melee attacks from the swipe attack cases. (Because some are done with mouth meshes, and the other with leg meshes)
- I added condition check for the animation and frame to avoid hurting Lara while the monster is preparing the attack.

* Lion Update

- Added a minimal range condition for the attacks, to prevent it attack while Lara is between Lion's head and body, (behind the head) where she wouldn't get hurt.
- Move the probability divisions to its own variable like Tiger has.
- Removed the RequiredState calls with the Lion_state_roar (still I left the check in Idle for consistency with the other entities).
- Changed the collision check condition to attack, for a distance range condition.
- Added creature->Flags value to control the number of times that DoDamage function happens.
- Added another attack range for the bite attack.

In TIGER.cpp
Changed the attack condition from the State check, to an animation check (used because some attacks are spreaded through several animations, all with same state but damage should not happens in all of them).

* Update tr5_lion.cpp

- Defined constants for turn values.
- replaced AI.ahead for a custom targetAhead that consider the offset for the head.

* Align to the floor

- Added AlignEntityToSurface function to both creatures.
- Reorganized Lion.cpp putting a NOT CreatureActive check a the top to simulate the other entities code. (So I had to delete spaces in the rest of the lines)

* Applied the function GetAnimNumber

* Formatting; demagic a few values

* Added brackets

Added brackets to separate the two operands of the OR.

* Formatting

* Update Changes.txt

---------

Co-authored-by: Sezz <sezzary@outlook.com>
Co-authored-by: Kubsy <kubadd475@gmail.com>
2023-02-04 10:36:04 +00:00
Adngel
fface0419d
Switches fix (#987)
* Switches fix

* Update generic_switch.cpp

* Polishment of the switch influence area.

* Update Changes.txt

---------

Co-authored-by: Kubsy <kubadd475@gmail.com>
Co-authored-by: Kubsy <80340234+Kubsy@users.noreply.github.com>
2023-02-04 10:34:10 +00:00
Adngel
02bbf48b57
More lua funcs adngel (#967)
* Updated Camera:SetPosition

Created a function to for the fixed camera position Update for those cases where this change (by lua) but there are not other game events to refresh the change.

For example: If Lara is moving, the camera is constantly refreshing, she can step triggers that change camera and this will work fine.

But if Lara is stopped, no keyboard input comming, and the fixed camera change its position externally (lua, evensequence, etc) these wouldn't be refreshed in the camera until a game Event happens (like player pressing any key).

This commitmment aims to solve that issue.

* Get Set Airborne

* Moveable Get direction Vectors

Available the functions to get the RIGHT, FORWARD and UP vector of the object. To help with some translations in lua.

* Revert "Moveable Get direction Vectors"

This reverts commit ce378f6a71.

* Update Changes.txt

* Moved Airborne getters to LaraObject functions.

* Update descriptions.

* Function name changed

* Get Set for creature->LocationAI

* Added Safety check.

* Added informative error lines for TEN Log.

* Updated feedback

* Update Changes.txt

---------

Co-authored-by: Kubsy <kubadd475@gmail.com>
2023-02-04 10:32:51 +00:00
Sezz
8d8474331f Remove unnecessary include 2023-02-01 18:34:30 +11:00
Lwmte
782c761b01 Bump version to 1.0.7/1.6.5 2023-01-31 01:03:11 +02:00
Lwmte
126e2a409b
Draw holsters for shadow and bypass skin / braid / joints if they don't exist (#977)
* Draw Lara holsters in shadow, don't crash if level has no braid or joints
* Update Changes.txt
* Also make lara skin object optional
* Update Renderer11Compatibility.cpp
* Update Renderer11Helper.cpp
* Update Renderer11Helper.cpp
* Update Changes.txt
2023-01-31 02:01:18 +02:00
Stranger1992
ba529fc772 Correction of @TokyoSU 's OCB Enum 2023-01-30 23:38:47 +00:00
Stranger1992
d67a5c5232
Update README.md 2023-01-30 22:49:27 +00:00
Stranger1992
08c1d758f9
Merge pull request #981 from MontyTRC89/Sophia-Leigh-SFX-Name-Corrections
Sopha-Leigh SFX enum corrections
2023-01-30 22:17:05 +00:00
Stranger1992
ac17f591f0 Sopha-Leigh SFX enum corrections 2023-01-30 22:12:44 +00:00
TokyoSU
3165185a57
Added Sophia Leigh (#969)
* Added sophia_lee WIP

* Added more code for sophia

* Finished Sophia Leigh Tower mode

- Fixed SpawnExplosionSmoke() crashing the game.
- Renamed SOPHIA_LEE to SOPHIA_LEIGH which is the real name.
- Allow boss to not be exploded when ExplodeBoss() finish, it's the case with sophia which don't explode.
- Added immortal state for sophia if tower mode is activated !

* Fix sophia health count

* Started normal mode

- Changed OCB to include lua mode.
- If ocb is 0 then normal mode is set by default.

* Update SophiaLeigh.cpp

* Fixed tower mode + lua mode

* Added sophia normal mode.

* Fix walking in normal mode

* Fixed charging and looking at lara

- Timer was not decreasing and head was not rotating to lara.

* Fix includes

* Function cleanup

* Formatting

* Formatting

* Formatting

* Organise includes

* dont merge this commit to master, this commit is only a test

* added new arguments to shockwave , code almost done

* fixed merge conflicts, shockwave death item missing

* Fixed sophia not doing charging shoot in normal mode

- Fixed sophia not calling CheckForRequiredObjects() which is required to call the explosion shockwave.

* fading dynamic light

* update fading light

* Change sophia effect color to cyan

* Update Changes.txt

* Update Changes.txt

---------

Co-authored-by: Sezz <sezzary@outlook.com>
Co-authored-by: Nemoel-Tomo <tomo_669@hotmail.com>
Co-authored-by: Kubsy <kubadd475@gmail.com>
2023-01-30 21:13:41 +00:00
TokyoSU
f79ac9212f
Fixed fire damage on puna (#974)
* Fixed fire damage on puna

- Added possibility to remove entity getting fire when shooted by explosive projectile !

* Removed hack for roman_statue

- Fixed puna boss shield with lara projectiles.

* Minor formatting

* Added update to change log

---------

Co-authored-by: Sezz <sezzary@outlook.com>
2023-01-30 19:32:26 +00:00
Lwmte
8143921fb8 More verbose level loading logging 2023-01-30 02:30:22 +02:00
Lwmte
a05c4b6ca6 Fix typo 2023-01-30 02:23:07 +02:00
Stranger1992
1309afdf67 Update link to website and not wiki. 2023-01-29 23:58:36 +00:00
hispidence
082adaae52 Bump API version number. 2023-01-29 18:58:58 +00:00
hispidence
005e5b25f8 Merge remote-tracking branch 'origin/master' 2023-01-29 18:53:43 +00:00
Lwmte
ee35564315 Prevent silent crash and show log message in case incorrect animation is accessed for a slot 2023-01-29 12:17:50 +02:00
Lwmte
1882711be4 Enable level select by default 2023-01-29 12:17:50 +02:00
Sezz
e3da30277d Fix Shiva 2023-01-29 22:04:32 +11:00
Sezz
88280f07c7 Restore SFX name 2023-01-29 21:27:33 +11:00
Lwmte
407d46c07f Update Changes.txt 2023-01-28 21:03:42 +02:00
Lwmte
80f17dd7f1 Update level.cpp 2023-01-28 18:47:26 +02:00
Anatoly
a3f25bf454
Merge pull request #973 from MontyTRC89/zone_count_in_level_file
Zone count in level file
2023-01-28 19:41:31 +02:00
Lwmte
13e46d3242 Show number of zone groups in a log 2023-01-28 18:29:57 +02:00
Lwmte
db090d1cd2 Merge branch 'master' into zone_count_in_level_file 2023-01-28 18:25:11 +02:00
Lwmte
84b9a2d0d5 Fix silent crash in case caustics were not found 2023-01-28 18:24:45 +02:00
Lwmte
e7780e8ee7 Merge branch 'master' into zone_count_in_level_file 2023-01-28 18:01:50 +02:00
Lwmte
474935430f Update Changes.txt 2023-01-28 17:50:48 +02:00
Anatoly
4c32ec1150
Merge pull request #943 from MontyTRC89/fix-TR5-Twogun
Fix tr5 twogun Laser guy
2023-01-28 18:46:59 +02:00
Sezz
8eed664b93
Add floor/ceiling normal getter functions (#966) 2023-01-28 14:50:22 +00:00
Sezz
37d521e6ea Remove comment 2023-01-29 01:05:44 +11:00
Sezz
7f7ba2673a Remove static 2023-01-29 01:01:26 +11:00
Sezz
aa361f1e15 Remove unnecessary includes 2023-01-29 01:00:39 +11:00