Rename expressions to official names (#531)

* Fix crafting leather amounts * Convert to data objects * Rename Angry to Frustrated * Rename Furious to Angry * Rename Talking to Neutral * Rename Suspicious to Shifty * Rename Unsure to Quiz * Rename Happy to Pleased * Rename Cheerful to Happy
GregHib · May 3, 2024 · b040377 · b040377
1 parent f4c7c6f
commit b040377
Show file tree

Hide file tree

Showing 76 changed files with 1,526 additions and 1,482 deletions.
diff --git a/data/definitions/animations.yml b/data/definitions/animations.yml
@@ -49,18 +49,18 @@ expression_scared1: 9777
 expression_scared2: 9778
 expression_scared3: 9779
 expression_scared4: 9780
-expression_angry1: 9781
-expression_angry2: 9782
-expression_angry3: 9783
-expression_angry4: 9784
+expression_frustrated1: 9781
+expression_frustrated2: 9782
+expression_frustrated3: 9783
+expression_frustrated4: 9784
 expression_angry_old1: 614
 expression_angry_old2: 615
 expression_angry_old3: 616
 expression_angry_old4: 617
-expression_furious1: 9785
-expression_furious2: 9786
-expression_furious3: 9787
-expression_furious4: 9788
+expression_angry1: 9785
+expression_angry2: 9786
+expression_angry3: 9787
+expression_angry4: 9788
 expression_mad1: 9789
 expression_mad2: 9790
 expression_mad3: 9791
@@ -75,14 +75,14 @@ expression_evil_grin2: 9799
 expression_evil_grin3: 9800
 expression_evil_grin4: 9801
 expression_asleep: 9802
-expression_talking1: 9803
-expression_talking2: 9804
-expression_talking3: 9805
-expression_talking4: 9806
-expression_talking_old1: 588
-expression_talking_old2: 589
-expression_talking_old3: 590
-expression_talking_old4: 591
+expression_neutral1: 9803
+expression_neutral2: 9804
+expression_neutral3: 9805
+expression_neutral4: 9806
+expression_neutral_old1: 588
+expression_neutral_old2: 589
+expression_neutral_old3: 590
+expression_neutral_old4: 591
 expression_talk1: 9807
 expression_talk2: 9808
 expression_talk3: 9809
@@ -108,14 +108,14 @@ expression_no_disgust1: 9823
 expression_no_disgust2: 9824
 expression_no_disgust3: 9825
 expression_no_disgust4: 9826
-expression_unsure1: 9827
-expression_unsure2: 9828
-expression_unsure3: 9829
-expression_unsure4: 9830
-expression_unsure_old1: 554
-expression_unsure_old2: 555
-expression_unsure_old3: 556
-expression_unsure_old4: 557
+expression_quiz1: 9827
+expression_quiz2: 9828
+expression_quiz3: 9829
+expression_quiz4: 9830
+expression_quiz_old1: 554
+expression_quiz_old2: 555
+expression_quiz_old3: 556
+expression_quiz_old4: 557
 expression_roll_eyes1: 9831
 expression_roll_eyes2: 9832
 expression_roll_eyes3: 9833
@@ -129,30 +129,30 @@ expression_drunk_old1: 600
 expression_drunk_old2: 601
 expression_drunk_old3: 602
 expression_drunk_old4: 603
-expression_suspicious1: 9836
-expression_suspicious2: 9837
-expression_suspicious3: 9838
-expression_suspicious4: 9839
-expression_suspicious_old1: 592
-expression_suspicious_old2: 593
-expression_suspicious_old3: 594
-expression_suspicious_old4: 595
+expression_shifty1: 9836
+expression_shifty2: 9837
+expression_shifty3: 9838
+expression_shifty4: 9839
+expression_shifty_old1: 592
+expression_shifty_old2: 593
+expression_shifty_old3: 594
+expression_shifty_old4: 595
 expression_chuckle: 9840
 expression_hysterics: 9841
 expression_evil_laugh: 9842
 expression_evil_laugh_old: 609
-expression_happy1: 9843
-expression_happy2: 9844
-expression_happy3: 9845
-expression_happy4: 9846
-expression_cheerful1: 9847
-expression_cheerful2: 9848
-expression_cheerful3: 9849
-expression_cheerful4: 9850
-expression_cheerful_old1: 567
-expression_cheerful_old2: 568
-expression_cheerful_old3: 569
-expression_cheerful_old4: 570
+expression_pleased1: 9843
+expression_pleased2: 9844
+expression_pleased3: 9845
+expression_pleased4: 9846
+expression_happy1: 9847
+expression_happy2: 9848
+expression_happy3: 9849
+expression_happy4: 9850
+expression_happy_old1: 567
+expression_happy_old2: 568
+expression_happy_old3: 569
+expression_happy_old4: 570
 expression_laugh1: 9851
 expression_laugh2: 9852
 expression_laugh3: 9853

diff --git a/data/definitions/item-on-item.yml b/data/definitions/item-on-item.yml
@@ -3479,7 +3479,9 @@ snakeskin_boots:
   level: 45
   xp: 30.0
   requires: [ needle, thread ]
-  remove: [ snakeskin ]
+  remove:
+    - item: snakeskin
+      amount: 6
   add: [ snakeskin_boots ]
   ticks: 3
   animation: craft_leather
@@ -3489,7 +3491,9 @@ snakeskin_vambraces:
   level: 47
   xp: 35.0
   requires: [ needle, thread ]
-  remove: [ snakeskin ]
+  remove:
+    - item: snakeskin
+      amount: 8
   add: [ snakeskin_vambraces ]
   ticks: 3
   animation: craft_leather
@@ -3499,7 +3503,9 @@ snakeskin_bandana:
   level: 48
   xp: 45.0
   requires: [ needle, thread ]
-  remove: [ snakeskin ]
+  remove:
+    - item: snakeskin
+      amount: 5
   add: [ snakeskin_bandana ]
   ticks: 3
   animation: craft_leather
@@ -3509,7 +3515,9 @@ snakeskin_chaps:
   level: 51
   xp: 50.0
   requires: [ needle, thread ]
-  remove: [ snakeskin ]
+  remove:
+    - item: snakeskin
+      amount: 12
   add: [ snakeskin_chaps ]
   ticks: 3
   animation: craft_leather
@@ -3519,7 +3527,9 @@ snakeskin_body:
   level: 53
   xp: 55.0
   requires: [ needle, thread ]
-  remove: [ snakeskin ]
+  remove:
+    - item: snakeskin
+      amount: 15
   add: [ snakeskin_body ]
   ticks: 3
   animation: craft_leather
@@ -3539,7 +3549,9 @@ green_dragonhide_chaps:
   level: 60
   xp: 124.0
   requires: [ needle, thread ]
-  remove: [ green_dragon_leather ]
+  remove:
+    - item: green_dragon_leather
+      amount: 2
   add: [ green_dragonhide_chaps ]
   ticks: 3
   animation: craft_leather
@@ -3549,7 +3561,9 @@ green_dragonhide_body:
   level: 63
   xp: 186.0
   requires: [ needle, thread ]
-  remove: [ green_dragon_leather ]
+  remove:
+    - item: green_dragon_leather
+      amount: 3
   add: [ green_dragonhide_body ]
   ticks: 3
   animation: craft_leather
@@ -3569,7 +3583,9 @@ blue_dragonhide_chaps:
   level: 68
   xp: 140.0
   requires: [ needle, thread ]
-  remove: [ blue_dragon_leather ]
+  remove:
+    - item: blue_dragon_leather
+      amount: 2
   add: [ blue_dragonhide_chaps ]
   ticks: 3
   animation: craft_leather
@@ -3579,7 +3595,9 @@ blue_dragonhide_body:
   level: 71
   xp: 210.0
   requires: [ needle, thread ]
-  remove: [ blue_dragon_leather ]
+  remove:
+    - item: blue_dragon_leather
+      amount: 3
   add: [ blue_dragonhide_body ]
   ticks: 3
   animation: craft_leather
@@ -3599,7 +3617,9 @@ red_dragonhide_chaps:
   level: 75
   xp: 156.0
   requires: [ needle, thread ]
-  remove: [ red_dragon_leather ]
+  remove:
+    - item: red_dragon_leather
+      amount: 2
   add: [ red_dragonhide_chaps ]
   ticks: 3
   animation: craft_leather
@@ -3609,7 +3629,9 @@ red_dragonhide_body:
   level: 77
   xp: 234.0
   requires: [ needle, thread ]
-  remove: [ red_dragon_leather ]
+  remove:
+    - item: red_dragon_leather
+      amount: 3
   add: [ red_dragonhide_body ]
   ticks: 3
   animation: craft_leather
@@ -3629,7 +3651,9 @@ black_dragonhide_chaps:
   level: 82
   xp: 172.0
   requires: [ needle, thread ]
-  remove: [ black_dragon_leather ]
+  remove:
+    - item: black_dragon_leather
+      amount: 2
   add: [ black_dragonhide_chaps ]
   ticks: 3
   animation: craft_leather
@@ -3639,7 +3663,9 @@ black_dragonhide_body:
   level: 84
   xp: 234.0
   requires: [ needle, thread ]
-  remove: [ black_dragon_leather ]
+  remove:
+    - item: black_dragon_leather
+      amount: 3
   add: [ black_dragonhide_body ]
   ticks: 3
   animation: craft_leather

diff --git a/game/src/main/kotlin/world/gregs/voidps/world/activity/dnd/shootingstar/ShootingStar.kts b/game/src/main/kotlin/world/gregs/voidps/world/activity/dnd/shootingstar/ShootingStar.kts
@@ -41,7 +41,7 @@ import world.gregs.voidps.world.activity.dnd.shootingstar.ShootingStarHandler.cu
 import world.gregs.voidps.world.activity.dnd.shootingstar.ShootingStarHandler.currentStarTile
 import world.gregs.voidps.world.activity.dnd.shootingstar.ShootingStarHandler.startEvent
 import world.gregs.voidps.world.activity.dnd.shootingstar.ShootingStarHandler.totalCollected
-import world.gregs.voidps.world.interact.dialogue.Cheerful
+import world.gregs.voidps.world.interact.dialogue.Happy
 import world.gregs.voidps.world.interact.dialogue.Sad
 import world.gregs.voidps.world.interact.dialogue.type.npc
 import world.gregs.voidps.world.interact.entity.combat.hit.damage
@@ -206,7 +206,7 @@ objectApproach("Prospect", "crashed_star_tier_#") {
 }
 
 npcOperate("Talk-to", "star_sprite") {
-    npc<Cheerful>("Thank you for helping me out of here")
+    npc<Happy>("Thank you for helping me out of here")
     val starDustCount = player.inventory.count("stardust")
     if (player.inventory.isFull()) {
         player.message("Inventory full. To make more room, sell, drop or bank something.", ChatType.Game)
@@ -225,10 +225,10 @@ npcOperate("Talk-to", "star_sprite") {
             }
         }
         if(!ShootingStarHandler.rewardPlayerBonusOre(player)) {
-            npc<Cheerful>("I have rewarded you by making it so you can mine extra ore for the next 15 minutes, ${messageBuilder}.")
+            npc<Happy>("I have rewarded you by making it so you can mine extra ore for the next 15 minutes, ${messageBuilder}.")
             givePlayerBonusOreReward(player)
         } else {
-            npc<Cheerful>("You already have the ability to mine an extra ore, ${messageBuilder.replace(0, 4, "However")}.")
+            npc<Happy>("You already have the ability to mine an extra ore, ${messageBuilder.replace(0, 4, "However")}.")
         }
     }
 }
diff --git a/game/src/main/kotlin/world/gregs/voidps/world/activity/skill/herblore/PotionDecanting.kts b/game/src/main/kotlin/world/gregs/voidps/world/activity/skill/herblore/PotionDecanting.kts
@@ -1,14 +1,16 @@
 package world.gregs.voidps.world.activity.skill.herblore
 
-import com.github.michaelbull.logging.InlineLogger
 import world.gregs.voidps.engine.entity.character.npc.npcOperate
 import world.gregs.voidps.engine.entity.character.player.Player
 import world.gregs.voidps.engine.entity.item.Item
 import world.gregs.voidps.engine.inv.inventory
 import world.gregs.voidps.engine.inv.transact.TransactionError
 import world.gregs.voidps.engine.inv.transact.operation.AddItem.add
 import world.gregs.voidps.engine.inv.transact.operation.ClearItem.clear
-import world.gregs.voidps.world.interact.dialogue.*
+import world.gregs.voidps.world.interact.dialogue.Happy
+import world.gregs.voidps.world.interact.dialogue.Neutral
+import world.gregs.voidps.world.interact.dialogue.Sad
+import world.gregs.voidps.world.interact.dialogue.Talk
 import world.gregs.voidps.world.interact.dialogue.type.choice
 import world.gregs.voidps.world.interact.dialogue.type.npc
 import world.gregs.voidps.world.interact.dialogue.type.player
@@ -23,24 +25,24 @@ val potions = setOf(
 
 npcOperate("Decant", "bob_barter_herbs") {
     if(decantPotions(player)) {
-        npc<Cheerful>("There you go, chum.")
+        npc<Happy>("There you go, chum.")
     } else {
         npc<Sad>("I wasn't able to decant your potions.")
     }
 }
 npcOperate("Talk-to", "bob_barter_herbs") {
-    npc<Cheerful>("Hello, chum, fancy buyin' some designer jewellry? They've come all the way from Ardougne! Most pukka!")
-    player<Talking>("Erm, no. I'm all set, thanks.")
-    npc<Cheerful>("Okay, chum, would you like to show you the very latest potion prices?")
+    npc<Happy>("Hello, chum, fancy buyin' some designer jewellry? They've come all the way from Ardougne! Most pukka!")
+    player<Neutral>("Erm, no. I'm all set, thanks.")
+    npc<Happy>("Okay, chum, would you like to show you the very latest potion prices?")
     choice {
         option<Talk>("Who are you?") {
-            npc<Cheerful>("Why, I'm Bob! Your friendly seller of smashin' goods!")
-            player<Talking>("So what do you have to sell?")
-            npc<Talking>("Oh, not much at the moment. Cuz, ya know, business being so well and cushie.")
-            player<Talking>("You don't really look like you're being so successful.")
-            npc<Talking>("You plonka! It's all a show, innit! If I let people knows I'm in good business they'll want a share of the moolah!")
-            player<Talking>("You conveniently have a response for everything.")
-            npc<Talking>("That's the Ardougne way, my son.")
+            npc<Happy>("Why, I'm Bob! Your friendly seller of smashin' goods!")
+            player<Neutral>("So what do you have to sell?")
+            npc<Neutral>("Oh, not much at the moment. Cuz, ya know, business being so well and cushie.")
+            player<Neutral>("You don't really look like you're being so successful.")
+            npc<Neutral>("You plonka! It's all a show, innit! If I let people knows I'm in good business they'll want a share of the moolah!")
+            player<Neutral>("You conveniently have a response for everything.")
+            npc<Neutral>("That's the Ardougne way, my son.")
         }
         option<Talk>("Can you show me the prices for potions?") {
             npc<Sad>("The Grand Exchange is still under construction, hopefully it won't take long, then i'll have those prices for yah")