Browse Source

Changed name of temporary file that build.sh makes

oldentree 5 years ago
parent
commit
4eac12a9bc
2 changed files with 6 additions and 6 deletions
  1. 5 5
      build.sh
  2. 1 1
      locations/mod_bestmod.qsrc

+ 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'