Compare commits
	
		
			No commits in common. "a7db3817a6dc142852f9a9f6e9cae52a3df332be" and "ad5d84cc8bf1d9d122c90a0c698e7661a3cfc061" have entirely different histories.
		
	
	
		
			a7db3817a6
			...
			ad5d84cc8b
		
	
		
@ -2147,12 +2147,9 @@ public class Game : MonoBehaviour
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	public static string LanguageFilter(string str)
 | 
						public static string LanguageFilter(string str)
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
		/*string patternMild = " crap | prawn |d4mn| damn | turd ";
 | 
							string patternMild = " crap | prawn |d4mn| damn | turd ";
 | 
				
			||||||
		str = Regex.Replace(str, patternMild, ".", RegexOptions.IgnoreCase);
 | 
							str = Regex.Replace(str, patternMild, ".", RegexOptions.IgnoreCase);
 | 
				
			||||||
		string pattern = "anus|ash0le|ash0les|asholes| ass |Ass Monkey|Assface|assh0le|assh0lez|bastard|bastards|bastardz|basterd|suka|asshole|assholes|assholz|asswipe|azzhole|bassterds|basterdz|Biatch|bitch|bitches|Blow Job|blowjob|in bed|butthole|buttwipe|c0ck|c0cks|c0k|Clit|cnts|cntz|cockhead| cock |cock-head|CockSucker|cock-sucker| cum |cunt|cunts|cuntz|dick|dild0|dild0s|dildo|dildos|dilld0|dilld0s|dominatricks|dominatrics|dominatrix|f.u.c.k|f u c k|f u c k e r|fag|fag1t|faget|fagg1t|faggit|faggot|fagit|fags|fagz|faig|faigs|fuck|fucker|fuckin|mother fucker|fucking|fucks|Fudge Packer|fuk|Fukah|Fuken|fuker|Fukin|Fukk|Fukkah|Fukken|Fukker|Fukkin|gay|gayboy|gaygirl|gays|gayz|God-dam|God dam|h00r|h0ar|h0re|jackoff|jerk-off|jizz|kunt|kunts|kuntz|Lesbian|Lezzian|Lipshits|Lipshitz|masochist|masokist|massterbait|masstrbait|masstrbate|masterbaiter|masterbate|masterbates|Motha Fucker|Motha Fuker|Motha Fukkah|Motha Fukker|Mother Fucker|Mother Fukah|Mother Fuker|Mother Fukkah|Mother Fukker|mother-fucker|Mutha Fucker|Mutha Fukah|Mutha Fuker|Mutha Fukkah|Mutha Fukker|orafis|orgasim|orgasm|orgasum|oriface|orifice|orifiss|packi|packie|packy|paki|pakie|peeenus|peeenusss|peenus|peinus|pen1s|penas|penis|penis-breath|penus|penuus|Phuc|Phuck|Phuk|Phuker|Phukker|polac|polack|polak|Poonani|pr1c|pr1ck|pr1k|pusse|pussee|pussy|puuke|puuker|queer|queers|queerz|qweers|qweerz|qweir|recktum|rectum|retard|sadist|scank|schlong|screwing| sex |sh1t|sh1ter|sh1ts|sh1tter|sh1tz|shit|shits|shitter|Shitty|Shity|shitz|Shyt|Shyte|Shytty|Shyty|skanck|skank|skankee| sob |skankey|skanks|Skanky|slut|sluts|Slutty|slutz|son-of-a-bitch|va1jina|vag1na|vagiina|vagina|vaj1na|vajina|vullva|vulva|xxx|b!+ch|bitch|blowjob|clit|arschloch|fuck|shit|asshole|b!tch|b17ch|b1tch|bastard|bi+ch|boiolas|buceta|c0ck|cawk|chink|clits|cunt|dildo|dirsa|ejakulate|fatass|fcuk|fuk|fux0r|l3itch|lesbian|masturbate|masterbat*|motherfucker|s.o.b.|mofo|nigga|nigger|n1gr|nigur|niiger|niigr|nutsack|phuck|blue balls|blue_balls|blueballs|pussy|scrotum|shemale|sh!t|slut|smut|teets|tits|boobs|b00bs|testical|testicle|titt|jackoff|whoar|whore|fuck|shit|arse|bi7ch|bitch|bollock|breasts|cunt|dick|fag |feces|fuk|futkretzn|gay|jizz|masturbat*|piss|poop|porn|p0rn|pr0n|shiz|splooge|b00b|testicle|titt|wank";
 | 
							string pattern = "anus|ash0le|ash0les|asholes| ass |Ass Monkey|Assface|assh0le|assh0lez|bastard|bastards|bastardz|basterd|suka|asshole|assholes|assholz|asswipe|azzhole|bassterds|basterdz|Biatch|bitch|bitches|Blow Job|blowjob|in bed|butthole|buttwipe|c0ck|c0cks|c0k|Clit|cnts|cntz|cockhead| cock |cock-head|CockSucker|cock-sucker| cum |cunt|cunts|cuntz|dick|dild0|dild0s|dildo|dildos|dilld0|dilld0s|dominatricks|dominatrics|dominatrix|f.u.c.k|f u c k|f u c k e r|fag|fag1t|faget|fagg1t|faggit|faggot|fagit|fags|fagz|faig|faigs|fuck|fucker|fuckin|mother fucker|fucking|fucks|Fudge Packer|fuk|Fukah|Fuken|fuker|Fukin|Fukk|Fukkah|Fukken|Fukker|Fukkin|gay|gayboy|gaygirl|gays|gayz|God-dam|God dam|h00r|h0ar|h0re|jackoff|jerk-off|jizz|kunt|kunts|kuntz|Lesbian|Lezzian|Lipshits|Lipshitz|masochist|masokist|massterbait|masstrbait|masstrbate|masterbaiter|masterbate|masterbates|Motha Fucker|Motha Fuker|Motha Fukkah|Motha Fukker|Mother Fucker|Mother Fukah|Mother Fuker|Mother Fukkah|Mother Fukker|mother-fucker|Mutha Fucker|Mutha Fukah|Mutha Fuker|Mutha Fukkah|Mutha Fukker|orafis|orgasim|orgasm|orgasum|oriface|orifice|orifiss|packi|packie|packy|paki|pakie|peeenus|peeenusss|peenus|peinus|pen1s|penas|penis|penis-breath|penus|penuus|Phuc|Phuck|Phuk|Phuker|Phukker|polac|polack|polak|Poonani|pr1c|pr1ck|pr1k|pusse|pussee|pussy|puuke|puuker|queer|queers|queerz|qweers|qweerz|qweir|recktum|rectum|retard|sadist|scank|schlong|screwing| sex |sh1t|sh1ter|sh1ts|sh1tter|sh1tz|shit|shits|shitter|Shitty|Shity|shitz|Shyt|Shyte|Shytty|Shyty|skanck|skank|skankee| sob |skankey|skanks|Skanky|slut|sluts|Slutty|slutz|son-of-a-bitch|va1jina|vag1na|vagiina|vagina|vaj1na|vajina|vullva|vulva|xxx|b!+ch|bitch|blowjob|clit|arschloch|fuck|shit|asshole|b!tch|b17ch|b1tch|bastard|bi+ch|boiolas|buceta|c0ck|cawk|chink|clits|cunt|dildo|dirsa|ejakulate|fatass|fcuk|fuk|fux0r|l3itch|lesbian|masturbate|masterbat*|motherfucker|s.o.b.|mofo|nigga|nigger|n1gr|nigur|niiger|niigr|nutsack|phuck|blue balls|blue_balls|blueballs|pussy|scrotum|shemale|sh!t|slut|smut|teets|tits|boobs|b00bs|testical|testicle|titt|jackoff|whoar|whore|fuck|shit|arse|bi7ch|bitch|bollock|breasts|cunt|dick|fag |feces|fuk|futkretzn|gay|jizz|masturbat*|piss|poop|porn|p0rn|pr0n|shiz|splooge|b00b|testicle|titt|wank";
 | 
				
			||||||
		return Regex.Replace(str, pattern, "#", RegexOptions.IgnoreCase);*/
 | 
							return Regex.Replace(str, pattern, "#", RegexOptions.IgnoreCase);
 | 
				
			||||||
 | 
					 | 
				
			||||||
        // the kids that played this game back then are no longer kids. little need to babysit them anymore
 | 
					 | 
				
			||||||
        return str;
 | 
					 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -86,6 +86,22 @@ public class Lobby : MonoBehaviour
 | 
				
			|||||||
	private bool dedicatedNAT;
 | 
						private bool dedicatedNAT;
 | 
				
			||||||
	// /*UNUSED*/ private int dedicatedHostAttempts;
 | 
						// /*UNUSED*/ private int dedicatedHostAttempts;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private bool showAds = false;
 | 
				
			||||||
 | 
					    adDesc[] gameAds;
 | 
				
			||||||
 | 
					    class adDesc : UnityEngine.Object
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					        public String url = "";
 | 
				
			||||||
 | 
					        public String title = "";
 | 
				
			||||||
 | 
					        public String desc = "";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        public adDesc(String u, String t, String d)
 | 
				
			||||||
 | 
					        {
 | 
				
			||||||
 | 
					            this.url = u;
 | 
				
			||||||
 | 
					            this.title = t;
 | 
				
			||||||
 | 
					            this.desc = d;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	public void Awake()
 | 
						public void Awake()
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
		QualitySettings.currentLevel = QualityLevel.Fantastic;
 | 
							QualitySettings.currentLevel = QualityLevel.Fantastic;
 | 
				
			||||||
@ -95,6 +111,9 @@ public class Lobby : MonoBehaviour
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    public IEnumerator Start()
 | 
					    public IEnumerator Start()
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
 | 
					        String adBrightUrl = "";
 | 
				
			||||||
 | 
					        String adSenseUrl = "";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        userPassword = PlayerPrefs.GetString("userPassword", "");
 | 
					        userPassword = PlayerPrefs.GetString("userPassword", "");
 | 
				
			||||||
        userCode = PlayerPrefs.GetString("userCode", "");
 | 
					        userCode = PlayerPrefs.GetString("userCode", "");
 | 
				
			||||||
        userRemembered = (PlayerPrefs.GetInt("userRemembered", 0) == 1 ? true : false);
 | 
					        userRemembered = (PlayerPrefs.GetInt("userRemembered", 0) == 1 ? true : false);
 | 
				
			||||||
@ -148,6 +167,10 @@ public class Lobby : MonoBehaviour
 | 
				
			|||||||
                {
 | 
					                {
 | 
				
			||||||
                    hostDedicated = (val[1] == "1" || val[1] == "true");
 | 
					                    hostDedicated = (val[1] == "1" || val[1] == "true");
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
					                else if (val[0] == "a")
 | 
				
			||||||
 | 
					                {
 | 
				
			||||||
 | 
					                    showAds = (val[1] == "1" || val[1] == "true");
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
                else if (val[0] == "m") msgs.Add(val[1]);
 | 
					                else if (val[0] == "m") msgs.Add(val[1]);
 | 
				
			||||||
                else if (val[0] == "w")
 | 
					                else if (val[0] == "w")
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
@ -205,6 +228,14 @@ public class Lobby : MonoBehaviour
 | 
				
			|||||||
                {
 | 
					                {
 | 
				
			||||||
                    GameData.networkMode = int.Parse(val[1]);
 | 
					                    GameData.networkMode = int.Parse(val[1]);
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
					                else if (val[0] == "adbr")
 | 
				
			||||||
 | 
					                {
 | 
				
			||||||
 | 
					                    adBrightUrl = val[1];
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					                else if (val[0] == "adsn")
 | 
				
			||||||
 | 
					                {
 | 
				
			||||||
 | 
					                    adSenseUrl = val[1];
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        else
 | 
					        else
 | 
				
			||||||
@ -216,6 +247,60 @@ public class Lobby : MonoBehaviour
 | 
				
			|||||||
        messages = msgs.ToArray();
 | 
					        messages = msgs.ToArray();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        MasterServer.RequestHostList(gameName);
 | 
					        MasterServer.RequestHostList(gameName);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (showAds)
 | 
				
			||||||
 | 
					        { 
 | 
				
			||||||
 | 
					            List<adDesc> ads = new List<adDesc>();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            //Adbrite
 | 
				
			||||||
 | 
					            www = new WWW(adBrightUrl);
 | 
				
			||||||
 | 
					            yield return www;
 | 
				
			||||||
 | 
					            if (www.error == null)
 | 
				
			||||||
 | 
					            {
 | 
				
			||||||
 | 
					                MatchCollection matches = Regex.Matches(
 | 
				
			||||||
 | 
					                    www.data.Replace(
 | 
				
			||||||
 | 
					                        "\\\"",
 | 
				
			||||||
 | 
					                        "\""),
 | 
				
			||||||
 | 
					                    "<a[^>]*?class=\\\"adHeadline\\\"[^>]*?href=\\\"(.*?)\\\"[^>]*?>(.*?)</a>[^.]*?<a[^>]*?class=\\\"adText\\\"[^>]*?>(.*?)</a>");
 | 
				
			||||||
 | 
					                foreach (Match match in matches)
 | 
				
			||||||
 | 
					                {
 | 
				
			||||||
 | 
					                    adDesc ad = new adDesc(
 | 
				
			||||||
 | 
					                        match.Groups[1].ToString(),
 | 
				
			||||||
 | 
					                        htmlDecode(match.Groups[2].ToString()),
 | 
				
			||||||
 | 
					                        htmlDecode(match.Groups[3].ToString()));
 | 
				
			||||||
 | 
					                    if (UnityEngine.Random.value > .5) ads.Add(ad);
 | 
				
			||||||
 | 
					                    else ads.Insert(0, ad);
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            //Adsense
 | 
				
			||||||
 | 
					            www = new WWW(adSenseUrl);
 | 
				
			||||||
 | 
					            yield return www;
 | 
				
			||||||
 | 
					            if (www.error == null)
 | 
				
			||||||
 | 
					            {
 | 
				
			||||||
 | 
					                MatchCollection matches = Regex.Matches(
 | 
				
			||||||
 | 
					                    www.data.Replace(
 | 
				
			||||||
 | 
					                        "\\\"",
 | 
				
			||||||
 | 
					                        "\""),
 | 
				
			||||||
 | 
					                    "<a[^>]*?class=adt[^>]*?href=\\\"(.*?)\\\"[^>]*?>(.*?)</a>[^.]*?<div[^>]*?class=adb[^>]*?>(.*?)</div>");
 | 
				
			||||||
 | 
					                foreach (Match match in matches)
 | 
				
			||||||
 | 
					                {
 | 
				
			||||||
 | 
					                    adDesc ad = new adDesc(
 | 
				
			||||||
 | 
					                        "http://googleads.g.doubleclick.net" +
 | 
				
			||||||
 | 
					                            match.Groups[1].ToString(),
 | 
				
			||||||
 | 
					                        htmlDecode(match.Groups[2].ToString()),
 | 
				
			||||||
 | 
					                        htmlDecode(match.Groups[3].ToString()));
 | 
				
			||||||
 | 
					                    if (ad.url.IndexOf("&nh=1") == -1) ad.url += "&nh=1";
 | 
				
			||||||
 | 
					                    ads.Insert(0, ad);
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            //Tally
 | 
				
			||||||
 | 
					            if (ads.Count > 0)
 | 
				
			||||||
 | 
					            {
 | 
				
			||||||
 | 
					                gameAds = ads.ToArray();
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
	public void OnFailedToConnectToMasterServer(NetworkConnectionError info)
 | 
						public void OnFailedToConnectToMasterServer(NetworkConnectionError info)
 | 
				
			||||||
@ -956,8 +1041,36 @@ public class Lobby : MonoBehaviour
 | 
				
			|||||||
                    System.Array.Sort(data, sortHostArray);
 | 
					                    System.Array.Sort(data, sortHostArray);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                    int i = 0;
 | 
					                    int i = 0;
 | 
				
			||||||
 | 
					                    float adCounter = 0.000f;
 | 
				
			||||||
 | 
					                    int adTicker = 0;
 | 
				
			||||||
                    foreach (HostData element in data)
 | 
					                    foreach (HostData element in data)
 | 
				
			||||||
                    { 
 | 
					                    { 
 | 
				
			||||||
 | 
					                        //Ads
 | 
				
			||||||
 | 
					                        if (showAds)
 | 
				
			||||||
 | 
					                        {
 | 
				
			||||||
 | 
					                            adCounter += (float)gameAds.Length / (float)data.Length;
 | 
				
			||||||
 | 
					                            if ((float)adTicker < adCounter && adTicker < gameAds.Length)
 | 
				
			||||||
 | 
					                            {
 | 
				
			||||||
 | 
					                                if (
 | 
				
			||||||
 | 
					                                    GUILayout.Button(
 | 
				
			||||||
 | 
					                                        gameAds[adTicker].title +
 | 
				
			||||||
 | 
					                                            "   ~   " +
 | 
				
			||||||
 | 
					                                            gameAds[adTicker].desc,
 | 
				
			||||||
 | 
					                                        "lobbyAd"))
 | 
				
			||||||
 | 
					                                {
 | 
				
			||||||
 | 
					                                    OpenURL(gameAds[adTicker].url);
 | 
				
			||||||
 | 
					                                }
 | 
				
			||||||
 | 
					                                if (
 | 
				
			||||||
 | 
					                                    Event.current.type != EventType.Layout &&
 | 
				
			||||||
 | 
					                                    mouseInServerList &&
 | 
				
			||||||
 | 
					                                    GUILayoutUtility.GetLastRect().Contains(Event.current.mousePosition))
 | 
				
			||||||
 | 
					                                {
 | 
				
			||||||
 | 
					                                    serverDetails = "This advertisement helps bring Mars Explorer to you for free!\n\nIf you are interested in one of our sponsor's offers,\nplease be sure to check it out.";
 | 
				
			||||||
 | 
					                                }
 | 
				
			||||||
 | 
					                                adTicker++;
 | 
				
			||||||
 | 
					                            }
 | 
				
			||||||
 | 
					                        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                        masterServerConFailures = 0;
 | 
					                        masterServerConFailures = 0;
 | 
				
			||||||
                        masterServerMessage = "";
 | 
					                        masterServerMessage = "";
 | 
				
			||||||
                        serverData = element.comment.Split(";"[0]);
 | 
					                        serverData = element.comment.Split(";"[0]);
 | 
				
			||||||
@ -1066,6 +1179,21 @@ public class Lobby : MonoBehaviour
 | 
				
			|||||||
                                (serverVersion != 0.0 ? " (» Dedicated Host Server)" : "");
 | 
					                                (serverVersion != 0.0 ? " (» Dedicated Host Server)" : "");
 | 
				
			||||||
                        }
 | 
					                        }
 | 
				
			||||||
                        i++;
 | 
					                        i++;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                        //"Advertise Here" Ad
 | 
				
			||||||
 | 
					                        if (showAds && i == data.Length)
 | 
				
			||||||
 | 
					                        {
 | 
				
			||||||
 | 
					                            if (GUILayout.Button("» Advertise on Mars Explorer! «", "lobbyAd"))
 | 
				
			||||||
 | 
					                            {
 | 
				
			||||||
 | 
					                                OpenURL("http://www.adbrite.com/mb/commerce/purchase_form.php?opid=1509409&&nr=1");
 | 
				
			||||||
 | 
					                            }
 | 
				
			||||||
 | 
					                            if (Event.current.type != EventType.Layout &&
 | 
				
			||||||
 | 
					                                mouseInServerList &&
 | 
				
			||||||
 | 
					                                GUILayoutUtility.GetLastRect().Contains(Event.current.mousePosition))
 | 
				
			||||||
 | 
					                            {
 | 
				
			||||||
 | 
					                                serverDetails = "That's right - you can bid directly to advertise inside Mars Explorer!\n\nPresent YOUR message to an audience\nof friendly Martians everywhere.";
 | 
				
			||||||
 | 
					                            }
 | 
				
			||||||
 | 
					                        }
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
				if (activePlayersVisible == 0)
 | 
									if (activePlayersVisible == 0)
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user