achievements system added

assets/data/ResourceScripts.gd

@@ -101,6 +101,7 @@ onready var node_data = {
 	input_handler.NODE_ARENA : {name = 'arena', mode = 'scene', scene = preload("res://gui_modules/arena/arena.tscn"), calls = 'open'},
 	input_handler.NODE_HARD_TUTORIAL_PANEL : {name = 'hard_tutorial_panel', mode = 'scene', scene = preload("res://gui_modules/Universal/Modules/hard_tutorial_panel.tscn")},
 	input_handler.NODE_HARD_TUTORIAL_LIST : {name = 'hard_tutorial_list', mode = 'scene', scene = preload("res://gui_modules/Universal/Modules/hard_tutorial_list.tscn")},
+	input_handler.NODE_ACHI_UNLOCK : {name = 'achi_unlock', mode = 'scene', scene = preload("res://gui_modules/achievements/unlock.tscn")},#calls = 'open'
 	#Animations
 	input_handler.ANIM_TASK_AQUARED : {name = 'ANIMTaskAquared', mode = 'scene', scene = preload("res://gui_modules/Animations/Animation_task_aquired.tscn") },
 	input_handler.ANIM_BATTLE_START : {name = 'ANIMBattleStart', mode = 'scene', scene = preload("res://gui_modules/Animations/Animation_battle_start.tscn") },

assets/data/achievements_data.gd

@@ -0,0 +1,145 @@
+extends Reference
+
+var achievements = {
+	quest_loan = {
+		name = "ACHIEVEMENT_LOAN_NAME",
+		description = "ACHIEVEMENT_LOAN_DESC",
+		hint = "ACHIEVEMENT_LOAN_HINT",
+		icon = "res://assets/Textures_v2/Universal/Icons/crown.png",
+		points = 5
+	},
+	quest_sword_art = {
+		name = "ACHIEVEMENT_SWORDART_NAME",
+		description = "ACHIEVEMENT_SWORDART_DESC",
+		hint = "ACHIEVEMENT_SWORDART_HINT",
+		icon = "res://assets/Textures_v2/Universal/Icons/crown.png",
+		points = 5
+	},
+	act1 = {
+		name = "ACHIEVEMENT_ACT1_NAME",
+		description = "ACHIEVEMENT_ACT1_DESC",
+		hint = "ACHIEVEMENT_ACT1_HINT",
+		icon = "res://assets/Textures_v2/Universal/Icons/icon_master.png",
+		points = 5
+	},
+	act2 = {
+		name = "ACHIEVEMENT_ACT2_NAME",
+		description = "ACHIEVEMENT_ACT2_DESC",
+		hint = "ACHIEVEMENT_ACT2_HINT",
+		icon = "res://assets/Textures_v2/Universal/Icons/icon_master.png",
+		points = 5
+	},
+	act3 = {
+		name = "ACHIEVEMENT_ACT3_NAME",
+		description = "ACHIEVEMENT_ACT3_DESC",
+		hint = "ACHIEVEMENT_ACT3_HINT",
+		icon = "res://assets/Textures_v2/Universal/Icons/icon_master.png",
+		points = 5
+	},
+	char_daisy = {
+		name = "ACHIEVEMENT_DAISY_NAME",
+		description = "ACHIEVEMENT_DAISY_DESC",
+		hint = "ACHIEVEMENT_DAISY_HINT",
+		icon = "res://assets/images/portraits/daisy_prt/daisy_default_prt_bold.png",
+		points = 5
+	},
+	char_kurdan = {
+		name = "ACHIEVEMENT_KURDAN_NAME",
+		description = "ACHIEVEMENT_KURDAN_DESC",
+		hint = "ACHIEVEMENT_KURDAN_HINT",
+		icon = "res://assets/images/portraits/kurdan_prt.png",
+		points = 5
+	},
+	char_aire = {
+		name = "ACHIEVEMENT_AIRE_NAME",
+		description = "ACHIEVEMENT_AIRE_DESC",
+		hint = "ACHIEVEMENT_AIRE_HINT",
+		icon = "res://assets/images/portraits/aire_prt.png",
+		points = 5
+	},
+	char_kuro = {
+		name = "ACHIEVEMENT_KURO_NAME",
+		description = "ACHIEVEMENT_KURO_DESC",
+		hint = "ACHIEVEMENT_KURO_HINT",
+		icon = "res://assets/images/portraits/Kuro_prt.png",
+		points = 5
+	},
+	class_worker = {
+		name = "ACHIEVEMENT_WORKER_NAME",
+		description = "ACHIEVEMENT_WORKER_DESC",
+		hint = "ACHIEVEMENT_WORKER_HINT",
+		icon = "res://assets/images/iconsclasses/Worker.png",
+		points = 5
+	},
+	class_hunter = {
+		name = "ACHIEVEMENT_HUNTER_NAME",
+		description = "ACHIEVEMENT_HUNTER_DESC",
+		hint = "ACHIEVEMENT_HUNTER_HINT",
+		icon = "res://assets/images/iconsclasses/Hunter.png",
+		points = 5
+	},
+	class_chef = {
+		name = "ACHIEVEMENT_CHEF_NAME",
+		description = "ACHIEVEMENT_CHEF_DESC",
+		hint = "ACHIEVEMENT_CHEF_HINT",
+		icon = "res://assets/images/iconsclasses/Chef.png",
+		points = 5
+	},
+	class_harlot = {
+		name = "ACHIEVEMENT_HARLOT_NAME",
+		description = "ACHIEVEMENT_HARLOT_DESC",
+		hint = "ACHIEVEMENT_HARLOT_HINT",
+		icon = "res://assets/images/iconsclasses/Whore.png",
+		points = 5
+	},
+	class_dancer = {
+		name = "ACHIEVEMENT_DANCER_NAME",
+		description = "ACHIEVEMENT_DANCER_DESC",
+		hint = "ACHIEVEMENT_DANCER_HINT",
+		icon = "res://assets/images/iconsclasses/dancer.png",
+		points = 5
+	},
+	class_fighter = {
+		name = "ACHIEVEMENT_FIGHTER_NAME",
+		description = "ACHIEVEMENT_FIGHTER_DESC",
+		hint = "ACHIEVEMENT_FIGHTER_HINT",
+		icon = "res://assets/images/iconsclasses/Fighter.png",
+		points = 5
+	},
+
+}
+
+var bonuses = {
+	daisy_start = {
+		name = "ACHIBONUS_DAISY_START",
+		description = "ACHIBONUS_DAISY_START_DESC",
+		hint = "ACHIBONUS_DAISY_START_HINT",
+		icon = "res://assets/images/portraits/daisy_prt/daisy_default_prt_bold.png",
+		preparation = "prep_daisy_start",
+		cost = 10
+	},
+	kurdan_start = {
+		name = "ACHIBONUS_KURDAN_START",
+		description = "ACHIBONUS_KURDAN_START_DESC",
+		hint = "ACHIBONUS_KURDAN_START_HINT",
+		icon = "res://assets/images/portraits/kurdan_prt.png",
+		preparation = "prep_kurdan_start",
+		cost = 10
+	},
+	aire_start = {
+		name = "ACHIBONUS_AIRE_START",
+		description = "ACHIBONUS_AIRE_START_DESC",
+		hint = "ACHIBONUS_AIRE_START_HINT",
+		icon = "res://assets/images/portraits/aire_prt.png",
+		preparation = "prep_aire_start",
+		cost = 10
+	},
+	kuro_start = {
+		name = "ACHIBONUS_KURO_START",
+		description = "ACHIBONUS_KURO_START_DESC",
+		hint = "ACHIBONUS_KURO_START_HINT",
+		icon = "res://assets/images/portraits/kuro_prt/kuro_default_prt_bold.png",
+		preparation = "prep_kuro_start",
+		cost = 5
+	}
+}

assets/data/classes.gd

@@ -126,6 +126,7 @@ var professions = {
 		skills = [],
 		combatskills = [],
 		conflict_classes = [],
+		achievement = "class_worker",
 	},
 	foreman = {
 		code = 'foreman',
@@ -156,6 +157,7 @@ var professions = {
 		skills = [],
 		combatskills = [],
 		conflict_classes = [],
+		achievement = "class_hunter"
 	},
 	smith = {
 		code = 'smith',
@@ -201,6 +203,7 @@ var professions = {
 		skills = [],
 		combatskills = [],
 		conflict_classes = [],
+		achievement = "class_chef"
 	},
 	attendant = {
 		code = 'attendant',
@@ -292,6 +295,7 @@ var professions = {
 		skills = [],
 		combatskills = [],
 		conflict_classes = [],
+		achievement = "class_harlot"
 	},
 	geisha = {
 		code = 'geisha',
@@ -435,6 +439,7 @@ var professions = {
 		skills = [],#'allure','performance'],
 		combatskills = ['distract'],
 		conflict_classes = [],
+		achievement = "class_dancer"
 	},
 	maid = {
 		code = 'maid',
@@ -467,6 +472,7 @@ var professions = {
 		skills = [],
 		combatskills = [],
 		conflict_classes = [],
+		achievement = "class_fighter"
 	},
 	knight = {
 		code = 'knight',

assets/data/events/act1_princess_declaration.gd

@@ -200,6 +200,10 @@ var data = {
 			},
 			{
 				code = "check_masters_story_fame",
+			},
+			{
+				code = "achievement",
+				value = "act1"
 			}
 		],
 		text = [

assets/data/events/act2_finish.gd

@@ -3752,6 +3752,10 @@ var data = {
 			{
 				code = "decision",
 				value = "act2_finish"
+			},
+			{
+				code = "achievement",
+				value = "act2"
 			}
 		]
 	},
@@ -4090,6 +4094,10 @@ var data = {
 			{
 				code = "decision",
 				value = "act2_finish"
+			},
+			{
+				code = "achievement",
+				value = "act2"
 			}
 		]
 	},

assets/data/events/act3_finish.gd

@@ -1000,6 +1000,10 @@ var data = {
 						code = "decision",
 						value = "act3_finish"
 					},
+					{
+						code = "achievement",
+						value = "act3"
+					},
 					{
 						code = "add_timed_event",
 						value = "emp_city_init",
@@ -1033,6 +1037,10 @@ var data = {
 						code = "decision",
 						value = "act3_finish"
 					},
+					{
+						code = "achievement",
+						value = "act3"
+					},
 					{
 						code = "add_timed_event",
 						value = "emp_city_init",
@@ -1414,6 +1422,10 @@ var data = {
 						code = "decision",
 						value = "act3_finish"
 					},
+					{
+						code = "achievement",
+						value = "act3"
+					},
 					{
 						code = "add_timed_event",
 						value = "emp_city_init",

assets/data/pregen_characters_data.gd

@@ -58,6 +58,8 @@ var pregen_characters = {
 			training_sexservice_adv = ["DaisyTrainingFinished"],
 			training_callmaster = ['DaisyQuestlineFinished'],
 		},
+		achievement = "char_daisy",
+		achi_bonus = "daisy_start",
 	},
 
 	Kurdan = {
@@ -99,6 +101,8 @@ var pregen_characters = {
 		traits = ['gifted','training_s_combat','training_s_working'],
 		tags = [],
 		sex_skills = {petting = 2, penetration = 15, oral = 4, anal = 0},
+		achievement = "char_kurdan",
+		achi_bonus = "kurdan_start",
 	},
 	Aire = {
 		code = 'aire',
@@ -153,6 +157,8 @@ var pregen_characters = {
 			positive = 'neutral',
 			magic = 'neutral',
 		},
+		achievement = "char_aire",
+		achi_bonus = "aire_start",
 	},
 	Anastasia = {
 		code = 'anastasia',
@@ -832,6 +838,8 @@ var pregen_characters = {
 			positive = 'neutral',
 			magic = 'resist',
 		},
+		achievement = "char_kuro",
+		achi_bonus = "kuro_start"
 	},
 
 	Rouge = {

assets/data/scenedata.gd

@@ -2234,6 +2234,7 @@ var quests = {
 		stage2 = {code = 'stage2', name = 'MAIN_QUEST_LOAN_NAME', descript = 'MAIN_QUEST_LOAN_STAGE2'},
 		stage3 = {code = 'stage3', name = 'MAIN_QUEST_LOAN_NAME', descript = 'MAIN_QUEST_LOAN_STAGE3'},
 		},
+		achievement = "quest_loan"
 	},
 
 	guilds_introduction = {
@@ -2489,6 +2490,7 @@ var quests = {
 			stage15 = {code = 'stage15', name = "SWORD_ARTIFACT_QUEST_NAME", descript = "SWORD_ARTIFACT_QUEST_STAGE_14"}, # go to white stag location
 			stage16 = {code = 'stage16', name = "SWORD_ARTIFACT_QUEST_NAME", descript = "SWORD_ARTIFACT_QUEST_STAGE_15"}, # return to erlen after you're done with temple quest
 		},
+		achievement = "quest_sword_art"
 	},
 
 	temple_quest = {

gui_modules/Mansion/Scripts/MansionJournalModule.gd

@@ -203,15 +203,9 @@ func CompleteReqs():
 		match i.code:
 			"random_material":
 				ResourceScripts.game_res.set_material(i.type, '-', i.value)
-	selectedquest.state = 'complete'
 	ResourceScripts.slave_quests.check_faction_rating(selectedquest)
 	globals.text_log_add("quest", tr("QUESTCOMPLETEMESSAGE")+": " + tr(selectedquest.name))
-	#NOTE, that only quest of "complete_location" with flag "no_autocomplet" should use this code
-	#of "unquest_location" and "remove_location". If vice versa, it is an error
-	for i in selectedquest.requirements:
-		if i.code == "complete_location":
-			globals.unquest_location(i.location)
-			globals.remove_location(i.location)
+	ResourceScripts.game_world.complete_quest(selectedquest, 'complete')
 	Reward()
 
 var char_reqs

gui_modules/Mansion/Scripts/MansionMainModule.gd

@@ -74,6 +74,7 @@ var always_show = [
 	"map_test"
 ]
 
+var newgame_bonuses
 
 func _ready():
 #	input_handler.CurrentScene = self
@@ -105,6 +106,9 @@ func _ready():
 		show()
 		input_handler.ActivateTutorial("TUTORIALLIST1")
 		globals.apply_starting_preset()
+		if newgame_bonuses != null:#can be set externally
+			input_handler.achievements.prepare_bonuses(newgame_bonuses)
+			newgame_bonuses = null
 
 		ResourceScripts.game_globals.reset_limits()
 		SlaveListModule.rebuild()

gui_modules/Mansion/Scripts/MansionSlaveListModule.gd

@@ -11,7 +11,7 @@ onready var CharacterContextMenu = $CharacterContextMenu
 
 var populatedlocations = []
 var default_locations = ["show_all", "mansion"]
-var selected_location = "mansion"
+var selected_location = "aliron"
 var prev_selected_location = "show_all"
 var visible_persons = []
 
@@ -470,6 +470,7 @@ func show_location_characters(button = null):
 	if visible_persons.size() < 1 and selected_location != "show_all":
 		selected_location = "show_all"
 		show_location_characters()
+	update_location_buttons()
 
 
 func update_location_buttons():