From b3bc7ae3f07b4db81ccff947aebfadc545f106e8 Mon Sep 17 00:00:00 2001 From: Justin Marshall Date: Sun, 5 Jul 2020 09:23:55 -0700 Subject: [PATCH] If IQ is too high it no longer sets to 1, instead IQ gets set to max IQ. --- SCU01EA.INI | 8 +++- SCU02EA.INI | 85 +++++++++++++++++++++++------------------ code/redalert/house.cpp | 6 ++- 3 files changed, 58 insertions(+), 41 deletions(-) diff --git a/SCU01EA.INI b/SCU01EA.INI index 853fe0b..cc41740 100644 --- a/SCU01EA.INI +++ b/SCU01EA.INI @@ -127,9 +127,13 @@ FillSilos=no TruckCrate=no Percent=0 -[Greece] +[USSR] PlayerControl=yes +[Greece] +IQ=6 +PlayerControl=No + [Map] Theater=SNOW X=16 @@ -225,7 +229,7 @@ Height=51 4=USSR,APWR,256,6462,0,None,0,0 5=USSR,APWR,256,6975,0,None,0,0 6=USSR,BARR,256,7618,0,None,0,0 -7=USSR,FCOM,256,8769,0,None,1,0 +7=USSR,FACT,256,8769,0,None,1,0 8=USSR,TSLA,256,8894,0,None,0,0 9=USSR,TSLA,256,8899,0,None,0,0 10=USSR,TSLA,256,8259,0,None,0,0 diff --git a/SCU02EA.INI b/SCU02EA.INI index 9e1e17b..2f5f8bd 100644 --- a/SCU02EA.INI +++ b/SCU02EA.INI @@ -19,41 +19,19 @@ TechLevel=2 [KENN] TechLevel=2 -[Basic] -Name=In the thick of it -Intro=AAGUN -Brief= -Win= -Lose= -Action= -Player=USSR -Theme=No theme -CarryOverMoney=0 -ToCarryOver=no -ToInherit=no -TimerInherit=no -CivEvac=no -NewINIFormat=3 -CarryOverCap=0 -EndOfGame=no -NoSpyPlane=no -SkipScore=no -OneTimeOnly=no -SkipMapSelect=no -Official=yes -FillSilos=no -TruckCrate=no -Percent=0 - -[Spain] -TechLevel=2 +[USSR] +PlayerControl=yes +Credits=5000 +TechLevel=3 [Greece] -TechLevel=2 +Credits=10000 +TechLevel=3 +IQ=5 [USSR] -Credits=108 -TechLevel=8 +Credits=5000 +TechLevel=3 [England] TechLevel=2 @@ -82,6 +60,35 @@ TechLevel=2 [Special] TechLevel=2 +[Spain] +TechLevel=2 + +[Basic] +Name=In the thick of it +Intro=AAGUN +Brief= +Win= +Lose= +Action= +Player=USSR +Theme=No theme +CarryOverMoney=0 +ToCarryOver=no +ToInherit=no +TimerInherit=no +CivEvac=no +NewINIFormat=3 +CarryOverCap=0 +EndOfGame=no +NoSpyPlane=no +SkipScore=no +OneTimeOnly=no +SkipMapSelect=no +Official=yes +FillSilos=no +TruckCrate=no +Percent=0 + [Map] Theater=SNOW X=9 @@ -143,17 +150,21 @@ Height=61 4118=T01 [UNITS] -0=Spain,MCV,256,5645,0,Guard,None -1=USSR,MCV,256,6332,0,Guard,None +0=USSR,MCV,256,6332,0,Guard,None +1=Greece,HARV,256,6037,0,Harvest,None + +[STRUCTURES] +0=Greece,FACT,256,5516,0,None,0,0 +1=Greece,PROC,256,5776,0,None,0,0 [Base] Player=Spain Count=0 [OverlayPack] -1=igAAIIH//pEY/4EKAASBC/59AP+DCwsJ/nsA/4QMCwoLIQX+eAD/hAkL/wkAg/57AP+DCg -2=kK/3wAlxmBDNeYGv9oAJga1S8bhAn/DAz+YwD/gQrVshuBDAAB/nwA/4ELAAL/ewAxHAB9 -3=gQn/fACYGoH/FJr/fAAWGf9/ABMZEoL+fwD//38AMh7+UAD/gAcAACCB//7/H/+A +1=igAAIIH//pEY/4EMAASBC/59AP+DCQoJ/nsA/4ULCgoL//98ABYZhQwK/wkJEYb+eQD/gQ +2=oRA/56AP+BDNcYGv9oABga1S8bgwz/C/9kAC8b1hQbggkK2BQb/mMA/xMaggkK/nkA/4EK +3=AX//fACXGQOZ/38AlBiBCRCC/nwA//96ALQc/24AKRv+ZwD/gAcAACCB//7/H/+A [Briefing] 1=Tomorrow, the attack on Germany begins, but today, we must protect our @@ -161,5 +172,5 @@ Count=0 3=costs, and destroy any Allied fortification you might find. [Digest] -1=dxNiLz3fQhsHkxKQbrST3BHHc6w= +1=fy7fYRaLFFOoEUlC/bJ+jbMPWIs= diff --git a/code/redalert/house.cpp b/code/redalert/house.cpp index e6e533e..9829ab9 100644 --- a/code/redalert/house.cpp +++ b/code/redalert/house.cpp @@ -7337,7 +7337,9 @@ void HouseClass::Read_INI(CCINIClass & ini) p->Credits = p->Control.InitialCredits; int iq = ini.Get_Int(hname, "IQ", 0); - if (iq > Rule.MaxIQ) iq = 1; +// jmarshall - if IQ index is too high set to max IQ not to 1 + if (iq > Rule.MaxIQ) iq = Rule.MaxIQ; +// jmarshall end p->IQ = p->Control.IQ = iq; p->Control.Edge = ini.Get_SourceType(hname, "Edge", SOURCE_NORTH); @@ -7385,7 +7387,7 @@ void HouseClass::Write_INI(CCINIClass & ini) if (p != NULL) { char const * name = p->Class->IniName; - ini.Clear(name); + //ini.Clear(name); if (i >= HOUSE_MULTI1) continue; if (p->Control.InitialCredits != control.InitialCredits) {