zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-23 12:32:13 +00:00
Code Issues Projects Releases Packages Wiki Activity
21218 commits 34 branches 63 tags 171 MiB
Commit graph

1312 commits

Author SHA1 Message Date
Christoph Oelckers
1bc9de1cf0 - the last picnums in actors_r.cpp 2023-04-23 09:52:56 +02:00
Christoph Oelckers
14bf74c0f9 - turned adjustfall into a 'gravityfactor' property. 2023-04-23 09:51:24 +02:00
Christoph Oelckers
4812e1431e - made fallspecial game independent and eliminated all the wrapping and callback weirdness with fall. 2023-04-23 09:43:20 +02:00
Christoph Oelckers
35a088ba04 - added map flags to enable RR's special sector types in Duke as well. 2023-04-23 09:42:29 +02:00
Christoph Oelckers
5a2410cbbb - more properties to get rid of the remaining actor type checks in move_d and move_r. 2023-04-23 09:42:29 +02:00
Christoph Oelckers
c4c035a527 - handle more of move's special cases with flags and properties. 2023-04-23 09:42:28 +02:00
Christoph Oelckers
2d4eee4153 - eliminated the last references to picnum in actors.cpp. 2023-04-23 09:42:28 +02:00
Christoph Oelckers
0249725ed8 - got rid of all TILE_* globals, except TILE_CROSSHAIR. 2023-04-23 09:42:28 +02:00
Christoph Oelckers
46f7e38e46 - cleaned up movesprite_ex. 
This needed 5 actor flags to handle some really inane special cases!
 2023-04-23 09:42:27 +02:00
Mitchell Richters
83365a9a14 - Fix typo in menu and clean up leftover variable in Exhumed's doPlayerCameraEffects(). 2023-04-23 10:20:10 +10:00
Christoph Oelckers
927d014cea - final cleanup on hitradius. 
Several dead code paths were also removed that are unable to be triggered by any event in the game - due to the spaghetti-style checks this hadn't been obvious before.
Also one more flag that handles the WT flamethrower's special case of not hurting any actors of the shooter's kind in a more generalized form
 2023-04-22 12:08:47 +02:00
Christoph Oelckers
ac430e6bc7 - another flag and the second old one renamed. 2023-04-22 12:08:47 +02:00
Christoph Oelckers
9ddb5987cd - two new flags and one renamed one for hitradius. 
slowly getting closer to sorting this one out. The new flags already make operation a lot clearer.
 2023-04-22 12:08:47 +02:00
Christoph Oelckers
19f4e4ff63 - added a new flag and split out the geometry destruction part from the hitradius functions 
... which suddenly look a lot less menacing...
 2023-04-22 12:08:47 +02:00
Christoph Oelckers
53e92097ac - converted weaponsandammosprites into a class pointer array and fixed RR's bogus content. 
It's a Duke only feature. RR can use it but would have spawned some non-functional items.
 2023-04-22 12:08:47 +02:00
Christoph Oelckers
c1a9163f3c - added machine translations for the new texts (except the bobbing stuff Deepl never heard of.) 
Texts still need proper translation, of course, but this is better than nothing.
 2023-04-22 12:08:33 +02:00
Mitchell Richters
a8327dbb80 - Another text update. 2023-04-22 19:40:17 +10:00
Mitchell Richters
71d833f9ea - Make Exhumed's new view tilting features accessible for all games. 2023-04-22 19:34:53 +10:00
Christoph Oelckers
49863c79ce - text update 2023-04-22 09:42:50 +02:00
Mitchell Richters
faaffa0d40 - Exhumed: Change formula for cl_exviewtilting 2. 
* Makes this proper strafe rolling based on the actual strafe velocity.
* Implement movement rolling as `cl_exviewtilting 3` as well.
 2023-04-22 14:10:10 +10:00
Mitchell Richters
80df9dca2c - Exhumed: Add all the new goodies to the menu. 2023-04-21 21:13:19 +10:00
Mitchell Richters
3604fd9bfa - Exhumed: Fix OOB access in GetAllStats() statusbar code. 
* Triggered during testing with the alt HUD.
 2023-04-21 21:13:13 +10:00
Mitchell Richters
fcfee9addc - Exhumed: Convert remainder of statusbar code and delete old system. 2023-04-21 21:13:13 +10:00
Mitchell Richters
7ca73aa562 - Exhumed: Initial setup of new statusbar sequence exports, starting with DrawStatusSequence(). 2023-04-21 21:13:12 +10:00
Mitchell Richters
5efc14411a - Exhumed: Use actor variables for sequences, not player ones. 2023-04-21 21:11:55 +10:00
Mitchell Richters
d7161a7368 - Exhumed: Convert the weapon code. 2023-04-21 21:11:54 +10:00
Mitchell Richters
316867581b - Duke: Fix previous commit. 2023-04-17 08:52:26 +10:00
Christoph Oelckers
a3c08e5a9d - Duke: fixed hitscan spread for enemies 
In RR this was correct, but in Duke the spread was far too narrow, especially for the first boss.
 2023-04-17 00:13:20 +02:00
Christoph Oelckers
5da28bf5ad - added new CHANF_SINGULAR flag plus a handler for CHANF_LOCAL in Duke. 2023-04-16 17:35:22 +02:00
Christoph Oelckers
a3da3a4c43 - added a large bunch of script exports. 2023-04-16 17:35:15 +02:00
Christoph Oelckers
ba7a0aa83c - added Vacation's and Route 66's new sounds. 2023-04-16 16:53:53 +02:00
Christoph Oelckers
93d04a6852 - added World Tour and Nuclear Winter's new sound definitions. 2023-04-16 16:53:53 +02:00
Christoph Oelckers
5f68291f69 - added skeleton definitions for all new Nuclear Winter items and their base tiles. 2023-04-16 16:53:53 +02:00
Christoph Oelckers
27188c3ec3 - integrate the NAM/WW2GI overrides that were already defined. 2023-04-16 16:53:53 +02:00
Christoph Oelckers
cb8137c32b - consolidated shoot_d and shoot_r. 2023-04-16 16:53:52 +02:00
Christoph Oelckers
ef412c20cc - scriptified shootrpg. 
Due to its ugly special cases this function is most likely not modding-safe.
 2023-04-16 16:53:52 +02:00
Christoph Oelckers
3d09be118a - scriptified the freezeblast shooter. 2023-04-16 16:53:52 +02:00
Christoph Oelckers
e97fc54179 - scriptified shootstuff. 2023-04-16 16:53:52 +02:00
Christoph Oelckers
9085157130 - scriptified shootwhip. 2023-04-16 16:53:51 +02:00
Christoph Oelckers
afe7086189 - reimplemented WW2GI's hitscan related events in ZScript. 2023-04-16 16:53:51 +02:00
Christoph Oelckers
3af08ecbac - scriptified and consolidated the hitscan attacks. 2023-04-16 16:53:51 +02:00
Christoph Oelckers
1f5cd93564 - wall flag interface cleanup. 
With wall textures now available the workarounds could be removed.
 2023-04-16 16:53:51 +02:00
Christoph Oelckers
041d5214a4 - two new flags for the hitscan attack. 2023-04-16 16:53:51 +02:00
Christoph Oelckers
0643ab22c0 - scriptified the melee attack. 2023-04-16 16:53:51 +02:00
Christoph Oelckers
1d887755a5 - scriptified shootfireball. 2023-04-16 16:53:50 +02:00
Christoph Oelckers
76b9314f63 - scriptified shootMortar. 2023-04-16 16:53:50 +02:00
Christoph Oelckers
48f7690756 - scriptified tripbomb 'shooting'. 2023-04-16 16:53:50 +02:00
Christoph Oelckers
93327ddfe1 - moved tripbomb code to weapons subdirectory. 2023-04-16 16:53:50 +02:00
Christoph Oelckers
1462cb5e9d - refactored some of WW2GI's gamewar stuff so that it is accessible to ZScript as well. 
The features here are useful, the way they were handled not so much. What is there now can also be set from proper definition files instead of CON hacks.
 2023-04-16 16:53:50 +02:00
Christoph Oelckers
ac1d1a90e0 - transfer the nofloorfire flag to the flame actor. 
When checked on the owner it can fall victim to garbage collection.
 2023-04-16 16:53:33 +02:00
Christoph Oelckers
f2b13410a5 fixed offset in grower 2023-04-16 12:26:18 +02:00
Christoph Oelckers
de5e779c50 - fixed offset in shrinker 2023-04-16 12:26:08 +02:00
Christoph Oelckers
1597cf5400 - exported the grower's shoot function and moved stuff to a separate file. 2023-04-16 11:49:47 +02:00
Christoph Oelckers
073c7e79e4 - Duke: remove redundant super.Initialize call from Liztrooper. 
This function is a no-op for enemies and not needed.
 2023-04-16 11:47:57 +02:00
Christoph Oelckers
77d14ec721 - scriptified shootshrinker and moved all shrinker code to a separate file. 2023-04-16 11:47:56 +02:00
Mitchell Richters
93e84ec49d - Apply ESyncBit::SB_QUICK_KICK change from 4d82a0effa to ZScript copy. 2023-04-16 17:15:17 +10:00
Christoph Oelckers
e15517cf57 - fixed some issues with projectile ownership. 
Some init code was run here that should not be run. Added a new flag to handle this case without major code explosion.
 2023-04-16 07:54:26 +02:00
Christoph Oelckers
c73830992f - added a few exports and properties for weapon shooting and added missing 'const' annotations for ShootThis overrides. 2023-04-15 23:23:09 +02:00
Christoph Oelckers
24fc780ede - fixed ZScript compilation. 2023-04-15 13:16:48 +02:00
Christoph Oelckers
ecd0c8c1ff - fixed a few bad scaling values. 2023-04-15 12:20:10 +02:00
Christoph Oelckers
f58d45dbe0 - text update. 2023-04-15 11:59:02 +02:00
Christoph Oelckers
1304577dac - Duke: do not call DukeActor's OnInitialize function for projectiles. 
This is performing some incompatible setup.
 2023-04-15 10:54:18 +02:00
Christoph Oelckers
aad6c3da90 - RR: RedneckExplosion3 was not fully initialized. 2023-04-15 10:00:21 +02:00
Christoph Oelckers
812b9d76d6 - Blood: display the charge meter for the dynamite also on the alternative HUD. 2023-04-15 09:33:46 +02:00
Christoph Oelckers
8de44573b0 - added some missing stuff for World Tour. 2023-04-12 22:03:24 +02:00
Christoph Oelckers
0a91a9a199 - route checkhitsprite fully through the virtual interface so that the player class can finally be exported. 2023-04-12 22:02:01 +02:00
Christoph Oelckers
60af1b4c62 - renamed temp_data[0] to 'counter' and map temp_data[5] to the now free temp_data[0]. 
This not only matches its use in CON but seems to be used as a counter in most other places as well.
The main reason is to improve readability of CON to ZScript conversions.
 2023-04-12 21:54:33 +02:00
Christoph Oelckers
c5c8ed16a3 - RR's keys also need 'noskill'. 2023-04-12 21:50:24 +02:00
Kevin Caccamo
854ecd1616 Keycards need the noskill flag 
Otherwise, maps like E2L2 will have missing keycards
 2023-04-12 21:48:50 +02:00
Christoph Oelckers
ebf7b4a121 - copy the CON defined info into the actual actors. 
Only using the strength value right now.
 2023-04-12 20:29:37 +02:00
Christoph Oelckers
8c831de9be - Duke: deleted the obsolete script side actor flag definitions 2023-04-12 20:10:13 +02:00
Christoph Oelckers
62ace9371f - moved the 3 actor properties out of the global data. 2023-04-12 20:07:12 +02:00
Christoph Oelckers
0c17a369db - Duke: changed skill filter to be solely controlled by the spawnclasses definitions. 
All classes with no skill filter now need an explicit noskill declaration.
The only exception is inert sprites using DukeActor directly, these will never get filtered by skill.
 2023-04-12 20:06:25 +02:00
Christoph Oelckers
f7d1838266 - Duke: tweaked the egg a little so that it does not run through the enemy init logic. 2023-04-11 21:30:12 +02:00
Christoph Oelckers
09cdc497bd - Duke: Inherit DukeReactor2Spark from DukeReactorSpark so that the checks for making it disappear work. 2023-04-11 21:24:23 +02:00
Christoph Oelckers
660227e175 - Duke: restrict skill filter to those actors which originally handled it. 
For flexibility there now is a flag that can be set on any actor class, but due to precedent it needs to be off by default.
 2023-04-11 20:14:02 +02:00
Christoph Oelckers
f7122e7f73 - updated the SB_* constants on the script side. 
Commit 272dfa762d changed a few on the native side but forgot to update the script version of it.
This caused all checks for SB_FIRE to fail.
 2023-04-10 19:46:05 +02:00
Christoph Oelckers
684fb5eb74 - added a few things missing for RR and Route 66. 
R66's gator was also added - this is the only completely new actor in this mod.
 2023-04-09 09:46:10 +02:00
Christoph Oelckers
dc15418f37 - added missing elements for RR. 
A few of Duke's actors which are not used in RR had to be included because some stale CON code still accesses them.
 2023-04-09 09:46:10 +02:00
Christoph Oelckers
886683bc1b - added definitions for all remaining original Duke CON based actors. 2023-04-09 09:46:10 +02:00
Christoph Oelckers
1738e9e4f5 - added skeleton definitions for several decorations that CON references by name 2023-04-09 09:46:10 +02:00
Christoph Oelckers
f700fd61d6 - added two actors referenced by CON 2023-04-09 09:46:10 +02:00
Christoph Oelckers
7f758eef2b - got rid of the script-side flag wrappers. 2023-04-09 09:46:09 +02:00
Christoph Oelckers
a014b3436b - implemented GetRadiusDamageType virtuals. 2023-04-09 09:46:09 +02:00
Christoph Oelckers
da0b429751 - migrated attackertype to class objects. 2023-04-09 09:46:09 +02:00
Christoph Oelckers
ae4ef6401c - use the actual actor flags. 
Not fully working yet...
 2023-04-09 09:45:42 +02:00
Christoph Oelckers
510afe16fb - NODAMAGEPUSH is the default for RR. 
The game never had this feature
 2023-04-09 09:35:38 +02:00
Christoph Oelckers
b908ede470 - reviewed actor flags and applied several fixes. 2023-04-09 09:35:37 +02:00
Christoph Oelckers
8172a9ac0c - moved all flags into the actor definitions. 2023-04-09 09:35:37 +02:00
Christoph Oelckers
281dbfb14c - added BADGUY/KILLCOUNT combos to all enemies. 2023-04-09 09:35:37 +02:00
Christoph Oelckers
672374c5f4 - added fullbright flags where appropriate 2023-04-09 09:35:37 +02:00
Christoph Oelckers
f4c176988a - first round of flag additions. 2023-04-09 09:35:36 +02:00
Christoph Oelckers
7d747489ec - fixed a typo 2023-04-09 09:35:27 +02:00
Christoph Oelckers
307276a276 - WIP for a default scale property. 
For now a NOP, we need to get a little further with the scriptification work before this can be made operational.
 2023-04-08 09:38:46 +02:00
Christoph Oelckers
9ba0b18013 - moved the 3 health related instructions out of the CON interpreter. 
This code can be shared with ZScript so it needs to be elsewhere.
 2023-04-07 13:15:06 +02:00
Christoph Oelckers
980b3f257a - converted the final set of actor classes the native code needs to reference. 2023-04-07 13:15:06 +02:00
Christoph Oelckers
2ba204444c - merged the spawn init code now that all differences are externalized 2023-04-07 13:15:06 +02:00
Christoph Oelckers
aae2c2dc3c - exported RR's enemies 2023-04-07 13:15:06 +02:00
Christoph Oelckers
779026162d - exported all of RR's pickup items. 2023-04-07 13:14:19 +02:00
Christoph Oelckers
3dd87cfd7f - got rid of checkType. 2023-04-07 12:22:46 +02:00
Christoph Oelckers
87bccb8933 - file for next stuff. 2023-04-07 12:22:46 +02:00
Christoph Oelckers
f2d802b537 - exported RR's remaining controllers. 2023-04-07 12:22:45 +02:00
Christoph Oelckers
0e169759d5 - animatesprites_r.cpp cleanup 2023-04-07 12:22:45 +02:00
Christoph Oelckers
f9e5f2c137 - final clenaup on animatesprites_d.cpp. 
Only the player actor is left, which is also the messiest part...
 2023-04-07 12:22:44 +02:00
Christoph Oelckers
ce00183707 - scriptified PlayerOnWater. 2023-04-07 12:17:56 +02:00
Christoph Oelckers
3106c8e6f5 - exported most of the remaining content in spawn_d.cpp 2023-04-07 12:14:16 +02:00
Christoph Oelckers
8b04f42ab5 - exported several fire related actors. 2023-04-07 11:52:53 +02:00
Christoph Oelckers
ef6a8c010a - exported ceilingsteam and consolidated movefallers functions. 2023-04-07 11:52:53 +02:00
Christoph Oelckers
82d04756be - exported a few of Duke's decorations 2023-04-07 11:52:53 +02:00
Christoph Oelckers
551e0af58d - exported the egg, also marking it non-killcount. 2023-04-07 11:52:53 +02:00
Christoph Oelckers
b4dcf8ddcf - exported the remaining Duke enemies. 2023-04-07 11:52:53 +02:00
Christoph Oelckers
0636358b5f - fixes for RR items. 2023-04-07 11:52:53 +02:00
Christoph Oelckers
1bc7c53351 - move the recon's FTA sound into the scripted actor. 2023-04-07 11:52:52 +02:00
Christoph Oelckers
ef54987a58 - exported WT's Firefly 2023-04-07 11:52:52 +02:00
Christoph Oelckers
4e0dad54a5 - exported all of Duke's pickup items. 2023-04-07 11:51:41 +02:00
Christoph Oelckers
7a699e032f - cleaned up Duke's very broken kill count system. 
This now uses a static flag to denote an actor as countable and an internal flag to track its killed state, because CON can toggle that at will.
 2023-04-07 09:49:20 +02:00
Christoph Oelckers
d7224245e3 - added back WT's fireball's postHitEffect. 
This somehow got lost during scriptification.
 2023-04-07 08:30:58 +02:00
Christoph Oelckers
58ee80564b - Duke: fixed scale default for non-ememies. 2023-04-07 00:15:15 +02:00
Christoph Oelckers
49c23eb4e5 fixed swapped language IDs for Norwegian and Dutch. 2023-04-05 18:15:09 +02:00
Christoph Oelckers
0706a8a5bb - exported LizTrooper and Lizman. 2023-04-02 17:37:30 +02:00
Christoph Oelckers
7b034b5eab - handle stayput for bosses. 
The generic code is not ready yet so it has to be done manually.
 2023-04-02 17:34:43 +02:00
Christoph Oelckers
240b24d771 - exported all females. 2023-04-02 17:34:37 +02:00
Christoph Oelckers
810977f19f - made RR thunder effect also work for Duke. 
This mainly meant adding support for random sounds and playing the thunder sound by name instead of by index.
 2023-04-02 17:20:06 +02:00
Christoph Oelckers
52ea497b50 - fixed lotsofstuff VM export. 2023-04-02 13:19:35 +02:00
Christoph Oelckers
30d066cee9 - added script exports for Duke's bosses. 
This allows removing a few hack checks.
 2023-04-02 13:13:45 +02:00
Christoph Oelckers
7f240a0a7a - converted all remaining classes used by PicForName. 
This means all functions using this can now pass class pointers directly to the native code.
 2023-04-02 13:13:45 +02:00
Christoph Oelckers
c9888ae6cb - exported several RR enemies/animals needed for the UFO spawner. 2023-04-02 13:13:06 +02:00
Christoph Oelckers
9b96f8312a - pig cop converted 2023-04-02 13:13:06 +02:00
Christoph Oelckers
bc50f596e8 - exported two more classes used by PicForName. 2023-04-02 13:10:34 +02:00
Christoph Oelckers
7b4d5eb26d - scriptified SHRINKEREXPLOSION and WATERBUBBLE. 2023-04-02 13:10:26 +02:00
Christoph Oelckers
673ea69d35 - scriptified a few more skeleton items needed by PicforName. 2023-04-02 13:00:13 +02:00
Christoph Oelckers
ccc048136f - exported TOILETWATER, BURNING and EXPLOSION2. 
All types needed for cleaning up PicForName
 2023-04-02 13:00:13 +02:00
Christoph Oelckers
e0bd038391 - scriptified the native parts of TRANSPORTERSTAR and TRANSPORTERBEAM 2023-04-02 13:00:13 +02:00
Mitchell Richters
03eb105df1 - Duke: Move RRRA vehicle tilting out of the input code and into the playsim. 2023-04-02 18:24:05 +10:00
Christoph Oelckers
bae18b3023 - removed debug output 2023-04-02 09:14:15 +02:00
Christoph Oelckers
65fcab71c3 - language update 2023-04-02 08:49:57 +02:00
Mitchell Richters
42d791e7c2 - Exhumed: Fix clip calculation setup. 
* Since game maintains its own clip capacities, we need to use them instead of the generic handler for the games that do not.
* Clean up the game-side code in `CheckClip()` to use `min()`.
* Repair issue with pistol clip calculation that was using modulo when it shouldn't. A full weapon with 300 will divide into 6 with no remainder, therefore nothing in the clip.
* Fixes #906.
 2023-03-27 22:05:35 +11:00
Mitchell Richters
a5a9882d9a - Duke: Add a myriad of pitch recentering CVARs. 
* Needs to be reworked into some kind of MP-safe flagging once we have demos/MP going. This will do for now.
* Fixes #853.
 2023-03-26 12:46:14 +11:00
Christoph Oelckers
77bcea409b - Duke: fixed potential logic deadlocks with the green slimer. 
It depended on the devoured actor not disappearing from the map prematurely to work as intended, so a new check had to be added to get out of the deadlock.
 2023-03-25 14:33:10 +01:00
Mitchell Richters
79f7ca976b - Exhumed: Refactor the pitch tilting/panning code. 
* Made it work on the player's view pitch and not their actual pitch.
* Drastically simplifies implementation and allows its use even with mouse aiming.
 2023-03-25 16:52:13 +11:00
Mitchell Richters
e5f3f5f149 - Make setForcedSyncInput() require a player index. 
* This should only ever apply to the console player.
 2023-03-23 17:09:02 +11:00
Mitchell Richters
81650036e6 - Duke/RR: Remove vehForward/Reverse variables from player struct. 
* Back in 2020, I was trying to tidy stuff up and had no idea about network awareness, etc.
* The original game misused network bits here, however I don't see why the player's angle can't just be tested for signedness. Again, something I didn't see way back when...
 2023-03-19 20:55:39 +11:00
Mitchell Richters
37e9cfed45 - Duke/RR: Remove vehBraking variable from player struct. 
* Back in 2020, I was trying to tidy stuff up and had no idea about network awareness, etc.
* We must continue the misuse of network bits like the original game did to make sure the RRRA vehicles are network aware.
 2023-03-19 20:54:43 +11:00
Mitchell Richters
31f8de3854 - Duke/RR: Remove vehTurn variables from player struct. 
* Back in 2020, I was trying to tidy stuff up and had no idea about network awareness, etc.
* The original game misused network bits here, however I don't see why the player's angle can't just be tested for signedness. Something I didn't see way back when...
 2023-03-19 20:54:19 +11:00
Mitchell Richters
df5e8b1d04 - Duke: Fix missing greenslime base sprite when randomly changing animation. 2023-03-19 11:30:01 +11:00
Mitchell Richters
4355a44721 - Duke: Rework input blocking setup. 
* Takes the duplicated conditions out of the input handler and makes the ticker responsible by forcing synchronised input.
 2023-03-18 19:29:29 +11:00
Mitchell Richters
d6b68dec5e - Duke: Remove player_struct::resurrected flag I added in 2021 and fix issue properly. 
* The check for `player_struct::dead_flag` in `FinalizeInput()` was overzealous and is not checked in the original code in this instance.
 2023-03-17 12:29:37 +11:00
Mitchell Richters
cb1e4e7a34 - Exhumed: Ensure Player::items[] is signed. 
* Change originates from b71c725e3e.
* Matches PCExhumed and GDX.
* Logic in game requires this variable to be signed.
* Fixes #415.
* Fixes #888.
 2023-03-16 13:05:22 +11:00
Mitchell Richters
30f9ec5fd8 - Blood: Fix shotgun ammo display when player fires a shell, switches weapons, then switches back. 
* Such a circumstance reloads the weapon off screen.
* While the "right" fix would be to stop that, some fanatics will probably be relying on such a mechanism.
* As such, just fudge the printout on the screen instead 🙃.
* Fixes #877.
 2023-03-15 21:30:44 +11:00
Mitchell Richters
a4bca328bc - SW: Remove Player::siang since we have the same data in 2023-03-15 19:57:45 +11:00