Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Work on logic stuff #333

Merged
merged 18 commits into from
Oct 12, 2023
Merged

Work on logic stuff #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
1bf2d30
work on logic stuff
Mr-Auto Sep 25, 2023
6b80c6f
build errors
Mr-Auto Sep 25, 2023
6668bad
cutscenes
Mr-Auto Sep 26, 2023
d105ddc
merge main
Mr-Auto Sep 28, 2023
a2e6ead
fix potential memory leaks
Mr-Auto Sep 28, 2023
0bf17ce
use the constant meant for this
Mr-Auto Sep 28, 2023
78436c2
some more logic stuff, also missing vtable offset
Mr-Auto Sep 28, 2023
8555adb
all logic looked at, except arena_2
Mr-Auto Sep 29, 2023
f5af744
add functions to kill and create Logic
Mr-Auto Sep 30, 2023
a7bc1a3
merge main
Mr-Auto Sep 30, 2023
157c587
`add_spawn` and `remove_spawn` for `LogicMagmamanSpawn`, expose `star…
Mr-Auto Sep 30, 2023
a94c974
add all logics to `LogicList`
Mr-Auto Sep 30, 2023
790638b
expose enum
Mr-Auto Oct 1, 2023
6b0d08f
move logic to separate file, expose all the knows logic stuff
Mr-Auto Oct 4, 2023
b37dace
casting, some fixing, make it work
Mr-Auto Oct 5, 2023
ae5241f
update doc, also not sure why i had to make the change in the `parse_…
Mr-Auto Oct 5, 2023
1b9ea22
fix doc
Mr-Auto Oct 5, 2023
d28b49f
typo
Mr-Auto Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
210 changes: 159 additions & 51 deletions docs/game_data/spel2.lua
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion docs/parse_source.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@
"../src/game_api/script/usertypes/screen_arena_lua.cpp",
"../src/game_api/script/usertypes/socket_lua.cpp",
"../src/game_api/script/usertypes/steam_lua.cpp",
"../src/game_api/script/usertypes/logic_lua.cpp",
]
vtable_api_files = [
"../src/game_api/script/usertypes/vtables_lua.cpp",
Expand Down Expand Up @@ -891,7 +892,8 @@ def run_parse():
if not var:
continue
var = var.split(",")
vars.append({"name": var[0], "type": var[1]})
if(len(var) > 1):
vars.append({"name": var[0], "type": var[1]})
Mr-Auto marked this conversation as resolved.
Show resolved Hide resolved
enums.append({"name": name, "vars": vars})
data = open(file, "r").read()
data = data.replace("\n", " ")
Expand Down
38 changes: 38 additions & 0 deletions docs/src/includes/_enums.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,44 @@ Name | Data | Description
[COARSE_LAVA](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LIQUID_POOL.COARSE_LAVA) | 4 |
[STAGNANT_LAVA](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LIQUID_POOL.STAGNANT_LAVA) | 5 |

## LOGIC


> Search script examples for [LOGIC](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC)



Name | Data | Description
---- | ---- | -----------
[TUTORIAL](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.TUTORIAL) | LOGIC::TUTORIAL |
[OUROBOROS](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.OUROBOROS) | LOGIC::OUROBOROS |
[SPEEDRUN](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.SPEEDRUN) | LOGIC::SPEEDRUN |
[GHOST](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.GHOST) | LOGIC::GHOST |
[GHOST_TOAST](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.GHOST_TOAST) | LOGIC::GHOST_TOAST |
[TUN_AGGRO](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.TUN_AGGRO) | LOGIC::TUN_AGGRO |
[DICESHOP](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.DICESHOP) | LOGIC::DICESHOP |
[PRE_CHALLENGE](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.PRE_CHALLENGE) | LOGIC::PRE_CHALLENGE |
[MOON_CHALLENGE](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.MOON_CHALLENGE) | LOGIC::MOON_CHALLENGE |
[STAR_CHALLENGE](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.STAR_CHALLENGE) | LOGIC::STAR_CHALLENGE |
[SUN_CHALLENGE](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.SUN_CHALLENGE) | LOGIC::SUN_CHALLENGE |
[MAGMAMAN_SPAWN](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.MAGMAMAN_SPAWN) | LOGIC::MAGMAMAN_SPAWN |
[WATER_BUBBLES](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.WATER_BUBBLES) | LOGIC::WATER_BUBBLES |
[OLMEC_CUTSCENE](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.OLMEC_CUTSCENE) | LOGIC::OLMEC_CUTSCENE |
[TIAMAT_CUTSCENE](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.TIAMAT_CUTSCENE) | LOGIC::TIAMAT_CUTSCENE |
[APEP](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.APEP) | LOGIC::APEP |
[COG_SACRIFICE](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.COG_SACRIFICE) | LOGIC::COG_SACRIFICE |
[DUAT_BOSSES](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.DUAT_BOSSES) | LOGIC::DUAT_BOSSES |
[BUBBLER](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.BUBBLER) | LOGIC::BUBBLER |
[PLEASURE_PALACE](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.PLEASURE_PALACE) | LOGIC::PLEASURE_PALACE |
[DISCOVERY_INFO](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.DISCOVERY_INFO) | LOGIC::DISCOVERY_INFO |
[BLACK_MARKET](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.BLACK_MARKET) | LOGIC::BLACK_MARKET |
[JELLYFISH](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.JELLYFISH) | LOGIC::JELLYFISH |
[ARENA_1](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.ARENA_1) | LOGIC::ARENA_1 |
[ARENA_2](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.ARENA_2) | LOGIC::ARENA_2 |
[ARENA_3](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.ARENA_3) | LOGIC::ARENA_3 |
[ARENA_ALIEN_BLAST](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.ARENA_ALIEN_BLAST) | LOGIC::ARENA_ALIEN_BLAST |
[ARENA_LOOSE_BOMBS](https://github.com/spelunky-fyi/overlunky/search?l=Lua&q=LOGIC.ARENA_LOOSE_BOMBS) | LOGIC::ARENA_LOOSE_BOMBS |

## MASK


Expand Down
Loading
Loading