Add AutoGun and SubObjects

config/setting.json

@@ -4,6 +4,7 @@
   "maxPlayer": 50,
   "maxShape": 1000,
   "chatting": false,
+  "getExp": 1,
   "mapSize": {
     "x": 1500,
     "y": 1500

lib/util.go

@@ -71,6 +71,10 @@ func Ccw(p1, p2, p3 Pos) int {
 	}
 }
 
+func DirDis(d1, d2 float64) float64 {
+	return math.Pi - math.Abs(math.Abs(d1-d2)-math.Pi)
+}
+
 func Now() int64 {
 	return time.Now().UnixNano() / 1000000
 }

main.go

@@ -80,16 +80,16 @@ func moveloop(ticker time.Ticker) { // manages the motion of all objects.
 
 		t := time.Now()
 
-		obj.AddShape()
+		obj.AddShape() // 도형 스폰
 
-		for _, u := range obj.Users {
+		for _, u := range obj.Users { // 유저 세팅
 			u.PlayerSet()
 			u.CameraSet()
 		}
 
-		obj.Qt.Clear()
+		obj.Qt.Clear() // 쿼드트리 초기화
 
-		for _, o := range obj.Objects {
+		for _, o := range obj.Objects { // 쿼드트리 충돌처리
 			if !o.IsDead {
 				obj.Qt.Insert(o)
 
@@ -98,27 +98,33 @@ func moveloop(ticker time.Ticker) { // manages the motion of all objects.
 					Y: o.Y - o.R,
 					W: o.R * 2,
 					H: o.R * 2,
-				}) {
+				}) { // 똑같은 오브젝트가 아니고, 죽지 않았으며, 이미 충돌감지가 처리되지 않았고, 주인이 같을 때 반동값을 주는가, 타 오브젝트의 주인이 자신의 오브젝트가 아닌가
 					if o != obj2 && !obj2.IsDead && !(o.IsCollision || obj2.IsCollision) && (obj2.Owner != o.Owner || obj2.IsOwnCol && o.IsOwnCol) && o != obj2.Owner && obj2 != o.Owner {
 						if (o.X-obj2.X)*(o.X-obj2.X)+(o.Y-obj2.Y)*(o.Y-obj2.Y) < (o.R+obj2.R)*(o.R+obj2.R) {
-							o.Collision(o, obj2)
-							obj2.Collision(obj2, o)
+							if o.Collision != nil {
+								o.Collision(o, obj2)
+							}
+							if obj2.Collision != nil {
+								obj2.Collision(obj2, o)
+							}
 						}
 					}
 				}
 			}
 		}
 
 		for i, o := range obj.Objects {
+			o.Index = i
 			if o.Tick != nil {
 				o.Tick(o)
 			}
 
-			o.ObjectTick(i)
+			o.ObjectTick()
 		}
 
 		for i := 0; i < len(obj.Objects); i++ {
 			var o *obj.Object = obj.Objects[i]
+			o.Index = i
 			if o.IsDead {
 				if o.DeadTime == -1 {
 					o.DeadTime = 300
@@ -130,6 +136,8 @@ func moveloop(ticker time.Ticker) { // manages the motion of all objects.
 					obj.Objects = append(obj.Objects[:i], obj.Objects[i+1:]...)
 					i--
 				} else {
+					o.Opacity = math.Max(o.Opacity-0.1, 0)
+					o.R += o.R * 0.02
 					o.DeadTime = math.Max(o.DeadTime-1000./60., 0.)
 				}
 			}

obj/gun.go

@@ -103,9 +103,15 @@ func (obj *Object) Shot(objIndex int) {
 				obj.Dy -= math.Sin(obj.Dir+g.Dir) * 0.1 * g.GunBound
 				g.DelayTime = (0.6 - 0.04*float64(GunOwner.Stats[6])) / g.Reload * 1000
 				g.IsShot = true
-				Objects[objIndex] = &bullet
-				objIndex = len(Objects)
-				Objects = append(Objects, obj)
+				if objIndex == -1 { // as subObject
+					Objects[GunOwner.Index] = &bullet
+					GunOwner.Index = len(Objects)
+					Objects = append(Objects, GunOwner)
+				} else {
+					Objects[objIndex] = &bullet
+					objIndex = len(Objects)
+					Objects = append(Objects, obj)
+				}
 			}
 		} else {
 			g.ShotTime = 0

obj/object.go

@@ -21,6 +21,7 @@ type Object struct {
 	Type       string  `json:"type"`
 	Team       string  `json:"team"`
 	Name       string  `json:"name"`
+	Index      int
 
 	X       float64 `json:"x"`
 	Y       float64 `json:"y"`
@@ -58,16 +59,17 @@ type Object struct {
 	IsShowName   bool `json:"isShowName"`
 	IsBack       bool
 
-	HitObject *Object
-	Target    *Object
-	Tick      func(*Object)
-	Collision func(*Object, *Object)
-	KillEvent func(*Object, *Object)
-	DeadEvent func(*Object, *Object)
+	SubObjects []*Object
+	HitObject  *Object
+	Target     *Object
+	Tick       func(*Object)
+	Collision  func(*Object, *Object)
+	KillEvent  func(*Object, *Object)
+	DeadEvent  func(*Object, *Object)
 }
 
 //
-func (obj *Object) ObjectTick(objIndex int) {
+func (obj *Object) ObjectTick() {
 	obj.X += obj.Dx //* lib.GameSetting.GameSpeed // 좌표값에 속도 적용
 	obj.Y += obj.Dy //* lib.GameSetting.GameSpeed
 
@@ -89,15 +91,27 @@ func (obj *Object) ObjectTick(objIndex int) {
 		}
 	}
 
-	if obj.H <= 0 {
+	if obj.H <= 0 && obj.Mh != 0 {
 		obj.IsDead = true
 		obj.H = 0
 	}
+	for _, o := range obj.SubObjects {
+		if o == nil {
+			continue
+		}
+		o.Index = -1
+		if o.Tick != nil {
+			o.Tick(o)
+		}
+
+		o.ObjectTick()
+	}
+
 	if obj.IsDead {
 		return
 	}
 
-	obj.Shot(objIndex)
+	obj.Shot(obj.Index)
 
 	if obj.Controller != nil && lib.Now()-int64(30000.*lib.GameSetting.GameSpeed) > obj.HitTime {
 		obj.H += obj.Mh / 60 / 10 * lib.GameSetting.GameSpeed
@@ -182,6 +196,14 @@ func (o Object) ObjBinaryData() []byte {
 			data = append(data, byte(0))
 		}
 	}
+	data = append(data, byte(len(o.SubObjects)))
+	for _, obj := range o.SubObjects {
+		if obj == nil {
+			data = append(data, make([]byte, 4)...)
+		} else {
+			data = append(data, obj.ObjBinaryData()...)
+		}
+	}
 	if o.HitTime+100-lib.Now() > 0 {
 		data = append(data, byte(uint8(o.HitTime+100-lib.Now())))
 	} else {

obj/player.go

@@ -180,7 +180,7 @@ func Event(p *Player, message []byte) {
 			value /= 2
 			if value%2 == 1 {
 				if obj := u.ControlObject; obj != nil {
-					//obj.H = 0
+					obj.H = 0
 				}
 			}
 		}
@@ -213,6 +213,9 @@ func Event(p *Player, message []byte) {
 			"Predator",
 			"Trapper",
 			"TriTrapper",
+			"Auto5",
+			"Auto3",
+			"AutoTrapper",
 			"Battleship",
 			"Spike",
 			"Skimmer",

obj/quadtree.go

@@ -152,7 +152,7 @@ func NearObject(o *Object, ran, dir, rdir float64) *Object {
 	var nearObj *Object = nil
 
 	for _, obj := range objList {
-		if math.Abs(dir-math.Atan2(o.Y-obj.Y, o.X-obj.X)) < rdir && lib.Distance(o.X, o.Y, obj.X, obj.Y) < ran && o != obj && o.Owner != obj && o.Team != obj.Team && !obj.IsDead && obj.IsTargeted {
+		if lib.DirDis(dir, math.Atan2(obj.Y-o.Y, obj.X-o.X)) < rdir && lib.Distance(o.X, o.Y, obj.X, obj.Y) < ran && o != obj && o.Owner != obj && o.Team != obj.Team && !obj.IsDead && obj.IsTargeted {
 			if nearObj == nil || lib.Distance(o.X, o.Y, obj.X, obj.Y) < lib.Distance(o.X, o.Y, nearObj.X, nearObj.Y) {
 				nearObj = obj
 			}

obj/tank.go

@@ -7,6 +7,9 @@ import (
 )
 
 func TankTick(obj *Object) {
+	if obj.IsDead {
+		return
+	}
 	obj.R = 12.9 * math.Pow(1.01, float64(obj.Level)-1)
 	obj.Damage = 20 + float64(obj.Stats[2])*4
 	obj.Speed = (0.07 + 0.007*float64(obj.Stats[7])) * math.Pow(0.985, float64(obj.Level)-1)
@@ -265,7 +268,7 @@ func NewTank(t string) *Object {
 		}, nil, nil, nil, nil)}
 	case "TriTrapper":
 		obj.Sight = 1.11
-		var dir float64 = -math.Pi / 3 * 2
+		var dir float64 = -math.Pi / 3. * 2.
 		obj.Guns = []Gun{}
 		for i := 0; i < 3; i++ {
 			obj.Guns = append(obj.Guns, NewGun(obj, map[string]interface{}{
@@ -277,8 +280,53 @@ func NewTank(t string) *Object {
 				"lifetime": 10,
 				"sy":       1.2,
 			}, nil, nil, nil, nil))
-			dir += math.Pi / 3 * 2
+			dir += math.Pi / 3. * 2.
+		}
+	case "Auto5":
+		obj.Sight = 1.11
+		for i := 0.; i < 5.; i++ {
+			obj.SubObjects = append(obj.SubObjects, AutoGun(obj, map[string]interface{}{
+				"speed":  1.2,
+				"damage": 0.4,
+				"radius": 1.2,
+				"bound":  0.333,
+			}, math.Pi*2./5.*i, math.Pi/2.))
+		}
+	case "Auto3":
+		obj.Sight = 1.11
+		for i := 0.; i < 3.; i++ {
+			obj.SubObjects = append(obj.SubObjects, AutoGun(obj, map[string]interface{}{
+				"speed":  1.2,
+				"damage": 0.4,
+				"radius": 1.2,
+				"bound":  0.333,
+			}, math.Pi*2./3.*i, math.Pi/2.))
 		}
+	case "Auto1":
+		obj.Sight = 1.11
+		obj.SubObjects = append(obj.SubObjects, AutoGun(obj, map[string]interface{}{
+			"speed":  1.2,
+			"damage": 0.4,
+			"radius": 1.2,
+			"bound":  0.333,
+		}, 0, math.Pi/2.))
+	case "AutoTrapper":
+		obj.Sight = 1.11
+		obj.Guns = []Gun{NewGun(obj, map[string]interface{}{
+			"type":     "Trap",
+			"health":   2,
+			"reload":   0.667,
+			"radius":   0.8,
+			"lifetime": 24,
+			"sy":       1.2,
+		}, nil, nil, nil, nil)}
+		obj.SubObjects = append(obj.SubObjects, nil)
+		obj.SubObjects = append(obj.SubObjects, AutoGun(obj, map[string]interface{}{
+			"speed":  1.2,
+			"damage": 0.3,
+			"radius": 1.2,
+			"bound":  0.125,
+		}, 0, 0))
 	case "Battleship":
 		obj.Sight = 1.11
 		obj.Stats = [8]int{0, 0, 0, 7, 7, 7, 7, 5}
@@ -403,8 +451,79 @@ func NewTank(t string) *Object {
 	return obj
 }
 
-func AutoGun() {
+func AutoGun(owner *Object, gunValue map[string]interface{}, dir, rdir float64) *Object {
+	var o *Object = NewObject(map[string]interface{}{
+		"team":     "nil",
+		"type":     "AutoGun",
+		"speed":    rdir,
+		"sight":    dir,
+		"mh":       0,
+		"r":        1,
+		"damage":   0,
+		"isBorder": false,
+		"isOwnCol": false,
+	}, func(obj *Object) {
+		obj.R = obj.Owner.R * 0.5
+		obj.Owner.Dx += obj.Dx
+		obj.Owner.Dy += obj.Dy
+		obj.Dx = 0
+		obj.Dy = 0
+
+		if obj.Owner.H == 0 || obj.Owner.IsDead == true {
+			obj.IsDead = true
+		}
 
+		if obj.Speed == 0. {
+			obj.X = obj.Owner.X
+			obj.Y = obj.Owner.Y
+			obj.Dir += 0.005
+
+			var target *Object = NearObject(obj, 400, 0, math.Pi)
+
+			if obj.Target == nil {
+				obj.Target = target
+			} else {
+				if (obj.Target.IsDead || obj.Owner == obj.Target || obj.Target.Team == obj.Team || !obj.Target.IsTargeted) && lib.Distance(obj.Target.X, obj.Target.Y, obj.X, obj.Y) > 500 {
+					obj.Target = target
+				} else {
+					obj.Target = nil
+				}
+			}
+
+		} else {
+			obj.X = obj.Owner.X + math.Cos(obj.Sight)*obj.Owner.R*0.8
+			obj.Y = obj.Owner.Y + math.Sin(obj.Sight)*obj.Owner.R*0.8
+			if obj.Target == nil {
+				obj.Dir = obj.Sight
+			}
+			obj.Sight = obj.Sight + 0.005
+			if obj.Sight > math.Pi*2 {
+				obj.Sight -= math.Pi * 2
+			}
+
+			var target *Object = NearObject(obj, 400, obj.Sight, obj.Speed)
+
+			if obj.Target == nil {
+				obj.Target = target
+			} else {
+				if (obj.Target.IsDead || obj.Owner == obj.Target || obj.Target.Team == obj.Team || !obj.Target.IsTargeted) && lib.Distance(obj.Target.X, obj.Target.Y, obj.X, obj.Y) > 500 {
+					obj.Target = target
+				} else {
+					obj.Target = nil
+				}
+			}
+		}
+
+		if obj.Target != nil {
+			obj.Guns[0].AutoShot = true
+			obj.Dir = math.Atan2(obj.Target.Y-obj.Y, obj.Target.X-obj.X)
+		} else {
+			obj.Guns[0].AutoShot = false
+		}
+	}, nil, DefaultKillEvent, nil)
+	o.Owner = owner
+	o.Guns = []Gun{NewGun(o, gunValue, nil, nil, nil, nil)}
+	return o
 }
 
 func Invisible(o *Object, t float64) {

src/js/data/gun.js

@@ -1,7 +1,7 @@
 import { colorList } from './console';
 import { drawC } from '../lib/draw';
 
-export const Gun = function (paths, dir, color, isMoveDir, isFront, isStatic) {
+export const Gun = function (paths, dir, color, isMoveDir, isStatic) {
     'use strict';
 
     /*
@@ -14,7 +14,6 @@ export const Gun = function (paths, dir, color, isMoveDir, isFront, isStatic) {
     this.color = color;
     if (this.color == undefined) this.color = 1; // default gun color
     this.isMoveDir = isMoveDir || 0; // is Cannot Control Gun? (and Turn like bolt?) (using Smasher or Spike)
-    this.isFront = isFront || false; // 오브젝트의 몸체보다 레이어가 위쪽에 위치했는가?
     this.isStatic = isStatic || false; // 총구가 가로로 늘어나지 않는가? (using Skimmer or Rocketeer 's Gun)
     this.shotTime = []; // using gun's animation
     this.back = 0;