소스 검색

[changed] moved the addictive personality trait to the correct file and balanced the heavy/light weight trait a bit

julzor 4 년 전
부모
커밋
66b1e05746
2개의 변경된 파일20개의 추가작업 그리고 17개의 파일을 삭제
  1. 1 16
      locations/drugs.qsrc
  2. 19 1
      locations/traits.qsrc

+ 1 - 16
locations/drugs.qsrc

@@ -239,22 +239,7 @@ else
 	'<br><font color = red>Developer note: The type of drug is wrong or missing in this scene. Please report this and a small part of the text of the current scene as a bug.</font>'
 end
 
-!!Addictive Personality Trait
-if addictive_cheat = 0:
-	addictive_exp = smoke_exp + joint_exp + heroin_exp + cocaine_exp + alcohol_exp + amphetamine_exp
-
-	if addictive_exp = 2 and addictive_trait_lvl < 1:
-		addictive_trait_lvl = 1
-		if add_trait_msg_1 = 0: add_trait_msg_1 = 1 & msg 'You have gained the trait ''Addicitive Personality''.'
-	elseif addictive_exp = 3 and addictive_trait_lvl < 2:
-		addictive_trait_lvl = 2
-		if add_trait_msg_2 = 0: add_trait_msg_2 = 1 & msg 'You have increased the level of your ''Addicitive Personality'' trait to 2.'
-	elseif addictive_exp >= 4 or (heroin_exp = 1 and cocaine_exp = 1) and addictive_trait_lvl < 3:
-		addictive_trait_lvl = 3
-		if add_trait_msg_3 = 0: add_trait_msg_3 = 1 & msg 'You have increased the level of your ''Addicitive Personality'' trait to 3.'
-	end
-end
-
+gs 'traits', 'addictive_personality'
 
 --- drugs ---------------------------------
 

+ 19 - 1
locations/traits.qsrc

@@ -140,7 +140,7 @@ if $ARGS[0] = 'overnight':
 			alko_trait_counter += alko_trait_day
 		end
 	elseif alko_trait_day = 0:
-		alko_trait_counter -= 3
+		alko_trait_counter -= 2
 	end
 	
 	!!Trait selection
@@ -167,5 +167,23 @@ if $ARGS[0] = 'overnight':
 	end
 end
 
+if $ARGS[0] = 'addictive_personality':
+	!!Addictive Personality Trait
+	if addictive_cheat = 0:
+		addictive_exp = smoke_exp + joint_exp + heroin_exp + cocaine_exp + alcohol_exp + amphetamine_exp
+
+		if addictive_exp = 2 and addictive_trait_lvl < 1:
+			addictive_trait_lvl = 1
+			if add_trait_msg_1 = 0: add_trait_msg_1 = 1 & msg 'You have gained the trait ''Addictive Personality''.'
+		elseif addictive_exp = 3 and addictive_trait_lvl < 2:
+			addictive_trait_lvl = 2
+			if add_trait_msg_2 = 0: add_trait_msg_2 = 1 & msg 'You have increased the level of your ''Addictive Personality'' trait to 2.'
+		elseif addictive_exp >= 4 or (heroin_exp = 1 and cocaine_exp = 1) and addictive_trait_lvl < 3:
+			addictive_trait_lvl = 3
+			if add_trait_msg_3 = 0: add_trait_msg_3 = 1 & msg 'You have increased the level of your ''Addictive Personality'' trait to 3.'
+		end
+	end
+end
+
 --- traits ---------------------------------