Commit graph

153 commits

Author SHA1 Message Date
Sally Coolatta
35e71beabf Fix Log not existing in the ACS definition 2024-10-15 13:35:26 -04:00
Sally Coolatta
364b5bda8a Improve compiling, add ACS_Execute
Arbritrary ACS scripts can now be run from linedef executors. I will be implementing more, non-linedef-executor-related methods in the future.
2024-10-15 13:07:13 -04:00
NepDisk
9a6aeaaa56 Allow ACS to call linedef specials as functions 2024-10-10 15:30:22 -04:00
Sally Coolatta
9d0ae3e489 Add LAP script type
GDCC just updated after my feature request for remappable script type names, so there's no more limitations surrounding those.
2024-10-10 15:17:17 -04:00
NepDisk
6edb12de78 Revert " Allow ACS to call linedef specials as functions"
This reverts commit f46a9ed5fa.
2024-10-10 15:14:01 -04:00
NepDisk
f46a9ed5fa Allow ACS to call linedef specials as functions 2024-10-10 15:10:18 -04:00
Sally Coolatta
eff994fd60 Add ThingCount
Hexen implements this as ThingCount(int, int), and ZDoom adds ThingCountName(str, int). I decided on simplifying down to ThingCount(str, int).
2024-10-10 01:42:38 -04:00
Sally Coolatta
629b0aa77a ACS basic implementation
- BEHAVIOR lumps successfully load & run from maps. Currently they do not get unloaded between maps, though.
- Print and Timer are the only implemented CallFuncs. All of the base language functions (Delay, etc) are already implemented by the VM though.
- ACS compiler files are included, for use with GDCC. (Picked instead of ACC because it's less ZDoom-centric)
- Additionally, also added the configs for Zone Builder to be able to compile it in editor. Syntax highlighting is very incomplete atm.
2024-10-10 01:41:24 -04:00
Sally Coolatta
72f3c3fe6c Add Hexen line activation flags
- Lines can be set to activate when crossing or bumping into them, with distinctions for players, enemies, and missiles+items.
- A new flag has been added to determine if a line special can activate more than once.
- Finish Line + Respawn Line are now handled like other specials. This means that:
    - They follow the new line activation rules (so you can potentially have a finish line that you have to bump instead of cross)
    - More importantly, they can be called as functions in ACS. (Player_FinishLine and Player_Respawn)
- Fixed linedef flags not being saved in save games.
2024-09-03 16:50:42 -04:00
NepDisk
3aab5834fc d5155e3d83411be7e71953e2f8e8fdc52818b36d 2024-09-03 16:39:02 -04:00
NepDisk
972b98cc90 Merge branch 'v2dev3' into udmf-cherrypick-cherrypick 2024-09-03 12:07:46 -04:00
NepDisk
077835e4ae Update New springs doomed nums
this is to prevent conflict with kart mods
2024-09-03 11:50:47 -04:00
Sally Coolatta
25a9b5cfa9 Copy first mapthing tag to their mobjs
Allows the ThingCount and ThingSound ACS functions to fully work now, and adds significantly more possibilities for scripting later.
2024-08-22 18:00:14 -04:00
Sally Coolatta
e830190986 Update UDMF config to work with latest UZB 2024-08-20 03:07:25 -04:00
NepDisk
a2fcc4bc20 UDMF cherry-pick cherry-pick 2024-08-20 02:47:00 -04:00
NepDisk
ee3e0ef1a3 Add eq and vslopes to udmf 2024-08-20 00:41:10 -04:00
NepDisk
75ddcb8fef revert mode set io and specfy this is a binary config. 2024-07-31 18:36:48 -04:00
NepDisk
d7dbe97eb8 Readd oil slik, uncomment things from UZB config 2024-07-31 18:17:11 -04:00
toaster
e01804c691 Update configuration
- Support new map lump ordering (THANKS STEEL FOR FINDING THESE OPTIONS!!)
- Prevent rotating waypoints causing their IDs to become corrupted
- Rename to `D3R-Config.cfg`
- Synchronise with changelog-tracked resource
- Integrate relevant 2.2 changes
- Add new credits according to historical changelogs
- A whole bunch of other cleanup
2024-07-31 04:06:25 -04:00
NepDisk
e470520710 Revert "Expose blendmodes to UDMF"
This reverts commit 31c38533b8.
2024-07-29 17:17:09 -04:00
MascaraSnake
31c38533b8 Expose blendmodes to UDMF 2024-07-29 17:02:57 -04:00
NepDisk
c510b9de77 Revert "Expose blendmodes to UDMF"
This reverts commit 0250fdadbe.
2024-07-28 23:16:45 -04:00
MascaraSnake
0250fdadbe Expose blendmodes to UDMF 2024-07-28 22:38:59 -04:00
toaster
a6690e02fa Revert "Add flag to line slopes for copying their slopes to the other side."
This reverts commit 7f969705b4.
2022-03-27 20:46:07 +01:00
spherallic
6cfe9ad4b3 Add toggle for linedef action 401 to not change the ceiling texture. 2022-03-18 19:45:40 +00:00
toaster
7f969705b4 Add flag to line slopes for copying their slopes to the other side.
# Conflicts:
#	extras/conf/SRB2Kart2.cfg
2022-03-18 18:30:40 +00:00
toaster
1289e08887 Enhance the multitagging functionality added in previous commits.
* Flattened version of commits from SRB2 repository's flarn2006:multitagging_plus/merge request 1524.
* New linedef special 96: "Apply Tag to Tagged Sectors".
* New flags for linedef specials 97-99
2022-03-18 17:06:22 +00:00
toaster
19a4ef23c2 Add more actions for slope copying & update the ZB config.
# Conflicts:
#	extras/conf/SRB2Kart2.cfg
2022-03-18 13:32:48 +00:00
toaster
857330f74f Add linedef specials for multitagging in binary maps
# Conflicts:
#	extras/conf/SRB2Kart2.cfg
2022-03-18 13:16:55 +00:00
James R
08348fcd43 Merge remote-tracking branch 'srb2/next' 2021-04-05 01:26:17 -07:00
James R
017c5a363f Fix casing 2021-03-01 19:49:44 -08:00
GoldenTails
c2e762bb5d Nice UDB config there, SRB2. 2020-12-24 03:22:08 -06:00
Sally Coolatta
351e4ad534 Add kart doom builder configurations to repo 2020-09-27 06:50:08 -04:00
MascaraSnake
c685328268 Adapt POF_SPLAT to UDMF setup 2020-06-09 09:44:49 +02:00
MascaraSnake
3ce62d7780 Merge branch 'next' into udmf-next
# Conflicts:
#	src/p_mobj.c
#	src/p_polyobj.c
2020-06-09 09:38:01 +02:00
MascaraSnake
f713487f3c Effect 6 flag allows cutting of cyan pixels on FOF and PolyObject planes (even if they're translucent) 2020-06-03 19:41:47 +02:00
MascaraSnake
473c9f372f Merge branch 'executordelay' into 'udmf-next'
UDMF linedef executor delay

See merge request STJr/SRB2!918
2020-06-01 07:57:23 -04:00
sphere
8e068e94b0 Rename the rest of the wall scrollers in the ZB config. 2020-05-23 16:41:38 +02:00
sphere
ff6b9a9cf0 Add linedef actions 507 & 508, allow using offsets for actions 502-504. 2020-05-19 23:39:35 +02:00
MascaraSnake
60076f04cb Remove linedef type 21 from ZB config (somehow I forgot to do that) 2020-05-17 14:18:27 +02:00
MascaraSnake
2e9a6afa3e Merge branch 'udmf-next' into executordelay
# Conflicts:
#	src/p_spec.c
2020-05-13 09:55:25 +02:00
MascaraSnake
db717f1cf7 Move polyobject crush option to the first line args 2020-05-04 23:27:26 +02:00
MascaraSnake
af8bd89558 Adapt basic PolyObject setup to UDMF 2020-05-04 22:40:49 +02:00
MascaraSnake
8c22834b46 Merge branch 'next' into udmf-next 2020-05-04 20:32:56 +02:00
MascaraSnake
b3f81349ae Merge branch 'polyobject-cleanup' into 'next'
PolyObject cleanup

See merge request STJr/SRB2!919
2020-05-04 14:18:08 -04:00
MascaraSnake
486996702d Add new PolyObject flag to ZB config 2020-05-04 19:55:25 +02:00
MascaraSnake
9566d7db96 Implement "set linedef executor delay" linedef type 2020-05-03 21:03:15 +02:00
MascaraSnake
89dd809e04 Merge branch 'next' into egg-capsule
# Conflicts:
#	extras/conf/SRB2-22.cfg
2020-05-03 16:00:05 +02:00
MascaraSnake
c39fd8053a Add object dye linedef executors to ZB config 2020-05-03 15:57:18 +02:00
MascaraSnake
6002a0e443 Add "trigger egg capsule" linedef executor 2020-05-03 15:22:13 +02:00
MascaraSnake
d2e21afaf1 Merge branch 'next' into udmf-next
# Conflicts:
#	src/p_mobj.c
#	src/r_segs.c
2020-04-24 21:15:53 +02:00
sphere
0868930d3b Make emerald hunt shards spawn at correct heights, and add Float option. 2020-04-22 18:58:40 +02:00
Nev3r
2d15e953eb Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-04-20 09:05:21 +02:00
James R
01da59fe02 Merge branch 'angle-for-spawn-object' into 'next'
Make the Spawn Object linedef executor able to set the object's angle.

See merge request STJr/SRB2!877
2020-04-18 20:16:07 -04:00
MascaraSnake
c1dff185bf Add enums to encapsulate the textmap colormap settings 2020-04-18 17:15:25 +02:00
Nev3r
750cafbcbc Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-04-14 22:20:54 +02:00
Nev3r
8c3485d82e Remove the bridge thinker entry from the ZB configuration. 2020-04-14 10:31:26 +02:00
sphere
e8a202e0a3 Make linedef type 461 able to set object angle, using the line's angle. 2020-04-13 17:10:25 +02:00
MascaraSnake
547f3887e3 Add wall spike arrow to UDB config as well 2020-03-22 12:56:59 +01:00
MascaraSnake
f5a8f7a79b Merge branch 'next' into udmf-next 2020-03-22 12:56:21 +01:00
MascaraSnake
331e906548 Add arrow to wall spike in ZB config 2020-03-22 12:55:34 +01:00
MascaraSnake
d87bb1fcad Move UDB configs into a subfolder 2020-03-22 08:08:34 +01:00
MascaraSnake
1d7e830bdc Add UDB config 2020-03-22 08:04:28 +01:00
MascaraSnake
5edec462a3 Minor ZB config fix 2020-03-22 07:50:57 +01:00
MascaraSnake
828bc47846 Another ZB config fix 2020-03-21 20:17:28 +01:00
MascaraSnake
915e6fce23 Add Object Special text for Star Post 2020-03-21 15:16:07 +01:00
MascaraSnake
7c8fa41b54 Updates and fixes for the ZB config 2020-03-21 12:06:52 +01:00
MascaraSnake
4b71029bdd Remove the multi-file ZB configs. We're stick with the single-file config for ZB and doing all the UDMF stuff in UDB 2020-03-21 09:40:37 +01:00
Alam Ed Arias
1785b8149e Merge branch 'master' into next 2019-12-28 21:43:16 -05:00
Alam Ed Arias
efad84a2d5 Revert "Delete the original configuration file."
This reverts commit 196e76cece.
2019-12-28 21:43:10 -05:00
MascaraSnake
12fbaf85f8 Fixed/clarified some flag descriptions in the ZB config 2019-12-28 08:43:27 +01:00
MascaraSnake
d182000223 Fixed/clarified some flag descriptions in the ZB config 2019-12-28 08:42:16 +01:00
Nev3r
196e76cece Delete the original configuration file. 2019-12-24 12:02:49 +01:00
Nev3r
e6608f4519 Refactor existing configuration into ZDoom-styled format. 2019-12-24 11:58:25 +01:00
MascaraSnake
90126cfb15 SDURF to SURF turned out to be contentious. 2019-12-07 06:46:37 -05:00
MascaraSnake
fe6b04c838 Rename SDURF to SURF and CastleBot FaceStabber to Lance-a-Bot for maximum pun 2019-12-07 09:51:09 +01:00
toaster
987aa7a5be (Temporary?) config name reversion to allow brakyeet merger 2019-11-30 05:07:33 -05:00
toaster
cd2cc43bc4 Edit config to account for new behaviour (plus add gold mode for the Eggman Statue, which I forgot to add earlier). 2019-11-29 21:59:06 +00:00
FuriousFox
dd01248c9c Missed a semicolon 2019-11-24 16:09:18 -05:00
FuriousFox
995451efaa Updated the list of which skies are associated with which maps, rearranged the list of character to match the character select in-game, and added myself to the file's credits.
(Re-did all of this because I think I messed up the branches and stuff last time.
2019-11-24 15:43:49 -05:00
FuriousFox
02a5b53ede Added Dragonbomber 2019-11-23 16:37:33 -05:00
FuriousFox
7b5e6df63b Added Blue Gargoyle and Green Flame 2019-11-23 15:04:59 -05:00
FuriousFox
142f799e82 Updated sprite for Minus 2019-11-23 14:21:48 -05:00
MascaraSnake
91f3bdc091 Minor capitalization fix in ZB config 2019-11-13 21:07:06 +01:00
MascaraSnake
aeedb86d8c Merge branch 'stopclock' into 'master'
Stop the clock!

See merge request STJr/SRB2Internal!450
2019-11-13 14:39:59 -05:00
toaster
0deb13c1ed Update ZB config for Glaregoyle and Buggle object names, and Glaregoyle sprite name. 2019-11-12 15:57:23 -05:00
toaster
2663c79d21 STOP THE CLOCK linedef exectutor!
* When activated, stops the timer in SP/MP.
* Applies to the mapheader countdowntimer as well.
* If you're playing Record Attack, also exits the level immediately.
* It has no special modes, no linedef flags, no parameters, nothing.
* Only not an innate property of A_BossDeath because people may want it to NOT happen sometimes, or make it happen with non-boss events too.

Also, skip over calling P_DoPlayerExit if the player isn't in game.
2019-11-08 15:47:12 +00:00
MascaraSnake
1e822edb70 Fixed a typo in the ZB config 2019-10-26 22:56:01 +02:00
toaster
0842d1f328 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into object_tweaks
# Conflicts:
#	extras/conf/SRB2-22.cfg
2019-10-25 20:32:15 +01:00
MascaraSnake
2cc74fc819 ...and also rename the palm tree leaves accordingly 2019-10-25 20:48:51 +02:00
MascaraSnake
6c45a17601 Removed palm tree trunks from the ZB config. They no longer exist as mapthings. 2019-10-25 20:17:50 +02:00
MascaraSnake
230f5e4d78 Merge branch 'spinbust' into 'master'
Make spinbust behavior consistent with other bustable blocks

Closes #254

See merge request STJr/SRB2Internal!398
2019-10-23 02:51:47 -04:00
toaster
d3f59f5cd1 Merge branch 'mace-place' into 'master'
Make maces normally placeable in maps.

See merge request STJr/SRB2Internal!390
2019-10-22 13:29:06 -04:00
MascaraSnake
d647e0e4a1 Clarified description of "strong" bustable blocks in the ZB config 2019-10-20 12:28:30 +02:00
MascaraSnake
7129293121 Make spinbust behavior consistent with other bustable blocks and rename FF_ONLYKNUX to FF_STRONGBUST 2019-10-19 22:20:48 +02:00
toaster
47054bd461 Grouped ports from object_tweaks.
* Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode.
* Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well.
* Put diagonal blue spring in config.
2019-10-19 15:57:01 +01:00
toaster
d5c8607cb1 Change boost panel thing numbers per MS's request. 2019-10-19 14:32:15 +01:00
toaster
383b93e43a * New object types!
* Red and yellow Boost panels!
        * Added because SUBARASHII and KIMOKAWAIII had several levels using them, and I wanted to make them look better.
        * https://cdn.discordapp.com/attachments/359091121789468672/634486669202161674/srb20015.gif
        * Uses the mapthingnums of Glaber's SOC resource boosters, but absolutely nothing else - not even the magnitudes.
        * Apply MF_AMBUSH to force the player into a spin - even if they don't have a spin ability!
    * Banpyura!
        * A Crushstacean with a spring instead of a crushclaw.
        * https://cdn.discordapp.com/attachments/428262628893261828/634432099306176512/srb20019.gif
        * Wanted this for a while, finally added it.
* Improved springs.
    * Add pw_noautobrake to disable autobrake for half a second when touching yellow horizontal springs, and a second when touching red ones, even on the ground.
    * Add pw_justsprung to disable directionchar for a few tics while touching any springs with a horizontal component to their velocity.
    * Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well.
    * Started but decided against a tip of the hat to the CD spring spin, hidden behind #define SPRINGSPIN.
* Make directionchar "lag behind" a little bit in waterslides.
* Improved flame jets.
    * They now use new sprites for having their flames move upwards and sideways, instead of having them always face downwards like in 2.1!
* Fixed a mixed declaration and code error in A_RolloutRock. (Sorry Lach!)
* Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode.
* Improved ZB config.
    * Add above new types.
    * Add Blue Diagonal Spring, which existed in the source but not the config.
    * Re-order enemies in ZB config by zone (but keep them in the Enemies section only).
2019-10-18 18:33:45 +01:00
sphere
71d7e2fedb Correct some ZB config errors & remove grabbable chains. 2019-10-16 22:30:52 +02:00
sphere
5778803012 Add normally placeable maces to the ZB config. 2019-10-16 21:20:49 +02:00