Merge branch 'MSR-Alpha' into MSR-Scripts

Author: greatguys1

scripts/NPCs/g_adventurer.script

@@ -144,10 +144,10 @@
 		setvard CONVO_TYPE intro
 		setvard CHAT_STEPS 3
 		setvard CHAT_STEP 0
-		setvard CHAT_STEP1 "Ah, hello there. I�ve been honing my skills here for awhile now."
+		setvard CHAT_STEP1 "Ah, hello there. I've been honing my skills here for awhile now."
 		setvard CHAT_DELAY_STEP1 5.01
 		setvard CHAT_SOUND1 voices/jerdid/Jerdid_1.wav
-		setvard CHAT_STEP2 "However, I�m hearing far more howls than I�d feel comfortable dealing with... Should there be wolves attached to them all."
+		setvard CHAT_STEP2 "However, I'm hearing far more howls than I'd feel comfortable dealing with... Should there be wolves attached to them all."
 		setvard CHAT_DELAY_STEP2 8.19
 		setvard CHAT_SOUND2 voices/jerdid/Jerdid_2.wav
 		setvard CHAT_STEP3 "If you'd be so kind as to stay a moment and assist me, I'd would be forever grateful."
@@ -258,7 +258,7 @@
 	setvard CONVO_TYPE none
 	setvard QUEST_WINNER PARAM1
 	playanim critical yes
-	saytext Your assistance is greatly appreciated! Now stand-fast and be ready... I�m sure they�ve caught our scent by now.
+	saytext Your assistance is greatly appreciated! Now stand-fast and be ready... I'm sure they've caught our scent by now.
 	playsound 0 10 voices/jerdid/Jerdid_5.wav
 	setvard IN_BATTLE 1
 	usetrigger wolves_go

scripts/NPCs/lighthouse_keeper.script

@@ -83,7 +83,7 @@
 		setvard CHAT_STEP 0
 		setvard BUSY_CHATTING 1
 		setvard CHAT_STEP1 "Oh! Hello there!"
-		setvard CHAT_STEP2 "Sorry for being so startled. It�s not very often I get visitors way up here."
+		setvard CHAT_STEP2 "Sorry for being so startled. It's not very often I get visitors way up here."
 		callevent chat_loop
 
 		local NEXT_CHAT CHAT_DELAY
@@ -105,7 +105,7 @@
 	setvard CHAT_STEPS 2
 	setvard CHAT_STEP 0
 	setvard BUSY_CHATTING 1
-	setvard CHAT_STEP1 "It�s just me up here, and I�m getting on in years, so I often neglect many tasks..."
+	setvard CHAT_STEP1 "It's just me up here, and I'm getting on in years, so I often neglect many tasks..."
 	callevent build_task_string
 	setvard CHAT_STEP2 TASK_STRING
 	callevent chat_loop
@@ -122,7 +122,7 @@
 	}
 	if ( !DONE_GRAVE )
 	{
-		stradd TASK_STRING "tending Feldar�s [grave], "
+		stradd TASK_STRING "tending Feldar's [grave], "
 		local QUESTS_LEFT 1
 	}
 	if ( !DONE_CRYSTAL )
@@ -137,7 +137,7 @@
 	}
 	if ( !QUESTS_LEFT )
 	{
-		setvard TASK_STRING "But good young lads like yourself come and fix me up from time to time - so - I�ve nothing that needs doing just now."
+		setvard TASK_STRING "But good young lads like yourself come and fix me up from time to time - so - I've nothing that needs doing just now."
 		callevent 2.0 resume_tending
 	}
 }
@@ -179,10 +179,10 @@
 	setvard CHAT_STEPS 4
 	setvard CHAT_STEP 0
 	setvard BUSY_CHATTING 1
-	setvard CHAT_STEP1 "Well, there�s a spider infestation in the caves below. I�ve put it off for far too long, so..."
-	setvard CHAT_STEP2 "...I figure by now there�s got to be a nest and some very sizable eggs."
+	setvard CHAT_STEP1 "Well, there's a spider infestation in the caves below. I've put it off for far too long, so..."
+	setvard CHAT_STEP2 "...I figure by now there's got to be a nest and some very sizable eggs."
 	setvard CHAT_STEP3 "If those hatch I could be in for more than a little trouble!"
-	setvard CHAT_STEP4 "Think you could go down there and take care of that for me? I�d be ever so grateful."
+	setvard CHAT_STEP4 "Think you could go down there and take care of that for me? I'd be ever so grateful."
 	setvard MENU_MODE confirm
 	setvard MENU_QUEST spider
 	setvard CONFIRM_STEP 4
@@ -234,7 +234,7 @@
 	setvard CHAT_STEP3 "He loved this old place, so we made his grave just around the back, ... I used to visit it quite often, but lately it's been... Strange."
 	setvard CHAT_STEP4 "He had a favorite figurine of The Goddess Felewyn, you see. His widow brought it to me recently. I think he wanted it buried with him..."
 	setvard CHAT_STEP5 "Or at least that would explain the... Unrest... Outside."
-	setvard CHAT_STEP6 "You look like you might be able to brave the denizens around there. If you could bring this statuette there, I�m sure it�d all quiet down." 
+	setvard CHAT_STEP6 "You look like you might be able to brave the denizens around there. If you could bring this statuette there, I'm sure it'd all quiet down." 
 	setvard MENU_MODE confirm
 	setvard MENU_QUEST grave
 	setvard CONFIRM_STEP 6
@@ -277,11 +277,11 @@
 	setvard CHAT_STEPS 5
 	setvard CHAT_STEP 0
 	setvard BUSY_CHATTING 1
-	setvard CHAT_STEP1 "Ah, well... The lighthouse here�s been a bit flickery as of late - I think she needs some new crystals."
+	setvard CHAT_STEP1 "Ah, well... The lighthouse here's been a bit flickery as of late - I think she needs some new crystals."
 	setvard CHAT_STEP2 "The light crystals that power the magic core are fairly common in these parts..."
-	setvard CHAT_STEP3 "But with all the things I�ve seen crawling about lately, I just don�t feel up to grabbing them myself!"
-	setvard CHAT_STEP4 "If you could find me a good set, I�ll reward ye handsomely."
-	setvard CHAT_STEP5 "Otherwise we could wind up with a boat smashed up on the rocks, and that�d be bad for business!"
+	setvard CHAT_STEP3 "But with all the things I've seen crawling about lately, I just don't feel up to grabbing them myself!"
+	setvard CHAT_STEP4 "If you could find me a good set, I'll reward ye handsomely."
+	setvard CHAT_STEP5 "Otherwise we could wind up with a boat smashed up on the rocks, and that'd be bad for business!"
 	setvard MENU_MODE confirm
 	setvard MENU_QUEST crystal
 	setvard CONFIRM_STEP 4
@@ -295,7 +295,7 @@
 	if ( DONE_FOOD )
 	{ 
 		playanim critical wave
-		saytext Oh, someone already got me some - I�m quite sated, thanks.
+		saytext "Oh, someone already got me some - I'm quite sated, thanks."
 		local EXIT_SUB 1		
 	}
 	if !EXIT_SUB
@@ -323,9 +323,9 @@
 	setvard CHAT_STEPS 3
 	setvard CHAT_STEP 0
 	setvard BUSY_CHATTING 1
-	setvard CHAT_STEP1 "I... I don�t think I�ve actually eaten a thing in a week, now that I think of it..."
+	setvard CHAT_STEP1 "I... I don't think I've actually eaten a thing in a week, now that I think of it..."
 	setvard CHAT_STEP2 "...and I really try not to, believe me. Too busy for food and all..."
-	setvard CHAT_STEP3 "If you could just bring me an apple or two, anything really, I�d be so very grateful."
+	setvard CHAT_STEP3 "If you could just bring me an apple or two, anything really, I'd be so very grateful."
 	setvard MENU_MODE confirm
 	setvard MENU_QUEST food
 	setvard CONFIRM_STEP 3
@@ -351,7 +351,7 @@
 	if ( MENU_QUEST equals grave )
 	{ 
 		setvard HIRED_GRAVE PARAM1
-		saytext Thank you, oh so much. Come back here when you�ve done the deed and I�ll reward you.
+		saytext Thank you, oh so much. Come back here when you've done the deed and I'll reward you.
 		offer PARAM1 item_fstatue
 	}
 
@@ -364,7 +364,7 @@
 	if ( MENU_QUEST equals food )
 	{ 
 		setvard HIRED_FOOD PARAM1
-		saytext Oh yes, please bring me something, I�d be grateful beyond words.
+		saytext "Oh yes, please bring me something, I'd be grateful beyond words."
 		setvard APPLE_QUEST_ACTIVE 1
 	}
 
@@ -391,7 +391,7 @@
 	setvard MENU_MODE normal
 	quest set PARAM1 l 0
 	playanim critical no
-	saytext Well... That�s alright. At least you�re some company... I guess.
+	saytext "Well... That's alright. At least you're some company... I guess."
 	callevent bchat_mouth_move
 	setvard TENDING_HOUSE 1
 }
@@ -444,7 +444,7 @@
 
 			if ( !DONE_GRAVE )
 			{ 
-				local reg.mitem.title 	"Ask about Feldar�s Grave"
+				local reg.mitem.title 	"Ask about Feldar's Grave"
 				local reg.mitem.type 	callback
 				local reg.mitem.callback say_grave
 				menuitem.register
@@ -476,16 +476,16 @@
 	//confirm quests
 	if ( MENU_MODE equals confirm )
 	{ 
-		if ( MENU_QUEST equals spider ) local reg.mitem.title  "I�ll clear the eggs."
-		if ( MENU_QUEST equals grave ) local reg.mitem.title  "I�ll visit the grave."
-		if ( MENU_QUEST equals crystal ) local reg.mitem.title  "I�ll get the crystals."
-		if ( MENU_QUEST equals food ) local reg.mitem.title  "I�ll bring some apples."
+		if ( MENU_QUEST equals spider ) local reg.mitem.title  "I'll clear the eggs."
+		if ( MENU_QUEST equals grave ) local reg.mitem.title  "I'll visit the grave."
+		if ( MENU_QUEST equals crystal ) local reg.mitem.title  "I'll get the crystals."
+		if ( MENU_QUEST equals food ) local reg.mitem.title  "I'll bring some apples."
 
 		local reg.mitem.type 	callback
 		local reg.mitem.callback accept_quest
 		menuitem.register
 
-		local reg.mitem.title "Sorry. I�m busy."
+		local reg.mitem.title "Sorry. I'm busy."
 		local reg.mitem.type callback
 		local reg.mitem.callback decline_quest
 		menuitem.register
@@ -539,7 +539,7 @@
 		if ( SCROLL_TOME == 2 ) offer PARAM1 scroll_ice_shield_lesser
 	}
 	if ( SCROLL_CHANCE == 2 ) callevent offer_basic_reward BASIC_WINNER
-	saytext "Thank you so very much. I�d hate to have a swarm of eight leggeds creeping up here."
+	saytext "Thank you so very much. I'd hate to have a swarm of eight leggeds creeping up here."
 	quest set PARAM1 l 0
 	callevent 2.0 resume_tending
 }
@@ -551,7 +551,7 @@
 	callevent face_speaker PARAM1
 	callevent convo_anim
 	offer PARAM1 gold $rand(10,15)
-	saytext "Thank you so very much. I�m sure he�ll rest easier now."
+	saytext "Thank you so very much. I'm sure he'll rest easier now."
 	quest set PARAM1 l 0
 	callevent 2.0 resume_tending
 }
@@ -564,7 +564,7 @@
 	callevent face_speaker PARAM1
 	callevent convo_anim
 	offer PARAM1 gold $rand(10,20)
-	saytext "A crystal! Thank goodness! I�m sure they�d hang me if we had another... Accident."
+	saytext "A crystal! Thank goodness! I'm sure they'd hang me if we had another... Accident."
 	quest set PARAM1 l 0
 	callevent 2.0 resume_tending
 }
@@ -599,7 +599,7 @@
 	if ( CUR_QUEST equals food ) setvard HIRED_FOOD 0
 	setvard MENU_MODE normal
 	quest set PARAM1 l 0
-	saytext That�s alright. There�s plenty else to do around here too, if you�re interested.
+	saytext "That's alright. There's plenty else to do around here too, if you're interested."
 	callevent bchat_mouth_move
 	setvard TENDING_HOUSE 1
 }
@@ -624,10 +624,10 @@ repeatdelay $randf(3,5)
 	//player is already on a quest for me
 	playanim critical pondering3
 	local CUR_QUEST $get_quest_data(PARAM1,l)
-	if ( CUR_QUEST equals spider ) saytext Didn�t you say you were going to kill some spiders for me?
-	if ( CUR_QUEST equals grave ) saytext Didn�t you say you were going to tend Feldar�s grave for me?
-	if ( CUR_QUEST equals crystal ) saytext Didn�t you say you were going to get some crystals for me?
-	if ( CUR_QUEST equals food ) saytext Didn�t you say you were going to get me some food?
+	if ( CUR_QUEST equals spider ) saytext "Didn't you say you were going to kill some spiders for me?"
+	if ( CUR_QUEST equals grave ) saytext "Didn't you say you were going to tend Feldar's grave for me?"
+	if ( CUR_QUEST equals crystal ) saytext "Didn't you say you were going to get some crystals for me?"
+	if ( CUR_QUEST equals food ) saytext "Didn't you say you were going to get me some food?"
 	setvard MENU_MODE confirm
 	setvard MENU_QUEST CUR_QUEST
 	menu.open PARAM1

scripts/a3/nightmare_a3TC2.script

@@ -16,7 +16,7 @@
 	//           |Store name|  |Item name|  		|Quantity| |cost|
 	addstoreitem STORENAME pack_archersquiver 1 0
 	addstoreitem STORENAME proj_arrow_poison GIVE_QUANTITY 0 0 60
-	if ( TC_NPLAYERS > 6 )
+	if ( TC_NPLAYERS > 1 )
 	{
 		//add_great_item 50 //this did nothing
 		callevent get_quantity 30 300 30 300

scripts/a3/nightmare_a3TC3.script

@@ -29,7 +29,7 @@
 	if ( GIVE_PRIZE )
 	{
 		addstoreitem STORENAME scroll_fire_wall 1 0
-		if TC_NPLAYERS > 5
+		if TC_NPLAYERS > 1
 		addstoreitem STORENAME scroll2_fire_wall 1 0
 	}
 	callevent get_chance_rare 300

scripts/aleyesu/final_chest.script

@@ -24,7 +24,7 @@
 
 	addstoreitem STORENAME NEWEST_CHARM 1 0
 
-	if ( $rand(1,10) == 10 ) addstoreitem STORENAME armor_paura 1 0
+	if ( $rand(1,10) == 1 ) addstoreitem STORENAME armor_paura 1 0
 
 	//if ( $rand(1,2) == 1 ) addstoreitem STORENAME key_blue 1 0
 	local L_LIST $rand(0,1)
@@ -36,14 +36,14 @@
 	local RND_PICK $rand(0,L_LIST)
 	local SCROLL_NAME $get_token(L_LIST,RND_PICK)
 	addstoreitem STORENAME SCROLL_NAME 1 0
-	if TC_NPLAYERS >= 4
+	if TC_NPLAYERS >= 2
 	callevent add_epic_item 100%
 	local N_SCROLLS $get_token_amt(L_LIST)
 	subtract N_SCROLLS 1
 	local RND_PICK $rand(0,L_LIST)
 	local SCROLL_NAME $get_token(L_LIST,RND_PICK)
 	addstoreitem STORENAME SCROLL_NAME 1 0
-	if TC_NPLAYERS >= 8
+	if TC_NPLAYERS >= 4
 	local N_SCROLLS $get_token_amt(L_LIST)
 	subtract N_SCROLLS 1
 	local RND_PICK $rand(0,L_LIST)

scripts/aleyesu/k_cult_chest.script

@@ -15,11 +15,8 @@
 
 	callevent add_good_item
 	callevent add_good_item
-
-	if TC_NPLAYERS >= 4
-
 	callevent add_great_item
 
-	if TC_NPLAYERS >=8
+	if TC_NPLAYERS >= 2
 	callevent add_great_item
 }

scripts/aleyesu/snakeman_chest.script

@@ -19,13 +19,13 @@
 	local RND_PICK $rand(0,SCROLL_LIST)
 	local SCROLL_NAME $get_token(SCROLL_LIST,RND_PICK)
 	addstoreitem STORENAME SCROLL_NAME 1 0
-	if TC_NPLAYERS >= 4
+	if TC_NPLAYERS >= 2
 	local N_SCROLLS $get_token_amt(SCROLL_LIST)
 	subtract N_SCROLLS 1
 	local RND_PICK $rand(0,SCROLL_LIST)
 	local SCROLL_NAME $get_token(SCROLL_LIST,RND_PICK)
 	addstoreitem STORENAME SCROLL_NAME 1 0
-	if TC_NPLAYERS >= 8
+	if TC_NPLAYERS >= 4
 	local N_SCROLLS $get_token_amt(SCROLL_LIST)
 	subtract N_SCROLLS 1
 	local RND_PICK $rand(0,SCROLL_LIST)

scripts/aleyesu/spider_chest.script

@@ -1,16 +1,14 @@
 #include chests/gold_10
 
-{
-   eventname treasure_spawn
+{ treasure_spawn
 
    gold		50
    setvar	STORENAME alyspider
 }
 
 #include items/base_treasurechest
 
-{
-   eventname chest_additems
+{ chest_additems
 
    //           |Store name|  	|Item name| 	|Quant|	|cost|	|0?|	|Stack?|
    	addstoreitem	STORENAME 	mana_mpotion	1	0
@@ -26,7 +24,7 @@
 	if ( $rand(1,20) == 1 ) addstoreitem STORENAME shields_lironshield 1 0
 	if ( $rand(1,10) == 1 ) addstoreitem STORENAME armor_knight 1 0
 
-   	if ( $item_exists(TC_CHEST_USER,bows_crossbow_heavy33) )  addstoreitem	STORENAME 	proj_bolt_steal 50 0 0 50
+   	if ( $item_exists(TC_CHEST_USER,bows_crossbow_heavy33) )  addstoreitem	STORENAME	proj_bolt_steel 50 0 0 50
 	addstoreitem	STORENAME	mana_prot_spiders
 
 }

scripts/bloodrose/key_chest.script

@@ -8,17 +8,15 @@
 
 #include items/base_treasurechest
 
-{
-   eventname treasure_spawn
+{ treasure_spawn
 
    gold		$rand(13,26)
    name		an|Old Dresser
    setmodel	props/Xen_furniture2.mdl
    setidleanim	ANIM_IDLE
 }
 
-{
-   eventname trade_success
+{ trade_success
 
    //Need a squeak sound
 
@@ -29,8 +27,7 @@
    setidleanim openidle
 }
 
-{
-   eventname chest_additems
+{ chest_additems
 
    //           |Store name|  |Item name|  	|Quantity| |cost|
    addstoreitem  cupboard01   health_mpotion 	 1          0

scripts/calruin/chest_qspider.script

@@ -8,22 +8,21 @@
 
 { treasure_spawn
 
-   gold $rand(4,10)
+	gold $rand(4,10)
 }
 
 { chest_additems
 
-   //           |Store name|  |Item name|  	|Quantity| |cost|
-   addstoreitem  STORENAME     health_lpotion		$rand(1,5)	0
-   addstoreitem  STORENAME     item_torch		$rand(1,2)	0
-   addstoreitem  STORENAME     swords_scimitar		1		0
-   addstoreitem  STORENAME     pack_archersquiver	1		0
-   addstoreitem  STORENAME     bows_longbow		1		0
-   addstoreitem  STORENAME     proj_arrow_jagged 30 0 0 30
-
-   if ( $rand(1,25) == 1 ) addstoreitem  STORENAME     bows_swiftbow	 	 1          0
+	//           |Store name|  |Item name|  	|Quantity| |cost|
+	addstoreitem  STORENAME     health_lpotion		$rand(1,5)	0
+	addstoreitem  STORENAME     item_torch		$rand(1,2)	0
+	addstoreitem  STORENAME     swords_scimitar		1		0
+	addstoreitem  STORENAME     pack_archersquiver	1		0
+	addstoreitem  STORENAME     bows_longbow		1		0
+	addstoreitem  STORENAME     proj_arrow_jagged 30 0 0 30
 
+	if ( $rand(1,25) == 1 ) addstoreitem  STORENAME     bows_swiftbow	 	 1          0
 
 	if $rand(1,25) == 1
-   addstoreitem STORENAME proj_arrow_gholy 15 0 0 15
+	addstoreitem STORENAME proj_arrow_gholy 15 0 0 15
 }