start separating traps notifications into tra

BGforgeNet · Feb 14, 2020 · 2e7bdc5 · 2e7bdc5
1 parent 9c416a3
commit 2e7bdc5
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 19 deletions.
diff --git a/tnt/components/easy_traps/traps.baf b/tnt/components/easy_traps/traps.baf
@@ -14,7 +14,7 @@ THEN
     SetGlobalTimer("g_trap_%trap_type_id%_timer","myarea",12)
     SetGlobalTimer("g_trap_common_timer","global",12)
     %traps_baf_stop%
-    DisplayStringHead(LastSeenBy,@29)
+    DisplayStringHead(LastSeenBy,@2)
     %traps_baf_sound%
     %traps_baf_view%
     %traps_baf_pause%
@@ -23,7 +23,7 @@ THEN
     SetGlobalTimer("g_trap_%trap_type_id%_timer","myarea",12)
     SetGlobalTimer("g_trap_common_timer","global",12)
     %traps_baf_stop%
-    DisplayStringHead(LastSeenBy,@30)
+    DisplayStringHead(LastSeenBy,@3)
     %traps_baf_sound%
     %traps_baf_view%
     %traps_baf_pause%
@@ -32,7 +32,7 @@ THEN
     SetGlobalTimer("g_trap_%trap_type_id%_timer","myarea",12)
     SetGlobalTimer("g_trap_common_timer","global",12)
     %traps_baf_stop%
-    DisplayStringHead(LastSeenBy,@31)
+    DisplayStringHead(LastSeenBy,@4)
     %traps_baf_sound%
     %traps_baf_view%
     %traps_baf_pause%
@@ -41,7 +41,7 @@ THEN
     SetGlobalTimer("g_trap_%trap_type_id%_timer","myarea",12)
     SetGlobalTimer("g_trap_common_timer","global",12)
     %traps_baf_stop%
-    DisplayStringHead(LastSeenBy,@32)
+    DisplayStringHead(LastSeenBy,@5)
     %traps_baf_sound%
     %traps_baf_view%
     %traps_baf_pause%
@@ -50,7 +50,7 @@ THEN
     SetGlobalTimer("g_trap_%trap_type_id%_timer","myarea",12)
     SetGlobalTimer("g_trap_common_timer","global",12)
     %traps_baf_stop%
-    DisplayStringHead(LastSeenBy,@33)
+    DisplayStringHead(LastSeenBy,@6)
     %traps_baf_sound%
     %traps_baf_view%
     %traps_baf_pause%
@@ -59,7 +59,7 @@ THEN
     SetGlobalTimer("g_trap_%trap_type_id%_timer","myarea",12)
     SetGlobalTimer("g_trap_common_timer","global",12)
     %traps_baf_stop%
-    DisplayStringHead(LastSeenBy,@34)
+    DisplayStringHead(LastSeenBy,@7)
     %traps_baf_sound%
     %traps_baf_view%
     %traps_baf_pause%
@@ -68,7 +68,7 @@ THEN
     SetGlobalTimer("g_trap_%trap_type_id%_timer","myarea",12)
     SetGlobalTimer("g_trap_common_timer","global",12)
     %traps_baf_stop%
-    DisplayStringHead(LastSeenBy,@35)
+    DisplayStringHead(LastSeenBy,@8)
     %traps_baf_sound%
     %traps_baf_view%
     %traps_baf_pause%
@@ -77,7 +77,16 @@ THEN
     SetGlobalTimer("g_trap_%trap_type_id%_timer","myarea",12)
     SetGlobalTimer("g_trap_common_timer","global",12)
     %traps_baf_stop%
-    DisplayStringHead(LastSeenBy,@36)
+    DisplayStringHead(LastSeenBy,@9)
+    %traps_baf_sound%
+    %traps_baf_view%
+    %traps_baf_pause%
+    Continue()
+  RESPONSE #1
+    SetGlobalTimer("g_trap_%trap_type_id%_timer","myarea",12)
+    SetGlobalTimer("g_trap_common_timer","global",12)
+    %traps_baf_stop%
+    DisplayStringHead(LastSeenBy,@10)
     %traps_baf_sound%
     %traps_baf_view%
     %traps_baf_pause%

diff --git a/tnt/components/easy_traps/traps_list.tpa b/tnt/components/easy_traps/traps_list.tpa
@@ -1,14 +1,15 @@
-ACTION_DEFINE_ASSOCIATIVE_ARRAY trap_type BEGIN // main hash
-  CTAR  => ~Arrow trap~
-  CTAR2 => ~Repeating arrow trap~
-  CTAR3 => ~Slaying arrow trap~
-  CTAR4 => ~Acid arrow trap~
-  CTAR5 => ~Biting arrow trap~
-  CTAR6 => ~Detonation arrow trap~
-  CTAR7 => ~Dispelling arrow trap~
-  CTAR8 => ~Fire arrow trap~
-  CTAR9 => ~Ice arrow trap~
-  CTAR10 => ~Piercing arrow trap~
+// main hash
+ACTION_DEFINE_ASSOCIATIVE_ARRAY trap_type BEGIN
+  CTAR  => @100
+  CTAR2 => @101
+  CTAR3 => @102
+  CTAR4 => @103
+  CTAR5 => @104
+  CTAR6 => @105
+  CTAR7 => @105
+  CTAR8 => @107
+  CTAR9 => @108
+  CTAR10 => @109
 
   GTAR  => ~Arrow trap~
   GTAR2 => ~Repeating arrow trap~

diff --git a/tnt/tra/english/easy_traps.tra b/tnt/tra/english/easy_traps.tra
@@ -0,0 +1,22 @@
+//notice a trap
+@1 = ~Uh, I smell a trap.~ //familiar
+@2 = ~Careful. Something's not quite right here.~
+@3 = ~Stop! It's a trap!~
+@4 = ~I sense a trap!~
+@5 = ~Hmm... We should tread lightly here.~
+@6 = ~Wait, wait. Let's take a closer look at this.~
+@7 = ~I sense danger.~
+@8 = ~Watch your step. Looks suspicious.~
+@10 = ~Hold on. See this?~
+
+// trap floats
+@100 = ~Arrow trap~
+@101 = ~Repeating arrow trap~
+@102 = ~Slaying arrow trap~
+@103 =  ~Acid arrow trap~
+@104 =  ~Biting arrow trap~
+@105 =  ~Detonation arrow trap~
+@106 = ~Dispelling arrow trap~
+@107 = ~Fire arrow trap~
+@108 = ~Ice arrow trap~
+@110 = ~Piercing arrow trap~