Fixed shop wares refresh bug

Author: jwvhewitt

.gitignore

@@ -4,6 +4,7 @@
 savegame/
 arena
 gharena
+gearhead2
 cosplay
 xxran
 *.exe

gearhead2

@@ -39,7 +39,7 @@
 {$ENDIF}
 
 const
-	Version = '0.628';
+	Version = '0.630';
 
 Procedure RedrawOpening;
 	{ The opening menu redraw procedure. }

gearhead2.pas

@@ -1,3 +1,6 @@
+0.630   June 30 2016
+- Fixed shopkeepers never changing wares bug (services.pp)
+- Added more item sprites by Francisco Munoz
 - Added Names_Above_Heads to options menu (pcaction.pp)
 - Added updated ColorMenu from GH1 (colormenu.pp)
 - Game automatically saved upon quit (pcaction.pp)

history.txt

@@ -37,7 +37,7 @@ interface
 	'201 205 229  49  91 161   0 200   0',	{ Aero Blue, Azure, Green }
 	'240 240 240 208  34  51  50  50 150'	{ White, Red Goes Fasta, Blue }
 	);
-
+
 	SATT_SaleTag = 'SALETAG';
 
 var
@@ -148,17 +148,17 @@ implementation
 end;
 
 Function ScalePrice( GB: GameBoardPtr; PC,NPC: GearPtr; Price: Int64 ): LongInt;
-	{ Modify the price listed based upon the PC's shopping skill, }
+	{ Modify the price listed based upon the PC's shopping skill, }
 	{ faction membership, and whatever else. }
 var
-	ShopRk,ShopTr,R: Integer;		{ ShopRank and ShopTarget }
-	PriceMod: LongInt;
+	ShopRk,ShopTr,R: Integer;		{ ShopRank and ShopTarget }
+	PriceMod: LongInt;
 	Adv: GearPtr;
-begin
-	{ Start with the assumption that we're paying 100%. }
-	PriceMod := 100;
+begin
+	{ Start with the assumption that we're paying 100%. }
+	PriceMod := 100;
 
-	{ First, let's modify this by Shopping skill. }
+	{ First, let's modify this by Shopping skill. }
 	{ Determine the Shopping skill rank of the buyer. }
 	ShopRk := SkillValue( PC , NAS_Shopping , STAT_Charm );
 
@@ -175,8 +175,8 @@ implementation
 		end else if R < 0 then begin
 			{ It's much harder to haggle if the shopkeep }
 			{ doesn't like you. }
-			ShopTr := ShopTr + Abs( R ) div 2;
-			{ If the dislike ventures into hate, there's a markup. }
+			ShopTr := ShopTr + Abs( R ) div 2;
+			{ If the dislike ventures into hate, there's a markup. }
 			if R < -20 then PriceMod := PriceMod + Abs( R ) div 5;
 		end;
 	end;
@@ -189,20 +189,20 @@ implementation
 		if ShopRk > 50 then ShopRk := 50;
 
 		PriceMod := PriceMod - ShopRk;
-	end;
-
-	{ Next, let's take a look at factions. }
-	if ( GB <> Nil ) and ( GB^.Scene <> Nil ) and ( NPC <> Nil ) then begin
-		{ ArchEnemies get a 20% markup, allies get a 10% discount. }
-		Adv := FindRoot( GB^.Scene );
-		if IsArchEnemy( Adv , NPC ) then begin
-			PriceMod := PriceMod + 20;
-		end else if IsArchAlly( Adv , NPC ) then begin
-			PriceMod := PriceMod - 10;
-		end;
-	end;
-
-	{ Calculate the final price. }
+	end;
+
+	{ Next, let's take a look at factions. }
+	if ( GB <> Nil ) and ( GB^.Scene <> Nil ) and ( NPC <> Nil ) then begin
+		{ ArchEnemies get a 20% markup, allies get a 10% discount. }
+		Adv := FindRoot( GB^.Scene );
+		if IsArchEnemy( Adv , NPC ) then begin
+			PriceMod := PriceMod + 20;
+		end else if IsArchAlly( Adv , NPC ) then begin
+			PriceMod := PriceMod - 10;
+		end;
+	end;
+
+	{ Calculate the final price. }
 	Price := ( Price * PriceMod ) div 100;
 	if Price < 1 then Price := 1;
 
@@ -1129,7 +1129,7 @@ procedure PurchaseGearMenu( GB: GameBoardPtr; PC,NPC,Part: GearPtr );
 		{ Certain items may need some initialization. }
 	var
 		mecha_colors: String;
-		Fac: GearPtr;
+		Fac: GearPtr;
 		Discount: Integer;
 	begin
 		if I^.G = GG_Mecha then begin
@@ -1154,13 +1154,13 @@ procedure PurchaseGearMenu( GB: GameBoardPtr; PC,NPC,Part: GearPtr );
 			end;
 
 			SetSAtt( I^.SA , 'sdl_colors <' + mecha_colors + '>' );
-		end;
-
-		{ New v0.625- Maybe this item will be on sale! }
-		if ( Random( 20 ) = 1 ) then begin
-			Discount := ( Random( 5 ) + 1 ) * 5;
-			MarkGearsWithNAtt( I , NAG_GearOps , NAS_CostAdjust , -Discount );
-			MarkGearsWithSAtt( I , SATT_SaleTag + ' <' + ReplaceHash( MSgString( 'SALETAG_Discount' ) , BStr( Discount ) ) + '>' );
+		end;
+
+		{ New v0.625- Maybe this item will be on sale! }
+		if ( Random( 20 ) = 1 ) then begin
+			Discount := ( Random( 5 ) + 1 ) * 5;
+			MarkGearsWithNAtt( I , NAG_GearOps , NAS_CostAdjust , -Discount );
+			MarkGearsWithSAtt( I , SATT_SaleTag + ' <' + ReplaceHash( MSgString( 'SALETAG_Discount' ) , BStr( Discount ) ) + '>' );
 		end;
 	end;
 var
@@ -1173,13 +1173,13 @@ procedure PurchaseGearMenu( GB: GameBoardPtr; PC,NPC,Part: GearPtr );
 	{ Set the random seed to something less than random... }
 	NPCSeed := NAttValue( NPC^.NA , NAG_PErsonal , NAS_RandSeed );
 	NPCRestock := NAttValue( NPC^.NA , NAG_PErsonal , NAS_RestockTime );
-	if NPCSeed = 0 then begin
+	if ( NPCSeed = 0 ) or ( GB^.Comtime > NPCRestock ) then begin
 		NPCSeed := Random( 2000000000 ) + 1;
-		NPCRestock := Random( 86400 ) + 1;
+		NPCRestock := 86400 + GB^.Comtime;
 		SetNAtt( NPC^.NA , NAG_PErsonal , NAS_RandSeed , NPCSeed );
 		SetNAtt( NPC^.NA , NAG_PErsonal , NAS_RestockTime , NPCRestock );
 	end;
-	RandSeed := ( ( GB^.ComTime + NPCRestock ) div 86400 ) + NPCSeed;
+	RandSeed := NPCSeed;
 
 	{ We've already got everything loaded from disk, in Standard_Equipment_List. }
 	{ Create a component list of legal parts. }
@@ -1279,7 +1279,7 @@ procedure PurchaseGearMenu( GB: GameBoardPtr; PC,NPC,Part: GearPtr );
 
 	N := 1;
 	while I <> Nil do begin
-		msg := FullGearName( I );
+		msg := FullGearName( I );
 
 		{ Add extra information, depending upon item type. }
 		if I^.G = GG_Weapon then begin
@@ -1296,10 +1296,10 @@ procedure PurchaseGearMenu( GB: GameBoardPtr; PC,NPC,Part: GearPtr );
 		if ( I^.G <> GG_Mecha ) and ( I^.Scale > 0 ) then begin
 			msg := msg + '(SF' + BStr( I^.Scale ) + ')';
 		end;
-
+
 		{ Add the sale tag, if it exists. }
-		msg2 := SAttValue( I^.SA , SATT_SALETAG );
-		if msg2 <> '' then msg := msg + ' (' + msg2 + ')';
+		msg2 := SAttValue( I^.SA , SATT_SALETAG );
+		if msg2 <> '' then msg := msg + ' (' + msg2 + ')';
 
 		{ Pad the message. }
 {$IFDEF ASCII}
@@ -1358,8 +1358,8 @@ procedure PurchaseGearMenu( GB: GameBoardPtr; PC,NPC,Part: GearPtr );
 		{ Create the menu. }
 		RPM := CreateRPGMenu( MenuItem , MenuSelect , ZONE_ShopMenu );
 		RPM^.Mode := RPMNoCleanup;
-
-		BuildInventoryMenu( RPM , PCInv , True );
+
+		BuildInventoryMenu( RPM , PCInv , True );
 
 		AddRPGMenuItem( RPM , MsgString( 'SERVICES_Exit' ) , -1 );
 
@@ -1388,11 +1388,11 @@ procedure PurchaseGearMenu( GB: GameBoardPtr; PC,NPC,Part: GearPtr );
 	SERV_Menu := Nil;
 	SERV_Info := Nil;
 end;
-
-Function ShopkeeperCanRepairMecha( NPC: GearPtr ): Boolean;
-	{ Return TRUE if the shopkeeper can repair mecha, or FALSE otherwise. }
-begin
-	ShopkeeperCanRepairMecha := ( NPC <> Nil ) and ( NAttValue( NPC^.NA , NAG_Skill , NAS_Repair ) > 5 );
+
+Function ShopkeeperCanRepairMecha( NPC: GearPtr ): Boolean;
+	{ Return TRUE if the shopkeeper can repair mecha, or FALSE otherwise. }
+begin
+	ShopkeeperCanRepairMecha := ( NPC <> Nil ) and ( NAttValue( NPC^.NA , NAG_Skill , NAS_Repair ) > 5 );
 end;
 
 Procedure ThisMechaWasSelected( GB: GameBoardPtr; MekNum: Integer; PC,NPC: GearPtr );
@@ -1474,10 +1474,10 @@ procedure PurchaseGearMenu( GB: GameBoardPtr; PC,NPC,Part: GearPtr );
 		{ If this gear is a mecha, and it belongs to the PC, }
 		{ add it to the menu. }
 		if ( NAttValue( Mek^.NA , NAG_Location , NAS_Team ) = NAV_DefPlayerTeam ) and not GearActive( Mek ) then begin
-			msg := TeamMateName( Mek );
-
-			msg2 := SAttValue( Mek^.SA , SATT_SALETAG );
-			if msg2 <> '' then msg := msg + ' (' + msg2 + ')';
+			msg := TeamMateName( Mek );
+
+			msg2 := SAttValue( Mek^.SA , SATT_SALETAG );
+			if msg2 <> '' then msg := msg + ' (' + msg2 + ')';
 
 			AddRPGMenuItem( RPM , msg , N );
 		end;