fix daily juice giving

P3D/Content/Data/Scripts/frontier/shops/juice/daily.dat

@@ -9,10 +9,19 @@ version=2
 		@register.unregister(solddailyjuice<storage.get(integer,juicecount)>)
 		
 		@storage.set(integer,berry1,<system.random(2000,2066)>)
+		:if:<system.random(0,1)>>0
+			@storage.set(string,drink,<inventory.juicecolor(<storage.get(int,berry1)>)>)
+			@storage.set(integer,value,<math.int(<inventory.juicegroup(<storage.get(int,berry1)>)>*4)>)
+		:else
 			@storage.set(integer,berry2,<system.random(2000,2066)>)
+			:if:<system.random(0,19)>>18
+				@storage.set(integer,berry1,<system.random(2058,2066)>)
+				@storage.set(integer,berry2,<system.random(2058,2066)>)
+			:endif
 			@storage.set(string,drink,fail)
 			@storage.set(integer,value,-1)
 			@script.start(frontier\shops\juice\calc)
+		:endif
 		@register.register(juicetype<storage.get(integer,juicecount)>,str,<storage.get(string,drink)>)
 		@register.register(juiceval<storage.get(integer,juicecount)>,int,<storage.get(integer,value)>)
 		
@@ -60,18 +69,20 @@ version=2
 
 @storage.set(integer,value,-1)
 	
+@storage.set(integer,juiceindex,0)
 @storage.set(integer,juicecount,0)
 @storage.set(string,juiceselect,)
-:while:6><storage.get(integer,juicecount)>
+:while:6><storage.get(integer,juiceindex)>
-	:if:<register.registered(solddailyjuice<storage.get(integer,juicecount)>)>=false
+	:if:<register.registered(solddailyjuice<storage.get(integer,juiceindex)>)>=false
-		@storage.set(string,juiceselect,<storage.get(string,juiceselect)><register.value(juicedesc<storage.get(integer,juicecount)>)>,)
+		@storage.set(string,juiceselect,<storage.get(string,juiceselect)><register.value(juicedesc<storage.get(integer,juiceindex)>)>,)
-	:endif
 		@storage.set(integer,juicecount,<math.int(<storage.get(integer,juicecount)>+1)>)
+	:endif
+	@storage.set(integer,juiceindex,<math.int(<storage.get(integer,juiceindex)>+1)>)
 :endwhile
 @storage.set(string,juiceselect,<storage.get(string,juiceselect)>Exit)
 
 @text.show(Welcome to the Juice Shoppe!*Please take a look~at our daily specials!)
-@options.setcancelindex(6)
+@options.setcancelindex(<storage.get(integer,juicecount)>)
 @options.show(<storage.get(string,juiceselect)>)
 	:when:Exit
 		@text.show(Come again soon!)
@@ -110,7 +121,8 @@ version=2
 :endif
 
 @script.start(frontier\shops\juice\give)
-@player.addbp(-<storage.get(integer,cost)>)
+@player.addbp(-<register.value(juicecost<storage.get(integer,select)>)>)
 @register.register(solddailyjuice<storage.get(integer,select)>)
+@text.show(I hope <pokemon.displayname(<pokemon.selected>)>~liked the drink!*Come again soon!)
 
 :end	

P3D/Content/Data/Scripts/frontier/shops/juice/give.dat

@@ -9,6 +9,7 @@ version=2
 			:when:No
 				@text.show(Come again soon!)
 				:endscript
+			:when:Yes
 		:endwhen
 		@pokemon.addfriendship(<pokemon.selected>,4)
 		@pokemon.addev(<pokemon.selected>,hp,<storage.get(integer,value)>)
@@ -19,6 +20,7 @@ version=2
 			:when:No
 				@text.show(Come again soon!)
 				:endscript
+			:when:Yes
 		:endwhen
 		@pokemon.addfriendship(<pokemon.selected>,4)
 		@pokemon.addev(<pokemon.selected>,atk,<storage.get(integer,value)>)
@@ -29,6 +31,7 @@ version=2
 			:when:No
 				@text.show(Come again soon!)
 				:endscript
+			:when:Yes
 		:endwhen
 		@pokemon.addfriendship(<pokemon.selected>,4)
 		@pokemon.addev(<pokemon.selected>,def,<storage.get(integer,value)>)
@@ -39,6 +42,7 @@ version=2
 			:when:No
 				@text.show(Come again soon!)
 				:endscript
+			:when:Yes
 		:endwhen
 		@pokemon.addfriendship(<pokemon.selected>,4)
 		@pokemon.addev(<pokemon.selected>,spatk,<storage.get(integer,value)>)
@@ -49,6 +53,7 @@ version=2
 			:when:No
 				@text.show(Come again soon!)
 				:endscript
+			:when:Yes
 		:endwhen
 		@pokemon.addfriendship(<pokemon.selected>,4)
 		@pokemon.addev(<pokemon.selected>,spdef,<storage.get(integer,value)>)
@@ -59,6 +64,7 @@ version=2
 			:when:No
 				@text.show(Come again soon!)
 				:endscript
+			:when:Yes
 		:endwhen
 		@pokemon.addfriendship(<pokemon.selected>,4)
 		@pokemon.addev(<pokemon.selected>,speed,<storage.get(integer,value)>)
@@ -69,6 +75,7 @@ version=2
 			:when:No
 				@text.show(Come again soon!)
 				:endscript
+			:when:Yes
 		:endwhen
 		@pokemon.addfriendship(<pokemon.selected>,<storage.get(integer,value)>)
 	:when:soda
@@ -82,6 +89,7 @@ version=2
 			:when:No
 				@text.show(Come again soon!)
 				:endscript
+			:when:Yes
 		:endwhen
 		@pokemon.addlevel(<pokemon.selected>,<storage.get(integer,value)>)
 	:when:soup
@@ -90,6 +98,8 @@ version=2
 			:when:No
 				@text.show(Come again soon!)
 				:endscript
+			:when:Yes
 		:endwhen
 		@pokemon.setallevs(<pokemon.selected>,0,0,0,0,0,0)
 :endwhen
+:end