25개 이상의 토픽을 선택하실 수 없습니다. Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

61 lines
1.1 KiB

  1. planetdata = {
  2. {
  3. x = 0, y = 0,
  4. <<<<<<< Updated upstream
  5. r = 500000, m = 1e9,
  6. =======
  7. <<<<<<< Updated upstream
  8. r = 500000, m = 5e15,
  9. >>>>>>> Stashed changes
  10. xSpeed = 0, ySpeed = 0,
  11. =======
  12. r = 500000, m = 1e12,
  13. xSpeed = 0, ySpeed = 100,
  14. >>>>>>> Stashed changes
  15. name = "Testos",
  16. colour = {42, 04, 20},
  17. parent = "star"
  18. },
  19. {
  20. x = 2000000, y = 0,
  21. <<<<<<< Updated upstream
  22. r = 100000, m = 4e10,
  23. xSpeed = 0, ySpeed = 50,
  24. name = "Deez",
  25. colour = {50, 50, 50},
  26. parent = 1
  27. },
  28. {
  29. x = 2200000, y = 0,
  30. r = 10000, m = 1e9,
  31. xSpeed = 0, ySpeed = 100,
  32. name = "Ligos",
  33. colour = {10, 50, 20},
  34. parent = 2
  35. =======
  36. <<<<<<< Updated upstream
  37. r = 40000, m = 4e7,
  38. xSpeed = 0, ySpeed = 12000,
  39. name = "Deez",
  40. colour = {50, 50, 50},
  41. parent = 1
  42. =======
  43. r = 100000, m = 4e9,
  44. xSpeed = 0, ySpeed = 175,
  45. name = "Deez",
  46. colour = {50, 50, 50},
  47. parent = 1
  48. },
  49. {
  50. x = 2200000, y = 0,
  51. r = 10000, m = 1e4,
  52. xSpeed = 0, ySpeed = 35,
  53. name = "Ligos",
  54. colour = {10, 50, 20},
  55. parent = 2
  56. >>>>>>> Stashed changes
  57. >>>>>>> Stashed changes
  58. }
  59. }
  60. return planetdata