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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cigarette Pack Functionality #3288

Merged
merged 1 commit into from
Jan 20, 2016
Merged

Conversation

FalseIncarnate
Copy link
Contributor

Adds the ability to put cheap lighters and individual matches into cigarette packs at the cost of cigarette slots.

  • A cheap lighter takes up the space of 2 cigarettes.
    • Zippos won't fit, they are too boxy.
  • A match takes up the space of 1 cigarette.

Increases the w_class of all lighters (cheap, zippo, and special zippos) and cigarette packages

  • Previously 1, now 2
    • Still fits in pockets, just can't shove as many into a box as they take up more space

Adds the ability to light and put out matches on your shoes.

  • Good for when you lose that matchbox (or shove matches into a cig pack) and need a light.
  • Works on all shoes, from the humble brown shoes to the devious syndicate magboots, and even the clown shoes.

Based on the suggestion from:
http://nanotrasen.se/phpbb3/viewtopic.php?f=12&t=6880

Adds the ability to put cheap lighters and individual matches into
cigarette packs at the cost of cigarette slots.
- A cheap lighter takes up the space of 2 cigarettes
- Zippos won't fit, they are too boxy.
- A match takes up the space of 1 cigarette.

Increases the w_class of all lighters (cheap, zippo, and special zippos)
from 1 to 2
- Still fits in pockets, just can't shove as many into a box as they
take up more space

Adds the ability to light and put out matches on your shoes.
- Good for when you lose that matchbox (or shove matches into a cig
pack) and need a light.
- Works on all shoes, from the humble brown shoes to the devious
syndicate magboots, and even the clown shoes.

Based on the suggestion from:
http://nanotrasen.se/phpbb3/viewtopic.php?f=12&t=6880
@Plotron
Copy link

Plotron commented Jan 19, 2016

More power to the people. 👍

@Fox-McCloud
Copy link
Member

don't personally think the weigh class increase is necessary. Cig packs nad lighters aren't big at all.

@FalseIncarnate
Copy link
Contributor Author

The lighter one was to avoid a hackysolution to the storage space.

The cig pack... I forget why. Probably something silly like placing items that are "larger" (small vs tiny) into it seeming illogical.

I can return cig packs to w_class 1, but doing the same for lighters will require a hacky / snowflakey solution to them taking 2 slots of space in a pack.

@Fox-McCloud
Copy link
Member

I don't really see the point of adding a snowflaked thing to make lighters take up multiple slots (as opposed to one) when that's not really consistent with any other storage container---when just adding in lighters to the can_hold list accomplishes what needs to be done.

@Fox-McCloud Fox-McCloud added the Feature This PR is a new addition to the game label Jan 19, 2016
@FalseIncarnate
Copy link
Contributor Author

I'm going to hate myself for this next line, but...

The lighters taking up 2 slots (which this PR does without actual snowflake currently) is more for realism than storage concerns.

As of the writing of this comment (as this could change with a new commit), the only "snowflaking" in this PR is to give different rejection messages for a lit match or lighter into a cig pack, and to avoid trying to equip matches and lighters to your mask slot if you hit yourself in the mouth with the pack. (Even that is probably not snowflake, but rather runtime prevention)

Increasing the w_class of the lighter to 2 allows the basic storage code regarding max_combined_w_class to make the lighter take up the same storage space as two cigarettes (which are w_class 1). The can_hold and cannot_hold lists were updated to allow the right objects, and the w_class was adjusted to make them take the right amount of space. This is not confined to their interaction with cig packs, all bags and boxes will hold fewer lighters because they are slightly bulkier than before.

Fox-McCloud added a commit that referenced this pull request Jan 20, 2016
@Fox-McCloud Fox-McCloud merged commit 0c4b851 into ParadiseSS13:master Jan 20, 2016
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

3 participants