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.

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

Already on GitHub? Sign in to your account

Enables Syndicate Paparazzi #6966

Merged
merged 2 commits into from Apr 5, 2017

Conversation

SamHPurp
Copy link
Contributor

馃啈 Purpose2
add: Can now take photos of the Blueprints to count as a completed objective.
/ :cl:

@Fruerlund
Copy link
Contributor

Thage her beat 馃憣

@Fruerlund
Copy link
Contributor

Thats very neat, damn autocorrect

if (steal_target.check_special_completion(I))
return 1

return 0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will break things; for instance, slime cores that are used and AI cards without anything in them will trigger this as a "success".

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This works @Fox-McCloud
image

@jughu
Copy link
Contributor

jughu commented Mar 28, 2017

Make it require to be a 1x1 photo

@Fox-McCloud Fox-McCloud added the Feature This PR is a new addition to the game label Mar 28, 2017
@jughu
Copy link
Contributor

jughu commented Mar 28, 2017

I mean its not like syndiecate want a photo where you can barely see the blueprints

var/list/all_items = owner.current.GetAllContents()

for(var/obj/I in all_items)
if(istype(I, steal_target))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a /datum/theft_objective, so this needs to be if(istype(I, steal_target.typepath)), now this is different to how /tg/ does it, and I've only just glanced at your code, but @Fox-McCloud confirm?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RemieRichards Thats the conclusion we reached as well!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah splendid, good to know my brain still works before lunch.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RemieRichards embarressingly it works for the things I was testing... AIs, slime cores, blueprints.... but breaks and auto-greentexts everything else. Red cheeks.


for(var/obj/I in all_items)
if(istype(I, steal_target))
return 1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be return steal_target.check_special_completion(I)
(then removing the second if below)

@Fox-McCloud
Copy link
Member

Fox-McCloud commented Mar 28, 2017

Hai, @RemieRichards. Funny you should post when you did; about 10 minutes before you posted, I told him pretty much what you did, then stated something along the lines of "give yourself the steal the HoS's energy gun objective; I bet it greentexts if you have a single object on you"

@RemieRichards
Copy link
Contributor

Heh.

@SamHPurp SamHPurp changed the title Enables Syndicate Paparazzi [DNM]Enables Syndicate Paparazzi Mar 28, 2017
@SamHPurp
Copy link
Contributor Author

SamHPurp commented Mar 28, 2017

@Fox-McCloud So I fixed this, with the correct way of running this loop, and had to add a new check on top for the alternative items.

Objectives now have an alternate item list, so if this does need to expand to other things in the future, this is easy to do.

  • Succeeds having blueprints and the photo of the blueprints
  • Fails not having the items for other objectives (this time, lol).
  • Special tests all succeeded, IE, empty slime cores, empty AI cards, unfull plasma tanks

@SamHPurp SamHPurp changed the title [DNM]Enables Syndicate Paparazzi Enables Syndicate Paparazzi Mar 28, 2017
var/flags=0
var/list/protected_jobs = list()
var/list/altitems = list()
var/flags = 0

/datum/theft_objective/proc/check_completion(var/datum/mind/owner)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is even used anymore. Should look into this more, but if it's not, then the safety checks from this should probably be moved to /datum/objective/steal/check_completion and this proc removed.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment still remains @SamHPurp

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Fox-McCloud will review in the morning.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Fox-McCloud this is still used, for checking credits for a 'money theft' objective... which I've never seen actually utilised.

Want me to leave it? Or rip out the whole money-theft thing.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually this is also used to determine the fullness of a Plasma tank for the Plasma objective.

Might be worth leaving it, unless you have a better suggestion?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait, you can steal money? Why is that not an objective? That would be great to steal credits from other peoples accounts

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

REEEeeeeeEEEeeEEEEe.

Objective code. This can just be refactored later, I guess.

@Xantholne
Copy link
Contributor

I could've sworn this was already a thing a few years back.

@SamHPurp
Copy link
Contributor Author

@Xantholne not on Paradise, but on TG, and maybe even Bay.

@SamHPurp SamHPurp closed this Mar 31, 2017
@SamHPurp SamHPurp reopened this Apr 1, 2017
@Fox-McCloud Fox-McCloud merged commit f9aaeee into ParadiseSS13:master Apr 5, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature This PR is a new addition to the game
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants