From 03b94d78621ecbeaa7a84ce841183f5c19e377e1 Mon Sep 17 00:00:00 2001 From: Lee Date: Thu, 17 Jan 2013 17:39:36 -0500 Subject: [PATCH] Cool gun is cool. Is it a gun? --- src/Goldfish.java | 49 +++++++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/src/Goldfish.java b/src/Goldfish.java index edb8c39..b92a69a 100644 --- a/src/Goldfish.java +++ b/src/Goldfish.java @@ -24,7 +24,7 @@ public class Goldfish { if (_render.reset) { setup(_render.rule); _render.reset = false; - } + } if (!_render.paused) { String rule = _render.rule; if (rule.equals("Conway")) @@ -55,24 +55,24 @@ public class Goldfish { } private void setup(String rule) { - if(rule.equals("Conway")) { - int[][] glidergun = { - {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0}, - {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0}, - {0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1}, - {0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1}, - {1,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, - {1,1,0,0,0,0,0,0,0,0,1,0,0,0,1,0,1,1,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0}, - {0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0}, - {0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, - {0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} - }; - for(int i = 0; i < 36; i++) { - for(int j = 0; j < 9; j++) { - _grid.getPatch(i+2,j+2).setState(glidergun[j][i]); - } - } - } else if (rule.equals("Life Without Death")) { + if(rule.equals("Conway")) { + int[][] glidergun = { + {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0}, + {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0}, + {0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1}, + {0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1}, + {1,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, + {1,1,0,0,0,0,0,0,0,0,1,0,0,0,1,0,1,1,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0}, + {0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0}, + {0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, + {0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} + }; + for(int i = 0; i < 36; i++) { + for(int j = 0; j < 9; j++) { + _grid.getPatch(i+2,j+2).setState(glidergun[j][i]); + } + } + } else if (rule.equals("Life Without Death")) { int[][] pattern = { {1,1,1,1,0,1}, {1,0,1,1,1,1} @@ -83,7 +83,16 @@ public class Goldfish { } } } else if (rule.equals("Brian's Brain")) { - _render.randomize(); + int[][] pattern = { + {2,0,2,0,2}, + {2,0,2,0,2}, + {0,1,0,1,0} + }; + for(int i = 0; i < 5; i++) { + for(int j = 0; j < 3; j++) { + _grid.getPatch(i+((_grid.getHeight()-5)/2),j+((_grid.getWidth()-3)/2)).setState(pattern[j][i]); + } + } } }