浏览代码

Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

Zedrt 1 月之前
父节点
当前提交
771aca38d9
共有 3 个文件被更改,包括 3 次插入2 次删除
  1. 1 1
      locations/bank.qsrc
  2. 1 0
      locations/dimaEv.qsrc
  3. 1 1
      locations/pav_lake_nude.qsrc

+ 1 - 1
locations/bank.qsrc

@@ -53,7 +53,7 @@ if $ARGS[0] = 'start':
 					karta += kartaIN
 					money -= kartaIN
 
-					'<br>You deposited <<kartaIN>> <b>₽</b>, your account balance is now ' + iif(karta >= 0,'<<karta>>','<font color="red"><<karta>></font>') + ' <b>₽</b>.'
+					'<br>You deposited <<kartaIN>> <b>₽</b>, your account balance is now ' + iif(karta >= bankDebtLimit, '<<karta - bankDebtLimit>>', '<font color="red"><<bankDebtLimit - karta>></font>') + ' <b>₽</b>.'
 				end
 				killvar 'kartaIN'
 				gs 'stat'

+ 1 - 0
locations/dimaEv.qsrc

@@ -279,6 +279,7 @@ if $ARGS[0] = 'blackmail':
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npc_firstname[''A1'']>> <<$npc_lastname[''A1'']>></font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big1.jpg"></center>'
+	nodimkaK = 0
 	if dimkawarn = 1:
 		*clr & cla
 		minut += 5

+ 1 - 1
locations/pav_lake_nude.qsrc

@@ -52,7 +52,7 @@ if mid($start_type,1,2) = 'sg' and month >= 3 and month <= 8 and week >= 6 and h
 		act 'Run away': ivanfedorseennaked = daystart & gt 'pav_lake_nude'
 		act 'Greet them': ivanfedorseennaked = daystart & gt 'gschool_socialchg1', 'ivan_fedor_naked'
 	else
-		'You''re walking down the secluded beach, enjoying the tranquility when you suddenly hear someone running up behind you. Expecting the worst, you turn around only to see a sweaty <a href="exec:gt ''ivanfedorseennaked = daystart & gschool_socialchg1'', ''tIvan''">Ivan</a>, closely followed by <a href="exec:ivanfedorseennaked = daystart & gt ''gschool_socialchg1'', ''tFedor''">Feodor</a>.'
+		'You''re walking down the secluded beach, enjoying the tranquility when you suddenly hear someone running up behind you. Expecting the worst, you turn around only to see a sweaty <a href="exec:gt ivanfedorseennaked = daystart &''gt gschool_socialchg1'', ''tIvan''">Ivan</a>, closely followed by <a href="exec:ivanfedorseennaked = daystart & gt ''gschool_socialchg1'', ''tFedor''">Feodor</a>.'
 	end
 end