diff --git a/Server/data/botdata/bot_dialogue.json b/Server/data/botdata/bot_dialogue.json index c225b11..9c2c3ce 100644 --- a/Server/data/botdata/bot_dialogue.json +++ b/Server/data/botdata/bot_dialogue.json @@ -48,7 +48,7 @@ "Nice Armor @name!", "Nice Weapon @name!", "Venezuela #1", - "2009scape and chill @name?", + "EmoScape and chill @name?", "@name is my girlfriend", "Buying gf", "Bank sale pm me for info", @@ -69,7 +69,7 @@ "Yes, Im botting. And?", "ERROR: BOTSCRIPT 404. REPORT TO BOT OWNER (Evilwaffles)", "Flash2:wave: FUCK", - "I love 2009Scape!", + "I love EmoScape!", "Ja Ja Ja Ja", "This is fun!", "Ironman or youre a scrub @name.", @@ -181,6 +181,10 @@ "@name have you met Ceikry?", "@name have you met Woah?", "@name have you met Bushtail?", + "@name have you met Emo?", + "I'm just a kid, and life is a nightmare", + "And its all downhill from here", + "I'm sorry I can't be perfect", "Wanna chill at my poh?", "Whats the best place to train attack?", "Good Waffles > Evil Waffles", @@ -196,7 +200,7 @@ "I dont use discord @name", "I dont use the CC @name", "Why should i use discord?", - "2009Scape is life", + "EmoScape is life", "Brb gotta make dinner", "I need to go to the GE", "@name can i have a ge tele?", @@ -294,14 +298,14 @@ "Ur nuts @name", "Lootshare go brr", "Partay with froggay", - "Know what else is lame? Not being able to play 2009scape right now", + "Know what else is lame? Not being able to play EmoScape right now", "Can you even grind on osrs", "I botted to 88 fishing", "Do not forget to vote in running polls!", "Always check announcments", "We thrivin", "Ship @name", - "Dont forget to vote 2009scape!", + "Dont forget to vote EmoScape!", "Kermit is too legit 2 quit", "Out here on the range we are having fun", "I am hank steel", @@ -393,9 +397,8 @@ "Fluff", "Bwuh", "I'm literally just mothin' bro", - "Certified 2009Scape Classic.", + "Certified EmoScape Classic.", "Make sure to like, comment and subscribe @name it really helps", - "Real 2009scape hours!!! Murder that like if you up!!!!", "W00t!", "Owned!", "Pwned!", @@ -410,7 +413,7 @@ "Yall got any deez?", "Deez nuts", "When she give you that yoinky sploinky", - "Sir, this is a 2009Scape.", + "Sir, this is a EmoScape.", "Oh dear! You are dead!", "Cor blimey, mate! What are ye doing in me pockets?", "Yeah i got funnies", @@ -431,7 +434,7 @@ "Who's lone?", "Who *is* he?", "Hi @name, I'm Dad!", - "Anyone wanna play melty blood after I high alch these bows?", + "Baroo!", "Buru nyaaaa", "Number 15, Taverley Dungeon Black Dragons.", "House party at Rimmington! Host: @name!", @@ -444,13 +447,12 @@ ":D", "Die screaming", "Only on Tuesdays", - "We stan 2009scape", "There is no spoon", "Where's the cow level?", - "Join 2009scape Clan Chat!", - "Join 2009scape Cc!", + "Join EmoScape Clan Chat!", + "Join EmoScape Cc!", "Chop chop!", - "2009Scape rox my sox!!!!!!1", + "EmoScape rox my sox!!!!!!1", "Type ::scripts for all 99s", "Help I just died to Evil Chicken and I lost my stuff!", "Can you fight Bandos in this game?", @@ -467,7 +469,7 @@ "With this character's death, the thread of prophecy is severed.", "You must gather your party before venturing forth.", "Praise Andrew Gower", - "Please help me I can't stop playing 2009scape", + "Please help me I can't stop playing EmoScape", "Are you ignoring me, @name?!", "I agree with this rfc can we put it in the game please", "@name, we've been trying to reach you about your car's extended warranty", @@ -788,7 +790,6 @@ "@name likes pickles and dipped in mayo", "Lmaaooooooo", "Bruh she said she loved me...", - "I caught @name rizzing a mewing teacher", "What that mouth do bb", "Ayo tf he say", "Ayo", diff --git a/Server/src/main/content/global/handlers/iface/RulesAndInfo.kt b/Server/src/main/content/global/handlers/iface/RulesAndInfo.kt index 420c70d..4cbad33 100644 --- a/Server/src/main/content/global/handlers/iface/RulesAndInfo.kt +++ b/Server/src/main/content/global/handlers/iface/RulesAndInfo.kt @@ -7,23 +7,26 @@ import core.game.interaction.InterfaceListener object RulesAndInfo { val RULES = arrayOf( + "1. Basically just don't be an asshole", + " -Spamming, serious harassment, and other disruptive behaviors", + " are not okay, and will be addressed appropriately.", "1. Be respectful to your fellow players.", " -No harassment, etc.", " -Keep arguments private.", "2. Do not exploit bugs.", " -Zero tolerance. Can result in account deletion.", - " -If you discover a bug, report it on our Gitlab.", - "3. Do not discuss or advertise other servers.", + " -If you discover a bug, report it to Emo or other admins.", + "3. Do not discuss or advertise.", " -Discussion of the live jagex games is fine.", " -Discussion of open source projects is fine.", + " -Advertising of non-open source RSPSs is not okay.", "4. No unfair advantages.", - " -This includes autoclickers, autohotkey, etc.", - " -Exception: 1-to-1 inputs, such as mousekeys.", - " -Includes training methods that bypass AFK limits." + " -No botting, autoclickers, AHKing, etc...", + " -Again, basically just don't be an asshole." ) val SEPARATOR = " " val INFO = arrayOf( - "Join the forums! forum.2009scape.org " + "Visit emoscape.org for more info " ) @JvmStatic diff --git a/Server/worldprops/default.conf b/Server/worldprops/default.conf index 6024160..0a01a42 100644 --- a/Server/worldprops/default.conf +++ b/Server/worldprops/default.conf @@ -23,7 +23,7 @@ noauth_default_admin = true #NOTE: If we are not using auth, this determines whe #The limit on how many different accounts a player can log into per day. daily_accounts_per_ip = 3 watchdog_enabled = true -connectivity_check_url = "https://google.com,https://2009scape.org" +connectivity_check_url = "https://duckduckgo.com,https://emoscape.org" connectivity_timeout = 500 [database] @@ -44,11 +44,11 @@ grafana_log_ttl_days = 7 [world] -name = "2009Scape" +name = "EmoScape" #name used for announcements of bots selling items on the GE -name_ge = "2009Scape" -debug = true -dev = true +name_ge = "EmoScape" +debug = false +dev = false start_gui = false daily_restart = false #world number @@ -56,7 +56,7 @@ world_id = "1" country_id = "0" members = true #activity as displayed on the world list -activity = "2009Scape Classic." +activity = "EmoScape Classic." pvp = false default_xp_rate = 5.0 allow_slayer_reroll = false