瀏覽代碼

Fixes and new rent payment options from Illume

KevinSmarts 8 年之前
父節點
當前提交
9dd2961890
共有 5 個文件被更改,包括 76 次插入18 次删除
  1. 12 12
      locations/Cheatmenu_din
  2. 2 0
      locations/_face_image
  3. 26 6
      locations/cikl
  4. 17 0
      locations/obj_din
  5. 19 0
      locations/stat_display

+ 12 - 12
locations/Cheatmenu_din

@@ -529,18 +529,18 @@ $cheatmenu['stats'] = {
 	if schoolprogul >= 0:pl'<a href="exec:schoolprogul = 0 & dynamic $cheatmenu[''stats'']">Zero Absenteeism: <<schoolprogul>></a>'
 	pl''
 	pl'<b>Test options</b> present in the mechanism of the game, but not involved in the game quests:'
-	if mutagenP = 0:pl'Mutagen strength <a href="exec:mutagenP = 1 & stren = 150 & dynamic $din_cheat">1Level</a>'
-	if mutagenP = 1:pl'Mutagen strength <a href="exec:mutagenP = 2 & stren = 200 & dynamic $din_cheat">2Level</a>'
-	if mutagenP = 2:pl'Mutagen strength <a href="exec:mutagenP = 3 & stren = 250 & dynamic $din_cheat">3Level</a>'
-	if mutagenP > 0:pl'Mutagen strength <a href="exec:mutagenP = 0 & stren = 100 & dynamic $din_cheat">Set to zero</a>'
-	if mutagenV = 0:pl'Mutagen endurance <a href="exec:mutagenV = 1 & vital = 150 & dynamic $din_cheat">1Level</a>'
-	if mutagenV = 1:pl'Mutagen endurance <a href="exec:mutagenV = 2 & vital = 200 & dynamic $din_cheat">2Level</a>'
-	if mutagenV = 2:pl'Mutagen endurance <a href="exec:mutagenV = 3 & vital = 250 & dynamic $din_cheat">3Level</a>'
-	if mutagenV > 0:pl'Mutagen endurance <a href="exec:mutagenV = 0 & vital = 100 & dynamic $din_cheat">Set to zero</a>'
-	if mutagenA = 0:pl'Mutagen Agility <a href="exec:mutagenA = 1 & agil = 150 & dynamic $din_cheat">1Level</a>'
-	if mutagenA = 1:pl'Mutagen Agility <a href="exec:mutagenA = 2 & agil = 200 & dynamic $din_cheat">2Level</a>'
-	if mutagenA = 2:pl'Mutagen Agility <a href="exec:mutagenA = 3 & agil = 250 & dynamic $din_cheat">3Level</a>'
-	if mutagenA > 0:pl'Mutagen Agility <a href="exec:mutagenA = 0 & agil = 100 & dynamic $din_cheat">Set to zero</a>'
+	if mutagenP = 0:pl'Mutagen strength <a href="exec:mutagenP = 1 & stren = 150 & $cheatmenu[''stats'']">1Level</a>'
+	if mutagenP = 1:pl'Mutagen strength <a href="exec:mutagenP = 2 & stren = 200 & $cheatmenu[''stats'']">2Level</a>'
+	if mutagenP = 2:pl'Mutagen strength <a href="exec:mutagenP = 3 & stren = 250 & $cheatmenu[''stats'']">3Level</a>'
+	if mutagenP > 0:pl'Mutagen strength <a href="exec:mutagenP = 0 & stren = 100 & $cheatmenu[''stats'']">Set to zero</a>'
+	if mutagenV = 0:pl'Mutagen endurance <a href="exec:mutagenV = 1 & vital = 150 & $cheatmenu[''stats'']">1Level</a>'
+	if mutagenV = 1:pl'Mutagen endurance <a href="exec:mutagenV = 2 & vital = 200 & $cheatmenu[''stats'']">2Level</a>'
+	if mutagenV = 2:pl'Mutagen endurance <a href="exec:mutagenV = 3 & vital = 250 & $cheatmenu[''stats'']">3Level</a>'
+	if mutagenV > 0:pl'Mutagen endurance <a href="exec:mutagenV = 0 & vital = 100 & $cheatmenu[''stats'']">Set to zero</a>'
+	if mutagenA = 0:pl'Mutagen Agility <a href="exec:mutagenA = 1 & agil = 150 & $cheatmenu[''stats'']">1Level</a>'
+	if mutagenA = 1:pl'Mutagen Agility <a href="exec:mutagenA = 2 & agil = 200 & $cheatmenu[''stats'']">2Level</a>'
+	if mutagenA = 2:pl'Mutagen Agility <a href="exec:mutagenA = 3 & agil = 250 & $cheatmenu[''stats'']">3Level</a>'
+	if mutagenA > 0:pl'Mutagen Agility <a href="exec:mutagenA = 0 & agil = 100 & $cheatmenu[''stats'']">Set to zero</a>'
 }
 
 $cheatmenu['reputation'] = {

+ 2 - 0
locations/_face_image

@@ -1,5 +1,7 @@
 # $face_image
 
+if player_avatar = 1:$RESULT = 'avatar.jpg' & exit
+
 !! These images are missing from my copy of the image folder, so I am commenting them out for now
 !!if glass = 2:
 !!	$RESULT = 'images/body/hcolglass<<hcol>>.jpg'

+ 26 - 6
locations/cikl

@@ -771,42 +771,62 @@ if week = 5:$week = 'Friday'
 if week = 6:$week = 'Saturday'
 if week = 7:$week = 'Sunday'
 
-if storyline = 1:
+if storyline = 1 and SchoolAtestat = 0:
 	$holyday = ''
 	kanikuli = 0
 
 	!holiday countdown (kanicont) by illume. countdown in [cikl], summer vacation pre-set in [startalt]
 	if (month = 10 and day >= 27) or (month = 11 and day <= 4):
+		if month = 11:
+			kanicont = 5 - day
+		else
+			kanicont = monthsEnd[10] - day + 1 + 4
+		end
 		if month = 10 and day = 27:kanicont = 9
 		$holyday = '<b>Autumn holidays</b>'
 		kanikuli = 1
 		if month = 11 and day = 4:$holyday += ' <b>Back to school tomorrow.</b>'
 	elseif (month = 12 and day >= 29) or (month = 1 and day <= 13):
-		if month = 12 and day = 29:kanicont = 16
+		if month = 1:
+			kanicont = 14 - day
+		else
+			kanicont = monthsEnd[12] - day + 1 + 13
+		end
 		$holyday = '<b>Winter Break</b>'
 		kanikuli = 2
 		if month = 1 and day = 13:$holyday += ' <b>Back to school tomorrow.</b>'
 	elseif (month = 3 and day >= 25):
-		if month = 3 and day = 25:kanicont = 7
+		if kanicount = 0:kanicont = monthsEnd[3] - day + 1
 		$holyday = '<b>Spring Break</b>'
 		kanikuli = 3
 		if month = 3 and day = 31:$holyday += ' <b>Back to school tomorrow.</b>'
 	elseif (month = 5 and day >= 25) or month = 6 or month = 7 or month = 8:
-		if month = 5 and day = 25:kanicont = 99
 		if month = 5 and day = 25 and age = 17:
 			$holyday = '<b>Your graduation is today. Be there by 8h.</b>'
 			kanikuli = 6
 		else
+			if month = 8:
+				kanicont = monthsEnd[8] - day + 1
+			elseif month = 7:
+				kanicont = monthsEnd[7] - day + 1 + monthsEnd[8]   
+			elseif month = 6:
+				kanicont = monthsEnd[6] - day + 1 + monthsEnd[7] + monthsEnd[8]
+			else
+				kanicont = monthsEnd[5] - day + 1 + monthsEnd[6] + monthsEnd[7] + monthsEnd[8]
+			end
 			$holyday = '<b>Summer holidays</b>'
 			kanikuli = 4
+			if month = 8 and day = 31:$holyday += ' <b>Back to school tomorrow.</b>'
 		end
-		if month = 8 and day = 31:$holyday += ' <b>Back to school tomorrow.</b>'
 	elseif month = 1 and day = 1:
 		$holyday = '<b>New Year!</b>'
 		kanikuli = 5
+	else
+		kanicount = 0
+		!cleanup if not holidays.
 	end
 
-	if kanikuli > 0 and kanikuli <5:$holyday += ', <<kanicont>> days left.</b>'
+	if kanikuli > 0 and kanikuli < 5:$holyday += ', <<kanicont>> days left.</b>'
 end
 
 --- cikl ---------------------------------

+ 17 - 0
locations/obj_din

@@ -206,6 +206,23 @@ $objstatistika = {
 	if opPRE = 0:pl 'It has been <<daystart>> days since the game started.'
 	if BuyHous = 2 and ArendHouseSL >0:pl 'You have rented an apartment in the residential area for <<ArendHouseSL>> days.'
 
+	if BuyHous = 2 and ArendHouseSL >0:
+		pl 'You have rented an apartment in the residential area for <<ArendHouseSL>> days.'
+			if money >= 6000 or stolmoney >= 6000 or money + stolmoney >= 6000 or karta >= 6000:
+			*P ' Renew with '
+			if money >= 6000:
+				*P ' <a href="exec:money -= 6000 & housr = 1 & BuyHous = 2 & ArendHouseSL += 30">cash</a>'
+			elseif stolmoney >= 6000:
+				*P ' <a href="exec:stolmoney -= 6000 & housr = 1 & BuyHous = 2 & ArendHouseSL += 30 & dynamic $objstatistika">cash from drawer</a>'
+			elseif money + stolmoney >= 6000:
+				!both < 6000, so money = money - 6000 + stolmoney
+				*P ' <a href="exec:money -= 6000 - stolmoney & stolmoney = 0 & housr = 1 & BuyHous = 2 & ArendHouseSL += 30 & dynamic $objstatistika">cash from purse and drawer</a>'
+			end
+			!from purse, drawer or both
+			if karta >= 6000: *P ' <a href="exec:karta -= 6000 & housr = 1 & BuyHous = 2 & ArendHouseSL += 30 & dynamic $objstatistika">bank account</a>'
+		end
+	end
+
 	if KikWinPro > 0 or KikLossPro > 0 or KikDrawPro > 0:
 		pl 'Professional Kickboxing Record:Win (Victory KO) - Loss (Defeat KO) - Draw'
 		pl '<<KikWinPro>> (<<KikWinProKO>>KO) - <<KikLossPro>> (<<KikLossProKO>>KO) - <<KikDrawPro>>'

+ 19 - 0
locations/stat_display

@@ -163,6 +163,25 @@ end
 
 if BuyHous = 2 and ArendHouseSL <= 0:'<font color="red"><b>The rent on your apartment expires today.</b></font>'
 
+if BuyHous = 2 and ArendHouseSL <= 0:
+	'<font color="red"><b>The rent on your apartment expires today.</b></font>'
+	if money >= 6000 or stolmoney >= 6000 or money + stolmoney >= 6000 or karta >= 6000:
+		*P ' Renew with '
+		if money >= 6000:
+			*P ' <a href="exec:money -= 6000 & housr = 1 & BuyHous = 2 & ArendHouseSL += 30" & gs''stat''>cash</a>'
+		elseif stolmoney >= 6000:
+			*P ' <a href="exec:stolmoney -= 6000 & housr = 1 & BuyHous = 2 & ArendHouseSL += 30" & gs''stat''>cash from drawer</a>'
+		elseif money + stolmoney >= 6000:
+			!both < 6000, so money = money - 6000 + stolmoney
+			*P ' <a href="exec:money -= 6000 - stolmoney & stolmoney = 0 & housr = 1 & BuyHous = 2 & ArendHouseSL += 30" & gs''stat''>cash from purse and drawer</a>'
+		end
+		!from purse, drawer or both
+		if karta >= 6000: *P ' <a href="exec:karta -= 6000 & housr = 1 & BuyHous = 2 & ArendHouseSL += 30 & gs''stat''">bank account</a>'
+	else
+		*P ' But you can''t afford to renew the lease.'
+	end   
+end
+
 if  weatherDay = daystart: pl '<<$weather>>' & pl
 
 if opPRE = 0: pl '<<$mop>> and your hair is <<$hapri>>.' & pl