implementing more dialogue

Commandprompt.gd

@@ -40,13 +40,13 @@ func _play_dialog():
 	$AutoCloseTimer.wait_time = closetime
 
 
-func _input(event):
-	if dialogue != null:
-		if event is InputEventMouseButton and event.is_pressed():
-			if textBox.get_visible_characters() < textBox.get_total_character_count():
-				textBox.set_visible_characters(textBox.get_total_character_count())
-				$AutoCloseTimer.start()
-				
+#func _input(event):
+#	if dialogue != null:
+#		if event is InputEventMouseButton and event.is_pressed():
+#			if textBox.get_visible_characters() < textBox.get_total_character_count():
+#				textBox.set_visible_characters(textBox.get_total_character_count())
+#				$AutoCloseTimer.start()
+#
 
 func skip_input():
 	if page < endpoint:
@@ -63,6 +63,8 @@ func set_up():
 	text = dialogue[page]["text"]
 	text = text.replace("{insertText}",pastDialogue[-1]["text"])
 	text = text.replace("{name}", playerName)
+	text = text.replace("{nameReaction}", UniversalFunctions.dialogueJson[UniversalFunctions.nameReaction])
+	text = text.replace("{emptyFilled}", UniversalFunctions.dialogueJson[UniversalFunctions.emptyFilled])
 	text = text.replace("{missingDialogue}", currentTree)
 	print(currentTree)
 	if dialogue[page]["color"] == "Teal":
@@ -71,8 +73,9 @@ func set_up():
 	if optionsVisible == true:
 		if UniversalFunctions.dialogueJson.has(dialogue[page]["options"]):
 			options = UniversalFunctions.dialogueJson[dialogue[page]["options"]]
+			options = options.replace("{variableOption}", UniversalFunctions.VariableOption)
 		else:
-			if UniversalFunctions.disgust < 60:
+			if UniversalFunctions.disgust < 20:
 				if UniversalFunctions.loneliness <60:
 					if UniversalFunctions.dialogueJson.has("fine"+dialogue[page]["options"]):
 						options = UniversalFunctions.dialogueJson["fine"+dialogue[page]["options"]]
@@ -90,13 +93,18 @@ func set_up():
 					options = UniversalFunctions.dialogueJson["optionsError"]
 		var counter = options.size()
 		for i in options:
-			var optText = ">"+i["text"]
-			optText = optText.replace("{missingOptions}",dialogue[page]["options"])
-			optText = optText.replace("{name}",UniversalFunctions.firstName)
-			get_tree().get_root().get_node_or_null("/root/world/Commandprompt/Options/Option"+str(counter)).visible = true
-			get_tree().get_root().get_node_or_null("/root/world/Commandprompt/Options/Option"+str(counter)).text = optText
-
-			counter-=1
+			var AlreadyUsed = false
+			for x in UniversalFunctions.TalkAbout: 
+				if i["name"] == x:
+					AlreadyUsed = true
+			if AlreadyUsed == false:
+				var optText = ">"+i["text"]
+				optText = optText.replace("{missingOptions}",dialogue[page]["options"])
+				optText = optText.replace("{name}",UniversalFunctions.firstName)
+				get_tree().get_root().get_node_or_null("/root/world/Commandprompt/Options/Option"+str(counter)).visible = true
+				get_tree().get_root().get_node_or_null("/root/world/Commandprompt/Options/Option"+str(counter)).text = optText
+
+				counter-=1
 	color = dialogue[page]["color"]
 	time = dialogue[page]["tickSpeed"]
 	closetime = dialogue[page]["closeSpeed"]
@@ -159,7 +167,7 @@ func _on_Voice_finished():
 
 func set_mood():
 	cursor.play("default")
-	if UniversalFunctions.disgust < 60:
+	if UniversalFunctions.disgust < 20:
 		if UniversalFunctions.loneliness <60:
 			mood = "fine"
 		elif UniversalFunctions.loneliness >= 60:

Commandprompt.tscn

@@ -21,6 +21,7 @@ margin_bottom = 14.0
 theme = ExtResource( 1 )
 custom_fonts/normal_font = ExtResource( 11 )
 bbcode_enabled = true
+text = "But you’ve pretty much solved that problem by now, haha."
 fit_content_height = true
 scroll_active = false
 __meta__ = {

UniversalFunctions.gd

@@ -8,11 +8,15 @@ var dialoguePlaying
 
 var swearWords = ["fuck", "shit", "bitch", "cunt", ]
 var loneliness = 44
-var disgust = 44
+var disgust = 15
 var locked = false
 var topics = []
 var firstName
 var lastName
+var VariableOption = "AdaSurprise"
+var emptyFilled = "stillEmpty"
+var nameReaction = "nameNormal"
+var TalkAbout = []
 
 func reset():
 	dialogueBox = get_tree().get_root().get_node_or_null("/root/world/Commandprompt")
@@ -37,7 +41,7 @@ func play_dialogue_JSON(dialogue : String):
 		dialogueBox.dialogue = dialogueJson["dialogueError"]
 		dialogueBox.currentTree = dialogue
 		var dialoguechecker = dialogue.replace("Converge", "")
-		if disgust < 60:
+		if disgust < 20:
 			if loneliness <60:
 				if dialogueJson.has("fine"+dialoguechecker):
 					dialogueBox.dialogue = dialogueJson["fine"+dialoguechecker]
@@ -46,7 +50,7 @@ func play_dialogue_JSON(dialogue : String):
 				if dialogueJson.has("sad"+dialoguechecker):
 					dialogueBox.dialogue = dialogueJson["sad"+dialoguechecker]
 					dialogueBox.currentTree = "angry"+dialoguechecker
-		elif disgust >=60:
+		elif disgust >=20:
 				if dialogueJson.has("angry"+dialoguechecker):
 					dialogueBox.dialogue = dialogueJson["angry"+dialoguechecker]
 					dialogueBox.currentTree = "angry"+dialoguechecker
@@ -55,7 +59,7 @@ func play_dialogue_JSON(dialogue : String):
 				dialoguechecker = dialoguechecker.replace("Good", "")
 				dialoguechecker = dialoguechecker.replace("Bad", "")
 				dialoguechecker = dialoguechecker.replace("Bad", "")
-				if disgust < 60:
+				if disgust < 20:
 					if loneliness <60:
 						if dialogueJson.has("fine"+dialoguechecker):
 							dialogueBox.dialogue = dialogueJson["fine"+dialoguechecker]
@@ -64,7 +68,7 @@ func play_dialogue_JSON(dialogue : String):
 						if dialogueJson.has("sad"+dialoguechecker):
 							dialogueBox.dialogue = dialogueJson["sad"+dialoguechecker]
 							dialogueBox.currentTree = "sad"+dialoguechecker
-				elif disgust >=60:
+				elif disgust >=20:
 						if dialogueJson.has("angry"+dialoguechecker):
 							dialogueBox.dialogue = dialogueJson["angry"+dialoguechecker]
 							dialogueBox.currentTree = "angry"+dialoguechecker

login.gd

@@ -16,7 +16,7 @@ func _on_Blinker_timeout():
 			$loading/loading.play("default")
 			$SubmitName.visible = false
 			yield($loading/loading,"animation_finished")
-			check_obscene(UniversalFunctions.firstName+" "+UniversalFunctions.lastName)
+			check_obscene(UniversalFunctions.firstName+UniversalFunctions.lastName)
 			if obscene == false:
 				UniversalFunctions.change_scenes_reload("res://main.tscn")
 			else:
@@ -70,6 +70,7 @@ func _on_SubmitName_pressed():
 		print(setName.replace(" ","."))
 		if setName.length() <= 0:
 			return
+		check_funny(setName)
 		check_obscene(setName)
 		if $"Keyboard/1/Label".text == "a":
 			$Keyboard._on_case_pressed()
@@ -103,8 +104,14 @@ func _on_SubmitName_pressed():
 		var text = $Name.text
 
 
+func check_funny(setName):
+	for i in ["ass", "balls","fuck", "shit", "penis", "cock", "dick", "cunt","pussy", "vagina","bitch","arse","crap","minger","minging","hell","piss","slut","whore","wank"]:
+		var funnyChecker = setName.to_lower()
+		if i in funnyChecker:
+			UniversalFunctions.nameReaction = "nameFunny"
+
 func check_obscene(setName):
-	for i in ["rapist", "pedophile","nigger", "nigga", "nigguh", "niggar", "niggur", "faggot", "fagot","fag", "wetback", "wet back", "beaner", "kike", "raghead",  "rag head", "towelhead", "towel head", "chink", "racist", "sexist","homophobe","transphobe"]:
+	for i in ["rapist", "pedophile","nigger", "nigga", "nigguh", "niggar", "niggur", "faggot", "fagot","fag", "wetback", "wet back", "beaner", "kike", "raghead",  "rag head", "towelhead", "towel head", "dyke","chink", "racist", "sexist","homophobe","transphobe", "white power"]:
 		var slurChecker = setName.to_lower()
 		if i in slurChecker:
 			var doubleCheck = false

main.gd

@@ -50,7 +50,7 @@ func _on_Commandprompt_option_pressed(optionName:String):
 				UniversalFunctions.play_dialogue_JSON("sadGreetingGood")
 			return
 		if split != null:
-			if UniversalFunctions.disgust < 60:
+			if UniversalFunctions.disgust < 20:
 				if UniversalFunctions.loneliness < 60:
 					UniversalFunctions.play_dialogue_JSON("fine"+split)
 				elif UniversalFunctions.loneliness >= 60 and UniversalFunctions.loneliness <= 90:
@@ -59,7 +59,7 @@ func _on_Commandprompt_option_pressed(optionName:String):
 				UniversalFunctions.play_dialogue_JSON("angry"+split)
 			split = null
 			return
-		if UniversalFunctions.disgust < 60:
+		if UniversalFunctions.disgust < 20:
 			if UniversalFunctions.loneliness < 60:
 				UniversalFunctions.play_dialogue_JSON("fineRepeat")
 			elif UniversalFunctions.loneliness >= 60 and UniversalFunctions.loneliness <= 90:
@@ -71,7 +71,7 @@ func _on_Commandprompt_option_pressed(optionName:String):
 			UniversalFunctions.play_dialogue_JSON($Commandprompt.pastDialogue[-1]["name"])
 		else: 
 			UniversalFunctions.play_dialogue_JSON($Commandprompt.pastDialogue[-1]["mood"]+$Commandprompt.pastDialogue[-1]["name"])
-	elif optionName == "GreetingGood" or optionName == "GreetingBad" or  optionName == "GreetingUgly":
+	elif optionName == "GreetingGoodConverge" or optionName == "GreetingBadConverge" or  optionName == "GreetingUglyConverge":
 		intro = ""
 		$NervousTimer.wait_time = 3
 		UniversalFunctions.play_dialogue_JSON(optionName)
@@ -87,6 +87,9 @@ func _on_Commandprompt_option_pressed(optionName:String):
 	elif optionName == "reactionToGenerationUgly":
 		split = null
 		UniversalFunctions.topics.append("Simulation")
+	elif optionName == "SpendTime" or optionName == "WhatWereYouLike" or optionName == "ElfTalk":
+		UniversalFunctions.TalkAbout.append(optionName)
+		UniversalFunctions.play_dialogue_JSON(optionName)
 	else:
 		UniversalFunctions.play_dialogue_JSON(optionName)
 
@@ -132,7 +135,7 @@ func _on_NervousTimer_timeout():
 		if UniversalFunctions.loneliness <= 90:
 			UniversalFunctions.loneliness += 1
 			if UniversalFunctions.loneliness % 2 == 0:
-				if UniversalFunctions.disgust < 60:
+				if UniversalFunctions.disgust < 20:
 					UniversalFunctions.play_dialogue_JSON("lonely"+intro+str(UniversalFunctions.loneliness/2))
 			else:
 				$NervousTimer.start()

main.tscn

@@ -2695,7 +2695,6 @@ show_behind_parent = true
 material = SubResource( 6 )
 position = Vector2( 3, 7 )
 frames = SubResource( 336 )
-frame = 14
 playing = true
 centered = false
 
@@ -2705,7 +2704,6 @@ light_mask = 2
 material = SubResource( 6 )
 position = Vector2( 3, 7 )
 frames = SubResource( 457 )
-frame = 14
 playing = true
 centered = false