From ffde3b80d731b22fb55f2bacee55f1a72bbb16fd Mon Sep 17 00:00:00 2001 From: Pecha Date: Mon, 14 Sep 2020 21:56:07 +1000 Subject: [PATCH] added back + exit functionality for creach addition --- Program.cs | 30 ++++++++++++++++------- bin/Debug/netcoreapp3.1/creachopedia.dll | Bin 12288 -> 12288 bytes bin/Debug/netcoreapp3.1/creachopedia.pdb | Bin 2840 -> 2884 bytes json.bak | 20 --------------- note.txt | 10 ++------ obj/Debug/netcoreapp3.1/creachopedia.dll | Bin 12288 -> 12288 bytes obj/Debug/netcoreapp3.1/creachopedia.pdb | Bin 2840 -> 2884 bytes 7 files changed, 23 insertions(+), 37 deletions(-) delete mode 100644 json.bak diff --git a/Program.cs b/Program.cs index 7afcff4..c209ac4 100644 --- a/Program.cs +++ b/Program.cs @@ -35,7 +35,7 @@ namespace creachopedia { case "add": switch (substatus) { case 1: - Console.WriteLine("Please enter a name for the creacher! Or type (b) for previous category, or (q) to cancel addition entirely."); + Console.WriteLine("Please enter a name for the creacher! Or type (x) to cancel and step back to the previous category, or (q) to cancel addition entirely."); break; case 2: Console.WriteLine("How many footsies? 0u0 (numerals only plz)"); @@ -59,11 +59,11 @@ namespace creachopedia { string userin = Console.ReadLine(); string luserin = userin.ToLower(); - if (luserin == "q" || luserin == "quit") { - Console.WriteLine("Thank you for using the CreachoPedia, please come again!!!!"); - return; - } if (status == "base") { + if (luserin == "q" || luserin == "quit") { + Console.WriteLine("Thank you for using the CreachoPedia, please come again!!!!"); + return; + } if (creacherdict.ContainsKey(userin)) { creacherdict[userin].Introduce(); creacherdict[userin].Step(); @@ -82,7 +82,19 @@ namespace creachopedia { } } else if (status == "add") { - if (substatus == 1) { + if (luserin == "x") { + substatus--; + luserin = ""; + } + else if (luserin == "q") { + status = "base"; + } + else if (substatus == 0) { + status = "base"; + substatus = 1; + Console.WriteLine("please hit enter to continue"); + } + else if (substatus == 1) { tempdict = new Dictionary(); var namematcher = new Regex(@"[^ ].[A-Za-z\- ]{2,}(?qDYPO=RjM?lBm!5^^WLu4hSI8I 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 Vs>P~Ttq~_pMbfZ(Uwk*Y{sP+&z0m*w delta 917 zcmXw%TS$~a6vxjw-|n~TuB*1@f_TYvEd|R$yT6#ZSy`xwnRX%Dq@=uUvPGF|U$*9& zrjAiWkO@8n5oHqfk`HDN6@-wzbR(h&iU^9{qW+)RFz3wq&73)B=FB|uT=w+mH;fBW zMmy1vM$|^ID_R5fjR%jyq&N!^I%QN=(0mxnOuM*pa}mZO@CzMWc%*4Rc)a>+|CLRt zTSpojKBbSmejk{!zjG7mRVgD;QFbDRPx`?1_>^22F_2^ka?UPTF*+cYf$7{8i7;Fc z8^m;21()?CbeNffEL0~<%_3B!GgazBH!$8-D|pSkOIW=HnS#7#jRsVRr+K3)m(tJ! zYa*$)1W8kAtpKFX1Hi*Gt@=I`Byb$ z1#c3(0u3YXO&Z3ftGGZk8paXOTI(8`{eik#zjlb~RhQPHerc^~{&!`;G2awpjYrAe@a@C|I3&SA=wDm7^9bm6Y1 zV-_Z5*WF|G;~auB;~Bm9WahRe^92_%Es>H$VhJ(HsZ=MS(yZ4qc`W24w?NIVMNh<< zU!db>sF9uQ<#pW59bfqD9}Z`E4YwF>uQ4g;;SvddmM&eo`sCbNIj5w%TDpVWo&QuK z4vBo@o*e0MN>7XQyp{8BrFR4O9+2K4>1*e{YtlC@7rt|UzCP&VL7!@K6xw3L@!`bq QVm0O1sRhF)RGQQK7rVr--v9sr diff --git a/json.bak b/json.bak deleted file mode 100644 index 47126eb..0000000 --- a/json.bak +++ /dev/null @@ -1,20 +0,0 @@ -{ - "paca": { - "$type": "creachopedia.GroundCreacher, creachopedia", - "type": "creacher of the land", - "name": "paca", - "_footsies": 4 - }, - "llama": { - "$type": "creachopedia.GroundCreacher, creachopedia", - "type": "creacher of the land", - "name": "llama", - "_footsies": 4 - }, - "stingray": { - "$type": "creachopedia.WaterCreacher, creachopedia", - "type": "creacher of the water", - "name": "stingray", - "_footsies": 0 - } -} \ No newline at end of file diff --git a/note.txt b/note.txt index f2d5a33..570f8c8 100644 --- a/note.txt +++ b/note.txt @@ -1,10 +1,4 @@ -name, footsycount, biome, locomotion, surfacerel, - - -None, Walker, Swimmer, Hopper, Flier, Slitherer, Incher - - FOR NEXT VERSION: - individuals/species distinction - - ability to add individuals without a previously-created species by creating them together - - maybe get rid of Newtonsoft JSON stuff- polymorphism no longer necessary w/ sunsetting of inheritance \ No newline at end of file + - ability to add individuals without a previously-created species by creating them together + - fix "creacher of the urban" and such formatting issues \ No newline at end of file diff --git a/obj/Debug/netcoreapp3.1/creachopedia.dll b/obj/Debug/netcoreapp3.1/creachopedia.dll index 78674ee55cf82a8f604d6431ff1df80f95ac10f2..5a3726d6c9c23f5895de32d6cb898636239dc272 100644 GIT binary patch delta 3743 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 Vs>P~Ttq~_pMbfZ(Uwk*Y{sP+&z0m*w delta 917 zcmXw%TS$~a6vxjw-|n~TuB*1@f_TYvEd|R$yT6#ZSy`xwnRX%Dq@=uUvPGF|U$*9& zrjAiWkO@8n5oHqfk`HDN6@-wzbR(h&iU^9{qW+)RFz3wq&73)B=FB|uT=w+mH;fBW zMmy1vM$|^ID_R5fjR%jyq&N!^I%QN=(0mxnOuM*pa}mZO@CzMWc%*4Rc)a>+|CLRt zTSpojKBbSmejk{!zjG7mRVgD;QFbDRPx`?1_>^22F_2^ka?UPTF*+cYf$7{8i7;Fc z8^m;21()?CbeNffEL0~<%_3B!GgazBH!$8-D|pSkOIW=HnS#7#jRsVRr+K3)m(tJ! zYa*$)1W8kAtpKFX1Hi*Gt@=I`Byb$ z1#c3(0u3YXO&Z3ftGGZk8paXOTI(8`{eik#zjlb~RhQPHerc^~{&!`;G2awpjYrAe@a@C|I3&SA=wDm7^9bm6Y1 zV-_Z5*WF|G;~auB;~Bm9WahRe^92_%Es>H$VhJ(HsZ=MS(yZ4qc`W24w?NIVMNh<< zU!db>sF9uQ<#pW59bfqD9}Z`E4YwF>uQ4g;;SvddmM&eo`sCbNIj5w%TDpVWo&QuK z4vBo@o*e0MN>7XQyp{8BrFR4O9+2K4>1*e{YtlC@7rt|UzCP&VL7!@K6xw3L@!`bq QVm0O1sRhF)RGQQK7rVr--v9sr