Merge pull request #6 from chris81605/Dev

Dev2main

addon-replace/Widgets Market_1.txt

@@ -2,8 +2,7 @@
 
 
 	<<if $stall_cost_FIX is undefined>>
-			<<set $stall_cost_FIX to 1>>
-		<</if>>
-
+		<<set $stall_cost_FIX to 1>>
+	<</if>>	
 	<<set $stall_cost to $stall_cost * $stall_cost_FIX>>
 	<br>

addon-replace/Widgets Market_2.txt

@@ -1,9 +1,5 @@
-		<<if $black_store_FIX_MIN is undefined>>
-			<<set $black_store_FIX_MIN to 11>>
-		<</if>>
-
-		<<if $black_store_FIX_MAX is undefined>>
-			<<set $black_store_FIX_MAX to 30>>
-		<</if>>
-
-		<<set $stall_amount to random($black_store_FIX_MIN, $black_store_FIX_MAX)>> 
+    <<if $black_storeswich is 1>>
+        <<set $stall_amount to random($black_store_FIX_MIN, $black_store_FIX_MAX)>>
+    <</if>>
+    <<if $stall_amount gte $plants[$stall_plant].amount>>
+

addon-replace/Widgets State Man_1.txt

@@ -1,5 +1,4 @@
-				<span class="green"><<He>>吃痛退开。</span>
-				<<combatcontrol 15>><<def 10>>
+				<span class="green"><<He>>吃痛退开。</span>              <<combatcontrol 15>><<def 10>>
 			<</if>>
 
 			<<HP_AP_display HP>>

boot.json

@@ -1,24 +1,25 @@
 {
   "name": "cheat extended",
-  "version": "1.15.1",
+  "version": "1.16",
   "styleFileList": [
     "css/CE_CSS.css"
   ],
-  "scriptFileList": [],
+  "scriptFileList": [
+    "scripts/CE_Time_Event.js",
+    "scripts/CE_getTargetWarmth2.js"
+  ],
   "tweeFileList": [
-    "game/ccplot.twee",
+    "game/Widgets cheat_extended.twee",
     "game/Bccm/bccmeditor.twee",
+    "game/ccplot.twee",
     "game/Bedroom Study.twee",
-    "game/随身衣柜.twee",
-    "game/CE_passage_editor.twee",
-    "game/Widgets cheat_extended.twee"
+    "game/随身衣柜.twee"
   ],
   "imgFileList": [],
   "scriptFileList_inject_early": [
     "scriptEarly/CERegist.js"
   ],
   "additionFile": [
-    "addon-replace/tattoo_index.txt",
     "addon-replace/Widgets Dance Audience.txt",
     "addon-replace/Widgets Market_1.txt",
     "addon-replace/Widgets Market_2.txt",
@@ -63,11 +64,6 @@
           "findString": "\t\t<<set $enemyhealth -= _thedamage>>",
           "replaceFile": "addon-replace/Widgets_5.txt"
         },
-        {
-          "passage": "Widgets Bodywriting Objects",
-          "findString": "\t\tcircle: {\n\t\t\tindex: 199,",
-          "replaceFile": "addon-replace/tattoo_index.txt"
-        },
         {
           "passage": "Widgets Bodywriting",
           "findString": "\"<span class=\"purple\"><<print $skin[_active_bodypart].writ_cn>></span>\"",
@@ -86,8 +82,8 @@
         },
         {
           "passage": "Widgets Orgasm",
-          "findString": "<<milkvolume 1>>",
-          "replace": "<<milkvolume 1>>\n\t<<milk_releasedFIX $_milk_released>>\n\t<<set $_milk_released += $milk_releasedFIX>>\n"
+          "findString": "<<if $milk_amount lt _milk_released>>",
+          "replace": "<<milk_releasedFIX _milk_released>>\n\t<<set _milk_released += $milk_releasedFIX>>\n\t<<if $milk_amount lt _milk_released>>"
         },
         {
           "passage": "Widgets State Man",
@@ -99,16 +95,6 @@
           "findString": "\t\t\t<<if $enemyanger gte $enemyangermax>>",
           "replaceFile": "addon-replace/Widgets State Man_2.txt"
         },
-        {
-          "passage": "Furniture Shop Papers",
-          "findString": "\t\t\t<<run Furniture.set('poster', 'poster', {",
-          "replace": "\t\t\t<<set _normalisedName to _chosenPosterCustom>>\n\t\t\t<<run Furniture.set('poster', 'poster', {"
-        },
-        {
-          "passage": "Furniture Shop Papers",
-          "findString": "\t\t\t<<run Furniture.set('wallpaper', 'wallpaper', {",
-          "replace": "\t\t\t<<set _normalisedName to _chosenWallpaperCustom>>\n\t\t\t<<run Furniture.set('wallpaper', 'wallpaper', {"
-        },
         {
           "passage": "Widgets Dance Audience",
           "findString": "\t\t\t\t<<set $dancetip *= 1 + ($mathstrait / 4)>>",
@@ -151,11 +137,11 @@
     },
     {
       "modName": "Simple Frameworks",
-      "version": ">=1.3.0"
+      "version": ">=1.15.3"
     },
     {
       "modName": "GameVersion",
-      "version": "=0.5.0.5"
+      "version": ">=0.5.0.5"
     }
   ]
 }