emo/emo-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: emo:504a49eaae52038b73f84b149f3f60d5de375edc
Branches Tags
emo:main
emo:2PlayerQuestWorkarounds
emo:cat-sold-counter
emo:new-exp
emo:hcim-backup
emo:2009Scape
..
compare: emo:c7db36d9b6bfacb5d0f8eeb8bb467111f72196fa
Branches Tags
emo:main
emo:2PlayerQuestWorkarounds
emo:cat-sold-counter
emo:new-exp
emo:hcim-backup
emo:2009Scape

No commits in common. "504a49eaae52038b73f84b149f3f60d5de375edc" and "c7db36d9b6bfacb5d0f8eeb8bb467111f72196fa" have entirely different histories.
504a49eaae ... c7db36d9b6

3 changed files with 1 additions and 4 deletions
Show Stats Expand all files Collapse all files

2
Server/src/main/content/region/kandarin/ardougne/westardougne/dialogue/CivilianDialogue.kt
View File

@ -124,7 +124,6 @@ class CivilianDialogue(player: Player? = null) : DialoguePlugin(player) {
if (removeItem(player, cat)){ if (removeItem(player, cat)){
player.familiarManager.removeDetails(cat) player.familiarManager.removeDetails(cat)
addItem(player, Items.DEATH_RUNE_560, 100) addItem(player, Items.DEATH_RUNE_560, 100)
player.incrementAttribute("/save:stats_manager:cats_sold");
break break
} }
} }
@ -173,7 +172,6 @@ class CatTrade : InteractionListener{
// Remove the cat // Remove the cat
player.familiarManager.removeDetails(used.id) player.familiarManager.removeDetails(used.id)
addItem(player, Items.DEATH_RUNE_560, 100) addItem(player, Items.DEATH_RUNE_560, 100)
player.incrementAttribute("/save:stats_manager:cats_sold");
openDialogue(player, dialogue, with as NPC) openDialogue(player, dialogue, with as NPC)
} }

1
Server/src/main/core/game/system/command/sets/StatAttributeKeys.kt
View File

@ -9,7 +9,6 @@ const val STATS_ROCKS = "rocks_mined"
const val STATS_RC = "essence_crafted" const val STATS_RC = "essence_crafted"
const val STATS_FOOD_COOKED = "food_cooked" const val STATS_FOOD_COOKED = "food_cooked"
const val STATS_CATS_RAISED = "cats_raised" const val STATS_CATS_RAISED = "cats_raised"
const val STATS_CATS_SOLD = "cats_sold"
const val STATS_PK_KILLS = "player_kills" const val STATS_PK_KILLS = "player_kills"
const val STATS_PK_DEATHS = "player_deaths" const val STATS_PK_DEATHS = "player_deaths"
const val STATS_ALKHARID_GATE = "alkharid_gate" const val STATS_ALKHARID_GATE = "alkharid_gate"

2
Server/src/main/core/game/system/command/sets/StatsCommandSet.kt
View File

@ -62,7 +62,7 @@ class StatsCommandSet : CommandSet(Privilege.STANDARD) {
72 -> sendLine(player,"Quest Points: ${queryPlayer.questRepository.points}",i) 72 -> sendLine(player,"Quest Points: ${queryPlayer.questRepository.points}",i)
73 -> sendLine(player,"Ironman Mode: ${queryPlayer.ironmanManager.mode.name.lowercase(Locale.getDefault())}",i) 73 -> sendLine(player,"Ironman Mode: ${queryPlayer.ironmanManager.mode.name.lowercase(Locale.getDefault())}",i)
74 -> sendLine(player,"Deaths: ${queryPlayer.getAttribute("$STATS_BASE:$STATS_DEATHS",0)}",i) 74 -> sendLine(player,"Deaths: ${queryPlayer.getAttribute("$STATS_BASE:$STATS_DEATHS",0)}",i)
75 -> sendLine(player, "Cats Sold: ${queryPlayer.getAttribute("$STATS_BASE:$STATS_CATS_SOLD", 0)}", i) 75 -> sendLine(player, SPACER,i)
76 -> sendLine(player,"Logs Chopped: ${queryPlayer.getAttribute("$STATS_BASE:$STATS_LOGS",0)}",i) 76 -> sendLine(player,"Logs Chopped: ${queryPlayer.getAttribute("$STATS_BASE:$STATS_LOGS",0)}",i)
77 -> sendLine(player,"Rocks Mined: ${queryPlayer.getAttribute("$STATS_BASE:$STATS_ROCKS",0)}",i) 77 -> sendLine(player,"Rocks Mined: ${queryPlayer.getAttribute("$STATS_BASE:$STATS_ROCKS",0)}",i)
78 -> sendLine(player,"Fish Caught: ${queryPlayer.getAttribute("$STATS_BASE:$STATS_FISH",0)}",i) 78 -> sendLine(player,"Fish Caught: ${queryPlayer.getAttribute("$STATS_BASE:$STATS_FISH",0)}",i)