4
1

8 کامیت‌ها c7cb29210f ... 2966c0e77f

نویسنده SHA1 پیام تاریخ
  oldentree 2966c0e77f Updating TODO 5 سال پیش
  oldentree b528a0a626 Messed around with settings anyway, now give state on link to change settings 5 سال پیش
  oldentree 93c7d1e933 Tried to make tables in settings menu look better. Still not happy. Giving up for now. 5 سال پیش
  oldentree 0e8413e572 Removed redundant sexvolume assignments; simplified code which decides which step to take in relationship with Bandit; added some more text 5 سال پیش
  oldentree 38ddf5a439 [bugfix] Accidentally swapped results of conditional for Bandit and pet dog potency 5 سال پیش
  oldentree fc48f2ab55 [bugfix, text] Check bm_cheatBandit is not 0, slightly easier to advance with Bandit when not drunk/horny, fixed bug where an action wouldn't display because it was followed by a gt, added some text 5 سال پیش
  oldentree cd131403ba Reindented options file, organized into tables, made Vargh's new cheat option a bit more compact 5 سال پیش
  oldentree 4eac12a9bc Changed name of temporary file that build.sh makes 5 سال پیش
6فایلهای تغییر یافته به همراه65 افزوده شده و 89 حذف شده
  1. 1 0
      TODO.md
  2. 5 5
      build.sh
  3. 1 1
      locations/mod_bestmod.qsrc
  4. 30 63
      locations/mod_bestmod_bandit.qsrc
  5. 27 19
      locations/mod_bestmod_options.qsrc
  6. 1 1
      locations/mod_bestmod_petshop.qsrc

+ 1 - 0
TODO.md

@@ -11,6 +11,7 @@
 - PC reactions to being pregnant by animal.
 - Random encounters with animals in park.
 - Dog beach scene.
+- Add some text for drunk interactions. These might be made generic for any time the PC is drunk, and inserted into scenes as needed. Same thing for high horny interactions.
 
 # Low priority
 - New images

+ 5 - 5
build.sh

@@ -10,16 +10,16 @@ QSPFILE=bestmod.qsp
 
 #######################################################################
 
-./txtmerge.py locations glife.txt
+./txtmerge.py locations bestmod.txt
 if [[ "$OSTYPE" == "linux-gnu" ]]; then
-	./txt2gam.linux glife.txt "${QSPFILE}" 1> /dev/null
+	./txt2gam.linux bestmod.txt "${QSPFILE}" 1> /dev/null
 elif [[ "$OSTYPE" == "darwin"* ]]; then
-	./txt2gam.mac glife.txt "${QSPFILE}" 1> /dev/null
+	./txt2gam.mac bestmod.txt "${QSPFILE}" 1> /dev/null
 elif [[ "$OSTYPE" == "msys" ]]; then
 	if [[ "$MSYSTEM_CARCH" == "x86_64" ]]; then
-		./txt2gam64.exe glife.txt "${QSPFILE}" 1> /dev/null
+		./txt2gam64.exe bestmod.txt "${QSPFILE}" 1> /dev/null
 	else
-		./txt2gam.exe glife.txt "${QSPFILE}" 1> /dev/null
+		./txt2gam.exe bestmod.txt "${QSPFILE}" 1> /dev/null
 	fi
 fi
 if [ -d "${DESTDIR}" ]; then

+ 1 - 1
locations/mod_bestmod.qsrc

@@ -19,7 +19,7 @@ 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 $curloc = '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 rand(0, 100) < 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'
 

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 30 - 63
locations/mod_bestmod_bandit.qsrc


+ 27 - 19
locations/mod_bestmod_options.qsrc

@@ -1,27 +1,35 @@
 # mod_bestmod_options
 
 *clr & cla
-usehtml = 1
-'<center><h1>Bestmod Settings</h1></center>'
+!!usehtml = 1
+'<center><h2>Bestmod Settings</h2></center>'
+'Change some settings for bestmod. If you are a cheater (you''re not a cheater, are you?), you can toggle some cheats as well in the lower part of the page.'
 '<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")>>):'
-'</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>'
-'</td></tr>'
-'<tr><td cellspacing="0" cellpadding="20" valign="top">'
-if bm_cheatBandit = 1:
-	'Bandit is always horny (Currently ON):'
-	'<td cellspacing="0" cellpadding="20" valign="top"><a href="exec:bm_cheatBandit = 0 & gt ''mod_bestmod_options''">Turn OFF</a>'
-else
-	'Bandit is always horny (Currently OFF):'
-	'<td cellspacing="0" cellpadding="20" valign="top"><a href="exec:bm_cheatBandit = 1 & gt ''mod_bestmod_options''">Turn ON</a>'
-end
-'</td></tr>'
+	'<tr><th colspan="2"><b>Gameplay</b></th></tr>'
+	'<tr><td>'
+		!! The return value of a conditional which evaluates to "true" is -1, so
+		!! to avoid issues when checking a variable assigned to with that value,
+		!! we''ll check if the variable is equal to 0 or not
+		'Player can be impregnated by beasts:'
+	'</td>'
+	'<td>'
+		'<span style="color: red;">Warning: this doesn''t do anything yet!</span>'
+		!! See note above
+		'<a href="exec: bm_enable_preg = (bm_enable_preg = 0) & gt ''mod_bestmod_options''">Turn <<iif(bm_enable_preg = 0, "ON", "OFF")>></a>'
+	'</td></tr>'
+	!!'<tr><td colspan="2">&nbsp;</td></tr>'
 '</table></center>'
-!usehtml = 0
+
+'<center><table border="0" cellspacing="0" cellpadding="20" valign="top">'
+	'<tr><th colspan="2"><b>Cheats</b></th></tr>'
+	'<tr><td>'
+		'Bandit is always horny:'
+	'</td>'
+	'<td>'
+		'<a href="exec:bm_cheatBandit = (bm_cheatBandit = 0) & gt ''mod_bestmod_options''">Turn <<iif(bm_cheatBandit = 0, "ON", "OFF")>></a>'
+	'</td></tr>'
+'</table></center>'
+
 act 'Return': gt 'mod_setting'
 
 --- mod_bestmod_options ---------------------------------

+ 1 - 1
locations/mod_bestmod_petshop.qsrc

@@ -31,7 +31,7 @@ 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(bm_pc_dog_fert and bm_enable_preg, 20000, -1)
 						$npc_thdick[$npclastsaved] = 'knotted'
 						npc_dick[$npclastsaved] = 7
 						npc_sexskill[$npclastsaved] = 0

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است