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

tweak: aiming lying targets by changing intent #6222

Merged
merged 3 commits into from
Dec 22, 2024
Merged

tweak: aiming lying targets by changing intent #6222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2434f63
intent targeting
LiquidPotroh Nov 29, 2024
195f4d0
very important commit
LiquidPotroh Nov 29, 2024
6909fe8
Merge branch 'master220' into intent-targeting
Antoonij Dec 22, 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
3 changes: 3 additions & 0 deletions code/modules/projectiles/projectile.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,8 @@
Angle = round(get_angle(src, current))
if(spread)
Angle += (rand() - 0.5) * spread
if(firer)
hit_crawling_mobs_chance = firer.a_intent == INTENT_HELP ? 0 : 100
// Turn right away
var/matrix/M = new
M.Turn(Angle)
Expand Down Expand Up @@ -422,6 +424,7 @@
current = curloc
yo = new_y - curloc.y
xo = new_x - curloc.x
hit_crawling_mobs_chance = 100
set_angle(get_angle(curloc, original))


Expand Down
2 changes: 0 additions & 2 deletions code/modules/spacepods/equipment.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,10 @@
projone.firer = usr
projone.firer_source_atom = src
projone.def_zone = BODY_ZONE_CHEST
projone.hit_crawling_mobs_chance = 33 // temporal soulution (or permanent), until weapons targeting rework
projtwo.starting = get_turf(my_atom)
projtwo.firer = usr
projtwo.firer_source_atom = src
projtwo.def_zone = BODY_ZONE_CHEST
projtwo.hit_crawling_mobs_chance = 33
spawn()
playsound(src, fire_sound, 50, 1)
projone.dumbfire(my_atom.dir)
Expand Down
Loading