浏览代码

[fixed], [text edit], [removed]. Replaced "manna", "KGManna", "mannaV", "pcs_manna", "Manna" with "mana / Mana" respectively.

Deroc 5 年之前
父节点
当前提交
e60a63eeea
共有 49 个文件被更改,包括 271 次插入271 次删除
  1. 1 1
      locations/Cheatmenu_din.qsrc
  2. 1 1
      locations/KGOLboss.qsrc
  3. 10 10
      locations/KGOLenemy.qsrc
  4. 33 33
      locations/KGOLfight.qsrc
  5. 7 7
      locations/KGOLgame.qsrc
  6. 2 2
      locations/KGstart.qsrc
  7. 4 4
      locations/MagEncounterFairy.qsrc
  8. 4 4
      locations/Prostitute.qsrc
  9. 14 14
      locations/atakA.qsrc
  10. 14 14
      locations/atakA1.qsrc
  11. 4 4
      locations/atakB.qsrc
  12. 4 4
      locations/atakB1.qsrc
  13. 9 9
      locations/atakM.qsrc
  14. 1 1
      locations/bass.qsrc
  15. 2 2
      locations/before.qsrc
  16. 2 2
      locations/body_shape.qsrc
  17. 1 1
      locations/castSpell.qsrc
  18. 6 6
      locations/defence.qsrc
  19. 1 1
      locations/dimaRevenge.qsrc
  20. 3 3
      locations/dinSex2.qsrc
  21. 10 10
      locations/din_pav.qsrc
  22. 33 33
      locations/enemy.qsrc
  23. 17 17
      locations/fight.qsrc
  24. 2 2
      locations/gschool_grounds.qsrc
  25. 1 1
      locations/init.qsrc
  26. 8 8
      locations/kakuzu.qsrc
  27. 1 1
      locations/kisameQW.qsrc
  28. 10 10
      locations/lab.qsrc
  29. 1 1
      locations/lover_pref.qsrc
  30. 1 1
      locations/mainQW.qsrc
  31. 2 2
      locations/obj_din.qsrc
  32. 5 5
      locations/park.qsrc
  33. 2 2
      locations/parkivent.qsrc
  34. 1 1
      locations/preCUST.qsrc
  35. 3 3
      locations/preTG.qsrc
  36. 3 3
      locations/priziv.qsrc
  37. 2 2
      locations/sauna.qsrc
  38. 3 3
      locations/saunawhore.qsrc
  39. 2 2
      locations/sexm.qsrc
  40. 5 5
      locations/spell.qsrc
  41. 1 1
      locations/spellList.qsrc
  42. 1 1
      locations/stallion.qsrc
  43. 6 6
      locations/stat.qsrc
  44. 4 4
      locations/stat_display.qsrc
  45. 5 5
      locations/street_event.qsrc
  46. 2 2
      locations/succubus.qsrc
  47. 14 14
      locations/test.qsrc
  48. 1 1
      locations/treeCircle.qsrc
  49. 2 2
      locations/version.qsrc

+ 1 - 1
locations/Cheatmenu_din.qsrc

@@ -521,7 +521,7 @@ $cheatmenu['state'] = {
 	'<a href="exec:pcs_horny = 0 & dynamic $cheatmenu[''state''] & gs ''stat''">Min arousal</a>'
 	'<a href="exec:dynamic $cheatmenu[''bodyMod'']">Body Modification</a>'
 	*nl
-	'<a href="exec:pcs_health = pcs_vital*10 + pcs_stren*5+1000 & pcs_willpwr = pcs_intel*5 + will*5+1000 & pcs_manna = (pcs_intel*pcs_magik) + pcs_magik*100 + pcs_vital*10 + rikudo & vgape = 0 & agape = 0 & nippain = 0 & dynamic $cheatmenu[''state''] & gs ''stat''">Full restoration of Health, Manna, Reason.</a>'
+	'<a href="exec:pcs_health = pcs_vital*10 + pcs_stren*5+1000 & pcs_willpwr = pcs_intel*5 + will*5+1000 & pcs_mana = (pcs_intel*pcs_magik) + pcs_magik*100 + pcs_vital*10 + rikudo & vgape = 0 & agape = 0 & nippain = 0 & dynamic $cheatmenu[''state''] & gs ''stat''">Full restoration of Health, Mana, Reason.</a>'
 	'<a href="exec:pcs_sleep = 100 & pcs_stam = stammax & pcs_mood = 100 & dynamic $cheatmenu[''state''] & gs ''stat''">Full restoration of Sleep, Stamina, Mood.</a>'
 	'<a href="exec:pcs_energy = 200 & pcs_hydra = 200 & dynamic $cheatmenu[''state''] & gs ''stat''">Full restoration of Hunger and Water.</a>'
 	'<a href="exec:dynamic $cheatmenu[''money''] & gs ''stat''">Change money</a>'

+ 1 - 1
locations/KGOLboss.qsrc

@@ -6,7 +6,7 @@ if $ARGS[0] = '1':
 	KGOLvitalV = 100
 	KGOLintelV = 10
 	KGHPV = KGOLvitalV * 10
-	KGMannaV = KGOLintelV * 10
+	KGManaV = KGOLintelV * 10
 	KGOLPrizeExp = rand(25, 50)
 	KGOLPrizeM = rand(150, 350)
 	KGOLennumBoss = 1

+ 10 - 10
locations/KGOLenemy.qsrc

@@ -6,7 +6,7 @@ if $ARGS[0] = '0':
 	KGOLvitalV = 10
 	KGOLintelV = 10
 	KGHPV = KGOLvitalV * 10
-	KGMannaV = KGOLintelV * 10
+	KGManaV = KGOLintelV * 10
 	KGOLPrizeExp = rand(1, 3)
 	KGOLPrizeM = rand(10, 30)
 	KGOLennum = 0
@@ -22,7 +22,7 @@ if $ARGS[0] = '1':
 	KGOLvitalV = 10
 	KGOLintelV = 10
 	KGHPV = KGOLvitalV * 10
-	KGMannaV = KGOLintelV * 10
+	KGManaV = KGOLintelV * 10
 	KGOLPrizeExp = rand(2, 5)
 	KGOLPrizeM = rand(15, 35)
 	KGOLennum = 1
@@ -38,7 +38,7 @@ if $ARGS[0] = '2':
 	KGOLvitalV = 10
 	KGOLintelV = 10
 	KGHPV = KGOLvitalV * 10
-	KGMannaV = KGOLintelV * 10
+	KGManaV = KGOLintelV * 10
 	KGOLPrizeExp = rand(3, 7)
 	KGOLPrizeM = rand(20, 40)
 	KGOLennum = 2
@@ -54,7 +54,7 @@ if $ARGS[0] = '3':
 	KGOLvitalV = 20
 	KGOLintelV = 10
 	KGHPV = KGOLvitalV * 10
-	KGMannaV = KGOLintelV * 10
+	KGManaV = KGOLintelV * 10
 	KGOLPrizeExp = rand(5, 10)
 	KGOLPrizeM = rand(30, 50)
 	KGOLennum = 3
@@ -70,7 +70,7 @@ if $ARGS[0] = '4':
 	KGOLvitalV = 20
 	KGOLintelV = 10
 	KGHPV = KGOLvitalV * 10
-	KGMannaV = KGOLintelV * 10
+	KGManaV = KGOLintelV * 10
 	KGOLPrizeExp = rand(7, 14)
 	KGOLPrizeM = rand(35, 60)
 	KGOLennum = 4
@@ -86,7 +86,7 @@ if $ARGS[0] = '5':
 	KGOLvitalV = 25
 	KGOLintelV = 10
 	KGHPV = KGOLvitalV * 10
-	KGMannaV = KGOLintelV * 10
+	KGManaV = KGOLintelV * 10
 	KGOLPrizeExp = rand(10, 18)
 	KGOLPrizeM = rand(40, 65)
 	KGOLennum = 5
@@ -102,7 +102,7 @@ if $ARGS[0] = '6':
 	KGOLvitalV = 35
 	KGOLintelV = 10
 	KGHPV = KGOLvitalV * 10
-	KGMannaV = KGOLintelV * 10
+	KGManaV = KGOLintelV * 10
 	KGOLPrizeExp = rand(12, 20)
 	KGOLPrizeM = rand(45, 65)
 	KGOLennum = 6
@@ -118,7 +118,7 @@ if $ARGS[0] = '7':
 	KGOLvitalV = 35
 	KGOLintelV = 10
 	KGHPV = KGOLvitalV * 10
-	KGMannaV = KGOLintelV * 10
+	KGManaV = KGOLintelV * 10
 	KGOLPrizeExp = rand(14, 22)
 	KGOLPrizeM = rand(50, 70)
 	KGOLennum = 7
@@ -134,7 +134,7 @@ if $ARGS[0] = '8':
 	KGOLvitalV = 40
 	KGOLintelV = 10
 	KGHPV = KGOLvitalV * 10
-	KGMannaV = KGOLintelV * 10
+	KGManaV = KGOLintelV * 10
 	KGOLPrizeExp = rand(16, 24)
 	KGOLPrizeM = rand(55, 75)
 	KGOLennum = 8
@@ -150,7 +150,7 @@ if $ARGS[0] = '9':
 	KGOLvitalV = 40
 	KGOLintelV = 10
 	KGHPV = KGOLvitalV * 10
-	KGMannaV = KGOLintelV * 10
+	KGManaV = KGOLintelV * 10
 	KGOLPrizeExp = rand(18, 20)
 	KGOLPrizeM = rand(60, 85)
 	KGOLennum = 9

+ 33 - 33
locations/KGOLfight.qsrc

@@ -42,8 +42,8 @@ if unvis > 0:'You are invisible'
 if poison > 0:poison -= 1 & KGHPV -= KGOLspell4 * 10 & 'The poison causes damage to the enemy <<KGOLspell4 * 10>>'
 if firecircle > 0:firecircle -= 1 & KGHPV -= KGOLspell9 * 50 & 'Circle of fire causes damage to the enemy <<KGOLspell9 * 50>>'
 
-'Life <<KGHP>>, the manna <<KGManna>>'
-'<<$KGname>> Life <<KGHPV>>manna <<KGMannaV>>'
+'Life <<KGHP>>, the mana <<KGMana>>'
+'<<$KGname>> Life <<KGHPV>>mana <<KGManaV>>'
 
 if KGOLhirka > 0:'Hirka can restore automatically <<KGOLhirka>> health units'
 if otkathirki > 0:'Hirka retrace through <<otkathirki>> moves.'
@@ -58,7 +58,7 @@ if KGHP <= 0:
 	KGOLloss += 1
 	poison = 0
 	firecircle = 0
-	pcs_manna -= 100
+	pcs_mana -= 100
 	'You lost the fight'
 
 	act 'Go to Rep.':gt 'KGOLgame'
@@ -72,7 +72,7 @@ if KGHPV <= 0:
 	KGOLWin += 1
 	KGOLmoney += KGOLPrizeM
 	KGOLexp += KGOLPrizeExp
-	pcs_manna += 100
+	pcs_mana += 100
 	'<<$KGname>> fell. You win the fight.'
 	'You got <<KGOLPrizeM>> coins and <<KGOLPrizeExp>> experience'
 
@@ -121,10 +121,10 @@ KGOLini = rand(KGOLspeed / 2, KGOLspeed * 2)
 					act 'Further':gt $curloc
 				end
 
-				if KGOLspell > 0 and KGManna >= KGOLspell * 10:
-					act 'Powerful blow (<<KGOLspell * 10>> manna)':
+				if KGOLspell > 0 and KGMana >= KGOLspell * 10:
+					act 'Powerful blow (<<KGOLspell * 10>> mana)':
 						cla
-						KGManna -= KGOLspell
+						KGMana -= KGOLspell
 						KGOLpower = KGOLstren + KGOLwpower+(KGOLspell * 100)
 						dynamic $KGOLatk
 
@@ -132,10 +132,10 @@ KGOLini = rand(KGOLspeed / 2, KGOLspeed * 2)
 					end
 				end
 
-				if KGOLspell2 > 0 and KGManna >= KGOLspell2 * 10:
-					act 'Multiple shot (<<KGOLspell2 * 10>> manna)':
+				if KGOLspell2 > 0 and KGMana >= KGOLspell2 * 10:
+					act 'Multiple shot (<<KGOLspell2 * 10>> mana)':
 						cla
-						KGManna -= KGOLspell2
+						KGMana -= KGOLspell2
 						KGOLpower = KGOLstren + KGOLwpower
 						KGLOloop = KGOLspell2 + 1
 						dynamic $KGOLatkKGOLspell2
@@ -144,10 +144,10 @@ KGOLini = rand(KGOLspeed / 2, KGOLspeed * 2)
 					end
 				end
 
-				if KGOLspell3 > 0 and KGManna >= KGOLspell3 * 10 and KGOLcooldown <= 0:
-					act 'Increase armor (<<KGOLspell3 * 10>> manna)':
+				if KGOLspell3 > 0 and KGMana >= KGOLspell3 * 10 and KGOLcooldown <= 0:
+					act 'Increase armor (<<KGOLspell3 * 10>> mana)':
 						cla
-						KGManna -= KGOLspell3
+						KGMana -= KGOLspell3
 						KGOLbronaMod += KGOLspell3 * 5
 						KGOLtimer += KGOLspell3 + 1
 						KGOLcooldown += KGOLspell3 + 3
@@ -168,10 +168,10 @@ KGOLini = rand(KGOLspeed / 2, KGOLspeed * 2)
 					act 'Further':gt $curloc
 				end
 
-				if KGOLspell4 > 0 and KGManna >= KGOLspell4 * 10:
-					act 'Sneaky shot (<<KGOLspell4 * 10>> manna)':
+				if KGOLspell4 > 0 and KGMana >= KGOLspell4 * 10:
+					act 'Sneaky shot (<<KGOLspell4 * 10>> mana)':
 						cla
-						KGManna -= KGOLspell4
+						KGMana -= KGOLspell4
 						KGOLpower = KGOLstren + KGOLwpower+(KGOLspell5 * 100)
 						dynamic $KGOLatk
 
@@ -179,10 +179,10 @@ KGOLini = rand(KGOLspeed / 2, KGOLspeed * 2)
 					end
 				end
 
-				if KGOLspell5 > 0 and KGManna >= KGOLspell5 * 10:
-					act 'Poison Blade (<<KGOLspell5 * 10>>manna)':
+				if KGOLspell5 > 0 and KGMana >= KGOLspell5 * 10:
+					act 'Poison Blade (<<KGOLspell5 * 10>>mana)':
 						cla
-						KGManna -= KGOLspell5
+						KGMana -= KGOLspell5
 						KGOLpower = KGOLstren + KGOLwpower
 						dynamic $KGOLatkPoison
 
@@ -190,10 +190,10 @@ KGOLini = rand(KGOLspeed / 2, KGOLspeed * 2)
 					end
 				end
 
-				if KGOLspell6 > 0 and KGManna >= KGOLspell6 * 10 and KGOLcooldown <= 0:
-					act 'Invisibility (<<KGOLspell6 * 10>> manna)':
+				if KGOLspell6 > 0 and KGMana >= KGOLspell6 * 10 and KGOLcooldown <= 0:
+					act 'Invisibility (<<KGOLspell6 * 10>> mana)':
 						cla
-						KGManna -= KGOLspell6
+						KGMana -= KGOLspell6
 						unvis += KGOLspell6 + 1
 						KGOLcooldown += KGOLspell6 + 3
 
@@ -211,10 +211,10 @@ KGOLini = rand(KGOLspeed / 2, KGOLspeed * 2)
 				act 'Further':gt $curloc
 			end
 
-			if KGOLspell7 > 0 and KGManna >= KGOLspell7 * 10:
-				act 'Faerboll (<<KGOLspell7 * 10>> manna)':
+			if KGOLspell7 > 0 and KGMana >= KGOLspell7 * 10:
+				act 'Faerboll (<<KGOLspell7 * 10>> mana)':
 					cla
-					KGManna -= KGOLspell7
+					KGMana -= KGOLspell7
 					KGOLpower = rand(KGOLspell7 * 100, KGOLspell7 * 200)
 					dynamic $KGOLatkFB
 
@@ -222,10 +222,10 @@ KGOLini = rand(KGOLspeed / 2, KGOLspeed * 2)
 				end
 			end
 
-			if KGOLspell8 > 0 and KGManna >= KGOLspell8 * 10:
-				act 'Dropping (<<KGOLspell5 * 10>> manna)':
+			if KGOLspell8 > 0 and KGMana >= KGOLspell8 * 10:
+				act 'Dropping (<<KGOLspell5 * 10>> mana)':
 					cla
-					KGManna -= KGOLspell5
+					KGMana -= KGOLspell5
 					KGOLdist += rand(KGOLspell5 * 10, KGOLspell5 * 50)
 					'You flung the enemy and now the distance between you <<KGOLdist>> meter'
 
@@ -233,10 +233,10 @@ KGOLini = rand(KGOLspeed / 2, KGOLspeed * 2)
 				end
 			end
 
-			if KGOLspell9 > 0 and KGManna >= KGOLspell9 * 10 and KGOLcooldown <= 0:
-				act 'Circle of fire (<<KGOLspell9 * 10>> manna)':
+			if KGOLspell9 > 0 and KGMana >= KGOLspell9 * 10 and KGOLcooldown <= 0:
+				act 'Circle of fire (<<KGOLspell9 * 10>> mana)':
 					cla
-					KGManna -= KGOLspell9
+					KGMana -= KGOLspell9
 					firecircle += KGOLspell9 + 1
 					KGOLcooldown += KGOLspell9 + 3
 					'Everything around you is burning hellfire'
@@ -296,9 +296,9 @@ KGOLini = rand(KGOLspeed / 2, KGOLspeed * 2)
 	end
 
 	if KGOLpotionM > 0:
-		act 'Drink the potion manna':
+		act 'Drink the potion mana':
 			KGOLpotionM -= 1
-			KGManna += 100
+			KGMana += 100
 			gt $curloc
 		end
 	end

+ 7 - 7
locations/KGOLgame.qsrc

@@ -19,7 +19,7 @@ $KGOLstat = {
 	'<center>Equipment</center>'
 
 	if KGOLpotionH > 0:pl 'Health potions <<KGOLpotionH>> pieces. <a href="exec:KGOLpotionH -= 1 & KGHP += 100 & gs ''stat'' & gt $curloc"><font color="red">Drink.</font></a>'
-	if KGOLpotionM > 0:pl 'Mana potions <<KGOLpotionM>> pieces. <a href="exec:KGOLpotionM -= 1 & KGManna += 100 & gs ''stat'' & gt $curloc"><font color="red">Drink.</font></a>'
+	if KGOLpotionM > 0:pl 'Mana potions <<KGOLpotionM>> pieces. <a href="exec:KGOLpotionM -= 1 & KGMana += 100 & gs ''stat'' & gt $curloc"><font color="red">Drink.</font></a>'
 
 	'<center>PVE</center>'
 	'Ratio <<KGOLWin>>, losses <<KGOLLoss>>'
@@ -40,10 +40,10 @@ if KGOLset3 = 0:$KGOLset3 = 'Simple shoes on his feet'
 if KGOLset4 = 0:$KGOLset4 = 'No gloves on hands'
 if KGOLset5 = 0:$KGOLset5 = 'No weapon'
 KGHPMAX = KGOLvital * 10
-KGMannaMax = KGOLintel * 10
+KGManaMax = KGOLintel * 10
 
 if KGHP > KGHPMAX:KGHP = KGHPMAX
-if KGManna > KGMannaMax:KGManna = KGMannaMax
+if KGMana > KGManaMax:KGMana = KGManaMax
 
 KGOLbrona -= KGOLbronaMod
 KGOLbronaMod = 0
@@ -77,10 +77,10 @@ gs 'KGOLexpa'
 '<a href="exec:gt ''KGstart''">Get out of the game</a>'
 '<a href="exec:dynamic $KGOLstat">View Statistics</a>'
 '<<$KGOLname>> <<$KGOLrace>> <<$KGOLklass>> <<KGOLlvl>> level'
-'Life <<KGHP>>, the manna <<KGManna>>'
+'Life <<KGHP>>, the mana <<KGMana>>'
 
 if KGHP < KGHPMAX:'You''ve got <<KGHP*100/KGHPMAX>>% of life'
-if KGManna < KGMannaMax:'You''ve got <<KGManna*100/KGMannaMax>>% of manna'
+if KGMana < KGManaMax:'You''ve got <<KGMana*100/KGManaMax>>% of mana'
 if KGOLhirka > 0:'Hirka can restore automatically <<KGOLhirka>> health units'
 if KGOLPrizeM > 0:'You have <<KGOLmoney>> coins'
 if KGOLneedExp <= 0:'<a href="exec:dynamic $KGOLrise"><font color="red">You need to increase the level.</font></a>'
@@ -204,12 +204,12 @@ act 'Go to the store':
 	act 'Leave':gt $curloc
 end
 
-if KGHP < KGHPMAX or KGManna < KGMannaMax:
+if KGHP < KGHPMAX or KGMana < KGManaMax:
 	act 'Regenerate (1:00)':
 		cls
 		minut += 60
 		KGHP = KGHPMAX
-		KGManna = KGMannaMax
+		KGMana = KGManaMax
 		'It was very sad. You''ve been sitting for an hour to regenerate your character. But free.'
 
 		act 'Leave':gt $curloc

+ 2 - 2
locations/KGstart.qsrc

@@ -1,4 +1,4 @@
-# KGstart
+# KGstart
 $KGOLklassvibor = {
 	cls
 	'You must select a character class.'
@@ -61,7 +61,7 @@ $KGOLklassvibor2 = {
 	end
 
 	KGHP = KGOLvital * 10
-	KGManna = KGOLintel * 10
+	KGMana = KGOLintel * 10
 
 	act 'Play':KGOLpers = 1 & gt 'KGOLgame'
 

+ 4 - 4
locations/MagEncounterFairy.qsrc

@@ -8,8 +8,8 @@ if $ARGS[0] = '':
 			act 'Look for the fairy to chat': gt 'MagEncounterFairy', 'fairy_chat'
 			act 'Just be on your way': gt $loc, $metka
 		else
-			if pcs_manna >= ((pcs_intel * pcs_magik + pcs_magik * 100 + pcs_vital * 10 + rikudo) / 2): act 'Be nice and chat with the fairy': gt 'MagEncounterFairy', 'fairy_chat'
-			if pcs_manna >= ((pcs_intel * pcs_magik + pcs_magik * 100 + pcs_vital * 10 + rikudo) / 4): act 'Just ignore the fairy': gt $loc, $metka
+			if pcs_mana >= ((pcs_intel * pcs_magik + pcs_magik * 100 + pcs_vital * 10 + rikudo) / 2): act 'Be nice and chat with the fairy': gt 'MagEncounterFairy', 'fairy_chat'
+			if pcs_mana >= ((pcs_intel * pcs_magik + pcs_magik * 100 + pcs_vital * 10 + rikudo) / 4): act 'Just ignore the fairy': gt $loc, $metka
 			act 'Shoo the pesky fairy away': gt 'MagEncounterFairy', 'fairy_shoo'
 		end
 	elseif pcs_magik + rand (1,10) >= 8:
@@ -34,7 +34,7 @@ if $ARGS[0] = 'fairy_chat_no1':
 		cla
 		minut += 30
 		fairychat = 1
-		pcs_manna += 25 * pcs_magik
+		pcs_mana += 25 * pcs_magik
 		pcs_mood += 15
 		gs 'stat'
 		'You chat with the fairy. At first it feels strange to talk with a creature, you thought was a myth from children''s books. More so, since the small beautiful woman flutters in front of your face the whole time. But the fairy is so amicable that half hour has passed before you even notice.'
@@ -92,7 +92,7 @@ if $ARGS[0] = 'fairy_chat':
 			fairyshoo -= 1
 		end
 		fairychat += 1
-		pcs_manna += 25 * pcs_magik
+		pcs_mana += 25 * pcs_magik
 		pcs_mood += 15
 		gs 'MagEncounterFairy', 'fairychattopic'
 		if pcs_skin < 80 and fairyday ! daystart and fairyshoo = 0:

+ 4 - 4
locations/Prostitute.qsrc

@@ -1,4 +1,4 @@
-# Prostitute
+# Prostitute
 $location_type = 'public_outdoors'
 
 if $ARGS[0] = 'start':
@@ -51,7 +51,7 @@ if $ARGS[0] = 'start':
 				shootV = 10
 				!!parameters
 				healthV = vitalV * 10 + strenV * 5
-				mannaV = intelV * 10 + magikV * 10
+				manaV = intelV * 10 + magikV * 10
 				willpowerV = willV * 10
 				BonusAtakV = 0
 				BonusDefV = 0
@@ -143,7 +143,7 @@ if $ARGS[0] = 'start':
 								shootV = 10
 								!!parameters
 								healthV = vitalV * 10 + strenV * 5
-								mannaV = intelV * 10 + magikV * 10
+								manaV = intelV * 10 + magikV * 10
 								willpowerV = willV * 10
 								BonusAtakV = 0
 								BonusDefV = 0
@@ -198,7 +198,7 @@ if $ARGS[0] = 'start':
 								shootV = 10
 								!!parameters
 								healthV = vitalV * 10 + strenV * 5
-								mannaV = intelV * 10 + magikV * 10
+								manaV = intelV * 10 + magikV * 10
 								willpowerV = willV * 10
 								BonusAtakV = 0
 								BonusDefV = 0

+ 14 - 14
locations/atakA.qsrc

@@ -68,13 +68,13 @@ if $ARGS[0] = 'damage':
 		healthV = healthV - damage
 
 		if damTipM > 0:
-			mannaV = mannaV - damageM
-			pcs_manna = pcs_manna + damageM
+			manaV = manaV - damageM
+			pcs_mana = pcs_mana + damageM
 
-			'<b><font color = green>You swallowed <<damageM>> manna enemy units.</font></b>'
+			'<b><font color = green>You swallowed <<damageM>> mana enemy units.</font></b>'
 		end
 
-		!pcs_manna = pcs_manna - damageM
+		!pcs_mana = pcs_mana - damageM
 
 		if eleSh > 0:
 			stunV = RAND(eleSh,eleSh*3)
@@ -83,7 +83,7 @@ if $ARGS[0] = 'damage':
 		end
 
 		'<b><font color = green>You have caused damage <<damage>> units</font></b>'
-		!'<b><font color = red>Your manna harmed <<damageM>> units</font></b>'
+		!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
 
 		if zerkaloV > 0:
 			zerkaloV = zerkaloV - 1
@@ -128,15 +128,15 @@ if $ARGS[0] = 'damage':
 
 			xgt'fight','sta'
 		elseif barierV < damage:
-			!pcs_manna = pcs_manna - damageM
+			!pcs_mana = pcs_mana - damageM
 			!pcs_health = pcs_health - damage
 			damage = damage - barierV
 			healthV = healthV - damage
 
 			if damTipM > 0:
-				mannaV = mannaV - damageM
-				pcs_manna = pcs_manna + damageM
-				'<b><font color = green>You swallowed <<damageM>> manna enemy units.</font></b>'
+				manaV = manaV - damageM
+				pcs_mana = pcs_mana + damageM
+				'<b><font color = green>You swallowed <<damageM>> mana enemy units.</font></b>'
 			end
 
 			if eleSh > 0:
@@ -145,7 +145,7 @@ if $ARGS[0] = 'damage':
 			end
 
 			'<b><font color = green>You have caused damage <<damage>> units</font></b>'
-			!'<b><font color = red>Your manna harmed <<damageM>> units</font></b>'
+			!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
 
 			if zerkaloV > 0:
 				zerkaloV = zerkaloV - 1
@@ -213,10 +213,10 @@ if $ARGS[0] = 'damageW':
 		if dospehV > 0:damageV = damageV - dospehDefV & dospehEn = dospehEn - 1
 		if damage < 0:damage = 0
 		healthV = healthV - damage
-		mannaV = mannaV - damageM
+		manaV = manaV - damageM
 
 		'<b><font color = green>You harmed <<damage>> units</font></b>'
-		'<b><font color = green>You have caused damage to the enemy manna <<damageM>> units</font></b>'
+		'<b><font color = green>You have caused damage to the enemy mana <<damageM>> units</font></b>'
 
 		if zerkaloV > 0:
 			zerkaloV = zerkaloV - 1
@@ -261,12 +261,12 @@ if $ARGS[0] = 'damageW':
 
 			xgt'fight','sta'
 		elseif barierV < damage:
-			mannaV = mannaV - damageM
+			manaV = manaV - damageM
 			healthV = healthV - damage
 			!healthV = healthV - damage
 
 			'<b><font color = green>You have caused damage <<damage>> units</font></b>'
-			'<b><font color = green>You have caused damage to the enemy manna <<damageM>> units</font></b>'
+			'<b><font color = green>You have caused damage to the enemy mana <<damageM>> units</font></b>'
 
 			if zerkaloV > 0:
 				zerkaloV = zerkaloV - 1

+ 14 - 14
locations/atakA1.qsrc

@@ -76,10 +76,10 @@ if $ARGS[0] = 'damage':
 		end
 
 		if damTipMV > 0:
-			pcs_manna = pcs_manna - damageM
-			pcs_manna = pcs_manna + damageM
+			pcs_mana = pcs_mana - damageM
+			pcs_mana = pcs_mana + damageM
 
-			'<b><font color = red><<$boydesc>> swallowed <<damageM>> Units manna you.</font></b>'
+			'<b><font color = red><<$boydesc>> swallowed <<damageM>> Units mana you.</font></b>'
 		end
 
 		if poisonAV = 1:
@@ -88,7 +88,7 @@ if $ARGS[0] = 'damage':
 			'<b><font color = red><<$boydesc>> hit the needle poisoned you.</font></b>'
 		end
 
-		!pcs_manna = pcs_manna - damageM
+		!pcs_mana = pcs_mana - damageM
 
 		if eleShV > 0:
 			stun = RAND(eleShV,eleShV*3)
@@ -97,7 +97,7 @@ if $ARGS[0] = 'damage':
 		end
 
 		'<b><font color = red><<$boydesc>> Damage caused to you <<damage>> units</font></b>'
-		!'<b><font color = red>Your manna harmed <<damageM>> units</font></b>'
+		!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
 
 		if zerkalo > 0:
 			zerkalo = zerkalo - 1
@@ -142,15 +142,15 @@ if $ARGS[0] = 'damage':
 
 			xgt'fight','sta'
 		elseif barier < damage:
-			!pcs_manna = pcs_manna - damageM
+			!pcs_mana = pcs_mana - damageM
 			!pcs_health = pcs_health - damage
 			pcs_health = pcs_health - damage
 
 			if damTipM > 0:
-				pcs_manna = pcs_manna - damageM
-				mannaV = mannaV + damageM
+				pcs_mana = pcs_mana - damageM
+				manaV = manaV + damageM
 
-				'<b><font color = green>You swallowed <<damageM>> manna enemy units.</font></b>'
+				'<b><font color = green>You swallowed <<damageM>> mana enemy units.</font></b>'
 			end
 
 			if eleShV > 0:
@@ -166,7 +166,7 @@ if $ARGS[0] = 'damage':
 			end
 
 			'<b><font color = red>You have caused damage <<damage>> units</font></b>'
-			!'<b><font color = red>Your manna harmed <<damageM>> units</font></b>'
+			!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
 
 			if zerkalo > 0:
 				zerkalo = zerkalo - 1
@@ -235,10 +235,10 @@ if $ARGS[0] = 'damageW':
 		if dospeh > 0:damage = damage - dospehDef & dospehEn = dospehEn - 1
 		if damage < 0:damage = 0
 		pcs_health = pcs_health - damage
-		pcs_manna = pcs_manna - damageM
+		pcs_mana = pcs_mana - damageM
 
 		'<b><font color = green>You harmed <<damage>> units</font></b>'
-		'<b><font color = green>You have caused damage to the enemy manna <<damageM>> units</font></b>'
+		'<b><font color = green>You have caused damage to the enemy mana <<damageM>> units</font></b>'
 
 		if zerkalo > 0:
 			zerkalo = zerkalo - 1
@@ -282,12 +282,12 @@ if $ARGS[0] = 'damageW':
 
 			xgt'fight','sta'
 		elseif barier < damage:
-			pcs_manna = pcs_manna - damageM
+			pcs_mana = pcs_mana - damageM
 			pcs_health = pcs_health - damage
 			!healthV = healthV - damage
 
 			'<b><font color = green>You have caused damage <<damage>> units</font></b>'
-			'<b><font color = green>You have caused damage to the enemy manna <<damageM>> units</font></b>'
+			'<b><font color = green>You have caused damage to the enemy mana <<damageM>> units</font></b>'
 
 			if zerkalo > 0:
 				zerkalo = zerkalo - 1

+ 4 - 4
locations/atakB.qsrc

@@ -54,7 +54,7 @@ if $ARGS[0] = 'damage':
 		if dospehV > 0:damageV = damageV - dospehDefV & dospehEn = dospehEn - 1
 		if damage < 0:damage = 0
 		healthV = healthV - damage
-		!pcs_manna = pcs_manna - damageM
+		!pcs_mana = pcs_mana - damageM
 
 		if eleSh > 0:
 			stunV = RAND(eleSh,eleSh*3)
@@ -63,7 +63,7 @@ if $ARGS[0] = 'damage':
 		end
 
 		'<b><font color = green>You have caused damage <<damage>> units</font></b>'
-		!'<b><font color = red>Your manna harmed <<damageM>> units</font></b>'
+		!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
 
 		if zerkaloV > 0:
 			zerkaloV = zerkaloV - 1
@@ -108,7 +108,7 @@ if $ARGS[0] = 'damage':
 
 			!xgt'fight','sta'
 		elseif barierV < damage:
-			!pcs_manna = pcs_manna - damageM
+			!pcs_mana = pcs_mana - damageM
 			!pcs_health = pcs_health - damage
 			healthV = healthV - damage
 
@@ -119,7 +119,7 @@ if $ARGS[0] = 'damage':
 			end
 
 			'<b><font color = green>Your defense caused damage <<damage>> units</font></b>'
-			!'<b><font color = red>Your manna harmed <<damageM>> units</font></b>'
+			!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
 
 			if zerkaloV > 0:
 				zerkaloV = zerkaloV - 1

+ 4 - 4
locations/atakB1.qsrc

@@ -54,7 +54,7 @@ if $ARGS[0] = 'damage':
 		if dospeh > 0:damage = damage - dospehDefV & dospehEn = dospehEn - 1
 		if damage < 0:damage = 0
 		pcs_health = pcs_health - damage
-		!pcs_manna = pcs_manna - damageM
+		!pcs_mana = pcs_mana - damageM
 
 		if eleShV > 0:
 			stun = RAND(eleShV,eleShV*3)
@@ -63,7 +63,7 @@ if $ARGS[0] = 'damage':
 		end
 
 		'<b><font color = red>Defense caused you damage <<damage>> units</font></b>'
-		!'<b><font color = red>Your manna harmed <<damageM>> units</font></b>'
+		!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
 
 		if zerkalo > 0:
 			zerkalo = zerkalo - 1
@@ -108,7 +108,7 @@ if $ARGS[0] = 'damage':
 
 			!xgt'fight','sta'
 		elseif barier < damage:
-			!pcs_manna = pcs_manna - damageM
+			!pcs_mana = pcs_mana - damageM
 			!pcs_health = pcs_health - damage
 			pcs_health = pcs_health - damage
 
@@ -119,7 +119,7 @@ if $ARGS[0] = 'damage':
 			end
 
 			'<b><font color = red>You harmed <<damage>> units of the defense</font></b>'
-			!'<b><font color = red>Your manna harmed <<damageM>> units</font></b>'
+			!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
 
 			if zerkalo > 0:
 				zerkalo = zerkalo - 1

+ 9 - 9
locations/atakM.qsrc

@@ -2,7 +2,7 @@
 
 menu_off = 1
 
-if $ARGS[0] = 'atakVmanna':
+if $ARGS[0] = 'atakVmana':
 	cla
 	!payment hit dodge
 	poSp = speedV*20/100
@@ -43,10 +43,10 @@ if $ARGS[0] = 'uronKritV':
 		if dospeh > 0:damage = damage - dospehDef & dospehEn = dospehEn - 1
 		if damage < 0:damage = 0
 		pcs_health = pcs_health - damage
-		pcs_manna = pcs_manna - damageM
+		pcs_mana = pcs_mana - damageM
 
 		'<b><font color = red>Your health harmed <<damage>> units</font></b>'
-		'<b><font color = red>Your manna harmed <<damageM>> units</font></b>'
+		'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
 
 		if zerkalo > 0:
 			zerkalo = zerkalo - 1
@@ -90,11 +90,11 @@ if $ARGS[0] = 'uronKritV':
 
 			xgt'fight','sta'
 		elseif barier < damage:
-			pcs_manna = pcs_manna - damageM
+			pcs_mana = pcs_mana - damageM
 			pcs_health = pcs_health - damage
 
 			'<b><font color = red>You harmed <<damage>> units</font></b>'
-			'<b><font color = red>Your manna harmed <<damageM>> units</font></b>'
+			'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
 
 			if zerkalo > 0:
 				zerkalo = zerkalo - 1
@@ -117,10 +117,10 @@ if $ARGS[0] = 'uronV':
 		if dospeh > 0:damage = damage - dospehDef & dospehEn = dospehEn - 1
 		if damage < 0:damage = 0
 		pcs_health = pcs_health - damage
-		pcs_manna = pcs_manna - damageM
+		pcs_mana = pcs_mana - damageM
 
 		'<b><font color = red>Your health harmed <<damage>> units</font></b>'
-		'<b><font color = red>Your manna harmed <<damageM>> units</font></b>'
+		'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
 
 		if zerkalo > 0:
 			zerkalo = zerkalo - 1
@@ -164,11 +164,11 @@ if $ARGS[0] = 'uronV':
 
 			xgt'fight','sta'
 		elseif barier < damage:
-			pcs_manna = pcs_manna - damageM
+			pcs_mana = pcs_mana - damageM
 			pcs_health = pcs_health - damage
 
 			'<b><font color = red>You harmed <<damage>> units</font></b>'
-			'<b><font color = red>Your manna harmed <<damageM>> units</font></b>'
+			'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
 
 			if zerkalo > 0:
 				zerkalo = zerkalo - 1

+ 1 - 1
locations/bass.qsrc

@@ -92,7 +92,7 @@ if $ARGS[0] = 'a':
 			shootV = 100
 			!!parameters
 			healthV = vitalV * 10 + strenV * 5
-			mannaV = intelV * magikV + magikV * 100 + vitalV * 10
+			manaV = intelV * magikV + magikV * 100 + vitalV * 10
 			willpowerV = willV * 10
 			BonusAtakV = 0
 			BonusDefV = 0

+ 2 - 2
locations/before.qsrc

@@ -19,12 +19,12 @@ if stunV > 0:'<font color = green><<$boydesc>> is still stunned and unable to mo
 
 if unmaterialV > 0:
 	unmaterialV = unmaterialV - 1
-	mannaV = mannaV - 20
+	manaV = manaV - 20
 end
 
 if unmaterial > 0:
 	unmaterial = unmaterial - 1
-	pcs_manna = pcs_manna - 20
+	pcs_mana = pcs_mana - 20
 
 	'<font color = green>You''re unable to withstand the most <<unmaterial>> moves.</font>'
 end

+ 2 - 2
locations/body_shape.qsrc

@@ -144,14 +144,14 @@ if $ARGS[0] = '':
 		jump 'salocatloop'
 	end
 
-	if salobustdo = 0 and magf2bdo = 1 and salocatnow > salocatlast and pcs_manna >= mannamax / 2:
+	if salobustdo = 0 and magf2bdo = 1 and salocatnow > salocatlast and pcs_mana >= manamax / 2:
 		if sftrstflag = 0:'<b>Your breasts seem fuller.</b>'
 		magicf2b += 1
 		salo -= 3
 		salobustdo = 1
 		if magicf2b >= 2 + magtarcup * 5: magf2bdo = 0
 		if pcs_magik < 20:
-			pcs_manna -= 2000 / pcs_magik
+			pcs_mana -= 2000 / pcs_magik
 		else
 			mana -= 100
 		end

+ 1 - 1
locations/castSpell.qsrc

@@ -54,7 +54,7 @@ if spellKnown[$SpellID] = 1:
 	else
 		manaCost = spellMana[$SpellID]
 	end
-	pcs_manna -= manaCost
+	pcs_mana -= manaCost
 	!pcs_willpwr -= spellWill[$SpellID]
 	arouseVal = manaCost / 50
 	gs 'arousal', 'voyeur', arouseVal

+ 6 - 6
locations/defence.qsrc

@@ -27,7 +27,7 @@ if defenceAct > 0:
 	defence += defenceActPar
 	defenceAct -= 1
 	defActParK = defenceActPar/100
-	pcs_manna -= defActParK
+	pcs_mana -= defActParK
 	'<b><font color="green">Regeneration consumes <<defActParK>> units of mana.</font></b>'
 end
 
@@ -35,20 +35,20 @@ if defenceActM > 0:
 	defenceM += defenceActParM
 	defenceActM -= 1
 	defActParKM = defenceActParM/100
-	pcs_manna -= defActParKM
+	pcs_mana -= defActParKM
 	'<b><font color="green">Regeneration consumes <<defActParKM>> units of mana.</font></b>'
 end
 
 if defenceActV > 0:
 	defenceV += defenceActParV
 	defenceActV -= 1
-	mannaV -= (defenceActParV / 100)
+	manaV -= (defenceActParV / 100)
 end
 
 if defenceActMV > 0:
 	defenceMV += defenceActParMV
 	defenceActMV -= 1
-	mannaV -= (defenceActParMV / 100)
+	manaV -= (defenceActParMV / 100)
 end
 
 if defAtk > 0:
@@ -68,7 +68,7 @@ if defAtkM > 0:
 
 	if defenceMV <= 0 and unmaterialV = 0:
 		defDamM = rand(defenceActParM/2, defenceActParM)
-		mannaV -= defDamM
+		manaV -= defDamM
 		defence += defDamM
 		'<b><font color="green">Your protection shield absorbed <<defDamM>> mana from an enemy, this mana converts into strengthening your defenses.</font></b>'
 	end
@@ -85,7 +85,7 @@ if defAtkMV > 0:
 
 	if defenceM <= 0 and unmaterial = 0:
 		defDamMV = rand(defenceActParMV/2, defenceActParMV)
-		pcs_manna -= defDamMV
+		pcs_mana -= defDamMV
 		defenceV += defDamMV
 		'<b><font color="red">You enemy takes <<defDamMV>> mana from you strengthening their defense.</font></b>'
 	end

+ 1 - 1
locations/dimaRevenge.qsrc

@@ -305,7 +305,7 @@ if ARGS[0] = 3:
 									shootV = 100
 									!!parameters
 									healthV = vitalV * 10 + strenV * 5
-									mannaV = intelV * 10 + magikV * 10
+									manaV = intelV * 10 + magikV * 10
 									willpowerV = willV * 10
 									BonusAtakV = 0
 									BonusDefV = 0

+ 3 - 3
locations/dinSex2.qsrc

@@ -1,4 +1,4 @@
-# dinSex2
+# dinSex2
 
 if $ARGS[0] = 'stamina_npc':
 	if sexstart <= 0:sexstart = 1 & sexvar = rand(2,5)
@@ -259,8 +259,8 @@ if $ARGS[0] = 'doublepenetration':
 
 	if totPAIN = 0:
 		'Feelings merge together when you move inside two members in contact with each other through a thin opening sharing your vagina filled <<dick1>> centimeter and a member of your <<$anustipe>> anus filled <<dick2>> centimeter member. Your abdomen burns as if pleasant sunlight was spreading heat throughout your body.'
-		bonusManna = pcs_mood
-		DPplus = (vaginalOrgasm * 10) + pcs_horny + bonusManna
+		bonusMana = pcs_mood
+		DPplus = (vaginalOrgasm * 10) + pcs_horny + bonusMana
 		DPminus = rand(250, 350)
 
 		if DPplus > DPminus:

+ 10 - 10
locations/din_pav.qsrc

@@ -1,4 +1,4 @@
-# din_pav
+# din_pav
 
 $pavserjil = {
 	menu_off = 1
@@ -93,13 +93,13 @@ $pavser1 = {
 	*clr & cla
 	menu_off = 1
     psiho = 1
-    pcs_manna -= 30
+    pcs_mana -= 30
     gs'stat'
     '<center><img <<$set_imgh>> src="images/characters/oldtown/pavser/pavserjil.jpg" ></center>'
     'Before you appeared no longer a young man. From him it emanated a savage force and evidence were the dimensions of the body, barely distinguishable from-a beige raincoat and crumpled.'
     act 'Who you are?':
         *clr & cla        
-        pcs_manna -= 30
+        pcs_mana -= 30
         gs'stat'
 		'<center><img <<$set_imgh>> src="'+FUNC('$face_image')+'"></center>'
         '<center><img <<$set_imgh>> src="images/characters/oldtown/pavser/pavserjil.jpg" ></center>'
@@ -153,7 +153,7 @@ $pavser3 = {
     act '- The chair would look good in a hall, - You dropped it withheld.':
         *clr & cla
         sub += 15
-        pcs_manna -= 50
+        pcs_mana -= 50
         pcs_horny += 20
         gs'stat'
 		'<center><img <<$set_imgh>> src="'+FUNC('$face_image')+'"></center>'
@@ -184,7 +184,7 @@ $pavser3 = {
 $pavser4 = {
     *clr & cla
 	menu_off = 1
-    pcs_manna = pcs_manna + 60
+    pcs_mana = pcs_mana + 60
     piss = piss + 1
     
     gs'stat'
@@ -294,7 +294,7 @@ $pavser8 = {
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="'+FUNC('$face_image')+'"></center>'
     pcs_horny +=10
-    pcs_manna = pcs_manna - 50
+    pcs_mana = pcs_mana - 50
     SUB = SUB + 5
     gs'stat'
     '<center><img <<$set_imgh>> src="images/characters/oldtown/pavser/pavserjil.jpg" ></center>'
@@ -310,7 +310,7 @@ $pavser8 = {
     'As well? But you do not know, Suddenly he began maniac and you now cut, and you are under hypnosis smotrelib him as a benefactor.'
     act 'The Hall':
 		*clr & cla
-        pcs_manna = mannamax
+        pcs_mana = manamax
         pcs_horny += 20
         gs'stat'
 		'<center><img <<$set_imgh>> src="'+FUNC('$face_image')+'"></center>'
@@ -373,7 +373,7 @@ $pavser9 = {
 		
                 act 'Further':
                     *clr & cla
-			        pcs_manna = mannamax
+			        pcs_mana = manamax
                     gs'stat'
                     '<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/sex/05.jpg" ></center>'
                     'And while your brain is trying to digest what is happening, and you understand in general how do you take...'
@@ -395,7 +395,7 @@ $pavser9 = {
 						
                         act '...':
                             *clr & cla
-			                pcs_manna = mannamax
+			                pcs_mana = manamax
 			                gs 'underwear', 'remove'
                             gs'stat'
                             '<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/sex/06.jpg" ></center>'
@@ -422,7 +422,7 @@ $pavser9 = {
 								
                                 act '...':
                                     *clr & cla
-			                        pcs_manna = mannamax
+			                        pcs_mana = manamax
                                     gs'stat'
                                     '<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/sex/08.jpg" ></center>'
                                     '...'

+ 33 - 33
locations/enemy.qsrc

@@ -50,10 +50,10 @@ if $ARGS[0] = 'hidan':
 
 	if zerkaloV > 0:
 		healthV = vitalV*10 + strenV*5
-		mannaV = intelV*magikV + magikV*100 + vitalV*10
+		manaV = intelV*magikV + magikV*100 + vitalV*10
 		willpowerV = willV*10
 		pcs_health = pcs_health - 400
-		pcs_manna -= 500
+		pcs_mana -= 500
 
 		'<b><font color = red><<$boydesc>> shouts "RITUAL BEGINS!" and stands in a circle inscribed in blood on the ground.</font></b>'
 		'<b><font color = red>He stabs himself and you feel, pain pierces the body.</font></b>'
@@ -89,7 +89,7 @@ end
 if $ARGS[0] = 'konan':
 	cla
 	if round < 6:
-		mannaV = mannaV - 10
+		manaV = manaV - 10
 		damTipV = 500
 
 		'<b><font color = red><<$boydesc>> fold marks in his hands and you are flying sheets of paper.</font></b>'
@@ -100,7 +100,7 @@ if $ARGS[0] = 'konan':
 		exit
 	elseif round >= 6:
 		if unmaterialV > 5 and defence > 0:
-			mannaV = mannaV - 250
+			manaV = manaV - 250
 			damTipV = 15000
 			bonusShV = 100
 
@@ -111,7 +111,7 @@ if $ARGS[0] = 'konan':
 			xgt'atakA1','atak'
 			exit
 		elseif unmaterialV > 5 and defence <= 0:
-			mannaV = mannaV - 20
+			manaV = manaV - 20
 			damTipV = 450
 
 			'<b><font color = red><<$boydesc>> creates paper boomerangs that fly in your direction.</font></b>'
@@ -119,7 +119,7 @@ if $ARGS[0] = 'konan':
 			xgt'atakA1','atak'
 			exit
 		elseif defenceV <= 0 and unmaterialV <= 5:
-			mannaV = mannaV - 250
+			manaV = manaV - 250
 			defenceV = defenceV + 3000
 			defenceMV = defenceMV + 3000
 			defenceWV = defenceWV + 3000
@@ -129,7 +129,7 @@ if $ARGS[0] = 'konan':
 			xgt'fight','sta'
 			exit
 		elseif unmaterialV <= 2 and konanD < 3:
-			mannaV = mannaV - 150
+			manaV = manaV - 150
 			konanD = konanD + 1
 
 			'<b><font color = red>Conan stops meditating in the air.</font></b>'
@@ -137,7 +137,7 @@ if $ARGS[0] = 'konan':
 			xgt'fight','sta'
 			exit
 		elseif konanD >= 3:
-			mannaV = mannaV - 250
+			manaV = manaV - 250
 			konanD = 0
 			unmaterialV = 20
 
@@ -157,7 +157,7 @@ if $ARGS[0] = 'sasori':
 	defenceV = defenceV + 10
 	defenceMV = defenceMV + 20
 	defenceWV = defenceWV + 50
-	mannaV = mannaV - 10
+	manaV = manaV - 10
 
 	if SasoriBody = 1 and defence > 0:
 		defSasori = defence*20/100
@@ -184,7 +184,7 @@ if $ARGS[0] = 'gedomazo':
 	elseif klon > 0 or tuman > 0:
 		klon = 0
 		tuman = 0
-		mannaV = mannaV - 500
+		manaV = manaV - 500
 
 		'<b><font color = red><<$boydesc>> issue a terrible roar and shock wave sweeps the air over the battlefield.</font></b>'
 
@@ -217,7 +217,7 @@ if $ARGS[0] = 'tobi':
 		shootV = 100
 		!Parameters
 		healthV = vitalV*10 + strenV*5
-		mannaV = intelV*magikV + magikV*100 + vitalV*10
+		manaV = intelV*magikV + magikV*100 + vitalV*10
 		willpowerV = willV*10
 		BonusAtakV = 0
 		BonusDefV = 0
@@ -227,7 +227,7 @@ if $ARGS[0] = 'tobi':
 		xgt'fight','start'
 		exit
 	elseif unmaterialV <= 2 and IzanagiV = 0 and GedoMazo > 0 and TobiStena = 0:
-		mannaV = mannaV - 500
+		manaV = manaV - 500
 		TobiStena = 1
 		defenceV = defenceV + 25000
 
@@ -238,7 +238,7 @@ if $ARGS[0] = 'tobi':
 		xgt'fight','sta'
 		exit
 	elseif unmaterialV <= 2 and IzanagiV = 0 and GedoMazo > 0 and TobiStena = 1:
-		mannaV = mannaV + 6000
+		manaV = manaV + 6000
 		TobiStena = 2
 
 		'<b><font color = red><<$boydesc>> Arcanum and makes you feel like its magical energy increases sharply.</font></b>'
@@ -262,7 +262,7 @@ if $ARGS[0] = 'tobi':
 		defenceAct = 0
 		defenceActM = 0
 		defAtk = 0
-		mannaV = mannaV - 100
+		manaV = manaV - 100
 		stunV = 1
 
 		'<b><font color = red><<$boydesc>> Close your eyes and you will see, of it as a tear ran down a drop of blood.</font></b>'
@@ -282,10 +282,10 @@ if $ARGS[0] = 'tobi':
 		exit
 	elseif unmaterialV > 0 and klon <= 0:
 		stunnerV = 1
-		mannaV = mannaV - 20
+		manaV = manaV - 20
 		magweapbonusV = 800
 
-		'<b><font color = red><<$boydesc>> attacks have gathered manna in the arm.</font></b>'
+		'<b><font color = red><<$boydesc>> attacks have gathered mana in the arm.</font></b>'
 
 		xgt'atak','enemy'
 		exit
@@ -298,7 +298,7 @@ if $ARGS[0] = 'tobi':
 		xgt'atak','enemy'
 		exit
 	elseif unmaterialV <= 0 and tobizanagi < 2:
-		mannaV = mannaV - 250
+		manaV = manaV - 250
 		tobizanagi = tobizanagi + 1
 		!unmaterialV = 10
 
@@ -307,7 +307,7 @@ if $ARGS[0] = 'tobi':
 		xgt'fight','sta'
 		exit
 	elseif unmaterialV <= 0 and tobizanagi = 2:
-		mannaV = mannaV - 250
+		manaV = manaV - 250
 		tobizanagi = 0
 		unmaterialV = 20
 		stunV = 1
@@ -324,7 +324,7 @@ if $ARGS[0] = 'kisame':
 	!software attacks Kisame
 	if defenceV <= 0 and kisamePro = 0:
 		kisamePro = 1
-		mannaV = mannaV - 150
+		manaV = manaV - 150
 		defenceV = defenceV + 1500
 		defenceMV = defenceMV + 1500
 		defenceWV = defenceWV + 1500
@@ -338,7 +338,7 @@ if $ARGS[0] = 'kisame':
 		xgt'fight','sta'
 		exit
 	elseif defenceV <= 1000 and kisamePro > 0:
-		mannaV = mannaV - 500
+		manaV = manaV - 500
 		defenceV = defenceV + 5000
 		defenceMV = defenceMV + 5000
 		defenceWV = defenceWV + 5000
@@ -364,7 +364,7 @@ if $ARGS[0] = 'kisame':
 			xgt'fight','sta'
 			exit
 		elseif kisameRAND > 0:
-			mannaV = mannaV - 250
+			manaV = manaV - 250
 			damTipV = 1500
 			damTipMV = 2500
 			bonusShV = 50
@@ -419,8 +419,8 @@ end
 if $ARGS[0] = 'fighter3':
 	cla
 	!program directly attacks
-	if tuman = 0 and tumanV < 5 and mannaV > 10:
-		mannaV = mannaV - 10
+	if tuman = 0 and tumanV < 5 and manaV > 10:
+		manaV = manaV - 10
 		tumanV = tumanV + 10
 
 		'<b><font color = red><<$boydesc>> produces a fog on the battlefield.</font></b>'
@@ -444,16 +444,16 @@ end
 if $ARGS[0] = 'fighter4':
 	cla
 	!program directly attacks
-	if tuman = 0 and tumanV < 5 and mannaV > 10:
-		mannaV = mannaV - 10
+	if tuman = 0 and tumanV < 5 and manaV > 10:
+		manaV = manaV - 10
 		tumanV = tumanV + 10
 
 		'<b><font color = red><<$boydesc>> produces a fog on the battlefield.</font></b>'
 
 		xgt'fight','sta'
 		exit
-	elseif klonV < 1 and mannaV > 15:
-		mannaV = mannaV - 15
+	elseif klonV < 1 and manaV > 15:
+		manaV = manaV - 15
 		klonV = klonV + 1
 
 		'<b><font color = green>LOST</font></b>'
@@ -477,25 +477,25 @@ end
 if $ARGS[0] = 'fighter5':
 	cla
 	!program directly attacks
-	if tuman = 0 and tumanV < 5 and mannaV > 10:
-		mannaV = mannaV - 10
+	if tuman = 0 and tumanV < 5 and manaV > 10:
+		manaV = manaV - 10
 		tumanV = tumanV + 10
 
 		'<b><font color = red><<$boydesc>> produces a fog on the battlefield.</font></b>'
 
 		xgt'fight','sta'
 		exit
-	elseif klonV < 1 and mannaV > 15:
-		mannaV = mannaV - 15
+	elseif klonV < 1 and manaV > 15:
+		manaV = manaV - 15
 		klonV = klonV + 1
 
 		'<b><font color = green>LOST</font></b>'
 
 		xgt'fight','sta'
 		exit
-	elseif stun < 1 and pcs_manna > 20:
+	elseif stun < 1 and pcs_mana > 20:
 		stunnerV = 1
-		mannaV = mannaV - 20
+		manaV = manaV - 20
 
 		'<b><font color = red><<$boydesc>> attacks you Gouge.</font></b>'
 

+ 17 - 17
locations/fight.qsrc

@@ -13,13 +13,13 @@ if $ARGS[0] = 'start':
 	gs'defence'
 	gs'statBat'
 
-	if SasoriBody > 2 and healthV <= 0 or SasoriBody > 2 and mannaV <= 0 or SasoriBody > 2 and willpowerV <= 0:
+	if SasoriBody > 2 and healthV <= 0 or SasoriBody > 2 and manaV <= 0 or SasoriBody > 2 and willpowerV <= 0:
 		SasoriBody = SasoriBody - 1
 		gs'priziv','sasori'
 
 		'<b><font color = red>The doll parts scatter all over and immediately head into battle mode.</font></b>'
 		'<b><font color = red>You hear the sonorous voice of Sasori, "I have a lots of dolls, you can''t beat me."</font></b>'
-	elseif SasoriBody = 2 and healthV <= 0 or SasoriBody = 2 and mannaV <= 0 or SasoriBody = 2 and willpowerV <= 0:
+	elseif SasoriBody = 2 and healthV <= 0 or SasoriBody = 2 and manaV <= 0 or SasoriBody = 2 and willpowerV <= 0:
 		SasoriBody = SasoriBody - 1
 		gs'priziv','sasori1'
 
@@ -38,7 +38,7 @@ if $ARGS[0] = 'start':
 		'<b><font color = red>Sasori moves again.</font></b>'
 	end
 
-	if GedoMazo = 1 and healthV <= 0 or GedoMazo = 1 and mannaV <= 0 or GedoMazo = 1 and willpowerV <= 0:
+	if GedoMazo = 1 and healthV <= 0 or GedoMazo = 1 and manaV <= 0 or GedoMazo = 1 and willpowerV <= 0:
 		GedoMazo = 2
 		barierV = 0
 
@@ -59,12 +59,12 @@ if $ARGS[0] = 'start':
 
 		xgt'ender','win'
 		exit
-	elseif pcs_manna <= 0 and heart = 0 and izanagi = 0:
+	elseif pcs_mana <= 0 and heart = 0 and izanagi = 0:
 		'<b><font color = red> You won!</font></b>'
 
 		xgt'ender','loss'
 		exit
-	elseif mannaV <= 0 and heartV = 0 and izanagiV = 0:
+	elseif manaV <= 0 and heartV = 0 and izanagiV = 0:
 		'<b><font color = green><<$boydesc>> lost!</font></b>'
 
 		xgt'ender','win'
@@ -81,45 +81,45 @@ if $ARGS[0] = 'start':
 		exit
 	end
 
-	if izanagiV > 0 and healthV <= 0 or izanagiV > 0 and mannaV <= 0 or izanagiV > 0 and willpowerV <= 0:
+	if izanagiV > 0 and healthV <= 0 or izanagiV > 0 and manaV <= 0 or izanagiV > 0 and willpowerV <= 0:
 		izanagiV = izanagiV - 1
 
 		'<b><font color = red><<$boydesc>> disappeared.</font></b>'
 
 		healthV = vitalV*10 + strenV*5
-		mannaV = intelV*magikV + magikV*100 + vitalV*10
+		manaV = intelV*magikV + magikV*100 + vitalV*10
 		willpowerV = willV*10
 		stunV = 0
 		if program = 6 and izanagiOnce = 0:izanagiOnce = 1 & unmaterialV = 40 & tobizanagi = 0
 
 		'<b><font color = red><<$boydesc>> appeared in front of you, completely healthy. He folded his arms and made the magic sign for Izanagi, the perfect illusion.</font></b>'
 		'<b><font color = red>The price for this spell was to sacrifice one of my eyes.</font></b>'
-	elseif heartV > 0 and healthV <= 0 or heartV > 0 and mannaV <= 0 or heartV > 0 and willpowerV <= 0:
+	elseif heartV > 0 and healthV <= 0 or heartV > 0 and manaV <= 0 or heartV > 0 and willpowerV <= 0:
 		heartV = heartV - 1
 
 		'<b><font color = red><<$boydesc>> staggered, as his heart burst.</font></b>'
 
 		healthV = vitalV*10 + strenV*5
-		mannaV = intelV*magikV + magikV*100 + vitalV*10
+		manaV = intelV*magikV + magikV*100 + vitalV*10
 		willpowerV = willV*10
 		stunV = 0
 
 		'<b><font color = red><<$boydesc>> stood up and got in a frenzy. He must have another heart.</font></b>'
-	elseif izanagi > 0 and pcs_health <= 0 or izanagi > 0 and pcs_manna <= 0 or izanagi > 0 and pcs_willpwr <= 0:
+	elseif izanagi > 0 and pcs_health <= 0 or izanagi > 0 and pcs_mana <= 0 or izanagi > 0 and pcs_willpwr <= 0:
 		izanagi = izanagi - 1
 
 		'<b><font color = green>He vanishes.</font></b>'
 
 		pcs_health = pcs_vital*10 + pcs_stren*5
 		pcs_willpwr = pcs_intel*5 + pcs_sprt*5
-		pcs_manna = (pcs_intel*pcs_magik) + pcs_magik*100 + pcs_vital*10 + rikudo
+		pcs_mana = (pcs_intel*pcs_magik) + pcs_magik*100 + pcs_vital*10 + rikudo
 		stun = 0
 		zerkaloV = 0
 		poisonV = 0
 		bloodV = 0
 
 		'<b><font color = green>All of a sudden he appears in front of you completely healthy.</font></b>'
-	elseif heart > 0 and pcs_health <= 0 or heart > 0 and pcs_manna <= 0 or heart > 0 and pcs_willpwr <= 0:
+	elseif heart > 0 and pcs_health <= 0 or heart > 0 and pcs_mana <= 0 or heart > 0 and pcs_willpwr <= 0:
 		heart = heart - 1
 		zerkaloV = 0
 		poisonV = 0
@@ -129,7 +129,7 @@ if $ARGS[0] = 'start':
 
 		pcs_health = pcs_vital*10 + pcs_stren*5
 		pcs_willpwr = pcs_intel*5 + pcs_sprt*5
-		pcs_manna = (pcs_intel*pcs_magik) + pcs_magik*100 + pcs_vital*10 + rikudo
+		pcs_mana = (pcs_intel*pcs_magik) + pcs_magik*100 + pcs_vital*10 + rikudo
 		stun = 0
 
 		'<b><font color = green>You open your eyes as you''re not dead...</font></b>'
@@ -137,11 +137,11 @@ if $ARGS[0] = 'start':
 
 	gs'before'
 	'<b>= = = = = = = = = = = = = (ROUND <<round>>) = = = = = = = = = = = = =</b>'
-	'<b><<$boydesc>></b> life <b><font color = red><<healthV>></font></b>, manna <b><font color = blue><<mannaV>></font></b>, willpower <b><font color = green><<willpowerV>></font></b>'
+	'<b><<$boydesc>></b> life <b><font color = red><<healthV>></font></b>, mana <b><font color = blue><<manaV>></font></b>, willpower <b><font color = green><<willpowerV>></font></b>'
 	if defenceV > 0:'<b><font color = red>Protection <<defenceV>> units</font></b>'
 	if defenceMV > 0:'<b><font color = red>Mana protection <<defenceMV>> units</font></b>'
 	if defenceWV > 0:'<b><font color = red>Will protection <<defenceWV>> units</font></b>'
-	'Your life <b><font color = red><<pcs_health>></font></b>, manna <b><font color = blue><<pcs_manna>></font></b>, willpower <b><font color = green><<pcs_willpwr>></font></b>'
+	'Your life <b><font color = red><<pcs_health>></font></b>, mana <b><font color = blue><<pcs_mana>></font></b>, willpower <b><font color = green><<pcs_willpwr>></font></b>'
 	if defence > 0:'<b><font color = green>Protection <<defence>> units</font></b>'
 	if defenceM > 0:'<b><font color = green>Mana impact protection <<defenceM>> units</font></b>'
 	if defenceW > 0:'<b><font color = green>Will impact protection <<defenceW>> units</font></b>'
@@ -327,11 +327,11 @@ if $ARGS[0] = 'sta':
 	hidanAtk = 0
 
 	'<b>= = = = = = = = = = = = = = = = = = = = = = = = = = = = = = =</b>'
-	'<b><<$boydesc>></b> life <b><font color = red><<healthV>></font></b>, manna <b><font color = blue><<mannaV>></font></b>, willpower <b><font color = green><<willpowerV>></font></b>'
+	'<b><<$boydesc>></b> life <b><font color = red><<healthV>></font></b>, mana <b><font color = blue><<manaV>></font></b>, willpower <b><font color = green><<willpowerV>></font></b>'
 	if defenceV > 0:'<b><font color = red>Protection <<defenceV>> units</font></b>'
 	if defenceMV > 0:'<b><font color = red>Mana protection <<defenceMV>> units</font></b>'
 	if defenceWV > 0:'<b><font color = red>Will protection <<defenceWV>> units</font></b>'
-	'Your life <b><font color = red><<pcs_health>></font></b>, manna <b><font color = blue><<pcs_manna>></font></b>, willpower <b><font color = green><<pcs_willpwr>></font></b>'
+	'Your life <b><font color = red><<pcs_health>></font></b>, mana <b><font color = blue><<pcs_mana>></font></b>, willpower <b><font color = green><<pcs_willpwr>></font></b>'
 	if defence > 0:'<b><font color = green>Protection <<defence>> units</font></b>'
 	if defenceM > 0:'<b><font color = green>Mana impact protection <<defenceM>> units</font></b>'
 	if defenceW > 0:'<b><font color = green>Will impact protection <<defenceW>> units</font></b>'

+ 2 - 2
locations/gschool_grounds.qsrc

@@ -1,4 +1,4 @@
-# gschool_grounds
+# gschool_grounds
 
 !Outside school building
 if $ARGS[0] = 'main':
@@ -482,7 +482,7 @@ if $ARGS[0] = 'KristinaFight':
 	shootV = 95
 	!Parameters
 	healthV = vitalV*10 + strenV*5
-	mannaV = intelV*10 + magikV*10
+	manaV = intelV*10 + magikV*10
 	willpowerV = willV*10
 	BonusAtakV = 0
 	BonusDefV = 0

+ 1 - 1
locations/init.qsrc

@@ -5,7 +5,7 @@
 !hod = 0 player attacks hod = 1 enemy attacks
 !<font color = red><<$pcs_nickname>> </font>
 
-if GedoMazo = 1 and stunV > 0:stunV = 0 & mannaV = mannaV - 1000 & '<font color = red><<$boydesc>> lets out a deafening roar. It rejuvenates a large amount of energy which allows him to attack you again.</font>'
+if GedoMazo = 1 and stunV > 0:stunV = 0 & manaV = manaV - 1000 & '<font color = red><<$boydesc>> lets out a deafening roar. It rejuvenates a large amount of energy which allows him to attack you again.</font>'
 
 initi = pcs_react*20/100
 initi = initi - dospehVes

+ 8 - 8
locations/kakuzu.qsrc

@@ -1,4 +1,4 @@
-# kakuzu
+# kakuzu
 if $ARGS[0] = 'start':
 	cla & *clr
 	minut += 5
@@ -56,7 +56,7 @@ if $ARGS[0] = 'mansion1':
 			'lightning - in this school each hit paralyzes the opponent, it has weaker than damage than the fire, but if you''re hooked by lightning, then quickly you will achieve any.'
 			'wind - weak damage, weak defense, but no fog or clones can save them from the wind and wind spells are almost impossible to dodge.'
 			'earth - defensive school, but the attacks are very dangerous. If the enemy attack misses, they will get stuck in the ground and unable to move. Earth protection is the most powerful of all protection, protection of land and regenerate itself absolute defense to attack the enemy.'
-			'Water - Damage of this school is weak, but all spells steal manna from the enemy, the same high level of water protection is very dangerous, it consumes manna from an enemy and regenerates, although it is weaker than earth protection.'
+			'Water - Damage of this school is weak, but all spells steal mana from the enemy, the same high level of water protection is very dangerous, it consumes mana from an enemy and regenerates, although it is weaker than earth protection.'
 			'Affinity with the elements means that you can learn this particular element. You can not explore another element after selecting affinity until izuchish element completely. I''ll give you 10 sheets of paper magic. Each sheet cost me 5, 000 <b>₽</b>. Concentrate the energy on a piece of paper until you succeed, then you can either start over and hope for another element, or proceed with the element that appeared to you.'
 
 			act 'Mark sheets':gt 'kakuzu', 'mansion1'
@@ -80,20 +80,20 @@ if $ARGS[0] = 'mansion1':
 			'lightning - in this school each hit paralyzes the opponent, it has weaker than damage than the fire, but if you''re hooked by lightning, then quickly you will achieve any.'
 			'wind - weak damage, weak defense, but no fog or clones can save them from the wind and wind spells are almost impossible to dodge.'
 			'earth - defensive school, but the attacks are very dangerous. If the enemy attack misses, they will get stuck in the ground and unable to move. Earth protection is the most powerful of all protection, protection of land and regenerate itself absolute defense to attack the enemy.'
-			'Water - Damage of this school is weak, but all spells steal manna from the enemy, the same high level of water protection is very dangerous, it consumes manna from an enemy and regenerates, although it is weaker than earth protection.'
+			'Water - Damage of this school is weak, but all spells steal mana from the enemy, the same high level of water protection is very dangerous, it consumes mana from an enemy and regenerates, although it is weaker than earth protection.'
 			'Affinity with the elements means that you can learn this particular element. You can not explore another element after selecting affinity until izuchish element completely. I''ll give you 10 sheets of paper magic. Each sheet cost me 5, 000 <b>₽</b>. Concentrate the energy on a piece of paper until you succeed, then you can either start over and hope for another element, or proceed with the element that appeared to you.'
 
 			act 'Move away':gt 'kakuzu', 'mansion1'
 		end
 	end
 
-	if tobiQW = 2 and srodpaper > 0 and pcs_manna < 2000:'You do not have enough mana to continue concentrating.'
+	if tobiQW = 2 and srodpaper > 0 and pcs_mana < 2000:'You do not have enough mana to continue concentrating.'
 
-	if tobiQW = 2 and srodpaper > 0 and pcs_manna >= 2000:
+	if tobiQW = 2 and srodpaper > 0 and pcs_mana >= 2000:
 		act 'Concentrating the energy in the sheet of paper (1:00)':
 			cla
 			minut += 60
-			pcs_manna -= 2000
+			pcs_mana -= 2000
 			pcs_sweat += 40
 
 			if srodstvo = 0:srodrand = rand(1, 5)
@@ -130,9 +130,9 @@ if $ARGS[0] = 'mansion1':
 		end
 	end
 
-	if tobiQW = 3 and pcs_manna < 1000:
+	if tobiQW = 3 and pcs_mana < 1000:
 		'Kakuzu tells you "You have almost no energy, you need to rest."'
-	elseif tobiQW = 3 and pcs_manna >= 1000:
+	elseif tobiQW = 3 and pcs_mana >= 1000:
 		if stihia = 1:
 			gs 'spellList', 'teacherActions', '$fireSpells', 'kakuzu', 'mansion1'
 		end

+ 1 - 1
locations/kisameQW.qsrc

@@ -67,7 +67,7 @@ if $ARGS[0] = 'start':
 			shootV = 100
 			!!parameters
 			healthV = vitalV * 10 + strenV * 5
-			mannaV = intelV * magikV + magikV * 100 + vitalV * 10
+			manaV = intelV * magikV + magikV * 100 + vitalV * 10
 			willpowerV = willV * 10
 			BonusAtakV = 0
 			BonusDefV = 0

+ 10 - 10
locations/lab.qsrc

@@ -1,4 +1,4 @@
-# lab
+# lab
 if $ARGS[0] = 'start':
 	cla & *clr
 	$menu_loc = 'lab'
@@ -61,7 +61,7 @@ if $ARGS[0] = 'start':
 			shootV = 100
 			!!parameters
 			healthV = vitalV * 10 + strenV * 5
-			mannaV = intelV * 10 + magikV * 10
+			manaV = intelV * 10 + magikV * 10
 			willpowerV = willV * 10
 			BonusAtakV = 0
 			BonusDefV = 0
@@ -91,7 +91,7 @@ if $ARGS[0] = 'start':
 			shootV = 100
 			!!parameters
 			healthV = vitalV * 10 + strenV * 5
-			mannaV = intelV * 6 + magikV * 10
+			manaV = intelV * 6 + magikV * 10
 			willpowerV = willV * 10
 			BonusAtakV = 0
 			BonusDefV = 0
@@ -257,7 +257,7 @@ if $ARGS[0] = 'ListBuilder':
 			bodymodValue = dyneval("result = <<$bodyModIndx>>[<<i>>]")
 		end
 		$bodyModDescX = dyneval('$result = <<$bodyModDesc>>[<<i>>]')
-		$ListStr = $ListStr + "<br><a href=""EXEC:<<$bodyModStat>> = <<bodymodValue>> & pcs_manna -= <<bodyModMana>> & gs 'arousal', 'voyeur', <<bodyModTime>> & gs 'stat' & gt 'lab', 'BodyModded', '<<$bodyModType>>', '<<$bodyModDescX>>'""><<$bodyModDescX>></a>"
+		$ListStr = $ListStr + "<br><a href=""EXEC:<<$bodyModStat>> = <<bodymodValue>> & pcs_mana -= <<bodyModMana>> & gs 'arousal', 'voyeur', <<bodyModTime>> & gs 'stat' & gt 'lab', 'BodyModded', '<<$bodyModType>>', '<<$bodyModDescX>>'""><<$bodyModDescX>></a>"
 		i += 1
 		jump 'BodyModLoop'
 	end
@@ -332,7 +332,7 @@ if $ARGS[0] = 'Tatiana':
 	act 'Ask for help with your appearance':
 		cla
 		'"Tatiana, I''m having problems with my body image, I''m not happy and was hoping that you might be able to help me."'
-		'"It''s possible but I will have to draw on your magical energy, it will cost some of your manna to perform a spell."'
+		'"It''s possible but I will have to draw on your magical energy, it will cost some of your mana to perform a spell."'
 
 		$HairColorTab =  func('lab', 'ListBuilder', 'Hair Color', '40', '30', '$hairColors','i',         'pcs_haircol')
 		$HairLengthTab = func('lab', 'ListBuilder', 'Hair Length','40', '30', '$hairTypes', 'hairTypes', 'pcs_hairlng')
@@ -341,9 +341,9 @@ if $ARGS[0] = 'Tatiana':
 		$LipTab =        func('lab', 'ListBuilder', 'Lip Size',   '40', '30', '$lipSize',   'i',         'pcs_lip')
 		$BreastTab =     func('lab', 'ListBuilder', 'Breast Size','40', '30', '$breastSize','breastSize','nbsize')
 
-		$SkinTab = "<a href=""EXEC:pcs_skin = 100 & pcs_manna -= 40 & gs 'arousal', 'voyeur', 30 & gs 'stat' & gt 'lab', 'BodyModded', 'Skin', 'clear'"">Clear Skin</a>"
-		$VirginTab = "<a href=""EXEC:pcs_vag = 0 & pcs_manna -= 40 & gs 'arousal', 'voyeur', 30 & gs 'stat' & gt 'lab', 'BodyModded', 'Virginity', 'renewed'"">Renew Virginity</a>"
-		$SiliconeTab = "<a href=""EXEC:brSurTemp = 0 & stringimplant = 0 & fillimplant = 0 & pcs_manna -= 40 & gs 'arousal', 'voyeur', 30 & gs 'stat' & gt 'lab', 'BodyModded', 'Boobs', 'natural again'"">Remove Silicone</a>"
+		$SkinTab = "<a href=""EXEC:pcs_skin = 100 & pcs_mana -= 40 & gs 'arousal', 'voyeur', 30 & gs 'stat' & gt 'lab', 'BodyModded', 'Skin', 'clear'"">Clear Skin</a>"
+		$VirginTab = "<a href=""EXEC:pcs_vag = 0 & pcs_mana -= 40 & gs 'arousal', 'voyeur', 30 & gs 'stat' & gt 'lab', 'BodyModded', 'Virginity', 'renewed'"">Renew Virginity</a>"
+		$SiliconeTab = "<a href=""EXEC:brSurTemp = 0 & stringimplant = 0 & fillimplant = 0 & pcs_mana -= 40 & gs 'arousal', 'voyeur', 30 & gs 'stat' & gt 'lab', 'BodyModded', 'Boobs', 'natural again'"">Remove Silicone</a>"
 
 		$SpellListStr = "<CENTER>
 	<TABLE CELLPADDING = '5'>
@@ -384,13 +384,13 @@ if $ARGS[0] = 'Tatiana':
 		act "Restore you body to it's original shape":
 			cla
 			'"Tatiana, I''m having problems with my body image, I''m not happy and was hoping that you might be able to help me."'
-			'"It''s possible but I will have to draw on your magical energy, it will cost 40 manna to perform a reset spell.'
+			'"It''s possible but I will have to draw on your magical energy, it will cost 40 mana to perform a reset spell.'
 			'This will reduce excess fat, growth of body parts and reduce high levels of silicone, moving you closer to your original body shape.'
 			'Do you wish to try this spell?'
 
 			act 'No, no, I''ve changed my mind. Thank you':gt 'lab', 'Tatiana'
 
-			if pcs_manna >= 40:
+			if pcs_mana >= 40:
 				act 'That sounds great, let''s do it!':
 					*clr
 					cla

+ 1 - 1
locations/lover_pref.qsrc

@@ -402,7 +402,7 @@ elseif titBoy = 2:
 end
 
 
-!! manna , mannamax * 50 / 100:
+!! mana , manamax * 50 / 100:
 
 if pcs_hairbsh = 1 and curly > 0:
 	loverrelation[lover_number] += 2 &

+ 1 - 1
locations/mainQW.qsrc

@@ -30,7 +30,7 @@ act 'Investigate':
 			cls
 			pcs_health = pcs_vital * 10
 			pcs_willpwr = pcs_intel * 5 + pcs_sprt * 5
-			pcs_manna = (pcs_intel * pcs_magik) + pcs_vital * 5 + rikudo
+			pcs_mana = (pcs_intel * pcs_magik) + pcs_vital * 5 + rikudo
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/lab/lab.jpg"></center>'
 			'Before you is a massive laboratory with a wide variety of stands and equipment racks with different flasks and bottles.'

+ 2 - 2
locations/obj_din.qsrc

@@ -1,4 +1,4 @@
-# obj_din
+# obj_din
 
 if $ARGS[0] = 'chartabs':
 	cla
@@ -1484,7 +1484,7 @@ if $ARGS[0] = 'magic':
 	if pcs_magik = 0:
 		'You are unable to use magic.'
 	elseif pcs_magik > 0:
-		'You have <<pcs_manna>> units of manna available to you.'
+		'You have <<pcs_mana>> units of mana available to you.'
 		!!' Forces Rikudo available to you <<rikudo>> units'
 		*nl
 

+ 5 - 5
locations/park.qsrc

@@ -1,4 +1,4 @@
-# park
+# park
 $location_type = 'public_outdoors'
 
 if $ARGS[0] = 'start':
@@ -154,7 +154,7 @@ if $ARGS[0] = 'start':
 						shootV = 100
 						!!parameters
 						healthV = vitalV * 10 + strenV * 5
-						mannaV = intelV * 10 + magikV * 10
+						manaV = intelV * 10 + magikV * 10
 						willpowerV = willV * 10
 						BonusAtakV = 0
 						BonusDefV = 0
@@ -561,7 +561,7 @@ if $ARGS[0] = 'prost':
 			shootV = 10
 			!!parameters
 			healthV = vitalV * 10 + strenV * 5
-			mannaV = intelV * 10 + magikV * 10
+			manaV = intelV * 10 + magikV * 10
 			willpowerV = willV * 10
 			BonusAtakV = 0
 			BonusDefV = 0
@@ -613,7 +613,7 @@ if $ARGS[0] = 'prost':
 					shootV = 10
 					!!parameters
 					healthV = vitalV * 10 + strenV * 5
-					mannaV = intelV * 10 + magikV * 10
+					manaV = intelV * 10 + magikV * 10
 					willpowerV = willV * 10
 					BonusAtakV = 0
 					BonusDefV = 0
@@ -690,7 +690,7 @@ if $ARGS[0] = 'prost':
 					shootV = 10
 					!!parameters
 					healthV = vitalV * 10 + strenV * 5
-					mannaV = intelV * 10 + magikV * 10
+					manaV = intelV * 10 + magikV * 10
 					willpowerV = willV * 10
 					BonusAtakV = 0
 					BonusDefV = 0

+ 2 - 2
locations/parkivent.qsrc

@@ -1,4 +1,4 @@
-# parkivent
+# parkivent
 
 if $ARGS[0] = 'empty':
 	menu_off = 1
@@ -61,7 +61,7 @@ if $ARGS[0] = '1':
 			shootV = 100
 			!!parameters
 			healthV = vitalV * 10 + strenV * 5
-			mannaV = intelV * 10 + magikV * 10
+			manaV = intelV * 10 + magikV * 10
 			willpowerV = willV * 10
 			BonusAtakV = 0
 			BonusDefV = 0

+ 1 - 1
locations/preCUST.qsrc

@@ -360,7 +360,7 @@ if $ARGS[0] = 'Done':
 
 	pcs_health = pcs_vital * 10 + pcs_stren * 5
 	pcs_willpwr = pcs_intel * 5 + pcs_sprt * 5
-	pcs_manna = (pcs_intel * pcs_magik) + pcs_magik * 100 + pcs_vital * 10 + rikudo
+	pcs_mana = (pcs_intel * pcs_magik) + pcs_magik * 100 + pcs_vital * 10 + rikudo
 	pcs_mood = 100
 	pcs_stam = 100
 

+ 3 - 3
locations/preTG.qsrc

@@ -1,4 +1,4 @@
-# preTG
+# preTG
 
 !!The TG Story Elements
 *clr & cla
@@ -270,7 +270,7 @@ if $ARGS[0] = 'otelPRE':
 										pcs_react = 50
 										pcs_health = pcs_vital * 10
 										pcs_willpwr = pcs_intel * 5 + pcs_sprt * 5
-										pcs_manna = (pcs_intel * pcs_magik) + pcs_vital * 5
+										pcs_mana = (pcs_intel * pcs_magik) + pcs_vital * 5
 										birthday = 1
 										birthmonth = 4
 										birthyear = 1983
@@ -294,7 +294,7 @@ if $ARGS[0] = 'otelPRE':
 											shootV = 100
 											!!parameters
 											healthV = vitalV * 10 + strenV * 5
-											mannaV = intelV * 10 + magikV * 10
+											manaV = intelV * 10 + magikV * 10
 											willpowerV = willV * 10
 											BonusAtakV = 0
 											BonusDefV = 0

+ 3 - 3
locations/priziv.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'tobi':
 	shootV = 100
 	!!parameters
 	healthV = vitalV * 10 + strenV * 5
-	mannaV = intelV * magikV + magikV * 100 + vitalV * 10
+	manaV = intelV * magikV + magikV * 100 + vitalV * 10
 	willpowerV = willV * 10
 	BonusAtakV = 0
 	BonusDefV = 0
@@ -64,7 +64,7 @@ if $ARGS[0] = 'sasori':
 	shootV = 100
 	!!parameters
 	healthV = vitalV * 10 + strenV * 5
-	mannaV = intelV * magikV + magikV * 100 + vitalV * 10
+	manaV = intelV * magikV + magikV * 100 + vitalV * 10
 	willpowerV = willV * 10
 	BonusAtakV = 0
 	BonusDefV = 0
@@ -90,7 +90,7 @@ if $ARGS[0] = 'sasori1':
 	shootV = 100
 	!!parameters
 	healthV = vitalV * 10 + strenV * 5
-	mannaV = intelV * magikV + magikV * 100 + vitalV * 10
+	manaV = intelV * magikV + magikV * 100 + vitalV * 10
 	willpowerV = willV * 10
 	BonusAtakV = 0
 	BonusDefV = 0

+ 2 - 2
locations/sauna.qsrc

@@ -1,4 +1,4 @@
-# sauna
+# sauna
 
 CLOSE ALL
 gs 'themes', 'indoors'
@@ -69,7 +69,7 @@ if $ARGS[0] = 'sauna2':
 			pcs_health += healthmax/5
 			pcs_stam = stammax
 			pcs_willpwr = pcs_intel*5 + will*5+1000
-			pcs_manna = (pcs_intel*pcs_magik) + pcs_magik*100 + pcs_vital*10 + rikudo
+			pcs_mana = (pcs_intel*pcs_magik) + pcs_magik*100 + pcs_vital*10 + rikudo
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/shared/sauna/sau.jpg"></center>'
 			'You spend an hour relaxing in the heat of the sauna, having a cool shower and dressing. You feel revitalised.'

+ 3 - 3
locations/saunawhore.qsrc

@@ -1,4 +1,4 @@
-# saunawhore
+# saunawhore
 
 if moodTypeRand <= 0:
 	$moodType = 'bad'
@@ -254,9 +254,9 @@ if $ARGS[0] = 'blowjob':
 		'As you kneel in front of him in tears, he grabs you roughly by your arms, painfully twisting them behind your back, and slams you down on the bed.'
 		gs 'pain', 1, 'cheeks', 'slap'
 		if slutty < 10:
-			Manna -= 50
+			Mana -= 50
 		else
-			Manna -= 10
+			Mana -= 10
 		end
 
 		gs 'pain', 2, 'armL', 'twist'

+ 2 - 2
locations/sexm.qsrc

@@ -1,4 +1,4 @@
-# sexm
+# sexm
 
 if $ARGS[0] = 'start':	
 	menu_off = 1
@@ -840,7 +840,7 @@ if $ARGS[0] = 'gangrape':
 		shootV = 100
 		!!parameters
 		healthV = vitalV * 10 + strenV * 5
-		mannaV = intelV * 10 + magikV * 10
+		manaV = intelV * 10 + magikV * 10
 		willpowerV = willV * 10
 		BonusAtakV = 0
 		BonusDefV = 0

+ 5 - 5
locations/spell.qsrc

@@ -56,13 +56,13 @@ end
 if $ARGS[0] = 'reset':
 	cla
 	!Create mist
-	'Accumulated manna <<mannaReset>> units.'
+	'Accumulated mana <<manaReset>> units.'
 
-	act 'Absorb accumulated manna':
+	act 'Absorb accumulated mana':
 		cla
 		*clr
-		pcs_manna = pcs_manna + mannaReset
-		mannaReset = 0
+		pcs_mana = pcs_mana + manaReset
+		manaReset = 0
 		xgt'fight','sta'
 	end
 	act 'Physical attacks':gt'boxing'
@@ -84,7 +84,7 @@ if $ARGS[0] = 'unmat':
 			*clr
 			unmaterial = 31
 			rikudo = rikudo + 3000
-			mannaReset = 0
+			manaReset = 0
 			xgt'fight','sta'
 		end
 	elseif rikudo < 3000:

+ 1 - 1
locations/spellList.qsrc

@@ -359,7 +359,7 @@ if $ARGS[0] = 'teacherActions':
 		if pcs_magik >= spellDifficulty and spellKnown[$ThisSpellName] = 0:
 			dynamic "act 'Learn <<$spellName[$ThisSpellName]>> (1:00)':
 				cla
-				pcs_manna -= 1000
+				pcs_mana -= 1000
 				minut += 60
 
 				spellLearn['<<$ThisSpellName>>'] += rand(1, 100/<<spellDifficulty>>)

+ 1 - 1
locations/stallion.qsrc

@@ -51,7 +51,7 @@ if $ARGS[0] = 'fight':
 		shootV = 10
 		!!parameters
 		healthV = vitalV * 10 + strenV * 5
-		mannaV = intelV * magikV + magikV * 100 + vitalV * 10
+		manaV = intelV * magikV + magikV * 100 + vitalV * 10
 		willpowerV = willV * 10
 		BonusAtakV = 0
 		BonusDefV = 0

+ 6 - 6
locations/stat.qsrc

@@ -193,12 +193,12 @@ end
 
 healthmax = (pcs_vital * 10 + pcs_stren * 5)
 stammax = 5 * (2 * pcs_vital + pcs_agil + pcs_stren) / 2
-mannamax = (pcs_intel * pcs_magik) + pcs_magik * 100 + pcs_vital * 10 + rikudo
+manamax = (pcs_intel * pcs_magik) + pcs_magik * 100 + pcs_vital * 10 + rikudo
 speed = (2 * (pcs_stren + pcs_agil) + pcs_vital) / 5
 if healthmax < 1: healthmax = 1
 if willpowermax < 50: willpowermax = 50
 if stammax < 1: stammax = 1
-if mannamax < 1: mannamax = 1
+if manamax < 1: manamax = 1
 
 !pre-calc max value for later display
 if fairycurse >= daystart and fairyshoo > 0: pcs_horny = 90
@@ -208,7 +208,7 @@ if pcs_horny < 0: pcs_horny = 0
 if pcs_health > healthmax: pcs_health = healthmax
 if pcs_willpwr > willpowermax: pcs_willpwr = willpowermax
 if pcs_stam > stammax: pcs_stam = stammax
-if pcs_manna > mannamax: pcs_manna = mannamax
+if pcs_mana > manamax: pcs_mana = manamax
 if pcs_mood > 100: pcs_mood = 100
 
 if hypnoAddict = 1 and pcs_horny < 30:
@@ -432,8 +432,8 @@ if minut >= 60:
 	gs 'femcyc'
 	if hypnoAddict > 0:dynamic $hypnoAddiction
 
-	!!manna regen
-	pcs_manna += mannamax / 20
+	!!mana regen
+	pcs_mana += manamax / 20
 
 	if alko > 0 and alkoblock = 0:
 		if alko >= 6:
@@ -539,7 +539,7 @@ if minut >= 60:
 
 	if KGOLpers > 0:
 		if KGHP < KGHPMAX:KGHP += 10
-		if KGManna < KGMannaMax:KGManna += 10
+		if KGMana < KGManaMax:KGMana += 10
 	end
 
 !! pain[0] = pain['total'] , pain[1] = pain['damage'] , pain[2] = pain['relief']

+ 4 - 4
locations/stat_display.qsrc

@@ -1,4 +1,4 @@
-# stat_display
+# stat_display
 
 gs 'outdoors', 'main'
 
@@ -212,7 +212,7 @@ if ETOmenu = 1:
 elseif Enable_scalepic = 2:
 	$st_temp='rgb(<<(16777216 + fcolor) mod 256>>,<<(16777216 + fcolor)/256 mod 256>>,<<(16777216 + fcolor)/65536>>)'
 	$stat_msg += '<p><font color="<<$st_temp>>"><TABLE width="300" cellpadding="1" cellspacing="0"><TR><TD width="85%">'+FUNC('indiktab', '2', pcs_horny, pcs_horny)+'</TD><TD> Arousal</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '2', pain['total'], pain['total'])+'</TD><TD> Pain</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_health * 100 / healthmax, pcs_health)+'</TD><TD> Health</TD></TR>'
-	if MagikDostup = 0: $stat_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_manna * 100 / mannamax, pcs_manna)+'</TD><TD> Manna</TD></TR>'
+	if MagikDostup = 0: $stat_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_mana * 100 / manamax, pcs_mana)+'</TD><TD> Mana</TD></TR>'
 	$stat_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_willpwr * 100 / willpowermax, pcs_willpwr)+'</TD><TD> Willpower</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_stam * 100 / stammax, pcs_stam)+'</TD><TD> Stamina</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_mood, pcs_mood)+'</TD><TD> Mood</TD></TR>'
 	if cheatNoEat = 0: $stat_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_energy, pcs_energy)+'</TD><TD> Hunger</TD></TR>'
 	if cheatNoDrink = 0: $stat_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_hydra, pcs_hydra)+'</TD><TD> Thirst</TD></TR>'
@@ -228,8 +228,8 @@ else
 	$stat_msg += '<BR><<$ind>> Health'
 
 	if MagikDostup = 0:
-		gs 'indik', '1', pcs_manna * 100 / mannamax, pcs_manna
-		$stat_msg += '<BR><<$ind>> Manna'
+		gs 'indik', '1', pcs_mana * 100 / manamax, pcs_mana
+		$stat_msg += '<BR><<$ind>> Mana'
 	end
 
 	gs 'indik', '1', pcs_willpwr * 100 / willpowermax, pcs_willpwr

+ 5 - 5
locations/street_event.qsrc

@@ -1,4 +1,4 @@
-# street_event
+# street_event
 
 !{$arg[0]='down','street','Nord' for trigger position.  if call this with gs, $curloc work the same.
 1. location indepent events, list: rape, rob, hijack, ask phonenumber, no pantie&skirt, $street_cum, $mobile_check
@@ -475,7 +475,7 @@ if $ARGS[1] = 'main':
 			shootV = 100
 			!!parameters
 			healthV = vitalV * 10 + strenV * 5
-			mannaV = intelV * 10 + magikV * 10
+			manaV = intelV * 10 + magikV * 10
 			willpowerV = willV * 10
 			BonusAtakV = 0
 			BonusDefV = 0
@@ -572,7 +572,7 @@ if $ARGS[1] = 'main':
 				shootV = 100
 				!!parameters
 				healthV = vitalV * 10 + strenV * 5
-				mannaV = intelV * 10 + magikV * 10
+				manaV = intelV * 10 + magikV * 10
 				willpowerV = willV * 10
 				BonusAtakV = 0
 				BonusDefV = 0
@@ -631,7 +631,7 @@ if $ARGS[1] = 'main':
 				shootV = 100
 				!!parameters
 				healthV = vitalV * 10 + strenV * 5
-				mannaV = intelV * 10 + magikV * 10
+				manaV = intelV * 10 + magikV * 10
 				willpowerV = willV * 10
 				BonusAtakV = 0
 				BonusDefV = 0
@@ -1260,7 +1260,7 @@ if $ARGS[1] = 'main':
 							shootV = 100
 							!!parameters
 							healthV = vitalV * 30 + strenV * 15
-							mannaV = intelV * 10 + magikV * 10
+							manaV = intelV * 10 + magikV * 10
 							willpowerV = willV * 10
 							BonusAtakV = 0
 							BonusDefV = 0

+ 2 - 2
locations/succubus.qsrc

@@ -1,4 +1,4 @@
-# succubus
+# succubus
 
 !!The verious calls for succubus specific events
 !!Varible identification:
@@ -800,7 +800,7 @@ if $args[0] = 'sucwalkinggo':
 		pcs_health += healthmax/5
 		pcs_stam = stammax
 		pcs_willpwr = pcs_intel*5 + will*5+1000
-		pcs_manna = (pcs_intel*pcs_magik) + pcs_magik*100 + pcs_vital*10 + rikudo
+		pcs_mana = (pcs_intel*pcs_magik) + pcs_magik*100 + pcs_vital*10 + rikudo
 
 		minut += 15
 		gs 'stat'

+ 14 - 14
locations/test.qsrc

@@ -13,7 +13,7 @@ boxing = 100
 pcs_magik = 10
 pcs_health = pcs_vital * 10 + pcs_stren * 5
 pcs_willpwr = pcs_intel * 5 + pcs_sprt * 5
-pcs_manna = (pcs_intel * pcs_magik) + pcs_magik * 100 + pcs_vital * 10 + rikudo
+pcs_mana = (pcs_intel * pcs_magik) + pcs_magik * 100 + pcs_vital * 10 + rikudo
 !!!!!!!!!!!!!!!!!!!!!!
 vmeat = (pcs_stren + pcs_vital) / 8
 !!!vmeat = vmeat / 8
@@ -75,7 +75,7 @@ killvar '$ThisSpellName'
 'All articles on the 100, all spells, magical about the 10 forces Rikudo 9000'
 'Do you have any second shadow sedtse that may once to die for you.'
 heart = 1
-mannaReset= 10000
+manaReset= 10000
 act '(Toby mag12)':
 	cla
 	gs 'boyStat', 'A167'
@@ -93,7 +93,7 @@ act '(Toby mag12)':
 	shootV = 100
 	!!parameters
 	healthV = vitalV * 10 + strenV * 5
-	mannaV = intelV * magikV + magikV * 100 + vitalV * 10
+	manaV = intelV * magikV + magikV * 100 + vitalV * 10
 	willpowerV = willV * 10
 	BonusAtakV = 0
 	BonusDefV = 0
@@ -132,7 +132,7 @@ act '(Kisame mag10)':
 	shootV = 100
 	!!parameters
 	healthV = vitalV * 10 + strenV * 5
-	mannaV = intelV * magikV + magikV * 100 + vitalV * 10
+	manaV = intelV * magikV + magikV * 100 + vitalV * 10
 	willpowerV = willV * 10
 	BonusAtakV = 0
 	BonusDefV = 0
@@ -167,7 +167,7 @@ act '(Sasori mag10)':
 	shootV = 100
 	!!parameters
 	healthV = vitalV * 10 + strenV * 5
-	mannaV = intelV * magikV + magikV * 100 + vitalV * 10
+	manaV = intelV * magikV + magikV * 100 + vitalV * 10
 	willpowerV = willV * 10
 	BonusAtakV = 0
 	BonusDefV = 0
@@ -202,7 +202,7 @@ act '(Conan mag10)':
 	shootV = 100
 	!!parameters
 	healthV = vitalV * 10 + strenV * 5
-	mannaV = intelV * magikV + magikV * 100 + vitalV * 10
+	manaV = intelV * magikV + magikV * 100 + vitalV * 10
 	willpowerV = willV * 10
 	BonusAtakV = 0
 	BonusDefV = 0
@@ -237,7 +237,7 @@ act '(Hidan mag9)':
 	shootV = 100
 	!!parameters
 	healthV = vitalV * 10 + strenV * 5
-	mannaV = intelV * magikV + magikV * 100 + vitalV * 10
+	manaV = intelV * magikV + magikV * 100 + vitalV * 10
 	willpowerV = willV * 10
 	BonusAtakV = 0
 	BonusDefV = 0
@@ -275,7 +275,7 @@ act '(Juugo, mutant power 600)':
 	shootV = 100
 	!!parameters
 	healthV = vitalV * 10 + strenV * 5
-	mannaV = intelV * magikV + magikV * 100 + vitalV * 10
+	manaV = intelV * magikV + magikV * 100 + vitalV * 10
 	willpowerV = willV * 10
 	BonusAtakV = 0
 	BonusDefV = 0
@@ -307,7 +307,7 @@ act '(tatiana mag6)':
 	shootV = 100
 	!!parameters
 	healthV = vitalV * 10 + strenV * 5
-	mannaV = intelV * magikV + magikV * 100 + vitalV * 10
+	manaV = intelV * magikV + magikV * 100 + vitalV * 10
 	willpowerV = willV * 10
 	BonusAtakV = 0
 	BonusDefV = 0
@@ -342,7 +342,7 @@ act '(Throwing knives mag1)':
 	shootV = 60
 	!!parameters
 	healthV = vitalV * 10 + strenV * 5
-	mannaV = intelV * magikV + magikV * 100 + vitalV * 10
+	manaV = intelV * magikV + magikV * 100 + vitalV * 10
 	willpowerV = willV * 10
 	BonusAtakV = 0
 	BonusDefV = 0
@@ -374,7 +374,7 @@ act '(Misty thrower, mag2)':
 	shootV = 60
 	!!parameters
 	healthV = vitalV * 10 + strenV * 5
-	mannaV = intelV * magikV + magikV * 100 + vitalV * 10
+	manaV = intelV * magikV + magikV * 100 + vitalV * 10
 	willpowerV = willV * 10
 	BonusAtakV = 0
 	BonusDefV = 0
@@ -406,7 +406,7 @@ act '(Misty lord clones mag3)':
 	shootV = 70
 	!!parameters
 	healthV = vitalV * 10 + strenV * 5
-	mannaV = intelV * magikV + magikV * 100 + vitalV * 10
+	manaV = intelV * magikV + magikV * 100 + vitalV * 10
 	willpowerV = willV * 10
 	BonusAtakV = 0
 	BonusDefV = 0
@@ -438,7 +438,7 @@ act '(Gouge magician mag4)':
 	shootV = 80
 	!!parameters
 	healthV = vitalV * 10 + strenV * 5
-	mannaV = intelV * magikV + magikV * 100 + vitalV * 10
+	manaV = intelV * magikV + magikV * 100 + vitalV * 10
 	willpowerV = willV * 10
 	BonusAtakV = 0
 	BonusDefV = 0
@@ -470,7 +470,7 @@ act '(Commando)':
 	shootV = 80
 	!!parameters
 	healthV = vitalV * 10 + strenV * 5
-	mannaV = intelV * magikV + magikV * 100 + vitalV * 10
+	manaV = intelV * magikV + magikV * 100 + vitalV * 10
 	willpowerV = willV * 10
 	BonusAtakV = 0
 	BonusDefV = 0

+ 1 - 1
locations/treeCircle.qsrc

@@ -51,7 +51,7 @@ canTeleport = 0
 if spellKnown['teleport'] = 1:
 	'You take the Fairy''s advice and get to know this Circle.'
 	minut += 15
-	if pcs_manna > spellMana['teleport']:
+	if pcs_mana > spellMana['teleport']:
 		canTeleport = 1
 	else
 		*nl

+ 2 - 2
locations/version.qsrc

@@ -1,4 +1,4 @@
-# version
+# version
 
 act 'Return': gt 'start'
 
@@ -201,7 +201,7 @@ act 'Return': gt 'start'
 '- Northern region renamed to industrial area by Kevin Smarts'
 '- Tanya house and maid job reworking and fixes from JulienJaden'
 '- Cheat menu tattoo removal updated to match the new tattoos from Maruda'
-'- Manna and mood separation so magic benefits stop being applied to non-magical Sveta by Kevin Smarts'
+'- Mana and mood separation so magic benefits stop being applied to non-magical Sveta by Kevin Smarts'
 '- Update generic fairy response to random topic from Vaelon and Morphuret'
 '- Appearance system and calculations reworked by Vaelon'
 '- New porn playing cards from Small Jerboa'