MagmaLink updates + added emotions to the narratives

peterwilli · Jun 25, 2022 · 4c5efd3 · 4c5efd3
1 parent 25a56ae
commit 4c5efd3
Show file tree

Hide file tree

Showing 7 changed files with 108 additions and 9,319 deletions.
diff --git a/EndlessAWSWClient/__init__.py b/EndlessAWSWClient/__init__.py
@@ -1,19 +1,21 @@
 from modloader.modclass import Mod, loadable_mod
 from modloader import modast, modinfo
+import jz_magmalink as ml
 
 @loadable_mod
 class AWSWMod(Mod):
-    def mod_info(self):
-        return ("EndlessAWSW", "1.0", "EmeraldOdin")
+    name = "EndlessAWSW"
+    version = "0.1"
+    author = "EmeraldOdin"
+    dependencies = ["MagmaLink"]
 
     def mod_load(self):
         modast.set_renpy_global("eawsw_naomi_installed", modinfo.has_mod("A Solitary Mind"))
-        ml = modinfo.get_mods()["MagmaLink"].import_ml()
         ml.find_label("seccont") \
             .search_say("He seemed a lot smaller than Remy, and when he somewhat") \
             .hook_to("eawsw_intro") \
             .search_say("Just follow me.") \
             .link_from("pick_your_poison_end")
 
     def mod_complete(self):
-        pass
+        pass
diff --git a/EndlessAWSWClient/main.rpy b/EndlessAWSWClient/main.rpy
@@ -43,14 +43,14 @@ label eawsw_pick_your_poison:
             $ eawsw_state['start_narrative'] = [
                 { 'cmd': 'msg', 'from': 'c', 'msg': "Hey Remy!" },
                 { 'cmd': 'scn', 'scn': 'park2' },
-                { 'cmd': 'msg', 'from': 'Ry', 'msg': "Hey!" },
+                { 'cmd': 'msg', 'emotion': 'smile', 'from': 'Ry', 'msg': "Hey!" },
             ]
         "You're watching Adine training stunt flights at the beach":
             $ eawsw_state['start_scene'] = 'beach'
             $ eawsw_state['start_narrative'] = [
                 { 'cmd': 'msg', 'from': 'c', 'msg': "Wow nice looping!" },
                 { 'cmd': 'scn', 'scn': 'beach' },
-                { 'cmd': 'msg', 'from': 'Ad', 'msg': "Thanks! But I have to do much better than this!" },
+                { 'cmd': 'msg', 'emotion': 'giggle', 'from': 'Ad', 'msg': "Thanks! But I have to do much better than this!" },
             ]
         "You're with Lorem in the forest.":
             $ eawsw_state['start_narrative'] = [
@@ -62,31 +62,31 @@ label eawsw_pick_your_poison:
         "You're with Lorem and Ipsum in their apartment.":
             $ eawsw_state['start_narrative'] = [
                 { 'cmd': 'scn', 'scn': 'loremapt' },
-                { 'cmd': 'msg', 'from': 'Lo', 'msg': "I'm glad you came!" },
+                { 'cmd': 'msg', 'from': 'Lo', 'emotion': 'happy', 'msg': "I'm glad you came!" },
                 { 'cmd': 'scn', 'scn': 'loremapt' },
-                { 'cmd': 'msg', 'from': 'Ip', 'msg': "I heard all about you." },
+                { 'cmd': 'msg', 'from': 'Ip', 'emotion': 'happy', 'msg': "I heard all about you." },
             ]
         "You're in a fight with Maverick.":
             $ eawsw_state['start_narrative'] = [
                 { 'cmd': 'scn', 'scn': 'np1r' },
                 { 'cmd': 'msg', 'from': 'm', 'msg': "Maverick growled heavily at me." },
                 { 'cmd': 'scn', 'scn': 'np1r' },
-                { 'cmd': 'msg', 'from': 'Mv', 'msg': "I'll slice you open!" },
+                { 'cmd': 'msg', 'from': 'Mv', 'emotion': 'angry', 'msg': "I'll slice you open!" },
             ]
         "On a picnic with Bryce":
             $ eawsw_state['start_narrative'] = [
                 { 'cmd': 'scn', 'scn': 'np2' },
                 { 'cmd': 'msg', 'from': 'm', 'msg': "I sat down with Bryce. During our trip to the picnic place he carried a large basket." },
                 { 'cmd': 'scn', 'scn': 'np2' },
-                { 'cmd': 'msg', 'from': 'Br', 'msg': "If you're hungry, you can grab something from the fun basket." },
+                { 'cmd': 'msg', 'from': 'Br', 'emotion': 'laugh', 'msg': "If you're hungry, you can grab something from the fun basket." },
             ]
         "In a shipwreck with Naomi":
             if eawsw_naomi_installed:   
                 $ eawsw_state['start_narrative'] = [
                     { 'cmd': 'scn', 'scn': 'eckoldbiolab' },
                     { 'cmd': 'msg', 'from': 'm', 'msg': "After days locked up in here, we still haven't found a way out." },
                     { 'cmd': 'scn', 'scn': 'eckoldbiolab' },
-                    { 'cmd': 'msg', 'from': 'Nm', 'msg': "Are they looking for us you think?" },
+                    { 'cmd': 'msg', 'from': 'Nm', 'emotion': 'blank', 'msg': "Are they looking for us you think?" },
                 ]
             else:    
                 jump need_naomi_error
@@ -171,12 +171,13 @@ label eawsw_loop:
                     "Kv": Kv,
                     "Lo": Lo,
                     "Mv": Mv,
-                    "Nm": Nm,
                     "Ry": Ry,
                     "Rz": Rz,
                     "Sb": Sb,
                     "Zh": Zh
                 }
+                if eawsw_naomi_installed:
+                    self.talk_functions['Nm'] = Nm
                 # Add self
                 self.talk_functions.update({
                     'm': m,
@@ -199,7 +200,7 @@ label eawsw_loop:
                                 self.last_character = None
                             else:
                                 if emotion is None:
-                                    self.last_character = '%s b' % (self.character_mapping[msg_from])
+                                    self.last_character = '%s normal b' % (self.character_mapping[msg_from])
                                 else:
                                     self.last_character = '%s %s b' % (self.character_mapping[msg_from], emotion)
                         else:

diff --git a/EndlessServer/src/validated_reply_buffer.py b/EndlessServer/src/validated_reply_buffer.py
@@ -44,8 +44,7 @@
     "m": "Narrator",
     "c": "Player"
 })
-allowed_scenes = ['park2', 'loremapt', 'office', 'black', 'bare', 'pad', 'bareblur', 'bareblur2', 'facin3', 'alley', 'fb', 'farm', 'town4', 'adineapt', 'corridor', 'emeraroom', 'o4', 'facin2', 'o2', 'park3', 'np2x', 'np1x', 'buildingoutside', 'np3', 'store2', 'cave', 'o', 'remyapt', 'cafe', 'viewingspot', 'np1r', 'hallway', 'np2y', 'np1n', 'town2', 'stairs', 'darker', 'store', 'library', 'forest2', 'school', 'forest1', 'storex', 'np3x', 'beachx', 'padx', 'np4', 'fac1', 'facin', 'town3', 'np1', 'stars', 'town6', 'deadbody', 'forestx', 'office2', 'cave2', 'table', 'farm2', 'hatchery', 'testingroom', 'gate', 'town7', 'fac12', 'adineapt2', 'ecknaomiapt01', 'eckswimmingpool', 'ecknewtownout2', 'eckswimmingpool2', 'eckoldbiolab', 'beach', 'eckwatersky01', 'eckunderwatertunnel', 'eckbeachb', 'ecknaomiapt03', 'ecknaomiaptbalcony', 'eckpolicedeptstairs1', 'eckplayeraptextra1', 'town1', 'eckkitchenx']
-
+allowed_scenes = ['park2', 'loremapt', 'office', 'black', 'bare', 'pad', 'bareblur', 'bareblur2', 'facin2', 'facinx', 'facin3', 'alley', 'fb', 'farm', 'town4', 'adineapt', 'emeraroom', 'o4', 'o2', 'park3', 'np3x', 'np2x', 'np1x', 'buildingoutside', 'np3', 'np2', 'store2', 'town1x', 'forestx', 'cave', 'o', 'remyapt', 'cafe', 'viewingspot', 'np1r', 'hallway', 'np2y', 'np1n', 'town2', 'darker', 'store', 'library', 'forest2', 'school', 'forest1', 'storex', 'np5e', 'beachx', 'padx', 'np4', 'np5', 'fac1', 'facin', 'town3', 'kitchen', 'np1', 'stars', 'o3', 'town7', 'town6', 'deadbody', 'whiteroom', 'office2', 'cave2', 'table', 'starsrx', 'farm2', 'hatchery', 'testingroom', 'gate', 'fac12', 'adineapt2', 'ecknaomiapt01', 'eckoutsideuniv2', 'eckswimmingpool', 'ecknewtownout2', 'eckswimmingpool2', 'eckoldbiolab', 'beach', 'eckwatersky01', 'eckunderwatertransition01', 'eckunderwater02', 'eckunderwatertunnel', 'eckbeachb', 'ecknaomiapt03', 'ecknaomiaptbalcony', 'ecknaomiapt02', 'eckpolicedeptstairs1', 'eckplayeraptextra1', 'town1', 'eckkitchenx']
 re_token = re.compile(r'(<.*?>|[^<]*)')
 re_command = re.compile(r'^<(.*?)>$')
 re_alphanumeric_whitespace = re.compile(r'[A-Za-z0-9\s]')

diff --git a/Research/Extras/Scene frequency analysis.ipynb b/Research/Extras/Scene frequency analysis.ipynb
@@ -3,7 +3,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "31bb8346-628e-4db4-a2b1-013a55627acd",
+   "id": "c25886f8",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -22,7 +22,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "c140fe72-c09d-497a-8c05-d11a9417d6d5",
+   "id": "baf46ad8",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -34,7 +34,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "86a8ef34-4489-43c6-b4b2-9dcfea97bef4",
+   "id": "2b86508c",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -44,7 +44,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "476b4dac-706f-4456-9b68-ab1bf7f945a2",
+   "id": "f965d447",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -62,7 +62,7 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "id": "58c55de4-39be-4dc4-98bb-669ba6d0f98f",
+   "id": "37c405fa",
    "metadata": {},
    "outputs": [],
    "source": [
@@ -94,7 +94,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.10"
+   "version": "3.8.13"
   }
  },
  "nbformat": 4,

diff --git a/Research/Extras/Sentiment Analysis.ipynb b/Research/Extras/Sentiment Analysis.ipynb
diff --git a/Research/Step 1 - Model overfitting.ipynb b/Research/Step 1 - Model overfitting.ipynb