From 33515e9cfe58d562ff921f49ae6f0b2f8a0fbea5 Mon Sep 17 00:00:00 2001 From: Solargale Date: Sun, 17 Feb 2019 19:48:52 -0700 Subject: [PATCH] deleting old files before adding updated project --- .svn/entries | 1 - .svn/format | 1 - ...344fb5e944722f5cc9a0d1f45ffb592c3.svn-base | 8 - ...b0ddd88261e4cde2fd88ac2c5a40ac406.svn-base | 11 - ...4e7bd7aabc4528b1d3292e14e972d3aa3.svn-base | 376 ------------------ ...5a547bb7117518fdccaddb68f38eb465d.svn-base | 4 - ...0ad1c70371e177a4d7d741f90af3f902c.svn-base | 6 - ...1af84f116d2e262995e9c1531443fa7ea.svn-base | 182 --------- ...ca6781e316ba907fb6c6c96f00be519c2.svn-base | 7 - ...3aa4fad038743ca4bb2199c3065815988.svn-base | 2 - ...a04a1de87216ddb782551757cb9138f3d.svn-base | 11 - .svn/wc.db | Bin 131072 -> 0 bytes .svn/wc.db-journal | 0 13 files changed, 609 deletions(-) delete mode 100644 .svn/entries delete mode 100644 .svn/format delete mode 100644 .svn/pristine/0f/0f5719e344fb5e944722f5cc9a0d1f45ffb592c3.svn-base delete mode 100644 .svn/pristine/ae/ae924b6b0ddd88261e4cde2fd88ac2c5a40ac406.svn-base delete mode 100644 .svn/pristine/ae/aeb18194e7bd7aabc4528b1d3292e14e972d3aa3.svn-base delete mode 100644 .svn/pristine/b3/b3587415a547bb7117518fdccaddb68f38eb465d.svn-base delete mode 100644 .svn/pristine/c9/c92f3eb0ad1c70371e177a4d7d741f90af3f902c.svn-base delete mode 100644 .svn/pristine/ca/cafe17e1af84f116d2e262995e9c1531443fa7ea.svn-base delete mode 100644 .svn/pristine/e2/e2a51faca6781e316ba907fb6c6c96f00be519c2.svn-base delete mode 100644 .svn/pristine/e5/e52fd513aa4fad038743ca4bb2199c3065815988.svn-base delete mode 100644 .svn/pristine/f9/f9f863ca04a1de87216ddb782551757cb9138f3d.svn-base delete mode 100644 .svn/wc.db delete mode 100644 .svn/wc.db-journal diff --git a/.svn/entries b/.svn/entries deleted file mode 100644 index 48082f7..0000000 --- a/.svn/entries +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/.svn/format b/.svn/format deleted file mode 100644 index 48082f7..0000000 --- a/.svn/format +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/.svn/pristine/0f/0f5719e344fb5e944722f5cc9a0d1f45ffb592c3.svn-base b/.svn/pristine/0f/0f5719e344fb5e944722f5cc9a0d1f45ffb592c3.svn-base deleted file mode 100644 index dfe61a7..0000000 --- a/.svn/pristine/0f/0f5719e344fb5e944722f5cc9a0d1f45ffb592c3.svn-base +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.svn/pristine/ae/ae924b6b0ddd88261e4cde2fd88ac2c5a40ac406.svn-base b/.svn/pristine/ae/ae924b6b0ddd88261e4cde2fd88ac2c5a40ac406.svn-base deleted file mode 100644 index c90834f..0000000 --- a/.svn/pristine/ae/ae924b6b0ddd88261e4cde2fd88ac2c5a40ac406.svn-base +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.svn/pristine/ae/aeb18194e7bd7aabc4528b1d3292e14e972d3aa3.svn-base b/.svn/pristine/ae/aeb18194e7bd7aabc4528b1d3292e14e972d3aa3.svn-base deleted file mode 100644 index aa377e7..0000000 --- a/.svn/pristine/ae/aeb18194e7bd7aabc4528b1d3292e14e972d3aa3.svn-base +++ /dev/null @@ -1,376 +0,0 @@ -import java.util.Random; -import java.util.Scanner; -public class TaipanShop { - - private String name = "Taipan"; - private int bank = 0; - private int money = 1000; - private int opiumHeld = 0; - private int silkHeld = 0; - private int generalHeld = 0; - private int armsHeld = 0; - private int cargoSpace = 60; - private int currentCargo = 0; - private int opiumPrice = 16000; - private int silkPrice = 1600; - private int armsPrice = 160; - private int generalPrice = 8; - private int location = 2; - private int guns = 0; - - public void updatePrices(){ - String s = "\n" + name + ", the price of "; - double value = 80*Math.random(); - Random rand = new Random(); - opiumPrice = (rand.nextInt(201) + 60)*100; - silkPrice = (rand.nextInt(201) + 60)*10; - armsPrice = (rand.nextInt(21) + 6)*10; - generalPrice = rand.nextInt(17) + 4; - if(value < 8){ - if(value < 2){ - if(value < 1){ - opiumPrice /= 5; - System.out.println(s + "Opium has dropped to " + opiumPrice +"!!!\n"); - }else{ - opiumPrice *= 5; - System.out.println(s + "Opium has risen to " + opiumPrice +"!!!\n"); - } - }else if(value < 4){ - if(value < 3){ - silkPrice /= 5; - System.out.println(s + "Silk has dropped to " + silkPrice +"!!!\n"); - }else{ - silkPrice *= 5; - System.out.println(s + "Silk has risen to " + silkPrice +"!!!\n"); - } - }else if(value < 6){ - if(value < 3){ - armsPrice /= 5; - System.out.println(s + "Arms has dropped to " + armsPrice +"!!!\n"); - }else{ - armsPrice *= 5; - System.out.println(s + "Arms has risen to " + armsPrice +"!!!\n"); - } - }else{ - if(value < 7){ - generalPrice = 1; - System.out.println(s + "General Cargo has dropped to 1!!!\n"); - }else{ - generalPrice *= 5; - System.out.println(s + "General Cargo has risen to " + generalPrice + "!!!\n"); - } - } - } - } - - public void printShop(){ - currentCargo = opiumHeld+guns*10+silkHeld+armsHeld+generalHeld; - if(cargoSpace - currentCargo < 0){ - System.out.println("Hold: Overloaded" + " Guns: " + guns); - }else{ - System.out.println("Hold: " + (cargoSpace-currentCargo) + " Guns: " + guns); - } - System.out.println("-------------------------------------------------------------"); - System.out.println(" Opium: " + opiumHeld + " Silk: " + silkHeld); - System.out.println(" Arms: " + armsHeld + " General: " + generalHeld); - System.out.println("-------------------------------------------------------------"); - System.out.println("Cash: " + money + " Bank: " + bank+"\n"); - System.out.println(name + ", present prices per unit here are:"); - System.out.println(" Opium: " + opiumPrice + " Silk: " + silkPrice); - System.out.println(" Arms: " + armsPrice + " General: " + generalPrice); - } - - public void shop() { - updatePrices(); - Scanner input = new Scanner(System.in); - boolean notDone = true; - if (location == 1) { - while (notDone) { - printShop(); - System.out.println("\nShall I Buy, Sell, Visit Bank, Transfer Cargo, or Quit Trading?"); - String response = input.next(); - if (response.equalsIgnoreCase("B")) { - boolean notDone2 = true; - System.out.println("What do you wish me to buy, " + name + "?"); - while (notDone2) { - response = input.nextLine(); - if (response.equalsIgnoreCase("O")) { - System.out.println("\nHow much Opium shall I buy, " + name + "? (You can afford " + money / opiumPrice + ")"); - while (notDone2) { - int num = input.nextInt(); - if (num <= money / opiumPrice && num >= 0) { - opiumHeld += num; - money -= num * opiumPrice; - notDone2 = false; - } else if (num >= 0) { - System.out.println(name + ", you can't afford that!"); - } else { - System.out.println(name + ", how am I supposed to buy " + "'" + num + "'" + " Opium?"); - } - } - } else if (response.equalsIgnoreCase("S")) { - System.out.println("\nHow much Silk shall I buy, " + name + "? (You can afford " + money / silkPrice + ")"); - while (notDone2) { - int num = input.nextInt(); - if (num <= money / silkPrice && num >= 0) { - silkHeld += num; - money -= num * silkPrice; - notDone2 = false; - } else if (num >= 0) { - System.out.println(name + ", you can't afford that!"); - } else { - System.out.println(name + ", how am I supposed to buy " + "'" + num + "'" + " Silk?"); - } - } - } else if (response.equalsIgnoreCase("A")) { - System.out.println("\nHow many Arms shall I buy, " + name + "? (You can afford " + money / armsPrice + ")"); - while (notDone2) { - int num = input.nextInt(); - if (num <= money / armsPrice && num >= 0) { - armsHeld += num; - money -= num * armsPrice; - notDone2 = false; - } else if (num >= 0) { - System.out.println(name + ", you can't afford that!"); - } else { - System.out.println(name + ", how am I supposed to buy " + "'" + num + "'" + " Arms?"); - } - } - } else if (response.equalsIgnoreCase("G")) { - System.out.println("\nHow much General Cargo shall I buy, " + name + "? (You can afford " + money / generalPrice + ")"); - while (notDone2) { - int num = input.nextInt(); - if (num <= money / generalPrice && num >= 0) { - generalHeld += num; - money -= num * generalPrice; - notDone2 = false; - } else if (num >= 0) { - System.out.println(name + ", you can't afford that!"); - } else { - System.out.println(name + ", how am I supposed to buy " + "'" + num + "'" + " General Cargo?"); - } - } - } - - } - - } else if (response.equalsIgnoreCase("S")) { - boolean notDone2 = true; - System.out.println("What do you wish me to sell, " + name + "?"); - while (notDone2) { - response = input.nextLine(); - if (response.equalsIgnoreCase("O")) { - System.out.println("\nHow much Opium shall I sell, " + name + "? (You have " + opiumHeld + ")"); - while (notDone2) { - int num = input.nextInt(); - if (num <= opiumHeld && num >= 0) { - opiumHeld -= num; - money += num * opiumPrice; - notDone2 = false; - } else if (num >= 0) { - System.out.println(name + ", you don't have that many to sell!"); - } else { - System.out.println(name + ", how am I supposed to sell " + "'" + num + "'" + " Opium?"); - } - } - } else if (response.equalsIgnoreCase("S")) { - System.out.println("\nHow much Silk shall I sell, " + name + "? (You have " + silkHeld + ")"); - while (notDone2) { - int num = input.nextInt(); - if (num <= silkHeld && num >= 0) { - silkHeld -= num; - money += num * silkPrice; - notDone2 = false; - } else if (num >= 0) { - System.out.println(name + ", you don't have that many to sell!"); - } else { - System.out.println(name + ", how am I supposed to sell " + "'" + num + "'" + " Silk?"); - } - } - } else if (response.equalsIgnoreCase("A")) { - System.out.println("\nHow many Arms shall I sell, " + name + "? (You have " + armsHeld + ")"); - while (notDone2) { - int num = input.nextInt(); - if (num <= armsHeld && num >= 0) { - armsHeld -= num; - money += num * armsPrice; - notDone2 = false; - } else if (num >= 0) { - System.out.println(name + ", you don't have that many to sell!"); - } else { - System.out.println(name + ", how am I supposed to sell " + "'" + num + "'" + " Arms?"); - } - } - } else if (response.equalsIgnoreCase("G")) { - System.out.println("\nHow much General Cargo shall I sell, " + name + "? (You have " + generalHeld + ")"); - while (notDone2) { - int num = input.nextInt(); - if (num <= generalHeld && num >= 0) { - generalHeld -= num; - money += num * generalPrice; - notDone2 = false; - } else if (num >= 0) { - System.out.println(name + ", you don't have that many to sell!"); - } else { - System.out.println(name + ", how am I supposed to sell " + "'" + num + "'" + " General Cargo?"); - } - } - } - - } - - } else if (response.equalsIgnoreCase("V")) { - System.out.println("\n*** PLACEHOLDER FOR BANK ***\n"); - } else if (response.equalsIgnoreCase("T")) { - System.out.println("\n*** PLACEHOLDER FOR WAREHOUSE ***\n"); - } else if (response.equalsIgnoreCase("Q")) { - System.out.println("\n*** PLACEHOLDER FOR TRAVEL ***\n"); - notDone = false; - } - } - } else { - while (notDone) { - printShop(); - System.out.println("\nShall I Buy, Sell, or Quit Trading?"); - String response = input.next(); - if (response.equalsIgnoreCase("B")) { - boolean notDone2 = true; - System.out.println("What do you wish me to buy, " + name + "?"); - while (notDone2) { - response = input.nextLine(); - if (response.equalsIgnoreCase("O")) { - System.out.println("\nHow much Opium shall I buy, " + name + "? (You can afford " + money / opiumPrice + ")"); - while (notDone2) { - int num = input.nextInt(); - if (num <= money / opiumPrice && num >= 0) { - opiumHeld += num; - money -= num * opiumPrice; - notDone2 = false; - } else if (num >= 0) { - System.out.println(name + ", you can't afford that!"); - } else { - System.out.println(name + ", how am I supposed to buy " + "'" + num + "'" + " Opium?"); - } - } - } else if (response.equalsIgnoreCase("S")) { - System.out.println("\nHow much Silk shall I buy, " + name + "? (You can afford " + money / silkPrice + ")"); - while (notDone2) { - int num = input.nextInt(); - if (num <= money / silkPrice && num >= 0) { - silkHeld += num; - money -= num * silkPrice; - notDone2 = false; - } else if (num >= 0) { - System.out.println(name + ", you can't afford that!"); - } else { - System.out.println(name + ", how am I supposed to buy " + "'" + num + "'" + " Silk?"); - } - } - } else if (response.equalsIgnoreCase("A")) { - System.out.println("\nHow many Arms shall I buy, " + name + "? (You can afford " + money / armsPrice + ")"); - while (notDone2) { - int num = input.nextInt(); - if (num <= money / armsPrice && num >= 0) { - armsHeld += num; - money -= num * armsPrice; - notDone2 = false; - } else if (num >= 0) { - System.out.println(name + ", you can't afford that!"); - } else { - System.out.println(name + ", how am I supposed to buy " + "'" + num + "'" + " Arms?"); - } - } - } else if (response.equalsIgnoreCase("G")) { - System.out.println("\nHow much General Cargo shall I buy, " + name + "? (You can afford " + money / generalPrice + ")"); - while (notDone2) { - int num = input.nextInt(); - if (num <= money / generalPrice && num >= 0) { - generalHeld += num; - money -= num * generalPrice; - notDone2 = false; - } else if (num >= 0) { - System.out.println(name + ", you can't afford that!"); - } else { - System.out.println(name + ", how am I supposed to buy " + "'" + num + "'" + " General Cargo?"); - } - } - } - - } - - } else if (response.equalsIgnoreCase("S")) { - boolean notDone2 = true; - System.out.println("What do you wish me to sell, " + name + "? (You have " + opiumHeld + ")"); - while (notDone2) { - response = input.nextLine(); - if (response.equalsIgnoreCase("O")) { - System.out.println("\nHow much Opium shall I sell, " + name + "?"); - while (notDone2) { - int num = input.nextInt(); - if (num <= opiumHeld && num >= 0) { - opiumHeld -= num; - money += num * opiumPrice; - notDone2 = false; - } else if (num >= 0) { - System.out.println(name + ", you don't have that many to sell!"); - } else { - System.out.println(name + ", how am I supposed to sell " + "'" + num + "'" + " Opium?"); - } - } - } else if (response.equalsIgnoreCase("S")) { - System.out.println("\nHow much Silk shall I sell, " + name + "? (You have " + silkHeld + ")"); - while (notDone2) { - int num = input.nextInt(); - if (num <= silkHeld && num >= 0) { - silkHeld -= num; - money += num * silkPrice; - notDone2 = false; - } else if (num >= 0) { - System.out.println(name + ", you don't have that many to sell!"); - } else { - System.out.println(name + ", how am I supposed to sell " + "'" + num + "'" + " Silk?"); - } - } - } else if (response.equalsIgnoreCase("A")) { - System.out.println("\nHow many Arms shall I sell, " + name + "? (You have " + armsHeld + ")"); - while (notDone2) { - int num = input.nextInt(); - if (num <= armsHeld && num >= 0) { - armsHeld -= num; - money += num * armsPrice; - notDone2 = false; - } else if (num >= 0) { - System.out.println(name + ", you don't have that many to sell!"); - } else { - System.out.println(name + ", how am I supposed to sell " + "'" + num + "'" + " Arms?"); - } - } - } else if (response.equalsIgnoreCase("G")) { - System.out.println("\nHow much General Cargo shall I sell, " + name + "? (You have " + generalHeld + ")"); - while (notDone2) { - int num = input.nextInt(); - if (num <= generalHeld && num >= 0) { - generalHeld -= num; - money += num * generalPrice; - notDone2 = false; - } else if (num >= 0) { - System.out.println(name + ", you don't have that many to sell!"); - } else { - System.out.println(name + ", how am I supposed to sell " + "'" + num + "'" + " General Cargo?"); - } - } - } - } - } else if (response.equalsIgnoreCase("Q")) { - System.out.println("\n*** PLACEHOLDER FOR TRAVEL ***\n"); - notDone = false; - } - } - - } - } - public static void main(String[] args){ - TaipanShop shop = new TaipanShop(); - shop.shop(); - } -} \ No newline at end of file diff --git a/.svn/pristine/b3/b3587415a547bb7117518fdccaddb68f38eb465d.svn-base b/.svn/pristine/b3/b3587415a547bb7117518fdccaddb68f38eb465d.svn-base deleted file mode 100644 index 15a15b2..0000000 --- a/.svn/pristine/b3/b3587415a547bb7117518fdccaddb68f38eb465d.svn-base +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.svn/pristine/c9/c92f3eb0ad1c70371e177a4d7d741f90af3f902c.svn-base b/.svn/pristine/c9/c92f3eb0ad1c70371e177a4d7d741f90af3f902c.svn-base deleted file mode 100644 index 94a25f7..0000000 --- a/.svn/pristine/c9/c92f3eb0ad1c70371e177a4d7d741f90af3f902c.svn-base +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.svn/pristine/ca/cafe17e1af84f116d2e262995e9c1531443fa7ea.svn-base b/.svn/pristine/ca/cafe17e1af84f116d2e262995e9c1531443fa7ea.svn-base deleted file mode 100644 index a26d191..0000000 --- a/.svn/pristine/ca/cafe17e1af84f116d2e262995e9c1531443fa7ea.svn-base +++ /dev/null @@ -1,182 +0,0 @@ -import java.util.InputMismatchException; -import java.util.Scanner; -import java.util.Random; -import java.util.concurrent.TimeUnit; - -public class ShipWarfare { - - private int money = 100000000; - private int guns = 3; - private int hp = 100; - private int numOfPeasantShips= 0; - - - - public void peasantFleetAttack() throws Exception{ - Scanner userResponse = new Scanner(System.in); - setNumOfPeasantShips(numOfShips()); - System.out.printf("By Golly! We have $%,d \nwe are being attacked by %d ships\n", getMoney(), getNumOfPeasantShips()); - System.out.println("What do you want to do? Press \"f\" to fight, and \"r\" to run "); - while(true) { - try { - String response = userResponse.nextLine(); - if (response.equalsIgnoreCase("f")) { - System.out.println("Ohh, fight ehh?"); - fightShips(getNumOfPeasantShips()); - } - else if(response.equalsIgnoreCase("r")){ - - } - - } catch (InputMismatchException e) { - String response; - System.out.println("Sorry, that is not an acceptable input please try again"); - response = userResponse.nextLine(); - if (response.equalsIgnoreCase("f") || response.equalsIgnoreCase("r")) - break; - } - } - - } - - public int getMoney() { - return money; - } - - public int getGuns() { - return guns; - } - - public int getHp() { - return hp; - } - - public int getNumOfPeasantShips() { - return numOfPeasantShips; - } - - public void setHp(int hp) { - this.hp = hp; - - } - - public void setMoney(int money) { - this.money = money; - } - - public void setGuns(int guns) { - this.guns = guns; - } - public void setNumOfPeasantShips(int numOfPeasantShips) { - this.numOfPeasantShips = numOfPeasantShips; - } - - public void delayForASecond() throws Exception { - TimeUnit.SECONDS.sleep(1); - } - - public void gameOver(){ - System.out.flush(); - System.out.println("Game over"); - } - - public int numOfShips(){ - - int numOfShipsAttacking = 0; - Random randomValue = new Random(); - - if (getMoney() <= 100000){ - //Minimum one ship will attack, maximum 20 - numOfShipsAttacking = randomValue.nextInt(20) + 1; - } - - else if (getMoney() <= 200000){ - //Minimum 30 Ships will attack, maximum 70 - numOfShipsAttacking = randomValue.nextInt(40) + 30; - } - - else if (getMoney() <= 500000){ - //Minimum 50 ships will attack, maximum 140 - numOfShipsAttacking = randomValue.nextInt(90) + 50; - } - - else if (getMoney() > 1000000){ - //Minimum 100 ships will attack, maximum 300 ships - numOfShipsAttacking = randomValue.nextInt(3) + 100; - } - - return numOfShipsAttacking; - - } - - - - - public void fightShips(int typeOfShip) throws Exception { - - Random randomValue = new Random(); - int shipsRemaining = typeOfShip; - int exitValue=0; - - if(typeOfShip==getNumOfPeasantShips()) { - //Player volley - while (exitValue==0){ - for (int i = 0; i < shipsRemaining; i++) { - for (int j = 0; j < getGuns(); j++) { - int hitOrMiss = randomValue.nextInt(2) + 1; - if (hitOrMiss == 2) { - shipsRemaining--; - if (shipsRemaining <= 0) { - exitValue = 1; - break; - } - System.out.println("Got eem"); - delayForASecond(); - } else { - System.out.println("ARRG! We missed captain"); - delayForASecond(); - } - - - } - - if (shipsRemaining <= 0) { - exitValue = 1; - break; - } - - System.out.printf("%d ships remaining\n", shipsRemaining); - System.out.println("Oh no, they are taking the offensive!"); - delayForASecond(); - //Computer volley - setHp(getHp() - randomValue.nextInt(10)); - if(getHp()<=0){ - exitValue=2; - break; - } - System.out.printf("EEK, we have %d health left\n", getHp()); - delayForASecond(); - - } - } - if(exitValue==1) { - System.out.printf("Got eem!\nIt appears we have defeated the enemy fleet and made it out at %d health\n", hp); - } - else if(exitValue==2){ - gameOver(); - } - - } - //Type of ship implied to be Liu Yen fleet - - else{ - - } - } - - public static void main(String[] args) throws Exception { - ShipWarfare littyObject = new ShipWarfare(); - littyObject.peasantFleetAttack(); - } - -} diff --git a/.svn/pristine/e2/e2a51faca6781e316ba907fb6c6c96f00be519c2.svn-base b/.svn/pristine/e2/e2a51faca6781e316ba907fb6c6c96f00be519c2.svn-base deleted file mode 100644 index 975ddc1..0000000 --- a/.svn/pristine/e2/e2a51faca6781e316ba907fb6c6c96f00be519c2.svn-base +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.svn/pristine/e5/e52fd513aa4fad038743ca4bb2199c3065815988.svn-base b/.svn/pristine/e5/e52fd513aa4fad038743ca4bb2199c3065815988.svn-base deleted file mode 100644 index 5e26124..0000000 --- a/.svn/pristine/e5/e52fd513aa4fad038743ca4bb2199c3065815988.svn-base +++ /dev/null @@ -1,2 +0,0 @@ -# TaipanClone -Computer Science 233 project, Winter 2019 diff --git a/.svn/pristine/f9/f9f863ca04a1de87216ddb782551757cb9138f3d.svn-base b/.svn/pristine/f9/f9f863ca04a1de87216ddb782551757cb9138f3d.svn-base deleted file mode 100644 index 2fe2e78..0000000 --- a/.svn/pristine/f9/f9f863ca04a1de87216ddb782551757cb9138f3d.svn-base +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.svn/wc.db b/.svn/wc.db deleted file mode 100644 index 737f77b869dd2f86dca9e20e81b98e8b54a7efbd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 131072 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 diff --git a/.svn/wc.db-journal b/.svn/wc.db-journal deleted file mode 100644 index e69de29..0000000