Skip to content

Clean up setting enemy properties and enemy animation #1003

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

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Clean up setting enemy properties and enemy animation #1003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9a17a07
Clean up setting enemy properties
AllyTally Sep 2, 2023
3e4079a
Move more properties to enemy types
AllyTally Sep 2, 2023
baf76cb
Move rest of enemy properties out of `setenemy`
AllyTally Sep 2, 2023
3aca47e
Remove `entityclonefix` in favor of improving emitters
AllyTally Sep 2, 2023
3335245
Add `set_enemy_colour`
AllyTally Sep 2, 2023
5409f07
Modify how enemy colors are set
AllyTally Sep 2, 2023
f926ebd
Fix typo (solider -> soldier)
AllyTally Sep 2, 2023
4bf2d23
Rename `size` to `render_type`, turn magic numbers into enum
AllyTally Sep 2, 2023
a82bd39
Change radar from 32x32 -> 64x64
AllyTally Sep 2, 2023
fd831dc
Completely replace `animate` system for entities
AllyTally Sep 4, 2023
44e8bce
Don't hardcode what emitters spawn!
NyakoFox Nov 17, 2024
bd869d9
Fix a couple issues
NyakoFox Nov 17, 2024
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
37 changes: 1 addition & 36 deletions desktop_version/src/Editor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4017,42 +4017,7 @@ bool editorclass::autotile_connector(int x, int y, TileTypes original_type)

int editorclass::get_enemy_tile(int t)
{
switch(t)
{
case 0:
return 78;
break;
case 1:
return 88;
break;
case 2:
return 36;
break;
case 3:
return 164;
break;
case 4:
return 68;
break;
case 5:
return 48;
break;
case 6:
return 176;
break;
case 7:
return 168;
break;
case 8:
return 112;
break;
case 9:
return 114;
break;
default:
return 78;
break;
}
return (&obj.enemy_types[obj.legacy_id_to_entity(t)])->tile;
}

void editorclass::set_tile(int x, int y, int t)
Expand Down
Loading
Loading