Revert "Updated with latest changes from oldentree"

This reverts commit 3f15070f29ce19a0de1e02d21fe4735941e9bac7.

locations/mod_bestmod.qsrc

@@ -19,9 +19,9 @@ if $loc = 'kafe' and metka = 'start' and menu_off = 0 and QWdogReiq = 3 and week
 
 !! Probably replace houserabrand with another random factor which takes into account PC's
 !! beast exp and relationship with pet.
-if $loc = 'bed' and ((bm_pet_dog_rel > 10 and pcs_horny > 60) or (pcs_horny > 80 and alko > 3) or bm_beast['exp'] > 6) and housrA = 1 and bm_dog_once_day ! daystart and houserabrand < 4: gt 'mod_bestmod_bed', 'sog1'
+if $loc = 'bed' and zoo > 6 and housrA = 1 and bm_dog_once_day ! daystart and houserabrand < 4:gt 'mod_bestmod_bed', 'sog1'
 
-if $loc = 'glake' and $selact = 'Go sunbathing (1:00)' and $clothingworntype = 'nude' and bm_beast['exp'] > 0 and rand(1,10) = 5: gt 'mod_bestmod_lake_dog', 'start'
+!!if $loc = 'glake' and $selact = 'Go sunbathing (1:00)' and $clothingworntype = 'nude' and zoo > 0 and rand(1,10) = 5
 
 if $loc = 'postdeliveries' and $ARGS[0] = '10':
 	if banditfrend = 1:
@@ -39,12 +39,4 @@ if $loc = 'postdeliveries' and $ARGS[0] = '10':
 		end
 	end
 end
-
-!! Some of the variables used in this mod:
-!! bm_beast['exp']			Beastiality experience. Incremented each act.
-!! bm_beast['num']			Count of animal partners. Incremented once per individual.
-!! bm_beast['dog_exp']		Experience with dogs. Incremented each act with dog.
-!! bm_beast['dog_num']		Count of dog partners. Incremented once per individual dog.
-!! ...
-
 --- mod_bestmod ---------------------------------

locations/mod_bestmod_bandit.qsrc

@@ -1765,11 +1765,10 @@ if $ARGS[0] = 'bandit_setup':
 	npc_gender['A<<npctemp>>'] = 0
 	$npc_thdick['A<<npctemp>>'] = 'knotted'
 	npc_dick['A<<npctemp>>'] = 0
-	npc_spermpot['A<<npctemp>>'] = iif(bm_pc_dog_fert and bm_enable_preg, -1, 20000)
+	npc_spermpot['A<<npctemp>>'] = iif(mod_bestmod_pc_dog_fert and mod_bestmod_enable_preg, -1, 20000)
 	npc_vag['A<<npctemp>>'] = -1
 	npc_hymen['A<<npctemp>>'] = -1
 	npc_nips['A<<npctemp>>'] = 1
-	$bm_npc_species['A<<npctemp>>'] = 'dog'
 
 end
 

locations/mod_bestmod_options.qsrc

@@ -5,11 +5,11 @@ usehtml = 1
 '<center><h1>Bestmod Settings</h1></center>'
 '<center><table cellspacing="0" cellpadding="20" valign="top">'
 '<tr><td cellspacing="0" cellpadding="20" valign="top">'
-'Player can be impregnated by beasts (Currently <<iif(bm_enable_preg = 0, "OFF", "ON")>>):'
+'Player can be impregnated by beasts (Currently <<iif(mod_bestmod_enable_preg = 0, "OFF", "ON")>>):'
 '</td>'
 '<td cellspacing="0" cellpadding="20" valign="top">'
 '<span style="color: red;">Warning: this doesn''t do anything yet!</span>'
-'<a href="exec: bm_enable_preg = (bm_enable_preg = 0) & gt ''mod_bestmod_options''">Toggle</a>'
+'<a href="exec: mod_bestmod_enable_preg = (mod_bestmod_enable_preg = 0) & gt ''mod_bestmod_options''">Toggle</a>'
 '</td></tr>'
 '</table></center>'
 !usehtml = 0

locations/mod_bestmod_park_dog.qsrc

@@ -2,7 +2,6 @@
 
 !! When encountered, and beast impreg is enabled, makes male dogs able to impregnate PC
 !! Right now does nothing. Need a function to run when user toggles beast preg on/off
-bm_pc_dog_fert = (bm_enable_preg and 1)
-
+mod_bestmod_pc_dog_fert = (mod_bestmod_enable_preg and 1)
 
 --- mod_bestmod_park_dog ---------------------------------

locations/mod_bestmod_petdog.qsrc

@@ -1,8 +1,4 @@
 # mod_bestmod_petdog
-
-!! Set a default large volume of sperm for pet dog
-sexvolume = rand(100, 200)
-
 if $ARGS[0] = 'start':
 	cls
 	minut += 5

locations/mod_bestmod_petshop.qsrc

@@ -31,11 +31,11 @@ if $ARGS[0] = 'buy_dog':
 						$npc_lastname[$npclastsaved] = $namesob
 						$npc_usedname[$npclastsaved] = $namesob
 						$npc_notes[$npclastsaved] = 'The dog you purchased from the pet shop.'
-						npc_spermpot[$npclastsaved] = iif(bm_pc_dog_fert and bm_enable_preg, -1, 20000)
+						npc_spermpot[$npclastsaved] = iif(mod_bestmod_pc_dog_fert and mod_bestmod_enable_preg, -1, 20000)
 						$npc_thdick[$npclastsaved] = 'knotted'
 						npc_dick[$npclastsaved] = 7
 						npc_sexskill[$npclastsaved] = 0
-						$bm_npc_species[$npclastsaved] = 'dog'
+						sobaka_sexvolume = rand(100, 200)
 
 						act 'Move away from the counter':gt 'zoomagazine', 'start'
 					end