[Ready]Car stereos #7458

werty1124 · Apr 28, 2014

#7293

The description and sound probably need changed. I couldn't think of anything.

Adds a stereo that can play music and boost morale if you are standing near it while it is playing music

Zireael07 · Apr 28, 2014

Wow!

tyrael93 · Apr 28, 2014

Go go gadget cheap infinite morale boost.

BevapDin · Apr 28, 2014

Nice work, but somehow you messed up the line endings in "data/json/items/melee.json" or maybe the indentation, it shows up as completely changed.

Link to issue #7293 - so it can be closed later.

werty1124 · Apr 28, 2014

Dang I didn't even notice that... Should be fixed now. I'm not really sure how I even managed to do that.

KA101 · Apr 28, 2014

KA101 reviewed Apr 28, 2014

View changes

KA101 · Apr 28, 2014

data/json/items/melee.json

+      "symbol":"?",
+      "color":"white",
+      "name":"music cd",
+      "description":"A cd with many hit songs burned to it.",


Probably capitalized: CD. Nice that we're still using CD-Rs in 204X; no objection on my part.

holds out for the dramatic classical CD or (of course) the post-glam speed polka

KA101 · Apr 28, 2014

KA101 reviewed Apr 28, 2014

View changes

KA101 · Apr 28, 2014

src/vehicle.cpp

+            continue;
+        const int radio_x = global_x() + parts[p].precalc_dx[0];
+        const int radio_y = global_y() + parts[p].precalc_dy[0];
+        g->sound(radio_x,radio_y,15,"dun dun duuun");


Huh. Any possibility of grabbing the sound-picking scheme from the mp3 player? Generic "dun dun duuun" might get old for players.

Yea that's a good idea!

KA101 · Apr 28, 2014

This has popped up on the forums for some time now, and will likely get aftermarket modded to handle USB drives and the mp3 player, I'd imagine. Nice start, though. :-)

Go go gadget cheap infinite morale boost.

It caps at 20, if I read the code correctly, so it's weaker than a rechargeable mp3 player. Ease up.

werty1124 · Apr 28, 2014

Yea it caps at 20 and starts going away as soon as you leave it's range

KA101 · Apr 29, 2014

KA101 reviewed Apr 29, 2014

View changes

KA101 · Apr 29, 2014

src/vehicle.cpp

+        std::string sound = "";
+        const int radio_x = global_x() + parts[p].precalc_dx[0];
+        const int radio_y = global_y() + parts[p].precalc_dy[0];
+        switch (rng(1, 10)) {


Uh, surely (1, 5)?

I just copied the mp3 code. I'm guessing it's like that to keep From displaying a message for the sound every time you move but I can change it to 1,5

Guessing, w/o having looked recently, that the mp3 only gives a message every so many turns. (I know the classical gave extra morale for high-IN folks too. Not sure if that's changed.)

Might be worth having it check every three to five minutes or so and change the message then?

Yea that might work. I'll take a look at the mp3 code again.

vache · Apr 30, 2014

Would radio stations still be transmitting without power? I would imagine instead of music, at the very least, you'd get a repetitive EBS warning every so often. Unless it's assumed that you're listening to music on some storage medium. Maybe have the option to swap back and forth, with the radio being able to clue you in to certain locations, and the CD/mp3/whatever player for music.

BevapDin · Apr 30, 2014

BevapDin reviewed Apr 30, 2014

View changes

BevapDin · Apr 30, 2014

src/vehicle.cpp

+                stereo_on = false;
+            } else if (stereo_on == false) {
+                add_msg("You eject your CD!");
+                g->u.inv.add_item_by_type(itypes["music_cd"]->id);


You already know the id of the item, it's "music_cd". No need to look it up in the itypes map. Just add_item_by_type("music_cd").

Also this checks for an item with the CD flag, but still uses the fixed item id.

O ok I'll fix that at first I was going to just look for that flag but then decided just to do the fixed item id.

werty1124 · Apr 30, 2014

You have to have a music CD in your inventory to turn the radio on. When you turn it on I takes the
CD when you turn it off you get the CD back.

KA101 · Apr 30, 2014

Integrating radio into it makes sense, but I don't think it's absolutely essential to the feature. Further, that would probably touch radio broadcasting too (having each tower with its own frequency, etc).

So yeah, it'd be nice, but having music in cars is a good first step.

kevingranade · May 1, 2014

Just fyi, radio towers (and other transmitters) do have their own
frequencies and transmission strengths already, it's what lets you tune
into different towers and use triangulation.

KA101 · May 1, 2014

OK, so someone could just hook into that code. Good to know.

werty1124 · May 1, 2014

This is a stupid question but how do you check for a specific item? I've been trying to figure it to work for like 40 minutes and nothing that I have tried worked.

BevapDin · May 1, 2014

iexamine::dirtmound does it nicely. It's nearly the same but with the SEED flag instead.

KA101 · May 3, 2014

What other things are usable?

looking for a "Ready" tag!

werty1124 · May 4, 2014

Well I didn't add anything else but you can use anything with CD flag on the stero instead of just the music CD. It works like picking seeds to plant so if you have more than 1 item with the CD flag it pops up a menu where you choose the item.

Also I think it's ready but I wanted to do a little more testing.

KA101 · May 4, 2014

I didn't see anything else get assigned the CD flag here. Something I missed?

werty1124 · May 4, 2014

Yea I didn't add anything, at first only the music CD worked but now anything with the CD flag works to start the stereo... I think my commit name may have been a little confusing

KA101 · May 4, 2014

OK, so folks could add the "CD" flag to an mp3 player or (hypothetically) a "USB drive with music files", for instance. Fair enough.

werty1124 · May 4, 2014

Exactly

KA101 · May 4, 2014

Throw one into the luxury RV or something, and let us know when you're ready for mergetesting?

werty1124 · May 5, 2014

Alright I'll do that and it should be ready.

KA101 · May 5, 2014

FWIW it doesn't ping us when you push a commit, so I missed this in my first pass.

Fixed melee.json spacing getting messed up

Loading status checks…

fea5879

better sounds for the sterep

Loading status checks…

95f62e2

werty1124 added some commits Apr 30, 2014

Show Message every 5 turns

Loading status checks…

40fca72

Merge remote-tracking branch 'origin/master' into stereo

Loading status checks…

1a46073

Use things other that CDs for music

Loading status checks…

5e9255a

Added stereo to a couple of vehicles

Loading status checks…

894e2b5

werty1124 changed the title ~~Car stereos~~ [Ready]Car stereos May 5, 2014

KA101 self-assigned this May 5, 2014

KA101 merged commit 894e2b5 into CleverRaven:master May 5, 2014
1 check passed

1 check passed

default This has been rescheduled for testing as the 'master' branch has been updated.

ianestrachan referenced this pull request May 15, 2014
Closed
Music in the car #7293

illi-kun referenced this pull request Apr 6, 2016
Merged
Remove unused variable music_id #16092

CleverRaven/Cataclysm-DDA

Join GitHub today

[Ready]Car stereos #7458

Conversation

werty1124 commented Apr 28, 2014

werty1124 added some commits Apr 28, 2014

This comment has been minimized.

Zireael07 commented Apr 28, 2014

This comment has been minimized.

tyrael93 commented Apr 28, 2014

This comment has been minimized.

BevapDin commented Apr 28, 2014

This comment has been minimized.

werty1124 commented Apr 28, 2014

KA101 reviewed Apr 28, 2014 View changes

This comment has been minimized.

KA101 reviewed Apr 28, 2014 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

KA101 commented Apr 28, 2014

This comment has been minimized.

werty1124 commented Apr 28, 2014

KA101 reviewed Apr 29, 2014 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

werty1124 added some commits Apr 30, 2014

This comment has been minimized.

vache commented Apr 30, 2014

BevapDin reviewed Apr 30, 2014 View changes

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

werty1124 commented Apr 30, 2014

This comment has been minimized.

KA101 commented Apr 30, 2014

This comment has been minimized.

kevingranade commented May 1, 2014

This comment has been minimized.

KA101 commented May 1, 2014

This comment has been minimized.

werty1124 commented May 1, 2014

This comment has been minimized.

BevapDin commented May 1, 2014

This comment has been minimized.

KA101 commented May 3, 2014

This comment has been minimized.

werty1124 commented May 4, 2014

This comment has been minimized.

KA101 commented May 4, 2014

This comment has been minimized.

werty1124 commented May 4, 2014

This comment has been minimized.

KA101 commented May 4, 2014

This comment has been minimized.

werty1124 commented May 4, 2014

This comment has been minimized.

KA101 commented May 4, 2014

This comment has been minimized.

werty1124 commented May 5, 2014

werty1124 changed the title Car stereos [Ready]Car stereos May 5, 2014

This comment has been minimized.

KA101 commented May 5, 2014

KA101 self-assigned this May 5, 2014

Hide details View details KA101 merged commit 894e2b5 into CleverRaven:master May 5, 2014 1 check passed

1 check passed

ianestrachan referenced this pull request May 15, 2014

illi-kun referenced this pull request Apr 6, 2016

KA101 reviewed Apr 28, 2014

View changes

KA101 reviewed Apr 28, 2014

View changes

KA101 reviewed Apr 29, 2014

View changes

BevapDin reviewed Apr 30, 2014

View changes

KA101 merged commit `894e2b5` into CleverRaven:master May 5, 2014
1 check passed