Skip to content

Commit

Permalink
Merge pull request #32 from Chakaa/feature/betterParents
Browse files Browse the repository at this point in the history 
applied erbkaiser suggestion for improved layouts
  • Loading branch information
@Chakaa
Chakaa authored Sep 5, 2022
2 parents b41e1a5 + 74f8484 commit 4dccdec
Show file tree
Hide file tree
Showing 3 changed files with 219 additions and 38 deletions.
4 changes: 2 additions & 2 deletions CookieGardenHelper-reloaded/info.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"ID": "cookiegardenhelperreloaded",
"Author": "chakaa",
"Description": "Automate your garden in Cookie Clicker - reloaded",
"ModVersion": 1.6,
"ModVersion": 1.7,
"GameVersion": 2.048,
"Date": "01/09/2021",
"Date": "05/09/2021",
"Dependencies": [],
"Disabled": 0,
"AllowSteamAchievs": 1
Expand Down
251 changes: 215 additions & 36 deletions CookieGardenHelper-reloaded/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -778,6 +778,16 @@ Game.registerMod("cookiegardenhelperreloaded",{
[Q,Q,Q,Q,Q,Q]
];
}
if(l>=8){
return [
[X,X,X,X,X,X],
[Q,Q,Q,Q,Q,Q],
[Q,X,Q,Q,X,Q],
[Q,Q,Q,Q,Q,Q],
[Q,X,Q,Q,X,Q],
[Q,Q,Q,Q,Q,Q]
];
}
if(l>=7){
return [
[X,X,X,X,X,X],
Expand All @@ -788,6 +798,36 @@ Game.registerMod("cookiegardenhelperreloaded",{
[X,Q,Q,Q,Q,Q]
];
}
if(l>=6){
return [
[X,X,X,X,X,X],
[X,Q,Q,Q,Q,Q],
[X,Q,X,Q,X,Q],
[X,Q,Q,Q,Q,Q],
[X,X,X,X,X,X],
[X,X,X,X,X,X]
];
}
if(l>=5){
return [
[X,X,X,X,X,X],
[X,Q,Q,Q,X,X],
[X,Q,X,Q,X,X],
[X,Q,Q,Q,X,X],
[X,X,X,X,X,X],
[X,X,X,X,X,X]
];
}
if(l>=4){
return [
[X,X,X,X,X,X],
[X,X,X,X,X,X],
[X,Q,Q,Q,X,X],
[X,Q,X,Q,X,X],
[X,Q,Q,Q,X,X],
[X,X,X,X,X,X]
];
}
if(l>=3){
return [
[X,X,X,X,X,X],
Expand All @@ -805,26 +845,24 @@ Game.registerMod("cookiegardenhelperreloaded",{
var C = [5,0]
var X = [0,0]
if(l>=9){
return [
[C,C,X,C,X,C],
[X,C,X,C,X,C],
return [
[C,X,X,C,X,C],
[C,X,C,X,X,C],
[C,X,C,X,C,X],
[C,X,C,X,C,C]
[C,C,C,C,C,X],
[X,X,X,X,C,C],
[C,C,X,X,X,X],
[X,C,C,C,C,C],
[C,X,C,X,X,C]
];
}
else if(l>=8){
}else if(l>=8){
return [
[X,X,X,X,X,X],
[C,X,C,X,X,C],
[C,X,C,C,C,C],
[C,C,C,X,X,C],
[X,X,X,X,X,X],
[C,X,C,C,C,C],
[C,C,C,X,X,C],
[C,X,C,X,X,C]
];
}
else if(l>=7){
}else if(l>=7){
return [
[X,X,X,X,X,X],
[X,C,X,C,X,C],
Expand All @@ -833,8 +871,7 @@ Game.registerMod("cookiegardenhelperreloaded",{
[X,C,X,C,X,C],
[X,C,X,C,X,C]
];
}
else if(l>=6){
}else if(l>=6){
return [
[X,X,X,X,X,X],
[X,C,C,X,C,C],
Expand All @@ -843,28 +880,25 @@ Game.registerMod("cookiegardenhelperreloaded",{
[X,C,C,X,C,C],
[X,X,X,X,X,X]
];
}
else if(l>=5){
}else if(l>=5){
return [
[X,X,X,X,X,X],
[X,C,X,C,C,X],
[X,C,X,C,X,X],
[X,C,X,C,X,X],
[X,C,X,C,C,X],
[X,C,X,X,C,X],
[X,C,C,C,C,X],
[X,X,X,X,X,X],
[X,C,C,C,C,X],
[X,X,X,X,X,X]
];
}
else if(l>=4){
}else if(l>=4){
return [
[X,X,X,X,X,X],
[X,X,X,X,X,X],
[X,C,X,C,C,X],
[X,C,X,C,X,X],
[X,C,X,C,X,X],
[X,X,C,X,C,X],
[X,X,C,X,C,X],
[X,C,C,X,C,X],
[X,X,X,X,X,X]
];
}
else if(l>=3){
}else if(l>=3){
return [
[X,X,X,X,X,X],
[X,X,X,X,X,X],
Expand All @@ -873,8 +907,7 @@ Game.registerMod("cookiegardenhelperreloaded",{
[X,X,C,X,C,X],
[X,X,X,X,X,X]
];
}
else if(l>=2){
}else if(l>=2){
return [
[X,X,X,X,X,X],
[X,X,X,X,X,X],
Expand All @@ -883,14 +916,164 @@ Game.registerMod("cookiegardenhelperreloaded",{
[X,X,X,X,X,X],
[X,X,X,X,X,X]
];
}else if(l>=1){
return [
[X,X,X,X,X,X],
[X,X,X,X,X,X],
[X,X,X,X,X,X],
[X,X,C,C,X,X],
[X,X,X,X,X,X],
[X,X,X,X,X,X]
];
}
return this.emptyPlot();
}
//Shriekbulb from Elderwort
if(seedId==31){
var E = [8,0]
var X = [0,0]
if(l>=9){
return [
[X,E,E,E,E,X],
[E,X,X,X,X,E],
[E,X,E,E,X,E],
[E,X,E,E,X,E],
[E,X,X,X,X,E],
[X,E,E,E,E,X]
];
}else if(l>=8){
return [
[X,X,X,X,X,X],
[E,E,X,E,X,E],
[X,E,X,E,E,E],
[E,E,X,X,E,X],
[X,E,X,E,E,E],
[E,E,X,E,X,E]
];
}else if(l>=7){
return [
[X,X,X,X,X,X],
[X,E,E,X,E,E],
[X,X,E,X,E,X],
[X,E,E,X,E,E],
[X,X,E,X,E,X],
[X,E,E,X,E,E]
];
}else if(l>=6){
return [
[X,X,X,X,X,X],
[X,X,E,E,E,X],
[X,X,X,X,X,X],
[X,E,E,E,E,E],
[X,E,X,E,X,E],
[X,X,X,X,X,X]
];
}else if(l>=5){
return [
[X,X,X,X,X,X],
[X,E,E,X,E,X],
[X,X,E,E,E,X],
[X,E,E,E,X,X],
[X,E,X,E,E,X],
[X,X,X,X,X,X]
];
}else if(l>=4){
return [
[X,X,X,X,X,X],
[X,X,X,X,X,X],
[X,E,X,E,E,X],
[X,E,E,E,X,X],
[X,E,X,E,E,X],
[X,X,X,X,X,X]
];
}else if(l>=3){
return [
[X,X,X,X,X,X],
[X,X,X,X,X,X],
[X,X,E,X,E,X],
[X,X,E,E,E,X],
[X,X,E,X,E,X],
[X,X,X,X,X,X]
];
}else if(l>=2){
return [
[X,X,X,X,X,X],
[X,X,X,X,X,X],
[X,X,E,X,E,X],
[X,X,E,E,E,X],
[X,X,X,X,X,X],
[X,X,X,X,X,X]
];
}else if(l<2){ //Alternative parents
m=[29,8];
}
else if(l>=1){
}
//Everdaisy
if(seedId==33){
var T = [32,0]
var E = [8,0]
var X = [0,0]
if(l>=9){
return [
[X,T,E,E,X,T],
[T,T,X,T,X,T],
[E,X,X,E,X,E],
[E,T,E,E,X,T],
[X,X,X,X,T,T],
[T,T,E,T,T,X]
];
}else if(l>=8){
return [
[X,X,X,X,X,X],
[T,T,T,T,T,T],
[X,X,X,X,X,X],
[E,E,E,E,E,E],
[X,X,X,X,X,X],
[X,X,C,X,X,X],
[X,X,C,X,X,X],
[T,T,T,T,T,T]
];
}else if(l>=7){
return [
[X,X,X,X,X,X],
[X,T,T,T,T,T],
[X,X,X,X,X,X],
[X,E,E,E,E,E],
[X,X,X,X,X,X],
[X,T,T,T,T,T]
];
}else if(l>=6){
return [
[X,X,X,X,X,X],
[X,T,X,E,X,T],
[X,T,X,E,X,T],
[X,T,X,E,X,T],
[X,T,X,E,X,T],
[X,X,X,X,X,X]
];
}else if(l>=5){
return [
[X,X,X,X,X,X],
[X,X,T,E,E,X],
[X,T,T,X,T,X],
[X,E,X,X,E,X],
[X,E,T,E,E,X],
[X,X,X,X,X,X]
];
}else if(l>=4){
return [
[X,X,X,X,X,X],
[X,X,X,X,X,X],
[X,E,E,E,E,X],
[X,X,X,X,X,X],
[X,T,T,T,T,X],
[X,X,X,X,X,X]
];
}else if(l>=3){
return [
[X,X,X,X,X,X],
[X,X,X,X,X,X],
[X,X,E,X,T,X],
[X,X,E,X,T,X],
[X,X,E,X,T,X],
[X,X,X,X,X,X]
];
}
Expand All @@ -900,10 +1083,6 @@ Game.registerMod("cookiegardenhelperreloaded",{
if(seedId==13 || seedId==24){
return this.allPlots(m);
}
//Shriekbulb && Everdaisy : Horizontal Lines
if((seedId==31 && l>=3) || seedId==33){
return this.horizontalPlots(m);
}
//Alternative parents
//Shriekbulb for level 1-2
if(seedId==31 && l<=2){
Expand Down
2 changes: 2 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,8 @@ The rest of your configuration will remain.
>`Skip harvesting young new seed, if it stands in place of something else (Littleevo)`
>
>`Immortal seeds are not counted for soil rotation`
>
>1.6.1: `More optimal seed layouts for Shriekbulb, Elderdaisy, JQB, GC (erbkaiser)`
## Issues

Expand Down

0 comments on commit 4dccdec

Please sign in to comment.