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

Puppet test activate_self wrapper and negative any_chatlog check #28209

Merged
merged 2 commits into from
Feb 2, 2025
Merged

Puppet test activate_self wrapper and negative any_chatlog check #28209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d6f22c
activate_self wrapper for puppet and NOT check for any_chatlog
Feb 1, 2025
1d142c9
fixed helper proc
Feb 1, 2025
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
2 changes: 2 additions & 0 deletions code/tests/_game_test.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ GLOBAL_LIST_EMPTY(game_test_chats)

#define TEST_ASSERT_ANY_CHATLOG(puppet, text) if(!puppet.any_chatlog_has_text(text)) { return Fail("Expected `[text]` in any chatlog but got [jointext(puppet.get_chatlogs(), "\n")]", __FILE__, __LINE__) }

#define TEST_ASSERT_NOT_CHATLOG(puppet, text) if(puppet.any_chatlog_has_text(text)) { return Fail("Didn't expect `[text]` in any chatlog but got [jointext(puppet.get_chatlogs(), "\n")]", __FILE__, __LINE__) }

/// Asserts that the two parameters passed are equal, fails otherwise
/// Optionally allows an additional message in the case of a failure
#define TEST_ASSERT_EQUAL(a, b, message) do { \
Expand Down
10 changes: 10 additions & 0 deletions code/tests/_game_test_puppeteer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,16 @@

origin_test.Fail("could not spawn obj [obj_type] near [src]")

/datum/test_puppeteer/proc/use_item_in_hand()
var/obj/item/item = puppet.get_active_hand()
if(!item)
return

item.activate_self(puppet)
puppet.next_click = world.time
puppet.next_move = world.time
return TRUE

/datum/test_puppeteer/proc/click_on(target, params)
var/datum/test_puppeteer/puppet_target = target
if(istype(puppet_target))
Expand Down