Skip to content

Commit

Permalink
Fix debug print formatting, add red ring purchase values
Browse files Browse the repository at this point in the history
  • Loading branch information
@fluofoxxo
fluofoxxo committed Nov 17, 2019
1 parent b482c46 commit 355abc4
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 57 deletions.
28 changes: 13 additions & 15 deletions muxhandlers/character.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,6 @@ func UnlockedCharacter(helper *helper.Helper) {
return
}

sp := fmt.Sprintf

responseStatus := status.OK

characterToBuy := request.CharacterID
Expand All @@ -160,13 +158,13 @@ func UnlockedCharacter(helper *helper.Helper) {
if buyWith == enums.ItemIDStrRing { // is buying with rings
ringCost := chara.Price
if ringCost > player.PlayerState.NumRings { // cannot buy
helper.DebugOut(sp("Player can't pay with rings (Has %v)", player.PlayerState.NumRings))
helper.DebugOut("Player can't pay with rings (Has %v)", player.PlayerState.NumRings)
responseStatus = status.NotEnoughRings
} else { // can buy with rings
helper.DebugOut(sp("NumRings: %v", player.PlayerState.NumRings))
helper.DebugOut("NumRings: %v", player.PlayerState.NumRings)
//helper.DebugOut(sp("CharacterState[%v].Level: %v", charaIndex, player.CharacterState[charaIndex].Level))
helper.DebugOut(sp("CharacterState[%v].Status: %v", charaIndex, player.CharacterState[charaIndex].Status))
helper.DebugOut(sp("CharacterState[%v].Star: %v", charaIndex, player.CharacterState[charaIndex].Star))
helper.DebugOut("CharacterState[%v].Status: %v", charaIndex, player.CharacterState[charaIndex].Status)
helper.DebugOut("CharacterState[%v].Star: %v", charaIndex, player.CharacterState[charaIndex].Star)
player.PlayerState.NumRings -= ringCost
//player.CharacterState[charaIndex].Level = 0
if player.CharacterState[charaIndex].Status == enums.CharacterStatusUnlocked { // character already owned, so just limit break
Expand All @@ -179,13 +177,13 @@ func UnlockedCharacter(helper *helper.Helper) {
} else if buyWith == enums.ItemIDStrRedRing { // is buying with red rings
redRingCost := chara.PriceRedRings
if redRingCost > player.PlayerState.NumRedRings { // cannot buy with red rings
helper.DebugOut(sp("Player can't pay with red rings (Has %v)", player.PlayerState.NumRedRings))
helper.DebugOut("Player can't pay with red rings (Has %v)", player.PlayerState.NumRedRings)
responseStatus = status.NotEnoughRedRings
} else { // can buy with red rings
helper.DebugOut(sp("NumRedRings: %v", player.PlayerState.NumRedRings))
helper.DebugOut("NumRedRings: %v", player.PlayerState.NumRedRings)
//helper.DebugOut(sp("CharacterState[%v].Level: %v", charaIndex, player.CharacterState[charaIndex].Level))
helper.DebugOut(sp("CharacterState[%v].Status: %v", charaIndex, player.CharacterState[charaIndex].Status))
helper.DebugOut(sp("CharacterState[%v].Star: %v", charaIndex, player.CharacterState[charaIndex].Star))
helper.DebugOut("CharacterState[%v].Status: %v", charaIndex, player.CharacterState[charaIndex].Status)
helper.DebugOut("CharacterState[%v].Star: %v", charaIndex, player.CharacterState[charaIndex].Star)
player.PlayerState.NumRedRings -= redRingCost
//player.CharacterState[charaIndex].Level = 0
if player.CharacterState[charaIndex].Status == enums.CharacterStatusUnlocked { // character already owned, so just limit break
Expand All @@ -200,11 +198,11 @@ func UnlockedCharacter(helper *helper.Helper) {
responseStatus = status.InternalServerError
}
helper.DebugOut("Post:")
helper.DebugOut(sp("NumRings: %v", player.PlayerState.NumRings))
helper.DebugOut(sp("NumRedRings: %v", player.PlayerState.NumRedRings))
helper.DebugOut(sp("CharacterState[%v].Level: %v", charaIndex, player.CharacterState[charaIndex].Level))
helper.DebugOut(sp("CharacterState[%v].Status: %v", charaIndex, player.CharacterState[charaIndex].Status))
helper.DebugOut(sp("CharacterState[%v].Star: %v", charaIndex, player.CharacterState[charaIndex].Star))
helper.DebugOut("NumRings: %v", player.PlayerState.NumRings)
helper.DebugOut("NumRedRings: %v", player.PlayerState.NumRedRings)
helper.DebugOut("CharacterState[%v].Level: %v", charaIndex, player.CharacterState[charaIndex].Level)
helper.DebugOut("CharacterState[%v].Status: %v", charaIndex, player.CharacterState[charaIndex].Status)
helper.DebugOut("CharacterState[%v].Star: %v", charaIndex, player.CharacterState[charaIndex].Star)

baseInfo := helper.BaseInfo(emess.OK, int64(responseStatus))
response := responses.DefaultUpgradeCharacter(baseInfo, player)
Expand Down
75 changes: 33 additions & 42 deletions obj/constobjs/character.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,244 +22,235 @@ which can be detected through a logcat reading.
const NumRedRings = 1337
const PriceRedRings = 9001

/*
func levelToMaxed(c int64) {
sum := c
for i := 0; i < 100; i++ {
c += consts.UpgradeIncreases[]
}
}
*/

// TODO: replace strconv.Itoa conversions to their string equivalents in enums. This should be done after #10 is solved and closed!

var CharacterSonic = obj.Character{
strconv.Itoa(enums.CharaTypeSonic),
0, // unlocked from the start, no cost
NumRedRings, // ?
40000, // used for limit breaking
PriceRedRings, // ?
0, // unlocked from the start, no cost
NumRedRings, // ?
40000, // used for limit breaking
16, // red rings used for limit breaking
}

var CharacterTails = obj.Character{
strconv.Itoa(enums.CharaTypeTails),
350,
NumRedRings,
30000, // used for limit breaking
PriceRedRings,
12, // red rings used for limit breaking
}

var CharacterKnuckles = obj.Character{
strconv.Itoa(enums.CharaTypeKnuckles),
350,
NumRedRings,
30000, // used for limit breaking
PriceRedRings,
12, // red rings used for limit breaking
}

var CharacterAmy = obj.Character{
strconv.Itoa(enums.CharaTypeAmy),
400,
NumRedRings,
31000, // used for limit breaking
PriceRedRings,
13, // red rings used for limit breaking
}

var CharacterShadow = obj.Character{
strconv.Itoa(enums.CharaTypeShadow),
500,
NumRedRings,
35000, // used for limit breaking
PriceRedRings,
14, // red rings used for limit breaking
}

var CharacterBlaze = obj.Character{
strconv.Itoa(enums.CharaTypeBlaze),
550,
NumRedRings,
39500, // used for limit breaking
PriceRedRings,
16, // red rings used for limit breaking
}

var CharacterRouge = obj.Character{
strconv.Itoa(enums.CharaTypeRouge),
550,
NumRedRings,
39500, // used for limit breaking
PriceRedRings,
16, // red rings used for limit breaking
}

var CharacterOmega = obj.Character{
strconv.Itoa(enums.CharaTypeOmega),
650,
NumRedRings,
46000, // used for limit breaking
PriceRedRings,
19, // red rings used for limit breaking
}

var CharacterBig = obj.Character{
strconv.Itoa(enums.CharaTypeBig),
700,
NumRedRings,
49500, // used for limit breaking
PriceRedRings,
20, // red rings used for limit breaking
}

var CharacterCream = obj.Character{
strconv.Itoa(enums.CharaTypeCream),
750,
NumRedRings,
49500, // used for limit breaking
PriceRedRings,
20, // red rings used for limit breaking
}
var CharacterEspio = obj.Character{
strconv.Itoa(enums.CharaTypeEspio),
650,
NumRedRings,
46000, // used for limit breaking
PriceRedRings,
19, // red rings used for limit breaking
}

var CharacterCharmy = obj.Character{
strconv.Itoa(enums.CharaTypeCharmy),
650,
NumRedRings,
46000, // used for limit breaking
PriceRedRings,
19, // red rings used for limit breaking
}

var CharacterVector = obj.Character{
strconv.Itoa(enums.CharaTypeVector),
700,
NumRedRings,
49500, // used for limit breaking
PriceRedRings,
20, // red rings used for limit breaking
}

var CharacterSilver = obj.Character{
strconv.Itoa(enums.CharaTypeSilver),
800,
NumRedRings,
52500, // used for limit breaking
PriceRedRings,
22, // red rings used for limit breaking
}

var CharacterMetalSonic = obj.Character{
strconv.Itoa(enums.CharaTypeMetalSonic),
900,
NumRedRings,
57000, // used for limit breaking
PriceRedRings,
24, // red rings used for limit breaking
}

var CharacterAmitieAmy = obj.Character{
strconv.Itoa(enums.CharaTypeAmitieAmy),
77000,
NumRedRings,
77000, // used for limit breaking
PriceRedRings,
32, // red rings used for limit breaking
}

var CharacterClassicSonic = obj.Character{
strconv.Itoa(enums.CharaTypeClassicSonic),
1000,
NumRedRings,
67000, // used for limit breaking
PriceRedRings,
28, // red rings used for limit breaking
}

var CharacterTikal = obj.Character{
strconv.Itoa(enums.CharaTypeTikal),
1100,
NumRedRings,
69000, // used for limit breaking
PriceRedRings,
29, // red rings used for limit breaking
}

var CharacterGothicAmy = obj.Character{
strconv.Itoa(enums.CharaTypeGothicAmy),
91000,
NumRedRings,
91000, // used for limit breaking
PriceRedRings,
38, // red rings used for limit breaking
}

var CharacterHalloweenShadow = obj.Character{
strconv.Itoa(enums.CharaTypeHalloweenShadow),
99000,
NumRedRings,
99000, // used for limit breaking
PriceRedRings,
41, // red rings used for limit breaking
}

var CharacterHalloweenRouge = obj.Character{
strconv.Itoa(enums.CharaTypeHalloweenRouge),
99000,
NumRedRings,
99000, // used for limit breaking
PriceRedRings,
41, // red rings used for limit breaking
}

var CharacterHalloweenOmega = obj.Character{
strconv.Itoa(enums.CharaTypeHalloweenOmega),
99000,
NumRedRings,
99000, // used for limit breaking
PriceRedRings,
41, // red rings used for limit breaking
}

var CharacterMephiles = obj.Character{
strconv.Itoa(enums.CharaTypeMephiles),
1550,
NumRedRings,
76000, // used for limit breaking
PriceRedRings,
31, // red rings used for limit breaking
}

var CharacterPSISilver = obj.Character{
strconv.Itoa(enums.CharaTypePSISilver),
2300,
NumRedRings,
98000, // used for limit breaking
PriceRedRings,
41, // red rings used for limit breaking
}

var CharacterXMasSonic = obj.Character{
strconv.Itoa(enums.CharaTypeXMasSonic),
85000,
NumRedRings,
85000, // used for limit breaking
PriceRedRings,
35, // red rings used for limit breaking
}

var CharacterXMasTails = obj.Character{
strconv.Itoa(enums.CharaTypeXMasTails),
85000,
NumRedRings,
85000, // used for limit breaking
PriceRedRings,
35, // red rings used for limit breaking
}

var CharacterXMasKnuckles = obj.Character{
strconv.Itoa(enums.CharaTypeXMasKnuckles),
85000,
NumRedRings,
85000, // used for limit breaking
PriceRedRings,
35, // red rings used for limit breaking
}

var CharacterWerehog = obj.Character{
strconv.Itoa(enums.CharaTypeWerehog),
800,
NumRedRings,
52500, // used for limit breaking
PriceRedRings,
52500, // used for limit breaking
PriceRedRings, // red rings used for limit breaking
}

var CharacterSticks = obj.Character{
strconv.Itoa(enums.CharaTypeSticks),
750,
NumRedRings,
49500, // used for limit breaking
PriceRedRings,
20, // red rings used for limit breaking
}

0 comments on commit 355abc4

Please sign in to comment.