ChronosXYZ/sfcnr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

radio stations fixed, duplicate maps removed

Browse Source
This commit is contained in:
Lorenc Pekaj 2018-05-13 21:16:01 +10:00
parent 9453ebe2aa
commit 26189aca7c
4 changed files with 21 additions and 1465 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gamemodes/sf-cnr.pwn
View File

@ -1557,19 +1557,19 @@ new
// { CATEGORY_GLASSES, 64, "Armani Aviator Orange", 19027, 840, 2 }, // { CATEGORY_GLASSES, 64, "Armani Aviator Orange", 19027, 840, 2 },
// { CATEGORY_GLASSES, 65, "Armani Aviator Yellow", 19028, 840, 2 }, // { CATEGORY_GLASSES, 65, "Armani Aviator Yellow", 19028, 840, 2 },
// { CATEGORY_GLASSES, 65, "Armani Aviator Green", 19029, 840, 2 }, // { CATEGORY_GLASSES, 65, "Armani Aviator Green", 19029, 840, 2 },
{ CATEGORY_GLASSES, 66, "Gucci Techno Yellow" , 19017, 650, 2 }, // { CATEGORY_GLASSES, 66, "Gucci Techno Yellow" , 19017, 650, 2 },
{ CATEGORY_GLASSES, 67, "Gucci Techno Salmon" , 19018, 650, 2 }, // { CATEGORY_GLASSES, 67, "Gucci Techno Salmon" , 19018, 650, 2 },
{ CATEGORY_GLASSES, 68, "Gucci Techno Red" , 19019, 650, 2 }, { CATEGORY_GLASSES, 68, "Gucci Techno Red" , 19019, 650, 2 },
{ CATEGORY_GLASSES, 69, "Gucci Techno Blue" , 19020, 650, 2 }, { CATEGORY_GLASSES, 69, "Gucci Techno Blue" , 19020, 650, 2 },
{ CATEGORY_GLASSES, 70, "Gucci Techno Green" , 19021, 650, 2 }, { CATEGORY_GLASSES, 70, "Gucci Techno Green" , 19021, 650, 2 },
{ CATEGORY_GLASSES, 71, "Versace Vintage", 19033, 520, 2 }, // { CATEGORY_GLASSES, 71, "Versace Vintage", 19033, 520, 2 },
{ CATEGORY_GLASSES, 72, "Versace Havana Wrap", 19030, 490, 2 }, // { CATEGORY_GLASSES, 72, "Versace Havana Wrap", 19030, 490, 2 },
{ CATEGORY_GLASSES, 73, "Oakley Whisker", 19008, 400, 2 }, { CATEGORY_GLASSES, 73, "Oakley Whisker", 19008, 400, 2 },
{ CATEGORY_GLASSES, 74, "Oakley Wiretap", 19009, 400, 2 }, // { CATEGORY_GLASSES, 74, "Oakley Wiretap", 19009, 400, 2 },
{ CATEGORY_GLASSES, 75, "Versace Brown Square", 19031, 360, 2 }, // { CATEGORY_GLASSES, 75, "Versace Brown Square", 19031, 360, 2 },
{ CATEGORY_GLASSES, 76, "Versace Marble Square", 19035, 380, 2 }, { CATEGORY_GLASSES, 76, "Versace Marble Square", 19035, 380, 2 },
{ CATEGORY_GLASSES, 77, "Oakley Valve", 19010, 300, 2 }, // { CATEGORY_GLASSES, 77, "Oakley Valve", 19010, 300, 2 },
{ CATEGORY_GLASSES, 78, "Oakley Crankshaft", 19007, 260, 2 }, // { CATEGORY_GLASSES, 78, "Oakley Crankshaft", 19007, 260, 2 },
// HANDHELD // HANDHELD
{ CATEGORY_HANDHELD, 100, "Antique Sword", 19590, 15000, 6 }, { CATEGORY_HANDHELD, 100, "Antique Sword", 19590, 15000, 6 },

1442
pawno/include/irresistible/cnr/static/player_objects.inc
View File

File diff suppressed because it is too large Load Diff

26
pawno/include/irresistible/features/radio.inc
View File

@ -19,27 +19,23 @@
/* ** Variables ** */ /* ** Variables ** */
enum E_RADIO_DATA enum E_RADIO_DATA
{ {
E_NAME [ 20 ], E_NAME [ 16 ],
E_URL [ 60 ] E_URL [ 60 ]
}; };
new new
g_RadioData[ ] [ E_RADIO_DATA ] = g_RadioData[ ] [ E_RADIO_DATA ] =
{ {
{ "Country", "http://yp.shoutcast.com/sbin/tunein-station.pls?id=446371" }, { "Country", "http://sc3c-sjc.1.fm:7806" },
{ "Drum n' Bass", "http://yp.shoutcast.com/sbin/tunein-station.pls?id=114517" }, { "Electronic", "http://useless.streams.enation.fm:8000" },
{ "Electronic", "http://yp.shoutcast.com/sbin/tunein-station.pls?id=201767" }, { "Metal", "http://ice.somafm.com/metal" },
{ "Metal", "http://yp.shoutcast.com/sbin/tunein-station.pls?id=558051" }, { "Hip Hop", "http://www.stationzilla.com/stationzilla.m3u" },
{ "Hip Hop", "http://yp.shoutcast.com/sbin/tunein-station.pls?id=366480" }, { "Pop", "http://listen.radionomy.com/airradiofreestyleslow" },
{ "Pop", "http://yp.shoutcast.com/sbin/tunein-station.pls?id=8318" }, { "Reggae", "http://whatisland.macchiatomedia.org:8118" },
{ "Reggae", "http://yp.shoutcast.com/sbin/tunein-station.pls?id=580756" }, { "Rock", "http://sorradio.org:5005/live" },
{ "Rock", "http://yp.shoutcast.com/sbin/tunein-station.pls?id=37586" }, { "Jamz 1.FM", "http://sc1c-sjc.1.fm:8052" },
{ "Trance", "http://yp.shoutcast.com/sbin/tunein-station.pls?id=83468" }, { "XLTRAX FM", "http://xltrax.com:8000" },
{ "Techno", "http://yp.shoutcast.com/sbin/tunein-station.pls?id=702264" }, { "Groove Salad", "http://ice.somafm.com/groovesalad" },
{ "House", "http://yp.shoutcast.com/sbin/tunein-station.pls?id=99194448" },
{ "SKY.FM Hits", "http://yp.shoutcast.com/sbin/tunein-station.pls?id=595424" },
{ "Party 181.FM", "http://yp.shoutcast.com/sbin/tunein-station.pls?id=508962" },
{ "Top 40 181.FM", "http://yp.shoutcast.com/sbin/tunein-station.pls?id=872" },
{ ".977 Hits", "http://7609.live.streamtheworld.com:80/977_HITS_SC" } { ".977 Hits", "http://7609.live.streamtheworld.com:80/977_HITS_SC" }
}, },
g_RadioStations [ 190 ] = ""COL_GREY"Custom URL "COL_GOLD"[V.I.P]"COL_WHITE"\n", g_RadioStations [ 190 ] = ""COL_GREY"Custom URL "COL_GOLD"[V.I.P]"COL_WHITE"\n",

2
scriptfiles/updates.txt
View File

@ -7,3 +7,5 @@
(/) Business security is now cheaper and based off the type of business. (/) Business security is now cheaper and based off the type of business.
(*) Fixes a death bug issue after being killed by an explosive. (*) Fixes a death bug issue after being killed by an explosive.
(*) Damaging a drug house bot will trigger them to all shoot. (*) Damaging a drug house bot will trigger them to all shoot.
(*) Radio stations in /radio have now been updated.
(-) Army limit removed.